windows-pr 1.2.0 → 1.2.1

data/CHANGES

@@ -1,3 +1,9 @@
+= 1.2.1 - 25-Aug-2011
+* The strcpy, mbscpy and wsccpy functions in the Windows::MSVCRT::String
+  module have been made friendlier. They will now accept either a string
+  or an address for the second argument.
+* Minor modification to one GetFinalPathNameByHandle test.
+
 = 1.2.0 - 24-Mar-2011
 * All methods and constants are now private. These methods were never meant
   to be used by individual objects, but are only meant to be used internally.

data/lib/windows/msvcrt/string.rb

@@ -21,17 +21,26 @@ module Windows
       Strspn   = API.new('strspn', 'PP', 'L', MSVCRT_DLL)
       Strstr   = API.new('strstr', 'PP', 'P', MSVCRT_DLL)
       Strtok   = API.new('strtok', 'PP', 'P', MSVCRT_DLL)
+
+      StrcpyPL = API.new('strcpy', 'PL', 'L', MSVCRT_DLL)
+      StrcpyPP = API.new('strcpy', 'PP', 'L', MSVCRT_DLL)
         
       Mbscmp   = API.new('_mbscmp', 'PP', 'I', 'msvcrt')
       Mbscpy   = API.new('_mbscpy', 'PL', 'L', 'msvcrt')
       Mbslen   = API.new('_mbslen', 'P', 'L', 'msvcrt')
       Mbsrev   = API.new('_mbsrev', 'P', 'P', 'msvcrt')
+
+      MbscpyPL = API.new('_mbscpy', 'PL', 'L', 'msvcrt')
+      MbscpyPP = API.new('_mbscpy', 'PP', 'L', 'msvcrt')
       
       Wcscmp   = API.new('wcscmp', 'PP', 'I', MSVCRT_DLL)
       Wcscpy   = API.new('wcscpy', 'PL', 'L', MSVCRT_DLL)
       Wcslen   = API.new('wcslen', 'P', 'L', MSVCRT_DLL)
       Wcsncpy  = API.new('wcsncpy', 'PPL', 'P', MSVCRT_DLL)
       Wcsrev   = API.new('_wcsrev', 'P', 'P', MSVCRT_DLL)
+
+      WcscpyPL = API.new('wcscpy', 'PL', 'L', MSVCRT_DLL)
+      WcscpyPP = API.new('wcscpy', 'PP', 'L', MSVCRT_DLL)
        
       begin
         Strtok_s = API.new('strtok_s', 'PPI', 'P', MSVCRT_DLL)
@@ -52,8 +61,12 @@ module Windows
       end
        
       def strcpy(dest, src)
-        return nil if src == 0
-        Strcpy.call(dest, src)
+        if src.is_a?(Numeric)
+          return nil if src == 0
+          StrcpyPL.call(dest, src)
+        else
+          StrcpyPP.call(dest, src)
+        end
       end
        
       def strlen(string)
@@ -116,8 +129,12 @@ module Windows
       end
        
       def mbscpy(dest, src)
-        return nil if src == 0
-        Mbscpy.call(dest, src)
+        if src.is_a?(Numeric)
+          return nil if src == 0
+          MbscpyPL.call(dest, src)
+        else
+          MbscpyPP.call(dest, src)
+        end
       end
        
       def mbslen(string)
@@ -138,8 +155,12 @@ module Windows
       end
 
       def wcscpy(dest, src)
-        return nil if src == 0
-        Wcscpy.call(dest, src)
+        if src.is_a?(Numeric)
+          return nil if src == 0
+          WcscpyPL.call(dest, src)
+        else
+          WcscpyPP.call(dest, src)
+        end
       end
        
       def wcslen(string)

data/test/tc_ntfs_winternl.rb

@@ -33,7 +33,7 @@ class TC_Windows_NTFS_Winternl < Test::Unit::TestCase
       res = GetFinalPathNameByHandle(@handle, buf, buf.size, 2)
     }
     assert_kind_of(Fixnum, res)
-    assert_equal(true, File.basename(buf) == @name)
+    assert_equal(@name, File.basename(buf))
   end
 
   def teardown

data/windows-pr.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'windows-pr'
-  spec.version    = '1.2.0'
+  spec.version    = '1.2.1'
   spec.license    = 'Artistic 2.0'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: windows-pr
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -06:00
-default_executable: 
+date: 2011-08-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: windows-api
@@ -185,7 +184,6 @@ files:
 - test/tc_window_timer.rb
 - test/tc_wsa.rb
 - windows-pr.gemspec
-has_rdoc: true
 homepage: http://www.rubyforge.org/projects/win32utils
 licenses: 
 - Artistic 2.0
@@ -215,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.4.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Windows functions and constants bundled via Win32::API