win32-service 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c9e7a6cfd6aa6f113daf315e64979fb66c9c83b
-  data.tar.gz: bc7920b71189a326bfd7b2b6e9affd2bd1fb1ded
+  metadata.gz: c044a38b8fd66f998b0db20693a785662116fb3b
+  data.tar.gz: d2b046ab3d2b41d7bef5c6ef7061d712bb580163
 SHA512:
-  metadata.gz: c3bca8887a30ced151972c81d62d0d724ba3954b62b7ce435b02053ce91d674602a2d274955992c6b4a28d751ce574da8f2ffb6aa5045e27b0b6d0cb345fa5fe
-  data.tar.gz: 8ad98044dd9fdee7917a2267715d0ecbd1b37d946525fba1a340391e877a6f340464fef6c31b4ad93f70e020e126ab5f986bc4830050d1bc66c366a2d9f59bda
+  metadata.gz: 22a107a68f5931c3efc0ad941db38330427189472e77fbb4952219f140af83a0d67f99bd3f808d12b1c822a40022ff87638e5dfe2589ce30b17429c07c4ee8a2
+  data.tar.gz: 9bd9c2828ac50944a97a09cabb9c8dac296cee1b18efe77f0dec7936a940bfa63997ff8d4e88bd21cf9922216472158e181ee64804eab2cd1b12680689e19bd0

data.tar.gz.sig

@@ -1,2 +1,3 @@
-��~�ՒG/n�"J�+�r�״]�θ

-�#i"rty�\��TL#:��v
+5#�LwN�";F�T9��	*:�o[q1,��m�]h@.WL%��"
+������!��]E��#'F|<����Z,M�
�
+��A��o�%Y��Tp�� ��U*ɈR�SS�����y�:#	:�����txV���Іψ8X��QOU���{����uxm%ceh Xk��_��.��Ju�??�� SWe�m��E!tl�D���.lhu�-��J�nюM�>aUF����V9{�r����mfQ���
˰���a$

data/CHANGES

@@ -1,3 +1,8 @@
+== 0.8.9 - 26-Jun-2016
+* Added the ffi-win32-extensions dependency.
+* Changed the way service dependencies are determined.
+* Removed the helper.rb file since it's no longer used.
+
 == 0.8.8 - 24-Jun-2016
 * Fixed the function prototypes for CreateEvent and AdjustTokenPrivileges
   where I was using :bool instead of :int.

data/MANIFEST

@@ -13,6 +13,9 @@
 * lib/win32-service.rb
 * lib/win32/service.rb
 * lib/win32/daemon.rb
+* lib/win32/windows/constants.rb
+* lib/win32/windows/functions.rb
+* lib/win32/windows/structs.rb
 * test/test_win32_daemon.rb
 * test/test_win32_service_configure.rb
 * test/test_win32_service_create.rb

data/lib/win32/daemon.rb

@@ -1,4 +1,3 @@
-require_relative 'windows/helper'
 require_relative 'windows/constants'
 require_relative 'windows/structs'
 require_relative 'windows/functions'
@@ -16,7 +15,7 @@ module Win32
     extend Windows::ServiceFunctions
 
     # The version of this library
-    VERSION = '0.8.8'
+    VERSION = '0.8.9'.freeze
 
     private
 

data/lib/win32/service.rb

@@ -1,4 +1,4 @@
-require_relative 'windows/helper'
+require 'ffi/win32/extensions'
 require_relative 'windows/constants'
 require_relative 'windows/structs'
 require_relative 'windows/functions'
@@ -17,7 +17,7 @@ module Win32
     extend Windows::ServiceFunctions
 
     # The version of the win32-service library
-    VERSION = '0.8.8'
+    VERSION = '0.8.9'.freeze
 
     # SCM security and access rights
 
@@ -886,7 +886,7 @@ module Win32
         struct[:lpBinaryPathName].read_string,
         struct[:lpLoadOrderGroup].read_string,
         struct[:dwTagId],
-        struct[:lpDependencies].read_array_of_null_separated_strings,
+        struct.dependencies,
         struct[:lpServiceStartName].read_string,
         struct[:lpDisplayName].read_string
       )
@@ -1073,7 +1073,7 @@ module Win32
               start_type = get_start_type(config_struct[:dwStartType])
               error_ctrl = get_error_control(config_struct[:dwErrorControl])
 
-              deps = config_struct[:lpDependencies].read_array_of_null_separated_strings
+              deps = config_struct.dependencies
 
               begin
                 buf = get_config2_info(handle_scs, SERVICE_CONFIG_DESCRIPTION)

data/lib/win32/windows/functions.rb

@@ -41,7 +41,7 @@ module Windows
     attach_pfunc :CloseServiceHandle, [:handle], :bool
 
     attach_pfunc :ChangeServiceConfig, :ChangeServiceConfigA,
-      [:handle, :dword, :dword, :dword, :str, :str, :ptr, :str, :str, :str, :str],
+      [:handle, :dword, :dword, :dword, :str, :str, :ptr, :ptr, :str, :str, :str],
       :bool
 
     attach_pfunc :ChangeServiceConfig2, :ChangeServiceConfig2A, [:handle, :dword, :ptr], :bool

data/lib/win32/windows/structs.rb

@@ -61,6 +61,11 @@ module Windows
         :lpServiceStartName, :pointer,
         :lpDisplayName, :pointer
       )
+
+      def dependencies
+        length = self[:lpServiceStartName].address - self[:lpDependencies].address - 1
+        self[:lpDependencies].read_bytes(length).split(0.chr)
+      end
     end
 
     class SERVICE_STATUS_PROCESS < FFI::Struct

data/test/test_win32_daemon.rb

@@ -17,7 +17,7 @@ class TC_Daemon < Test::Unit::TestCase
   end
 
   test "version number is set properly" do
-    assert_equal('0.8.8', Daemon::VERSION)
+    assert_equal('0.8.9', Daemon::VERSION)
   end
 
   test "constructor basic functionality" do

data/test/test_win32_service.rb

@@ -64,7 +64,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "version number is expected value" do
-    assert_equal('0.8.8', Win32::Service::VERSION)
+    assert_equal('0.8.9', Win32::Service::VERSION)
   end
 
   test "services basic functionality" do

data/win32-service.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-service'
-  spec.version    = '0.8.8'
+  spec.version    = '0.8.9'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   ]
 
   spec.add_dependency('ffi')
+  spec.add_dependency('ffi-win32-extensions')
+
   spec.add_development_dependency('test-unit')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('win32-security')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-service
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -31,7 +31,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2016-06-25 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -47,6 +47,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi-win32-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +138,6 @@ files:
 - lib/win32/windows
 - lib/win32/windows/constants.rb
 - lib/win32/windows/functions.rb
-- lib/win32/windows/helper.rb
 - lib/win32/windows/structs.rb
 - lib/win32-daemon.rb
 - lib/win32-service.rb

data/lib/win32/windows/helper.rb

@@ -1,41 +0,0 @@
-require 'ffi'
-
-class FFI::Pointer
-  def read_array_of_null_separated_strings
-    elements = []
-    loc = self
-
-    while element = loc.read_string
-      break if element.nil? || element == ""
-      elements << element
-      loc += element.size + 1
-    end
-
-    elements
-  end
-end
-
-module FFI
-  extend FFI::Library
-
-  ffi_lib :kernel32
-
-  attach_function :FormatMessage, :FormatMessageA,
-    [:ulong, :pointer, :ulong, :ulong, :pointer, :ulong, :pointer], :ulong
-
-  def win_error(function, err=FFI.errno)
-    flags = 0x00001000 | 0x00000200
-    buf = FFI::MemoryPointer.new(:char, 1024)
-
-    FormatMessage(flags, nil, err , 0x0409, buf, 1024, nil)
-
-    function + ': ' + buf.read_string.strip
-  end
-
-  def raise_windows_error(function, err=FFI.errno)
-    raise SystemCallError.new(win_error(function, err), err)
-  end
-
-  module_function :win_error
-  module_function :raise_windows_error
-end