win32-service 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 746b781ce8ab92f9ef2f38854781e593281687956b171bd4aa57054e02b68648
-  data.tar.gz: 55ac6d06feb8f47751ffee8edee887420001d4b11ba5e5cce16daae343c80e1b
+  metadata.gz: d6e082fe0332a702fd8a8abe6be757173ac44a97f5aca6b544e63aea98435e41
+  data.tar.gz: 22628c39784ab449296e8775298bbb9502b1fd944097dfa7c8fac25b423f1f69
 SHA512:
-  metadata.gz: 3cd8d485dae8159f1d0d788baa22c30fb5b98ab71623ef935c7b27535c100e6fa4b33cc59aa9617c313c3d33a637ab1dc8034aac236f5231e0fb09d2487fa308
-  data.tar.gz: e8410fc1cd05028d99b6f3c1822e635e85e50eb3b08f48e291fb20cfa06ad1c98bce740fc25af51eea7aa1a18b990f78727be0eed7ddc648d4f4b3875ac5c6fa
+  metadata.gz: 3c20950b21f865da21aef986bed1d8f9eb72cca83f6e78f91bf4abc963bce43ae715b73a3ed5e72cc2649138209bd2120cb8e38870487620d728e264864db8fc
+  data.tar.gz: 4327e6a58cc533509506ad72783f2150f6d84ff60df1661abc8b3a5b7193d0627ed806e09c2db219ebc390202a9fa2e91902ee27eac0ff6ffac39966bb9e9a6d

data/lib/win32/daemon.rb

@@ -79,8 +79,8 @@ module Win32
         ss[:dwControlsAccepted] = 0
       else
         ss[:dwControlsAccepted] =
-        SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN |
-        SERVICE_ACCEPT_PAUSE_CONTINUE | SERVICE_ACCEPT_PARAMCHANGE
+          SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN |
+          SERVICE_ACCEPT_PAUSE_CONTINUE | SERVICE_ACCEPT_PARAMCHANGE
       end
 
       # Initialize ss structure.
@@ -142,48 +142,48 @@ module Win32
 
     # Called by the service control manager after the call to StartServiceCtrlDispatcher.
     Service_Main = FFI::Function.new(:void, %i{ulong pointer}, blocking: false) do |dwArgc, lpszArgv|
-      begin
-        # Obtain the name of the service.
-        if lpszArgv.address != 0
-          argv = lpszArgv.get_array_of_string(0, dwArgc)
-          lpszServiceName = argv[0]
-        else
-          lpszServiceName = ""
-        end
 
-        # Args passed to Service.start
-        if dwArgc > 1
-          @@Argv = argv[1..-1]
-        else
-          @@Argv = nil
-        end
+      # Obtain the name of the service.
+      if lpszArgv.address != 0
+        argv = lpszArgv.get_array_of_string(0, dwArgc)
+        lpszServiceName = argv[0]
+      else
+        lpszServiceName = ""
+      end
 
-        # Register the service ctrl handler.
-        @@ssh = RegisterServiceCtrlHandlerEx(
-          lpszServiceName,
-          Service_Ctrl_ex,
-          nil
-        )
+      # Args passed to Service.start
+      if dwArgc > 1
+        @@Argv = argv[1..-1]
+      else
+        @@Argv = nil
+      end
 
-        # No service to stop, no service handle to notify, nothing to do but exit.
-        return if @@ssh == 0
+      # Register the service ctrl handler.
+      @@ssh = RegisterServiceCtrlHandlerEx(
+        lpszServiceName,
+        Service_Ctrl_ex,
+        nil
+      )
 
-        # The service has started.
-        SetTheServiceStatus.call(SERVICE_RUNNING, NO_ERROR, 0, 0)
+      # No service to stop, no service handle to notify, nothing to do but exit.
+      return if @@ssh == 0 # rubocop:disable Lint/NonLocalExitFromIterator
 
-        SetEvent(@@hStartEvent)
+      # The service has started.
+      SetTheServiceStatus.call(SERVICE_RUNNING, NO_ERROR, 0, 0)
 
-        # Main loop for the service.
-        while WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0
-        end
+      SetEvent(@@hStartEvent)
 
-        # Main loop for the service.
-        while WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0
-        end
-      ensure
-        # Stop the service.
-        SetTheServiceStatus.call(SERVICE_STOPPED, NO_ERROR, 0, 0)
+      # Main loop for the service.
+      while WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0
       end
+
+      # Main loop for the service.
+      while WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0
+      end
+    ensure
+      # Stop the service.
+      SetTheServiceStatus.call(SERVICE_STOPPED, NO_ERROR, 0, 0)
+
     end
 
     ThreadProc = FFI::Function.new(:ulong, [:pointer]) do |lpParameter|
@@ -277,44 +277,44 @@ module Win32
       end
 
       thr = Thread.new do
-        begin
-          while WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT
-            # Check to see if anything interesting has been signaled
-            case @@waiting_control_code
-              when SERVICE_CONTROL_PAUSE
-                service_pause if respond_to?("service_pause")
-              when SERVICE_CONTROL_CONTINUE
-                service_resume if respond_to?("service_resume")
-              when SERVICE_CONTROL_INTERROGATE
-                service_interrogate if respond_to?("service_interrogate")
-              when SERVICE_CONTROL_SHUTDOWN
-                service_shutdown if respond_to?("service_shutdown")
-              when SERVICE_CONTROL_PARAMCHANGE
-                service_paramchange if respond_to?("service_paramchange")
-              when SERVICE_CONTROL_NETBINDADD
-                service_netbindadd if respond_to?("service_netbindadd")
-              when SERVICE_CONTROL_NETBINDREMOVE
-                service_netbindremove if respond_to?("service_netbindremove")
-              when SERVICE_CONTROL_NETBINDENABLE
-                service_netbindenable if respond_to?("service_netbindenable")
-              when SERVICE_CONTROL_NETBINDDISABLE
-                service_netbinddisable if respond_to?("service_netbinddisable")
-            end
 
-            # handle user defined control codes
-            if @@waiting_control_code >= 128 && @@waiting_control_code <= 255
-              if respond_to?("service_user_defined_control")
-                service_user_defined_control(@@waiting_control_code)
-              end
-            end
+        while WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT
+          # Check to see if anything interesting has been signaled
+          case @@waiting_control_code
+            when SERVICE_CONTROL_PAUSE
+              service_pause if respond_to?("service_pause")
+            when SERVICE_CONTROL_CONTINUE
+              service_resume if respond_to?("service_resume")
+            when SERVICE_CONTROL_INTERROGATE
+              service_interrogate if respond_to?("service_interrogate")
+            when SERVICE_CONTROL_SHUTDOWN
+              service_shutdown if respond_to?("service_shutdown")
+            when SERVICE_CONTROL_PARAMCHANGE
+              service_paramchange if respond_to?("service_paramchange")
+            when SERVICE_CONTROL_NETBINDADD
+              service_netbindadd if respond_to?("service_netbindadd")
+            when SERVICE_CONTROL_NETBINDREMOVE
+              service_netbindremove if respond_to?("service_netbindremove")
+            when SERVICE_CONTROL_NETBINDENABLE
+              service_netbindenable if respond_to?("service_netbindenable")
+            when SERVICE_CONTROL_NETBINDDISABLE
+              service_netbinddisable if respond_to?("service_netbinddisable")
+          end
 
-            @@waiting_control_code = IDLE_CONTROL_CODE
+          # handle user defined control codes
+          if @@waiting_control_code.between?(128, 255)
+            if respond_to?("service_user_defined_control")
+              service_user_defined_control(@@waiting_control_code)
+            end
           end
 
-          service_stop if respond_to?("service_stop")
-        ensure
-          SetEvent(@@hStopCompletedEvent)
+          @@waiting_control_code = IDLE_CONTROL_CODE
         end
+
+        service_stop if respond_to?("service_stop")
+      ensure
+        SetEvent(@@hStopCompletedEvent)
+
       end
 
       if respond_to?("service_main")

data/lib/win32/service.rb

@@ -301,24 +301,24 @@ module Win32
       end
 
       opts = {
-        "display_name"           => nil,
-        "desired_access"         => SERVICE_ALL_ACCESS,
-        "service_type"           => SERVICE_WIN32_OWN_PROCESS,
-        "start_type"             => SERVICE_DEMAND_START,
-        "error_control"          => SERVICE_ERROR_NORMAL,
-        "binary_path_name"       => nil,
-        "load_order_group"       => nil,
-        "dependencies"           => nil,
-        "service_start_name"     => nil,
-        "password"               => nil,
-        "description"            => nil,
-        "failure_reset_period"   => nil,
+        "display_name" => nil,
+        "desired_access" => SERVICE_ALL_ACCESS,
+        "service_type" => SERVICE_WIN32_OWN_PROCESS,
+        "start_type" => SERVICE_DEMAND_START,
+        "error_control" => SERVICE_ERROR_NORMAL,
+        "binary_path_name" => nil,
+        "load_order_group" => nil,
+        "dependencies" => nil,
+        "service_start_name" => nil,
+        "password" => nil,
+        "description" => nil,
+        "failure_reset_period" => nil,
         "failure_reboot_message" => nil,
-        "failure_command"        => nil,
-        "failure_actions"        => nil,
-        "failure_delay"          => 0,
-        "host"                   => nil,
-        "service_name"           => nil,
+        "failure_command" => nil,
+        "failure_actions" => nil,
+        "failure_delay" => 0,
+        "host" => nil,
+        "service_name" => nil,
       }
 
       # Validate the hash options
@@ -403,8 +403,6 @@ module Win32
         self.class.close_service_handle(handle_scs)
         self.class.close_service_handle(handle_scm)
       end
-
-      self
     end
 
     # Configures the named +service+ on +host+, or the local host if no host
@@ -460,24 +458,24 @@ module Win32
       end
 
       opts = {
-        "service_type"           => SERVICE_NO_CHANGE,
-        "start_type"             => SERVICE_NO_CHANGE,
-        "error_control"          => SERVICE_NO_CHANGE,
-        "binary_path_name"       => nil,
-        "load_order_group"       => nil,
-        "dependencies"           => nil,
-        "service_start_name"     => nil,
-        "password"               => nil,
-        "display_name"           => nil,
-        "description"            => nil,
-        "failure_reset_period"   => nil,
+        "service_type" => SERVICE_NO_CHANGE,
+        "start_type" => SERVICE_NO_CHANGE,
+        "error_control" => SERVICE_NO_CHANGE,
+        "binary_path_name" => nil,
+        "load_order_group" => nil,
+        "dependencies" => nil,
+        "service_start_name" => nil,
+        "password" => nil,
+        "display_name" => nil,
+        "description" => nil,
+        "failure_reset_period" => nil,
         "failure_reboot_message" => nil,
-        "failure_command"        => nil,
-        "failure_actions"        => nil,
-        "failure_delay"          => 0,
-        "service_name"           => nil,
-        "host"                   => nil,
-        "delayed_start"          => false,
+        "failure_command" => nil,
+        "failure_actions" => nil,
+        "failure_delay" => 0,
+        "service_name" => nil,
+        "host" => nil,
+        "delayed_start" => false,
       }
 
       # Validate the hash options
@@ -686,7 +684,8 @@ module Win32
         close_service_handle(handle_scm)
       end
 
-      service_name.read_string
+      # Return a lowercase, UTF-8 encoded string
+      service_name.read_string.downcase.force_encoding("UTF-8")
     end
 
     # Attempts to start the named +service+ on +host+, or the local machine
@@ -714,13 +713,12 @@ module Win32
         num_args = 0
 
         if args.empty?
-          args = nil
+          nil # rubocop:disable Lint/Void
         else
-          str_ptrs = []
           num_args = args.size
 
-          args.each { |string|
-            str_ptrs << FFI::MemoryPointer.from_string(string)
+          str_ptrs = args.map { |string|
+            FFI::MemoryPointer.from_string(string)
           }
 
           str_ptrs << nil
@@ -1212,12 +1210,12 @@ module Win32
       delayed_start_buf = get_config2_info(handle_scs, SERVICE_CONFIG_DELAYED_AUTO_START_INFO)
       if delayed_start_buf.is_a?(FFI::MemoryPointer)
         delayed_start_info = SERVICE_DELAYED_AUTO_START_INFO.new(delayed_start_buf)
-        delayed_start = delayed_start_info[:fDelayedAutostart]
+        delayed_start_info[:fDelayedAutostart]
       else
-        delayed_start = false
+        false
       end
     rescue SystemCallError
-      delayed_start = nil
+      nil
     ensure
       close_service_handle(handle_scs)
       close_service_handle(handle_scm)
@@ -1252,18 +1250,18 @@ module Win32
     # @see Windows::ServiceConstants
     #
     def self.open_service(scm_handle, service_name, desired_access)
-       service_handle = OpenService(
+      service_handle = OpenService(
         scm_handle,
         service_name,
         desired_access
       )
-       FFI.raise_windows_error("OpenService") if service_handle == 0
+      FFI.raise_windows_error("OpenService") if service_handle == 0
 
-       if block_given?
-         yield service_handle
-       else
-         service_handle
-       end
+      if block_given?
+        yield service_handle
+      else
+        service_handle
+      end
     ensure
       close_service_handle(service_handle) if block_given?
     end
@@ -1606,30 +1604,19 @@ module Win32
     # Converts a service type numeric constant into a human readable string.
     #
     def self.get_service_type(service_type)
-      case service_type
-        when SERVICE_FILE_SYSTEM_DRIVER
-          "file system driver"
-        when SERVICE_KERNEL_DRIVER
-          "kernel driver"
-        when SERVICE_WIN32_OWN_PROCESS
-          "own process"
-        when SERVICE_WIN32_SHARE_PROCESS
-          "share process"
-        when SERVICE_RECOGNIZER_DRIVER
-          "recognizer driver"
-        when SERVICE_DRIVER
-          "driver"
-        when SERVICE_WIN32
-          "win32"
-        when SERVICE_TYPE_ALL
-          "all"
-        when SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS
-          "own process, interactive"
-        when SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_SHARE_PROCESS
-          "share process, interactive"
-        else
-          nil
+      if (service_type & SERVICE_INTERACTIVE_PROCESS) > 0
+        interactive_suffix = ", interactive"
       end
+
+      return "share process#{interactive_suffix}" if (service_type & SERVICE_WIN32_SHARE_PROCESS) > 0
+      return "own process#{interactive_suffix}" if (service_type & SERVICE_WIN32_OWN_PROCESS) > 0
+      return "file system driver" if (service_type & SERVICE_FILE_SYSTEM_DRIVER) > 0
+      return "kernel driver" if (service_type & SERVICE_KERNEL_DRIVER) > 0
+      return "recognizer driver" if (service_type & SERVICE_RECOGNIZER_DRIVER) > 0
+      return "driver" if (service_type & SERVICE_DRIVER) > 0
+      return "all" if (service_type == SERVICE_TYPE_ALL) > 0
+
+      "win32" if (service_type & SERVICE_WIN32) > 0
     end
 
     # A shortcut method that simplifies the various service control methods.

data/lib/win32/windows/functions.rb

@@ -49,7 +49,7 @@ module Windows
     attach_pfunc :CreateService, :CreateServiceA,
       %i{handle string string dword dword dword dword
        string string ptr pointer string string},
-       :handle
+      :handle
 
     attach_pfunc :ControlService, %i{handle dword ptr}, :bool
     attach_pfunc :DeleteService, [:handle], :bool

data/lib/win32/windows/version.rb

@@ -1,6 +1,6 @@
 module Win32
   class Service
-    VERSION = "2.3.2".freeze
+    VERSION = "2.4.0".freeze
     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.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2025-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.2
 - !ruby/object:Gem::Dependency
   name: ffi-win32-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: An interface for MS Windows services