[Mp-plugins-svn] SF.net SVN: mp-plugins:[3098] trunk/plugins/IR Server Suite

[<che...@us...>]

Revision: 3098
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3098&view=rev
Author:   chef_koch
Date:     2009-09-29 19:53:52 +0000 (Tue, 29 Sep 2009)

Log Message:
-----------
added AdminHelper to start and stop input service during runtime of irss config

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
    trunk/plugins/IR Server Suite/setup/setup.nsi

Added Paths:
-----------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.csproj
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.manifest
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/AssemblyInfo.cs

Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs	2009-09-23 20:54:48 UTC (rev 3097)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs	2009-09-29 19:53:52 UTC (rev 3098)
@@ -70,7 +70,6 @@
     /// <summary>Forces processes to terminate. When this flag is set, the system does not send the WM_QUERYENDSESSION and WM_ENDSESSION messages. This can cause the applications to lose data. Therefore, you should only use this flag in an emergency.</summary>
     private const int EWX_FORCE = 4;
 
-
     #endregion Constants
 
     #region Enumerations
@@ -2696,6 +2695,43 @@
       return isWow64;
     }
 
+    #region UAC Shield on button
+    /* 
+     * Code is implemented implemented together at place for the beginning.
+     * needs rework, since I do not know exactly where to put which things.
+     */
+
+    #region Interop Command Link Definitions
+
+    internal const int BS_COMMANDLINK = 0x0000000E;
+    internal const uint BCM_SETNOTE = 0x00001609;
+    internal const uint BCM_GETNOTE = 0x0000160A;
+    internal const uint BCM_GETNOTELENGTH = 0x0000160B;
+    internal const uint BCM_SETSHIELD = 0x0000160C;
+
+    #endregion
+
+    /// <summary>
+    /// Adds a Shield-Icon to a button to indicate clicking on it launches a UAC protected action,
+    /// which requires user 
+    /// </summary>
+    /// <param name="button">the button control</param>
+    /// <param name="showShield">Indicates whether the shield should be displayed or not.</param>
+    public static void SetWindowsFormsButtonShield(System.Windows.Forms.Button button, bool showShield)
+    {
+      SendMessage(button.Handle, BCM_SETSHIELD, 0, showShield);
+    }
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    internal static extern int SendMessage(
+        IntPtr hWnd,
+        uint msg,
+        int wParam,
+        bool lParam
+    );
+
+    #endregion
+
     #endregion Methods
   }
 

Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.csproj	                        (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.csproj	2009-09-29 19:53:52 UTC (rev 3098)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F6C2B2FA-026A-4483-854C-735D6E59E69C}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>IR_Server_AdminHelper</RootNamespace>
+    <AssemblyName>IR Server AdminHelper</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ApplicationManifest>IR Server AdminHelper.manifest</ApplicationManifest>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="IR Server AdminHelper.manifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+      <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+      <Name>IrssUtils</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.manifest
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.manifest	                        (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/IR Server AdminHelper.manifest	2009-09-29 19:53:52 UTC (rev 3098)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <description>IRRS Suite - Server AdminHelper</description>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="requireAdministrator"
+          uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>

Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Program.cs	                        (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Program.cs	2009-09-29 19:53:52 UTC (rev 3098)
@@ -0,0 +1,216 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.ServiceProcess;
+using IrssUtils;
+using TimeoutException=System.TimeoutException;
+
+namespace IR_Server_AdminHelper
+{
+  class Program
+  {
+    #region Constants
+
+    internal const string ServerName = "IRServer";
+    internal const string ServerWindowName = "IRSS - " + ServerName;
+    internal const string ServerDisplayName = "IR Server";
+
+    //private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml");
+    internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server.exe");
+
+    private static readonly TimeSpan defaultServiceTime = new TimeSpan(0, 0, 30);
+
+    #endregion Constants
+
+    #region Variables
+
+    //private static bool _abstractRemoteMode;
+    //private static string _hostComputer;
+    //private static IRServerMode _mode;
+    //private static string[] _pluginNameReceive;
+    //private static string _pluginNameTransmit;
+    //private static string _processPriority;
+    //private static NotifyIcon _notifyIcon;
+    //private static bool _inConfiguration;
+    //private static Thread thread;
+    private static ServiceController serviceController;
+    private static ServiceController[] serviceControllers;
+    //private static IntPtr irsWindow;
+    //private static int waitCount;
+    //internal static IrsStatus _irsStatus;
+    //internal static bool _serviceInstalled;
+
+    #endregion Variables
+
+    static void Main(string[] args)
+    {
+      try
+      {
+        IrssLog.LogLevel = IrssLog.Level.Debug;
+        IrssLog.Open("IR Server AdminHelper.log");
+
+        if (args.Length == 0)
+        {
+          throw new InvalidOperationException(String.Format("No command line parameter specified."));
+        }
+        else
+        {
+          foreach (string parameter in args)
+          {
+            switch (parameter.ToUpperInvariant().Replace("-", "/"))
+            {
+              case "/INSTALL":
+                IrssLog.Info("Installing IR Server ...");
+                ServiceInstall();
+                break;
+
+              case "/UNINSTALL":
+                IrssLog.Info("Uninstalling IR Server ...");
+                ServiceUninstall();
+                break;
+
+              case "/START":
+                IrssLog.Info("Starting IR Server ...");
+                ServiceStart();
+                break;
+
+              case "/STOP":
+                IrssLog.Info("Stopping IR Server ...");
+                ServiceStop();
+                break;
+
+              case "/RESTART":
+                IrssLog.Info("Restarting IR Server ...");
+                ServiceStop();
+                ServiceStart();
+                break;
+
+              default:
+                throw new InvalidOperationException(String.Format("Unknown command line parameter \"{0}\"", parameter));
+            }
+          }
+
+          IrssLog.Info("Done.");
+        }
+
+        Environment.ExitCode = 0;
+      }
+      catch (System.Security.SecurityException secEx)
+      {
+        IrssLog.Error(secEx);
+        Environment.ExitCode = 1;
+      }
+      catch (UnauthorizedAccessException authEx)
+      {
+        IrssLog.Error(authEx);
+        Environment.ExitCode = 2;
+      }
+      catch (Exception ex)
+      {
+        IrssLog.Error(ex);
+        Environment.ExitCode = 3;
+      }
+      finally
+      {
+        IrssLog.Close();
+      }
+    }
+
+    #region Service handler
+
+    private static ServiceController getServiceController()
+    {
+      serviceControllers = ServiceController.GetServices();
+      foreach (ServiceController sc in serviceControllers)
+      {
+        if (sc.ServiceName == ServerName)
+          return sc;
+      }
+      return null;
+    }
+
+    internal static void ServiceInstall()
+    {
+      try
+      {
+        IrssLog.Info("Installing IR Server service");
+        Process IRServer = Process.Start(Program.IRServerFile, "/INSTALL");
+        IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds);
+        IrssLog.Info("Installing IR Server service - done");
+      }
+      catch (Exception ex)
+      {
+        IrssLog.Error("Installing IR Server service - failed (see following...)");
+        IrssLog.Error(ex);
+      }
+    }
+
+    internal static void ServiceUninstall()
+    {
+      try
+      {
+        IrssLog.Info("Uninstalling IR Server service");
+        Process IRServer = Process.Start(Program.IRServerFile, "/UNINSTALL");
+        IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds);
+        IrssLog.Info("Uninstalling IR Server service - done");
+      }
+      catch (Exception ex)
+      {
+        IrssLog.Error("Uninstalling IR Server service - failed (see following...)");
+        IrssLog.Error(ex);
+      }
+    }
+
+    internal static void ServiceStart()
+    {
+      try
+      {
+        serviceController = getServiceController();
+        if (serviceControllers != null)
+        {
+          IrssLog.Info("Starting IR Server (service)");
+          serviceController.Start();
+          serviceController.WaitForStatus(ServiceControllerStatus.Running, defaultServiceTime);
+          IrssLog.Info("Starting IR Server (service) - done");
+        }
+      }
+      catch (TimeoutException ex)
+      {
+        IrssLog.Error("Starting IR Server (service) - failed (timeout error)");
+        IrssLog.Error(ex);
+      }
+      catch (Exception ex)
+      {
+        IrssLog.Error("Starting IR Server (service) - failed (see following...)");
+        IrssLog.Error(ex);
+      }
+    }
+
+    internal static void ServiceStop()
+    {
+      try
+      {
+        serviceController = getServiceController();
+        if (serviceControllers != null)
+        {
+          IrssLog.Info("Stopping IR Server (service)");
+          serviceController.Stop();
+          serviceController.WaitForStatus(ServiceControllerStatus.Stopped, defaultServiceTime);
+          IrssLog.Info("Stopping IR Server (service) - done");
+        }
+      }
+      catch (TimeoutException ex)
+      {
+        IrssLog.Error("Stopping IR Server (service) - failed (timeout error)");
+        IrssLog.Error(ex);
+      }
+      catch (Exception ex)
+      {
+        IrssLog.Error("Stopping IR Server (service) - failed (see following...)");
+        IrssLog.Error(ex);
+      }
+    }
+
+    #endregion
+  }
+}

Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/AssemblyInfo.cs	                        (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server AdminHelper/Properties/AssemblyInfo.cs	2009-09-29 19:53:52 UTC (rev 3098)
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen ?ber eine Assembly werden ?ber die folgenden 
+// Attribute gesteuert. ?ndern Sie diese Attributwerte, um die Informationen zu ?ndern,
+// die mit einer Assembly verkn?pft sind.
+[assembly: AssemblyTitle("IR Server AdminHelper")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("IR Server AdminHelper")]
+[assembly: AssemblyCopyright("Copyright ?  2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
+// f?r COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von 
+// COM zugreifen m?ssen, legen Sie das ComVisible-Attribut f?r diesen Typ auf "true" fest.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt f?r COM verf?gbar gemacht wird
+[assembly: Guid("3ddd5385-19dc-4ee9-b0c2-38687c64281c")]
+
+// Versionsinformationen f?r eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion 
+//      Buildnummer
+//      Revision
+//
+// Sie k?nnen alle Werte angeben oder die standardm??igen Build- und Revisionsnummern 
+// ?bernehmen, indem Sie "*" eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj	2009-09-23 20:54:48 UTC (rev 3097)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj	2009-09-29 19:53:52 UTC (rev 3098)
@@ -136,12 +136,10 @@
     <ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
       <Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project>
       <Name>IrssComms</Name>
-      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
       <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
       <Name>IrssUtils</Name>
-      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
       <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs	2009-09-23 20:54:48 UTC (rev 3097)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs	2009-09-29 19:53:52 UTC (rev 3098)
@@ -92,10 +92,10 @@
 
     private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData, @"IR Server\IR Server.xml");
     internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server.exe");
+    internal static readonly string AdminHelperFile = Path.Combine(Common.FolderProgramFiles, @"IR Server AdminHelper.exe");
 
     internal static readonly Icon _iconGray = new Icon(Resources.iconGray, new Size(16, 16));
     internal static readonly Icon _iconGreen = new Icon(Resources.iconGreen, new Size(16, 16));
-    private static readonly TimeSpan defaultServiceTime = new TimeSpan(0, 0, 30);
 
     #endregion Constants
 
@@ -110,7 +110,7 @@
     private static NotifyIcon _notifyIcon;
     private static bool _inConfiguration;
     private static Thread thread;
-    private static ServiceController serviceController;
+    //private static ServiceController serviceController;
     private static ServiceController[] serviceControllers;
     private static IntPtr irsWindow;
     private static int waitCount;
@@ -455,97 +455,63 @@
       }
     }
 
-    private static ServiceController getServiceController()
+    private static void RunAdminHelper(string arguments)
     {
-      serviceControllers = ServiceController.GetServices();
-      foreach (ServiceController sc in serviceControllers)
-      {
-        if (sc.ServiceName == ServerName)
-          return sc;
-      }
-      return null;
-    }
+      int exitCode = 0;
 
-    internal static void ServiceInstall()
-    {
+      Process process = new Process();
+      process.StartInfo = new ProcessStartInfo();
+      process.StartInfo.FileName = AdminHelperFile;
+      process.StartInfo.Arguments = arguments;
+      process.StartInfo.CreateNoWindow = true;
+      process.StartInfo.UseShellExecute = true;
+
+      // Must enable Exited event for both sync and async scenarios
+      process.EnableRaisingEvents = true;
+
       try
       {
-        IrssLog.Info("Installing IR Server service");
-        Process IRServer = Process.Start(Program.IRServerFile, "/INSTALL");
-        IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds);
-        IrssLog.Info("Installing IR Server service - done");
+        process.Start();
+        // Synchronously block until process is complete, then return exit code from process
+        process.WaitForExit();
+        exitCode = process.ExitCode;
       }
       catch (Exception ex)
       {
-        IrssLog.Error("Installing IR Server service - failed (see following...)");
         IrssLog.Error(ex);
+        exitCode = 10;
       }
+
+
+      if (exitCode != 0)
+      {
+        IrssLog.Error("RunAdminHelper exitcode = " + exitCode);
+        MessageBox.Show("There occured an issue when trying to run AdminHelper." + Environment.NewLine + 
+          "Do you have administration rights?" + Environment.NewLine +
+          "Did you accept the request for Administration rights?" + Environment.NewLine + Environment.NewLine +
+          "If you think you did everything right, please report the issue to the devlopers.",
+          "IR Server Configuration", MessageBoxButtons.OK, MessageBoxIcon.Error);
+      }
     }
 
+    internal static void ServiceInstall()
+    {
+      RunAdminHelper("/INSTALL");
+    }
+
     internal static void ServiceUninstall()
     {
-      try
-      {
-        IrssLog.Info("Uninstalling IR Server service");
-        Process IRServer = Process.Start(Program.IRServerFile, "/UNINSTALL");
-        IRServer.WaitForExit((int)defaultServiceTime.TotalMilliseconds);
-        IrssLog.Info("Uninstalling IR Server service - done");
-      }
-      catch (Exception ex)
-      {
-        IrssLog.Error("Uninstalling IR Server service - failed (see following...)");
-        IrssLog.Error(ex);
-      }
+      RunAdminHelper("/UNINSTALL");
     }
 
     internal static void ServiceStart()
     {
-      try
-      {
-        serviceController = getServiceController();
-        if (serviceControllers != null)
-        {
-          IrssLog.Info("Starting IR Server (service)");
-          serviceController.Start();
-          serviceController.WaitForStatus(ServiceControllerStatus.Running, defaultServiceTime);
-          IrssLog.Info("Starting IR Server (service) - done");
-        }
-      }
-      catch (TimeoutException ex)
-      {
-        IrssLog.Error("Starting IR Server (service) - failed (timeout error)");
-        IrssLog.Error(ex);
-      }
-      catch (Exception ex)
-      {
-        IrssLog.Error("Starting IR Server (service) - failed (see following...)");
-        IrssLog.Error(ex);
-      }
+      RunAdminHelper("/START");
     }
 
     internal static void ServiceStop()
     {
-      try
-      {
-        serviceController = getServiceController();
-        if (serviceControllers != null)
-        {
-          IrssLog.Info("Stopping IR Server (service)");
-          serviceController.Stop();
-          serviceController.WaitForStatus(ServiceControllerStatus.Stopped, defaultServiceTime);
-          IrssLog.Info("Stopping IR Server (service) - done");
-        }
-      }
-      catch (TimeoutException ex)
-      {
-        IrssLog.Error("Stopping IR Server (service) - failed (timeout error)");
-        IrssLog.Error(ex);
-      }
-      catch (Exception ex)
-      {
-        IrssLog.Error("Stopping IR Server (service) - failed (see following...)");
-        IrssLog.Error(ex);
-      }
+      RunAdminHelper("/STOP");
     }
 
     internal static void ApplicationStart()

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln	2009-09-23 20:54:48 UTC (rev 3097)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln	2009-09-29 19:53:52 UTC (rev 3098)
@@ -127,6 +127,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireDTV Receiver", "IR Server Plugins\FireDTV Receiver\FireDTV Receiver.csproj", "{D88EDBC1-D583-4149-9873-8239FA63F4FE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server AdminHelper", "IR Server\IR Server AdminHelper\IR Server AdminHelper.csproj", "{F6C2B2FA-026A-4483-854C-735D6E59E69C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -599,6 +601,14 @@
 		{D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.ActiveCfg = Release|x86
 		{D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.Build.0 = Release|x86
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|x86.ActiveCfg = Debug|x86
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C}.Debug|x86.Build.0 = Debug|x86
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|x86.ActiveCfg = Release|x86
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -659,6 +669,7 @@
 		{28098574-D22E-457C-AFFA-560554499EAC} = {E757F80C-23C5-4AD6-B178-16799E337E03}
 		{46F1DB42-F082-4200-B939-6E4B72A8117C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
 		{1E84C2ED-92FC-43A4-9C12-374B3347F6D7} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
+		{F6C2B2FA-026A-4483-854C-735D6E59E69C} = {DEE5AAD1-0110-4681-8FF9-662CEA72FD94}
 		{21E04B17-D850-43E7-AAD3-876C0E062BDB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
 		{106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
 		{D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}

Modified: trunk/plugins/IR Server Suite/setup/setup.nsi
===================================================================
--- trunk/plugins/IR Server Suite/setup/setup.nsi	2009-09-23 20:54:48 UTC (rev 3097)
+++ trunk/plugins/IR Server Suite/setup/setup.nsi	2009-09-29 19:53:52 UTC (rev 3098)
@@ -380,7 +380,8 @@
   File "..\IR Server Suite\IR Server\IR Server Configuration\bin\${Build_Type}\IR Server Configuration.*"
   File "..\IR Server Suite\IR Server\SourceGrid\DevAge*"
   File "..\IR Server Suite\IR Server\SourceGrid\SourceGrid*"
-
+  
+  File "..\IR Server Suite\IR Server\IR Server AdminHelper\bin\${Build_Type}\IR Server AdminHelper.*"
   File "..\IR Server Suite\IR Server Plugins\IR Server Plugin Interface\bin\${Build_Type}\IRServerPluginInterface.*"
 
   ${LOG_TEXT} "INFO" "Installing IR Server Plugins..."
@@ -471,6 +472,7 @@
   Delete "$DIR_INSTALL\DevAge*"
   Delete "$DIR_INSTALL\SourceGrid*"
 
+  Delete "$DIR_INSTALL\IR Server AdminHelper.*"
   Delete "$DIR_INSTALL\IRServerPluginInterface.*"
 !macroend
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.