win32-dir 0.4.1 → 0.4.2

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.4.2 - 8-Apr-2013
+* Fixed the HANDLE function prototypes in the underlying FFI code and added
+  some custom typedefs for convenience. This affects 64 bit Ruby code.
+
 == 0.4.1 - 2-Oct-2012
 * Added the Dir.read_junction method. Thanks go to Gabriel Wilkins for the patch.
 

data/lib/win32/dir.rb

@@ -26,7 +26,7 @@ class Dir
   )
 
   # The version of the win32-dir library.
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 
   # CSIDL constants
   csidl = Hash[
@@ -194,11 +194,8 @@ class Dir
   #    Dir.create_junction('C:/to', 'C:/from')
   #
   def self.create_junction(to, from)
-    to   = to.tr(File::SEPARATOR, File::ALT_SEPARATOR) + "\0"   # Normalize path
-    from = from.tr(File::SEPARATOR, File::ALT_SEPARATOR) + "\0" # Normalize path
-
-    to.encode!('UTF-16LE')
-    from.encode!('UTF-16LE')
+    to   = to.wincode
+    from = from.wincode
 
     from_path = 0.chr * 1024
     from_path.encode!('UTF-16LE')
@@ -212,7 +209,6 @@ class Dir
     end
 
     to_path = 0.chr * 1024
-    to.encode!('UTF-16LE')
     to_path.encode!('UTF-16LE')
 
     length = GetFullPathNameW(to, to_path.size, to_path, nil)
@@ -303,9 +299,9 @@ class Dir
   #
   def self.read_junction(junction)
     return false unless Dir.junction?(junction)
-    junction = junction.tr(File::SEPARATOR, File::ALT_SEPARATOR) + "\0"  # Normalize path
 
-    junction.encode!('UTF-16LE')
+    junction = junction.wincode
+
     junction_path = 0.chr * 1024
     junction_path.encode!('UTF-16LE')
 
@@ -379,19 +375,15 @@ class Dir
   # a directory, or contains any files other than '.' or '..'.
   #
   def self.empty?(path)
-    path = path + "\0"
-    path = path.encode('UTF-16LE')
-    PathIsDirectoryEmptyW(path)
+    PathIsDirectoryEmptyW(path.wincode)
   end
 
   # Returns whether or not +path+ is a junction.
   #
   def self.junction?(path)
     bool = true
-    path = path + "\0"
-    path.encode!('UTF-16LE')
 
-    attrib = GetFileAttributesW(path)
+    attrib = GetFileAttributesW(path.wincode)
 
     # Only directories with a reparse point attribute can be junctions
     if attrib == INVALID_FILE_ATTRIBUTES ||

data/lib/win32/dir/functions.rb

@@ -9,11 +9,16 @@ require 'ffi'
 module Dir::Functions
   extend FFI::Library
 
+  typedef :ulong, :dword
+  typedef :uintptr_t, :handle
+  typedef :uintptr_t, :hwnd
+  typedef :pointer, :ptr
+
   ffi_lib :shell32
 
-  attach_function :SHGetFolderPathW, [:ulong, :int, :ulong, :ulong, :buffer_out], :ulong
-  attach_function :SHGetFolderLocation, [:ulong, :int, :ulong, :ulong, :pointer], :ulong
-  attach_function :SHGetFileInfo, [:ulong, :ulong, :pointer, :uint, :uint], :ulong
+  attach_function :SHGetFolderPathW, [:hwnd, :int, :handle, :dword, :buffer_out], :dword
+  attach_function :SHGetFolderLocation, [:hwnd, :int, :handle, :dword, :ptr], :dword
+  attach_function :SHGetFileInfo, [:dword, :dword, :ptr, :uint, :uint], :dword
 
   ffi_lib :shlwapi
 
@@ -21,15 +26,23 @@ module Dir::Functions
 
   ffi_lib :kernel32
 
-  attach_function :CloseHandle, [:ulong], :bool
-  attach_function :CreateDirectoryW, [:buffer_in, :pointer], :bool
-  attach_function :CreateFileW, [:buffer_in, :ulong, :ulong, :pointer, :ulong, :ulong, :ulong], :ulong
-  attach_function :DeviceIoControl, [:ulong, :ulong, :pointer, :ulong, :pointer, :ulong, :pointer, :pointer], :bool
-  attach_function :GetCurrentDirectoryW, [:ulong, :buffer_out], :ulong
-  attach_function :GetFileAttributesW, [:buffer_in], :ulong
-  attach_function :GetLastError, [], :ulong
-  attach_function :GetShortPathNameW, [:buffer_in, :buffer_out, :ulong], :ulong
-  attach_function :GetLongPathNameW, [:buffer_in, :buffer_out, :ulong], :ulong
-  attach_function :GetFullPathNameW, [:buffer_in, :ulong, :buffer_out, :pointer], :ulong
+  attach_function :CloseHandle, [:handle], :bool
+  attach_function :CreateDirectoryW, [:buffer_in, :ptr], :bool
+  attach_function :CreateFileW, [:buffer_in, :dword, :dword, :ptr, :dword, :dword, :handle], :handle
+  attach_function :DeviceIoControl, [:handle, :dword, :ptr, :dword, :ptr, :dword, :ptr, :ptr], :bool
+  attach_function :GetCurrentDirectoryW, [:dword, :buffer_out], :dword
+  attach_function :GetFileAttributesW, [:buffer_in], :dword
+  attach_function :GetLastError, [], :dword
+  attach_function :GetShortPathNameW, [:buffer_in, :buffer_out, :dword], :dword
+  attach_function :GetLongPathNameW, [:buffer_in, :buffer_out, :dword], :dword
+  attach_function :GetFullPathNameW, [:buffer_in, :dword, :buffer_out, :ptr], :dword
   attach_function :RemoveDirectoryW, [:buffer_in], :bool
 end
+
+class String
+  # Convenience method for converting strings to UTF-16LE for wide character
+  # functions that require it.
+  def wincode
+    (self.tr(File::SEPARATOR, File::ALT_SEPARATOR) + 0.chr).encode('UTF-16LE')
+  end
+end

data/test/test_win32_dir.rb

@@ -25,7 +25,7 @@ class TC_Win32_Dir < Test::Unit::TestCase
   end
 
   test "version number is set to expected value" do
-    assert_equal('0.4.1', Dir::VERSION)
+    assert_equal('0.4.2', Dir::VERSION)
   end
 
   test 'glob handles backslashes' do

data/win32-dir.gemspec

@@ -2,11 +2,11 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'win32-dir'
-  spec.version   = '0.4.1'
+  spec.version   = '0.4.2'
   spec.authors   = ['Daniel J. Berger', 'Park Heesob']
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'
-  spec.homepage  = 'http://www.rubyforge.org/projects/win32utils'
+  spec.homepage  = 'http://github.com/djberg96/win32-dir'
   spec.summary   = 'Extra constants and methods for the Dir class on Windows.'
   spec.test_file = 'test/test_win32_dir.rb'
   spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-dir
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -68,7 +68,7 @@ files:
 - README
 - test/test_win32_dir.rb
 - win32-dir.gemspec
-homepage: http://www.rubyforge.org/projects/win32utils
+homepage: http://github.com/djberg96/win32-dir
 licenses:
 - Artistic 2.0
 post_install_message: