Merge pull request #2685 from dotnet-bot/from-tfs

Merge changes from TFS

Author: stephentoub

src/Common/src/Interop/Windows/mincore/Interop.ServiceProcessOptions.cs

@@ -71,6 +71,8 @@ internal partial class ServiceTypeOptions
 
         internal partial class ServiceStartModes
         {
+            internal const int START_TYPE_BOOT = 0x00000000;
+            internal const int START_TYPE_SYSTEM = 0x00000001;
             internal const int START_TYPE_AUTO = 0x00000002;
             internal const int START_TYPE_DEMAND = 0x00000003;
             internal const int START_TYPE_DISABLED = 0x00000004;

src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj

@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>System.ServiceProcess.ServiceController</RootNamespace>
     <AssemblyName>System.ServiceProcess.ServiceController</AssemblyName>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ProjectGuid>{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}</ProjectGuid>
   </PropertyGroup>

src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceController.cs

@@ -27,12 +27,14 @@ public class ServiceController : IDisposable
         private string _displayName;
         private int _commandsAccepted;
         private bool _statusGenerated;
+        private bool _startTypeInitialized;
         private int _type;
         private bool _disposed;
         private SafeServiceHandle _serviceManagerHandle;
         private ServiceControllerStatus _status;
         private ServiceController[] _dependentServices;
         private ServiceController[] _servicesDependedOn;
+        private ServiceStartMode _startType;
 
         private const int SERVICENAMEMAXLENGTH = 80;
         private const int DISPLAYNAMEBUFFERSIZE = 256;
@@ -305,6 +307,56 @@ public unsafe ServiceController[] ServicesDependedOn
             }
         }
 
+        public ServiceStartMode StartType
+        {
+            get
+            {
+                if (_startTypeInitialized)
+                    return _startType;
+
+                IntPtr serviceHandle = IntPtr.Zero;
+                try
+                {
+                    serviceHandle = GetServiceHandle(Interop.mincore.ServiceOptions.SERVICE_QUERY_CONFIG);
+
+                    int bytesNeeded = 0;
+                    bool success = Interop.mincore.QueryServiceConfig(serviceHandle, IntPtr.Zero, 0, out bytesNeeded);
+
+                    int lastError = Marshal.GetLastWin32Error();
+                    if (lastError != Interop.mincore.Errors.ERROR_INSUFFICIENT_BUFFER)
+                        throw new Win32Exception(lastError);
+
+                    // get the info
+                    IntPtr bufPtr = IntPtr.Zero;
+                    try
+                    {
+                        bufPtr = Marshal.AllocHGlobal((IntPtr)bytesNeeded);
+                        success = Interop.mincore.QueryServiceConfig(serviceHandle, bufPtr, bytesNeeded, out bytesNeeded);
+                        if (!success)
+                            throw new Win32Exception(Marshal.GetLastWin32Error());
+
+                        Interop.mincore.QUERY_SERVICE_CONFIG config = new Interop.mincore.QUERY_SERVICE_CONFIG();
+                        Marshal.PtrToStructure(bufPtr, config);
+
+                        _startType = (ServiceStartMode)config.dwStartType;
+                        _startTypeInitialized = true;
+                    }
+                    finally
+                    {
+                        if (bufPtr != IntPtr.Zero)
+                            Marshal.FreeHGlobal(bufPtr);
+                    }
+                }
+                finally
+                {
+                    if (serviceHandle != IntPtr.Zero)
+                        Interop.mincore.CloseServiceHandle(serviceHandle);
+                }
+
+                return _startType;
+            }
+        }
+
         public SafeHandle ServiceHandle
         {
             get
@@ -357,6 +409,7 @@ protected virtual void Dispose(bool disposing)
             }
 
             _statusGenerated = false;
+            _startTypeInitialized = false;
             _type = Interop.mincore.ServiceTypeOptions.SERVICE_TYPE_ALL;
             _disposed = true;
         }
@@ -673,6 +726,7 @@ public unsafe void Continue()
         public void Refresh()
         {
             _statusGenerated = false;
+            _startTypeInitialized = false;
             _dependentServices = null;
             _servicesDependedOn = null;
         }

src/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceStartMode.cs

@@ -8,5 +8,7 @@ public enum ServiceStartMode
         Manual = Interop.mincore.ServiceStartModes.START_TYPE_DEMAND,
         Automatic = Interop.mincore.ServiceStartModes.START_TYPE_AUTO,
         Disabled = Interop.mincore.ServiceStartModes.START_TYPE_DISABLED,
+        Boot = Interop.mincore.ServiceStartModes.START_TYPE_BOOT,
+        System = Interop.mincore.ServiceStartModes.START_TYPE_SYSTEM
     }
 }