windows-pr 0.8.6 → 0.8.7

data/CHANGES

@@ -1,3 +1,8 @@
+= 0.8.7 - 23-Jun-2008
+* Wide character fix for the get_last_error helper function. Thanks go to
+  Dave Whitley for the spot.
+* Added local memory functions and constants to the Windows::Memory module.
+
 = 0.8.6 - 14-Jun-2008
 * Added the Windows::Network::Winsock module.
 * Added the Windows::ToolHelper module.

data/lib/windows/error.rb

@@ -413,10 +413,10 @@ module Windows
       # returns a human readable string.
       #
       def get_last_error(err_num = GetLastError.call)
-         buf   = 0.chr * 260
-         flags = FORMAT_MESSAGE_FROM_SYSTEM + FORMAT_MESSAGE_ARGUMENT_ARRAY        
+         buf   = $KCODE == 'UTF8' ? 0.chr * 520 : 0.chr * 260
+         flags = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY        
          FormatMessage.call(flags, 0, err_num, 0, buf, buf.size, 0)
-         buf.split(0.chr).first.chomp rescue 'Unknown error'       
+         buf.split(0.chr).join[ /^[^\0\r\n]*/ ] rescue 'Unknown error'       
       end
       
       # Macros from WinError.h

data/lib/windows/memory.rb

@@ -53,6 +53,18 @@ module Windows
       SEC_COMMIT   = 0x8000000     
       SEC_NOCACHE  = 0x10000000            
 
+      LMEM_FIXED          = 0x0000
+      LMEM_MOVEABLE       = 0x0002
+      LMEM_NOCOMPACT      = 0x0010
+      LMEM_NODISCARD      = 0x0020
+      LMEM_ZEROINIT       = 0x0040
+      LMEM_MODIFY         = 0x0080
+      LMEM_DISCARDABLE    = 0x0F00
+      LMEM_VALID_FLAGS    = 0x0F72
+      LMEM_INVALID_HANDLE = 0x8000
+      LMEM_DISCARDED      = 0x4000
+      LMEM_LOCKCOUNT      = 0x00FF
+
       API.new('GlobalAlloc', 'II', 'I')
       API.new('GlobalFlags', 'I', 'I')
       API.new('GlobalFree', 'I', 'I')
@@ -78,6 +90,15 @@ module Windows
       API.new('HeapValidate', 'LLL', 'B')
       API.new('HeapWalk', 'LP', 'B')
 
+      API.new('LocalAlloc', 'IL', 'L')
+      API.new('LocalFlags', 'L', 'I')
+      API.new('LocalFree', 'L', 'L')
+      API.new('LocalHandle', 'L', 'L')
+      API.new('LocalLock', 'L', 'L')
+      API.new('LocalReAlloc', 'LLI', 'L')
+      API.new('LocalSize', 'L', 'I')
+      API.new('LocalUnlock', 'L', 'B')
+
       API.new('VirtualAlloc', 'LLLL', 'L')
       API.new('VirtualAllocEx', 'LLLLL', 'L')
       API.new('VirtualFree', 'LLL', 'B')
@@ -90,6 +111,11 @@ module Windows
       API.new('VirtualUnlock', 'LL', 'B')
       API.new('RtlZeroMemory', 'PL', 'L')
 
+      # The LocalDiscard macro from winbase.h
+      def LocalDiscard(mem_loc)
+         LocalReAlloc(mem_loc, 0, LMEM_MOVEABLE)
+      end
+
       # Windows XP or later
       begin
          API.new('HeapQueryInformation', 'LIPLL', 'B')

data/test/tc_tool_helper.rb

@@ -0,0 +1,29 @@
+#####################################################################
+# tc_tool_helper.rb
+#
+# Test case for the Windows::ToolHelper module.
+#####################################################################
+require 'windows/tool_helper'
+require 'test/unit'
+
+class ToolHelperFoo
+   include Windows::ToolHelper
+end
+
+class TC_Windows_ToolHelper < Test::Unit::TestCase
+   def setup
+      @foo  = ToolHelperFoo.new
+   end
+
+   def test_numeric_constants
+      assert_equal(0x00000001, ToolHelperFoo::TH32CS_SNAPHEAPLIST)
+   end
+
+   def test_method_constants
+      assert_not_nil(ToolHelperFoo::Process32First)
+   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.8.6"
+   gem.version     = "0.8.7"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: windows-pr
 version: !ruby/object:Gem::Version 
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-14 00:00:00 -06:00
+date: 2008-06-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ files:
 - test/tc_system_info.rb
 - test/tc_thread.rb
 - test/tc_time.rb
+- test/tc_tool_helper.rb
 - test/tc_unicode.rb
 - test/tc_volume.rb
 - test/tc_window.rb
@@ -189,6 +190,7 @@ test_files:
 - test/tc_system_info.rb
 - test/tc_thread.rb
 - test/tc_time.rb
+- test/tc_tool_helper.rb
 - test/tc_unicode.rb
 - test/tc_volume.rb
 - test/tc_window.rb