windows-pr 0.5.0-mswin32 → 0.5.1-mswin32

data/CHANGES

@@ -1,3 +1,8 @@
+= 0.5.1 - 26-May-2006
+* Minor updates and fixes for the Unicode and DeviceIO modules.
+* Added some wide character support, based on $KCODE values (which should
+  not be used at this time).
+
 = 0.5.0 - 23-May-2006
 * Added the Registry module
 * Added the EventLog module

data/README

@@ -45,6 +45,16 @@
    file contains clipboard related functions, such as CloseClipboard(), as
    well as constants such as CF_TEXT, CF_BITMAP, etc.
    
+== Wide character functions - DO NOT USE
+   Because there's no way to "#define UNICODE" from outside of C, I have
+   instead taken the approach of defining the wide character functions and
+   automatically using those if $KCODE is set to anything other than "NONE".
+   
+   However, support for this is very incomplete at the moment.  In addition,
+   unpredictable segfaults occur with Ruby's string processing in some cases,
+   the cause of which is unknown at this time.  The upshot of this is that you
+   should not use these modules with $KCODE set to anything other than "NONE".
+   
 == Where are the tests, dude?
    While I've made some effort to test these functions, there are simply too
    many for me to effectively test them all.  We're ultimately talking about

data/lib/windows/device_io.rb

@@ -63,10 +63,26 @@ module Windows
       FILE_DEVICE_FIPS                = 0x0000003A
       FILE_DEVICE_INFINIBAND          = 0x0000003B
       
+      METHOD_BUFFERED = 0
+      FILE_ANY_ACCESS = 0
+      
       DeviceIoControl = Win32API.new('kernel32', 'DeviceIoControl', 'LLPLPLPP', 'I')
       
       def DeviceIoControl(dev, code, in_buf, in_buf_size, out_buf, out_buf_size, bytes, overlapped)
-         DeviceIoControl.call(dev, code, in_buf, in_buf_size, out_buf, out_buf_size, bytes, overlapped)
+         DeviceIoControl.call(dev, code, in_buf, in_buf_size, out_buf, out_buf_size, bytes, overlapped) > 0
+      end
+      
+      # Macros from WinIoCtl.h
+      def CTL_CODE(device, function, method, access)
+         ((device) << 16) | ((access) << 14) | ((function) << 2) | (method)
+      end
+      
+      def FSCTL_SET_COMPRESSION 
+         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, 0, FILE_READ_DATA | FILE_WRITE_DATA)
+      end
+   
+      def FSCTL_SET_SPARSE
+         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, 0, FILE_SPECIAL_ACCESS)
       end
    end
 end

data/lib/windows/directory.rb

@@ -1,8 +1,9 @@
-require 'Win32API'
+require 'windows/unicode'
 
 module Windows
    module Directory
       CreateDirectory             = Win32API.new('kernel32', 'CreateDirectory', 'PP', 'I')
+      CreateDirectoryW            = Win32API.new('kernel32', 'CreateDirectoryW', 'PP', 'I')
       CreateDirectoryEx           = Win32API.new('kernel32', 'CreateDirectoryEx', 'PPP', 'I')
       FindCloseChangeNotification = Win32API.new('kernel32', 'FindCloseChangeNotification', 'L', 'I')
       FindFirstChangeNotification = Win32API.new('kernel32', 'FindFirstChangeNotification', 'PIL', 'L')
@@ -10,10 +11,16 @@ module Windows
       GetCurrentDirectory         = Win32API.new('kernel32', 'GetCurrentDirectory', 'LP', 'L')
       ReadDirectoryChangesW       = Win32API.new('kernel32', 'ReadDirectoryChangesW', 'LPLILPPP', 'I')
       RemoveDirectory             = Win32API.new('kernel32', 'RemoveDirectory', 'P', 'I')
+      RemoveDirectoryW            = Win32API.new('kernel32', 'RemoveDirectoryW', 'P', 'I')
       SetCurrentDirectory         = Win32API.new('kernel32', 'SetCurrentDirectory', 'P', 'I')
+      SetCurrentDirectoryW        = Win32API.new('kernel32', 'SetCurrentDirectoryW', 'P', 'I')
 
-      def CreateDirectory(path, attributes)
-         CreateDirectory.call(path, attributes) != 0
+      def CreateDirectory(path, attributes = 0)
+         if $KCODE != 'NONE'
+            CreateDirectoryW.call(path, attributes) != 0
+         else
+            CreateDirectory.call(path, attributes) != 0
+         end
       end
 
       def CreateDirectoryEx(template, new, attributes)
@@ -41,11 +48,19 @@ module Windows
       end
 
       def RemoveDirectory(path)
-         RemoveDirectory.call(path) != 0
+         if $KCODE != 'NONE'
+            RemoveDirectoryW.call(path) != 0
+         else
+            RemoveDirectory.call(path) != 0
+         end
       end
 
       def SetCurrentDirectory(path)
-         SetCurrentDirectory.call(path) != 0
+         if $KCODE != 'NONE'
+            SetCurrentDirectoryW.call(path) != 0
+         else
+            SetCurrentDirectory.call(path) != 0
+         end
       end
    end
 end

data/lib/windows/error.rb

@@ -8,7 +8,7 @@
 # get_last_error - Returns a human readable string for the error returned
 # by the GetLastError() function.
 ############################################################################
-require 'Win32API'
+require 'windows/unicode'
 
 module Windows
    module Error
@@ -273,6 +273,7 @@ module Windows
       SetLastErrorEx = Win32API.new('kernel32', 'GetLastError', 'LL', 'V')
       SetErrorMode   = Win32API.new('kernel32', 'SetErrorMode', 'I', 'I')
       FormatMessage  = Win32API.new('kernel32', 'FormatMessage', 'LLLLPLP', 'L')
+      FormatMessageW = Win32API.new('kernel32', 'FormatMessageW', 'LLLLPLP', 'L')
       
       def GetLastError
          GetLastError.call
@@ -298,17 +299,15 @@ module Windows
       # returns a human readable string.
       #
       def get_last_error(err_num = GetLastError.call)
-         buf = 0.chr * 260
-         FormatMessage.call(
-            FORMAT_MESSAGE_FROM_SYSTEM + FORMAT_MESSAGE_ARGUMENT_ARRAY,
-            0,
-            err_num,
-            0,
-            buf,
-            buf.length,
-            0
-         )
-         buf.split(0.chr).first.chomp
+         buf   = 0.chr * 260
+         flags = FORMAT_MESSAGE_FROM_SYSTEM + FORMAT_MESSAGE_ARGUMENT_ARRAY
+         
+         if $KCODE != 'NONE'
+            FormatMessageW.call(flags, 0, err_num, 0, buf, buf.length, 0)
+         else
+            FormatMessage.call(flags, 0, err_num, 0, buf, buf.length, 0)      
+         end
+         buf.split(0.chr).first.chomp       
       end
    end
 end

data/lib/windows/file.rb

@@ -1,4 +1,4 @@
-require 'Win32API'
+require 'windows/unicode'
 
 module Windows
    module File
@@ -146,6 +146,7 @@ module Windows
       CopyFile       = Win32API.new('kernel32', 'CopyFile', 'PPI', 'I')
       CopyFileEx     = Win32API.new('kernel32', 'CopyFileEx', 'PPPPPL', 'I')
       CreateFile     = Win32API.new('kernel32', 'CreateFile', 'PLLPLLL', 'L')
+      CreateFileW    = Win32API.new('kernel32', 'CreateFileW', 'PLLPLLL', 'L')
       CreateHardLink = Win32API.new('kernel32', 'CreateHardLink', 'PPP', 'I')
       DecryptFile    = Win32API.new('advapi32', 'DecryptFile', 'PL', 'I')
       DeleteFile     = Win32API.new('kernel32', 'DeleteFile', 'P', 'I')
@@ -157,6 +158,8 @@ module Windows
       GetFileSize         = Win32API.new('kernel32', 'GetFileSize', 'LP', 'L')
       GetFileSizeEx       = Win32API.new('kernel32', 'GetFileSizeEx', 'LP', 'L')
       GetFileType         = Win32API.new('kernel32', 'GetFileType', 'L', 'L')
+      GetFullPathName     = Win32API.new('kernel32', 'GetFullPathName', 'PLPP', 'L')
+      GetFullPathNameW    = Win32API.new('kernel32', 'GetFullPathNameW', 'PLPP', 'L')
       GetLongPathName     = Win32API.new('kernel32', 'GetLongPathName', 'PPL', 'L')
       GetShortPathName    = Win32API.new('kernel32', 'GetShortPathName', 'PPL', 'L')
 
@@ -181,7 +184,11 @@ module Windows
       end
 
       def CreateFile(file, access, share, sec, disp, flags, template)
-         CreateFile.call(file, access, share, sec, disp, flags, template)
+         if $KCODE != 'NONE'
+            CreateFileW.call(file, access, share, sec, disp, flags, template)
+         else
+            CreateFile.call(file, access, share, sec, disp, flags, template)
+         end
       end
 
       def CreateHardLink(new_file, old_file, attributes)
@@ -224,6 +231,14 @@ module Windows
          GetFileType.call(handle)
       end
       
+      def GetFullPathName(file, buf, buf_size, part)
+         if $KCODE != 'NONE'
+            GetFullPathNameW.call(file, buf, buf_size, part)
+         else
+            GetFullPathName.call(file, buf, buf_size, part)
+         end
+      end
+      
       def GetLongPathName(short, buf, buf_size)
          GetLongPathName.call(short, buf, buf_size)
       end

data/lib/windows/shell.rb

@@ -66,8 +66,8 @@ module Windows
       E_INVALIDARG = 2147483651
 
       # Flags
-      SHGFP_TYPE_CURRENT
-      SHGFP_TYPE_DEFAULT
+      SHGFP_TYPE_CURRENT = 0
+      SHGFP_TYPE_DEFAULT = 1
 
       SHGetFolderPath            = Win32API.new('shell32', 'SHGetFolderPath', 'LLLLP', 'L')
       SHGetSpecialFolderLocation = Win32API.new('shell32', 'SHGetSpecialFolderLocation', 'LIP', 'L')

data/lib/windows/unicode.rb

@@ -68,7 +68,7 @@ module Windows
       IsDBCSLeadByteEx     = Win32API.new('kernel32', 'IsDBCSLeadByteEx', 'IP', 'I')
       IsTextUnicode        = Win32API.new('advapi32', 'IsTextUnicode', 'PIP', 'I')
       MultiByteToWideChar  = Win32API.new('kernel32', 'MultiByteToWideChar', 'ILPIPI', 'I')
-      TranslateCharsetInfo = Win32API.new('kernel32', 'TranslateCharsetInfo', 'PPL', 'I')
+      TranslateCharsetInfo = Win32API.new('gdi32', 'TranslateCharsetInfo', 'PPL', 'I')
       WideCharToMultiByte  = Win32API.new('kernel32', 'WideCharToMultiByte', 'ILPIPIPP', 'I')
 
       def GetTextCharset(hdc)
@@ -87,7 +87,7 @@ module Windows
          IsDBCSLeadByteEx.call(code_pag, char) != 0
       end
 
-      def IsTextUnicode(buf, size, options)
+      def IsTextUnicode(buf, size = buf.size, options = 0)
          IsTextUnicode.call(buf, size, options) != 0
       end
 
@@ -102,5 +102,37 @@ module Windows
       def WideCharToMultiByte(page, flags, str, str_size, buf, buf_size, defchar, used_def)
          WideCharToMultiByte.call(page, flags, str, str_size, buf, buf_size, defchar, used_def)
       end
+      
+      # Convenient wrapper methods
+      
+      # Maps a string to a wide (unicode) string using UTF8.  If the function
+      # fails it just returns the string as is.
+      # 
+      def multi_to_wide(str)
+         cp  = ($KCODE == 'UTF8') ? CP_UTF8 : CP_ACP
+         buf = 0.chr * str.size * 2 # sizeof(WCHAR)
+         int = MultiByteToWideChar(cp, 0, str, str.size, buf, buf.size)
+         
+         if int > 0
+            buf[0, int*2]
+         else
+            str
+         end
+      end
+      
+      # Maps a wide character string to a new character string.  If the
+      # function fails it just returns the string as is.
+      # 
+      def wide_to_multi(str)
+         cp  = ($KCODE == 'UTF8') ? CP_UTF8 : CP_ACP
+         buf = 0.chr * str.size
+         int = WideCharToMultiByte(cp, 0, str, str.size/2, buf, buf.size, 0, 0)
+
+         if int > 0
+            buf[0, int]
+         else
+            str
+         end
+      end
    end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: windows-pr
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2006-05-23 00:00:00 -06:00
+  version: 0.5.1
+date: 2006-05-28 00:00:00 -06:00
 summary: Windows functions and constants predefined via Win32API
 require_paths: 
 - lib