win32-service 2.1.6 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f007030dada04e304cef4f4313683963c5bf0cb7f14a850a80737c5a21f1cf
-  data.tar.gz: db6532bfa3181487a86ed875a078621c4c67583b80ffd15ca805b605d14efabd
+  metadata.gz: ef70f0e8d16323dd531f4a6558b910121fa02ed62a432e5e82a70bfa19736805
+  data.tar.gz: f1128b7daa3ec6d64cb374c554c291b222f37dd10079865f5be6ae930287c0bc
 SHA512:
-  metadata.gz: 033bc35538753dde884295b62c6b30ea12cff01b607e3ca7313c64cdcc01e5a915bd18248062f779e75c1fa37b9b81270942943bf18770b569eb62623dab5232
-  data.tar.gz: c7c95bd52e6e41273e008f3c3c43bf588cdd1fe4f5728e05fa5d3751de070192e7986c3a3735b257a4d9a175f762f47e25f37eb0f4b15544464cf5c946dfb648
+  metadata.gz: a9bb4ac05263a141d2a4fc1030e16b9d6df66af501917f3403fa082412055bd6c1118404e06b35531845bcbaa55ecd3f89e8677ec57c422b40c7cfa61d3a8e3d
+  data.tar.gz: be2e0f6108dd0093e582659ef201d78266cbcaa428e08eac3624146695bdc46337edbb3b5823179f3f5c541b881bb0e3d95c64fe1ef92ef636f1521a72053ef7

data/lib/win32/service.rb

@@ -898,59 +898,41 @@ module Win32
     # Service.status('W32Time') => <struct Struct::ServiceStatus ...>
     #
     def self.status(service, host=nil)
-      handle_scm = OpenSCManager(host, nil, SC_MANAGER_ENUMERATE_SERVICE)
-
-      FFI.raise_windows_error('OpenSCManager') if handle_scm == 0
-
-      begin
-        handle_scs = OpenService(
-          handle_scm,
-          service,
-          SERVICE_QUERY_STATUS
-        )
-
-        FFI.raise_windows_error('OpenService') if handle_scs == 0
-
-        # SERVICE_STATUS_PROCESS struct
-        status = SERVICE_STATUS_PROCESS.new
-        bytes  = FFI::MemoryPointer.new(:ulong)
-
-        bool = QueryServiceStatusEx(
-          handle_scs,
-          SC_STATUS_PROCESS_INFO,
-          status,
-          status.size,
-          bytes
-        )
+      status = SERVICE_STATUS_PROCESS.new
+      bytes  = FFI::MemoryPointer.new(:ulong)
+
+      open_sc_manager(host) do |scm_handle|
+        open_service(scm_handle, service, SERVICE_QUERY_STATUS) do |service_handle|
+          bool = QueryServiceStatusEx(
+            service_handle,
+            SC_STATUS_PROCESS_INFO,
+            status,
+            status.size,
+            bytes
+          )
 
-        FFI.raise_windows_error('QueryServiceStatusEx') unless bool
-
-        service_type  = get_service_type(status[:dwServiceType])
-        current_state = get_current_state(status[:dwCurrentState])
-        controls      = get_controls_accepted(status[:dwControlsAccepted])
-        interactive   = status[:dwServiceType] & SERVICE_INTERACTIVE_PROCESS > 0
-
-        # Note that the pid and service flags will always return 0 if you're
-        # on Windows NT 4 or using a version of Ruby compiled with VC++ 6
-        # or earlier.
-        #
-        status_struct = StatusStruct.new(
-          service_type,
-          current_state,
-          controls,
-          status[:dwWin32ExitCode],
-          status[:dwServiceSpecificExitCode],
-          status[:dwCheckPoint],
-          status[:dwWaitHint],
-          interactive,
-          status[:dwProcessId],
-          status[:dwServiceFlags]
-        )
-      ensure
-        close_service_handle(handle_scs)
-        close_service_handle(handle_scm)
+          FFI.raise_windows_error('QueryServiceStatusEx') unless bool
+        end
       end
 
+      service_type  = get_service_type(status[:dwServiceType])
+      current_state = get_current_state(status[:dwCurrentState])
+      controls      = get_controls_accepted(status[:dwControlsAccepted])
+      interactive   = status[:dwServiceType] & SERVICE_INTERACTIVE_PROCESS > 0
+
+      status_struct = StatusStruct.new(
+        service_type,
+        current_state,
+        controls,
+        status[:dwWin32ExitCode],
+        status[:dwServiceSpecificExitCode],
+        status[:dwCheckPoint],
+        status[:dwWaitHint],
+        interactive,
+        status[:dwProcessId],
+        status[:dwServiceFlags]
+      )
+
       status_struct
     end
 

data/lib/win32/windows/version.rb

@@ -1,6 +1,6 @@
 module Win32
   class Service
-    VERSION = "2.1.6"
+    VERSION = "2.2.0"
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-service
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi