windows-pr 0.5.5 → 0.6.0

data/CHANGES

@@ -1,3 +1,11 @@
+= 0.6.0 - 5-Nov-2006
+* Added the Windows::Volume module.
+
+= 0.5.6 - 22-Oct-2006
+* Modified the memcpy method in Windows::MSVCRT::Buffer to do the right
+  thing based on the type of the parameters, as well as automatically
+  set the default size to the size of the source being copied.
+
 = 0.5.5 - 11-Oct-2006
 * Prototype modification for VirtualQuery and VirtualQueryEx in the
   Windows::Memory module.

data/lib/windows/memory.rb

@@ -7,6 +7,14 @@ module Windows
       GMEM_MOVABLE   = 0002
       GMEM_ZEROINIT  = 0x0040
       GPTR           = 0x0040
+      
+      MEM_COMMIT      = 0x1000
+      MEM_RESERVE     = 0x2000
+      MEM_RESET       = 0x80000
+      MEM_LARGE_PAGES = 0x20000000
+      MEM_PHYSICAL    = 0x400000
+      MEM_TOP_DOWN    = 0x100000
+      MEM_WRITE_WATCH = 0x200000
 
       GlobalAlloc          = Win32API.new('kernel32', 'GlobalAlloc', 'II', 'I')
       GlobalFlags          = Win32API.new('kernel32', 'GlobalFlags', 'I', 'I')

data/lib/windows/msvcrt/buffer.rb

@@ -11,9 +11,30 @@ module Windows
          Memmove = Win32API.new('msvcrt', 'memmove', 'PPL', 'P')
          Memset  = Win32API.new('msvcrt', 'memset', 'PLL', 'L')
          Swab    = Win32API.new('msvcrt', '_swab', 'PPI', 'V')
+         
+         MemcpyPLL  = Win32API.new('msvcrt', 'memcpy', 'PLL', 'P')
+         MemcpyLPL  = Win32API.new('msvcrt', 'memcpy', 'LPL', 'P')
+         MemcpyLLL  = Win32API.new('msvcrt', 'memcpy', 'LLL', 'P')
+         MemcpyPPL  = Win32API.new('msvcrt', 'memcpy', 'PPL', 'P')
       
-         def memcpy(dest, src, size)
-            Memcpy.call(dest, src, size)
+         # Wrapper for the memcpy() function.  Both the +dest+ and +src+ can
+         # be either a string or a memory address.  If +size+ is omitted, it
+         # defaults to the length of +src+.
+         # 
+         def memcpy(dest, src, size = src.length)
+            if dest.is_a?(Integer)
+               if src.is_a?(String)
+                  MemcpyLPL.call(dest, src, size)
+               else
+                  MemcpyLLL.call(dest, src, size)
+               end
+            else
+               if src.is_a?(String)
+                  MemcpyPPL.call(dest, src, size)
+               else
+                  MemcpyPLL.call(dest, src, size)
+               end
+            end
          end
       
          def memccpy(dest, src, char, count)

data/lib/windows/volume.rb

@@ -0,0 +1,91 @@
+require 'Win32API'
+
+module Windows
+   module Volume
+      DRIVE_UNKNOWN     = 0
+      DRIVE_NO_ROOT_DIR = 1
+      DRIVE_REMOVABLE   = 2
+      DRIVE_FIXED       = 3
+      DRIVE_REMOTE      = 4
+      DRIVE_CDROM       = 5
+      DRIVE_RAMDISK     = 6
+      
+      FindFirstVolume           = Win32API.new('kernel32', 'FindFirstVolume', 'PL', 'L')
+      FindFirstVolumeMountPoint = Win32API.new('kernel32', 'FindFirstVolumeMountPoint', 'PPL', 'L')
+      FindNextVolume            = Win32API.new('kernel32', 'FindNextVolume', 'LPL', 'I')
+      FindNextVolumeMountPoint  = Win32API.new('kernel32', 'FindNextVolumeMountPoint', 'LPL', 'I')
+      FindVolumeClose           = Win32API.new('kernel32', 'FindVolumeClose', 'L', 'I')
+      FindVolumeMountPointClose = Win32API.new('kernel32', 'FindVolumeMountPointClose', 'L', 'I')
+      
+      GetDriveType           = Win32API.new('kernel32', 'GetDriveType', 'P', 'I')
+      GetLogicalDrives       = Win32API.new('kernel32', 'GetLogicalDrives', 'V', 'L')
+      GetLogicalDriveStrings = Win32API.new('kernel32', 'GetLogicalDrives', 'LP', 'L')
+      GetVolumeInformation   = Win32API.new('kernel32', 'GetVolumeInformation', 'PPLPPPPL', 'I')      
+      GetVolumeNameForVolumeMountPoint = Win32API.new('kernel32', 'GetVolumeNameForVolumeMountPoint', 'PPL', 'I')
+      GetVolumePathName      = Win32API.new('kernel32', 'GetVolumePathName', 'PPL', 'I')
+      GetVolumePathNamesForVolumeName = Win32API.new('kernel32', 'GetVolumePathNamesForVolumeName', 'PPLL', 'I')
+
+      SetVolumeLabel = Win32API.new('kernel32', 'SetVolumeLabel', 'PP', 'I')
+      SetVolumeMountPoint = Win32API.new('kernel32', 'SetVolumeMountPoint', 'PP', 'I')
+      
+      def FindFirstVolume(name, length=name.size)
+         FindFirstVolume.call(name, length)
+      end
+      
+      def FindFirstVolumeMountPoint(name, volume, length=volume.size)
+         FindFirstVolumeMountPoint.call(name, volume, length)
+      end
+      
+      def FindNextVolume(handle, name, length=name.size)
+         FindNextVolume.call(handle, name, length) != 0
+      end
+      
+      def FindNextVolumeMountPoint(handle, name, length=name.size)
+         FindNextVolumeMountPoint.call(handle, name, length) != 0
+      end
+      
+      def FindVolumeClose(handle)
+         FindVolumeClose.call(handle) != 0
+      end
+      
+      def FindVolumeMountPointClose(handle)
+         FindVolumeMountPointClose.call(handle) != 0
+      end
+      
+      def GetDriveType(path)
+         GetDriveType.call(path)
+      end
+      
+      def GetLogicalDrives()
+         GetLogicalDrives.call()
+      end
+      
+      def GetLogicalDriveStrings(length, buffer)
+         GetLogicalDriveStrings.call(length, buffer)
+      end
+      
+      def GetVolumeInformation(path, v_buf, v_size, serial, length, flags, fs_buf, fs_size)
+         GetVolumeInformation.call(path, v_buf, v_size, serial, length, flags, fs_buf, fs_size) != 0
+      end
+      
+      def GetVolumeNameForVolumeMountPoint(mount, name, length=name.size)
+         GetVolumeNameForVolumeMountPoint.call(mount, name, length) != 0
+      end
+      
+      def GetVolumePathName(file, name, length = name.size)
+         GetVolumePathName.call(file, name, length) != 0
+      end
+      
+      def GetVolumePathNamesForVolumeName(volume, paths, buf_len, return_len)
+         GetVolumePathNamesForVolumeName.call(volume, paths, buf_len, return_len) != 0
+      end
+      
+      def SetVolumeLabel(label, volume)
+         SetVolumeLabel.call(label, volume) != 0
+      end
+      
+      def SetVolumeMountPoint(mount, name)
+         SetVolumeMountPoint.call(mount, name) != 0
+      end
+   end
+end

data/test/tc_volume.rb

@@ -0,0 +1,32 @@
+#####################################################################
+# tc_volume.rb
+#
+# Test case for the Windows::Volume module.
+#####################################################################
+base = File.basename(Dir.pwd)
+if base == 'test' || base =~ /windows-pr/
+   Dir.chdir '..' if base == 'test'
+   $LOAD_PATH.unshift Dir.pwd + '/lib'
+   Dir.chdir 'test' rescue nil
+end
+
+require 'windows/volume'
+require 'test/unit'
+
+class Foo
+   include Windows::Volume
+end
+
+class TC_Windows_Clipboard < Test::Unit::TestCase
+   def setup
+      @foo = Foo.new
+   end
+   
+   def test_method_constants
+      assert_not_nil(Foo::GetVolumeInformation)
+   end
+   
+   def teardown
+      @foo = nil
+   end
+end

data/windows-pr.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "windows-pr"
-   gem.version     = "0.5.5"
+   gem.version     = "0.6.0"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: windows-pr
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
-date: 2006-10-13 00:00:00 -06:00
+  version: 0.6.0
+date: 2006-11-17 00:00:00 -07:00
 summary: Windows functions and constants predefined via Win32API
 require_paths: 
 - lib
@@ -56,12 +56,12 @@ files:
 - lib/windows/synchronize.rb
 - lib/windows/system_info.rb
 - lib/windows/unicode.rb
+- lib/windows/volume.rb
 - lib/windows/window.rb
 - test/ts_all.rb
 - lib/windows/msvcrt/buffer.rb
 - lib/windows/msvcrt/file.rb
 - lib/windows/msvcrt/string.rb
-- test/CVS
 - test/tc_clipboard.rb
 - test/tc_console.rb
 - test/tc_error.rb
@@ -77,8 +77,8 @@ files:
 - test/tc_security.rb
 - test/tc_synchronize.rb
 - test/tc_unicode.rb
+- test/tc_volume.rb
 - CHANGES
-- CVS
 - doc
 - install.rb
 - lib