From: <an...@us...> - 2007-09-19 14:51:58
|
Revision: 941 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=941&view=rev Author: and-81 Date: 2007-09-19 07:51:51 -0700 (Wed, 19 Sep 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs trunk/plugins/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/Input Service/InputService.cs trunk/plugins/IR Server Suite/Input Service/InputServiceInstaller.cs trunk/plugins/IR Server Suite/Input Service/Program.cs Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-09-19 14:07:27 UTC (rev 940) +++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-09-19 14:51:51 UTC (rev 941) @@ -129,7 +129,7 @@ IRServerPlugin[] serverPlugins = AvailablePlugins(); if (serverPlugins == null) - throw new ApplicationException("No available plugins found."); + throw new FileNotFoundException("No available plugins found"); foreach (IRServerPlugin plugin in serverPlugins) if (plugin.Name.Equals(pluginName, StringComparison.InvariantCultureIgnoreCase)) Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-09-19 14:07:27 UTC (rev 940) +++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-09-19 14:51:51 UTC (rev 941) @@ -436,7 +436,8 @@ {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|x86.ActiveCfg = Debug|x86 {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Debug|x86.Build.0 = Debug|x86 {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|x86.ActiveCfg = Release|Any CPU + {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|x86.ActiveCfg = Release|x86 + {BCAFDF45-70DD-46FD-8B98-880DDA585AD2}.Release|x86.Build.0 = Release|x86 {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|Any CPU.Build.0 = Debug|Any CPU {905131F8-F8AC-4A65-A722-37783902D7B8}.Debug|x86.ActiveCfg = Debug|x86 @@ -491,14 +492,16 @@ {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Debug|x86.Build.0 = Debug|x86 {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Release|Any CPU.ActiveCfg = Release|Any CPU {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Release|Any CPU.Build.0 = Release|Any CPU - {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Release|x86.ActiveCfg = Release|Any CPU + {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Release|x86.ActiveCfg = Release|x86 + {327F54E5-D1DC-4297-BF2F-4283EB30FFB1}.Release|x86.Build.0 = Release|x86 {DDB52A4D-A670-411A-8273-8B1707C67028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DDB52A4D-A670-411A-8273-8B1707C67028}.Debug|Any CPU.Build.0 = Debug|Any CPU {DDB52A4D-A670-411A-8273-8B1707C67028}.Debug|x86.ActiveCfg = Debug|x86 {DDB52A4D-A670-411A-8273-8B1707C67028}.Debug|x86.Build.0 = Debug|x86 {DDB52A4D-A670-411A-8273-8B1707C67028}.Release|Any CPU.ActiveCfg = Release|Any CPU {DDB52A4D-A670-411A-8273-8B1707C67028}.Release|Any CPU.Build.0 = Release|Any CPU - {DDB52A4D-A670-411A-8273-8B1707C67028}.Release|x86.ActiveCfg = Release|Any CPU + {DDB52A4D-A670-411A-8273-8B1707C67028}.Release|x86.ActiveCfg = Release|x86 + {DDB52A4D-A670-411A-8273-8B1707C67028}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/plugins/IR Server Suite/Input Service/InputService.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/InputService.cs 2007-09-19 14:07:27 UTC (rev 940) +++ trunk/plugins/IR Server Suite/Input Service/InputService.cs 2007-09-19 14:51:51 UTC (rev 941) @@ -96,14 +96,28 @@ #endregion Constructor - #region Dispose + #region IDisposable protected override void Dispose(bool disposing) { - base.Dispose(disposing); + try + { + if (disposing) + { + if (_server != null) + _server.Dispose(); + + if (_client != null) + _client.Dispose(); + } + } + finally + { + base.Dispose(disposing); + } } - #endregion Dispose + #endregion IDisposable #region Service Methods Modified: trunk/plugins/IR Server Suite/Input Service/InputServiceInstaller.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/InputServiceInstaller.cs 2007-09-19 14:07:27 UTC (rev 940) +++ trunk/plugins/IR Server Suite/Input Service/InputServiceInstaller.cs 2007-09-19 14:51:51 UTC (rev 941) @@ -49,6 +49,7 @@ /// <summary> /// Used to set the "Allow service to interact with the desktop" setting. /// </summary> + /* void InputServiceInstaller_Committing(object sender, InstallEventArgs e) { ManagementBaseObject InParam = null; @@ -71,9 +72,9 @@ OutParam = wmiService.InvokeMethod("Change", InParam, null); } } - catch (Exception ex) + catch { - Trace.WriteLine(ex.ToString()); + throw; } finally { @@ -84,7 +85,7 @@ OutParam.Dispose(); } } - + */ } } Modified: trunk/plugins/IR Server Suite/Input Service/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/Input Service/Program.cs 2007-09-19 14:07:27 UTC (rev 940) +++ trunk/plugins/IR Server Suite/Input Service/Program.cs 2007-09-19 14:51:51 UTC (rev 941) @@ -120,7 +120,7 @@ IRServerPlugin[] serverPlugins = AvailablePlugins(); if (serverPlugins == null) - throw new ApplicationException("No available plugins found."); + throw new FileNotFoundException("No available plugins found"); foreach (IRServerPlugin plugin in serverPlugins) if (plugin.Name.Equals(pluginName, StringComparison.InvariantCultureIgnoreCase)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |