windows-pr 0.9.5 → 0.9.6

data/CHANGES

@@ -1,3 +1,15 @@
+= 0.9.6 - 14-Nov-2008
+* Updated the RegisterServiceCtrlHandler and RegisterServiceCtrlHandlerEx
+  protoypes in the Windows::Service module. Changed old 'P' prototype to 'K'
+  for callbacks.
+* Added explicit ANSI and Wide character functions for GetFileSecurity and
+  SetFileSecurity in the Windows::Security module (since automatic unicode
+  generation is set to false for that particular module).
+* Added IO reparse point tag constants to the Windows::File module.
+* The multi_to_wide helper method in Windows::Unicode now returns the string
+  as-is if it's already a Unicode string.
+* A couple 'P' prototypes were switched to 'S' in Windows::Unicode functions.
+
 = 0.9.5 - 21-Oct-2008
 * Fixed the rescue clauses for unsupported functions for the Windows::Console
   and Windows::Debug modules. Thanks go to an anonymous user for the spot.

data/lib/windows/file.rb

@@ -187,6 +187,16 @@ module Windows
       FileIdBothDirectoryRestartInfo = 11
       FileIoPriorityHintInfo         = 12
       MaximumFileInfoByHandleClass   = 13
+
+      # Reparse point tags
+      
+      IO_REPARSE_TAG_DFS         = 0x8000000A
+      IO_REPARSE_TAG_DFSR        = 0x80000012
+      IO_REPARSE_TAG_HSM         = 0xC0000004
+      IO_REPARSE_TAG_HSM2        = 0x80000006
+      IO_REPARSE_TAG_MOUNT_POINT = 0xA0000003
+      IO_REPARSE_TAG_SIS         = 0x80000007
+      IO_REPARSE_TAG_SYMLINK     = 0xA000000C
      
       API.new('CopyFile', 'PPI', 'B')
       API.new('CopyFileEx', 'PPKPPL', 'B')

data/lib/windows/security.rb

@@ -1,5 +1,9 @@
 require 'windows/api'
 
+# The auto_unicode option has been set to false because the majority of
+# the methods defined here do not have explicit ANSI or Wide character
+# versions.
+
 module Windows
    module Security
       API.auto_namespace = 'Windows::Security'
@@ -365,6 +369,8 @@ module Windows
       API.new('GetAce', 'LLP', 'B', 'advapi32')
       API.new('GetAclInformation', 'PPLI', 'B', 'advapi32')
       API.new('GetFileSecurity', 'PLPLP', 'B', 'advapi32')
+      API.new('GetFileSecurityA', 'PLPLP', 'B', 'advapi32')
+      API.new('GetFileSecurityW', 'PLPLP', 'B', 'advapi32')
       API.new('GetLengthSid', 'P', 'L', 'advapi32')
       API.new('GetSecurityDescriptorControl', 'PPP', 'B', 'advapi32')
       API.new('GetSecurityDescriptorDacl', 'PPPP', 'B', 'advapi32')
@@ -396,7 +402,9 @@ module Windows
       API.new('LookupPrivilegeValue', 'PPP', 'B', 'advapi32')
       API.new('OpenProcessToken', 'LLP', 'B', 'advapi32')
       API.new('OpenThreadToken', 'LLLP', 'B', 'advapi32')
-      API.new('SetFileSecurity', 'PPP', 'B', 'advapi32') 
+      API.new('SetFileSecurity', 'PPP', 'B', 'advapi32')
+      API.new('SetFileSecurityA', 'PPP', 'B', 'advapi32')
+      API.new('SetFileSecurityW', 'PPP', 'B', 'advapi32') 
       API.new('SetSecurityDescriptorDacl', 'PIPI', 'B', 'advapi32')
       API.new('SetSecurityDescriptorGroup', 'PPI', 'B', 'advapi32')
       API.new('SetSecurityDescriptorOwner', 'PPI', 'B', 'advapi32')

data/lib/windows/service.rb

@@ -128,8 +128,8 @@ module Windows
       API.new('QueryServiceLockStatus', 'LPLP', 'B', 'advapi32')
       API.new('QueryServiceStatus', 'LP', 'B', 'advapi32')
       API.new('QueryServiceStatusEx', 'LLPLP', 'B', 'advapi32')
-      API.new('RegisterServiceCtrlHandler', 'PP', 'L', 'advapi32')
-      API.new('RegisterServiceCtrlHandlerEx', 'PPP', 'L', 'advapi32')
+      API.new('RegisterServiceCtrlHandler', 'PK', 'L', 'advapi32')
+      API.new('RegisterServiceCtrlHandlerEx', 'PKP', 'L', 'advapi32')
       API.new('SetServiceBits', 'LLII', 'B', 'advapi32')
       API.new('SetServiceStatus', 'LP', 'B', 'advapi32')
       API.new('StartService', 'LLP', 'B', 'advapi32')

data/lib/windows/unicode.rb

@@ -76,10 +76,10 @@ module Windows
       API.new('GetTextCharsetInfo', 'LPL', 'I', 'gdi32')
       API.new('IsDBCSLeadByte', 'P', 'B')
       API.new('IsDBCSLeadByteEx', 'IP', 'B')
-      API.new('IsTextUnicode', 'PIP', 'B', 'advapi32')
-      API.new('MultiByteToWideChar', 'ILPIPI', 'I')
+      API.new('IsTextUnicode', 'SIP', 'B', 'advapi32')
+      API.new('MultiByteToWideChar', 'ILSIPI', 'I')
       API.new('TranslateCharsetInfo', 'PPL', 'B', 'gdi32')
-      API.new('WideCharToMultiByte', 'ILPIPIPP', 'I')
+      API.new('WideCharToMultiByte', 'ILSIPIPP', 'I')
 
       # Convenient wrapper methods
        
@@ -92,6 +92,7 @@ module Windows
       def multi_to_wide(string, encoding=nil)
          return nil unless string
          raise TypeError unless string.is_a?(String)
+         return string if IsTextUnicode(string, string.size, nil)
          
          unless encoding
             encoding = ($KCODE == 'UTF8') ? CP_UTF8 : CP_ACP

data/windows-pr.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "windows-pr"
-   gem.version     = "0.9.5"
+   gem.version     = "0.9.6"
    gem.authors     = ["Daniel J. Berger", "Park Heesob"]
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |gem|
    gem.require_path = "lib"
    gem.extra_rdoc_files = ["MANIFEST", "README", "CHANGES"]
    gem.add_dependency("windows-api", ">= 0.2.4")
-   gem.add_dependency("win32-api", ">= 1.2.0")
+   gem.add_dependency("win32-api", ">= 1.2.1")
 end
 
 if $0 == __FILE__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: windows-pr
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-24 00:00:00 -06:00
+date: 2008-11-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: 
 description: Windows functions and constants bundled via Win32::API
 email: djberg96@gmail.com
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Windows functions and constants bundled via Win32::API