RubyGems - windows-api - Versions diffs - 0.2.0 → 0.2.1 - Mend

windows-api 0.2.0 → 0.2.1

Files changed (6) hide show

data/CHANGES CHANGED Viewed

@@ -1,3 +1,7 @@
+= 0.2.1 - 10-Feb-2008
+* Added support for long data type names, e.g. 'DWORD' instead of 'L', for
+  both the prototype and return type.
 = 0.2.0 - 20-Sep-2007
 * Now requires the win32-api library.
 * Replaced class variables with class instance variables to prevent conflicts.

data/README CHANGED Viewed

@@ -18,6 +18,9 @@
    # Explicitly state every argument
    GetComputerNameEx = API.new('GetComputerNameEx', 'PPP', 'I', 'kernel32')
+   # Use long data type names
+   GetUserName = API.new('GetUserName',['LPTSTR','LPDWORD'],'BOOL','advapi32')
    # Attributes for possible inspection
    puts GetVersion.dll_name      # 'kernel32'
    puts GetVersion.function_name # 'GetVersion'

data/lib/windows/api.rb CHANGED Viewed

@@ -2,10 +2,99 @@ require 'win32/api'
 module Windows
    class API
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
       class Error < RuntimeError; end
+      private
+      DATA_TYPES = {
+         'ATOM'         => 'I',
+         'BOOL'         => 'B',
+         'BOOLEAN'      => 'B',
+         'BYTE'         => 'I',
+         'CALLBACK'     => 'K',
+         'CHAR'         => 'I',
+         'COLORREF'     => 'L',
+         'DWORD'        => 'L',
+         'DWORDLONG'    => 'L',
+         'DWORD_PTR'    => 'P',
+         'DWORD32'      => 'I',
+         'DWORD64'      => 'L',
+         'HACCEL'       => 'L',
+         'HANDLE'       => 'L',
+         'HBITMAP'      => 'L',
+         'HBRUSH'       => 'L',
+         'HCOLORSPACE'  => 'L',
+         'HCONV'        => 'L',
+         'HDC'          => 'L',
+         'HFILE'        => 'I',
+         'HKEY'         => 'L',
+         'HFONT'        => 'L',
+         'HINSTANCE'    => 'L',
+         'HKEY'         => 'L',
+         'HLOCAL'       => 'L',
+         'HMENU'        => 'L',
+         'HMODULE'      => 'L',
+         'HRESULT'      => 'L',
+         'HWND'         => 'L',
+         'INT'          => 'I',
+         'INT_PTR'      => 'P',
+         'INT32'        => 'I',
+         'INT64'        => 'L',
+         'LANGID'       => 'I',
+         'LCID'         => 'L',
+         'LCTYPE'       => 'L',
+         'LONG'         => 'L',
+         'LONGLONG'     => 'L',
+         'LONG_PTR'     => 'P',
+         'LONG32'       => 'L',
+         'LONG64'       => 'L',
+         'LPARAM'       => 'P',
+         'LPBOOL'       => 'P',
+         'LPBYTE'       => 'P',
+         'LPCOLORREF'   => 'P',
+         'LPCSTR'       => 'P',
+         'LPCTSTR'      => 'P',
+         'LPCVOID'      => 'L',
+         'LPCWSTR'      => 'P',
+         'LPDWORD'      => 'P',
+         'LPHANDLE'     => 'P',
+         'LPINT'        => 'P',
+         'LPLONG'       => 'P',
+         'LPSTR'        => 'P',
+         'LPTSTR'       => 'P',
+         'LPVOID'       => 'L',
+         'LPWORD'       => 'P',
+         'LPWSTR'       => 'P',
+         'LRESULT'      => 'P',
+         'PBOOL'        => 'P',
+         'PBOOLEAN'     => 'P',
+         'PBYTE'        => 'P',
+         'PHKEY'        => 'P',
+         'SC_HANDLE'    => 'L',
+         'SC_LOCK'      => 'L',
+         'SERVICE_STATUS_HANDLE' => 'L',
+         'SHORT'        => 'I',
+         'SIZE_T'       => 'P',
+         'TCHAR'        => 'L',
+         'UINT'         => 'I',
+         'UINT_PTR'     => 'P',
+         'UINT32'       => 'I',
+         'UINT64'       => 'L',
+         'ULONG'        => 'L',
+         'ULONGLONG'    => 'L',
+         'ULONG_PTR'    => 'P',
+         'ULONG32'      => 'L',
+         'ULONG64'      => 'L',
+         'USHORT'       => 'I',
+         'USN'          => 'L',
+         'WINAPI'       => 'L',
+         'WORD'         => 'I'
+      }
+      public
       @auto_constant  = false
       @auto_method    = false
       @auto_unicode   = false
@@ -200,12 +289,25 @@ module Windows
       # If the function cannot be found then an API::Error is raised (a subclass
       # of RuntimeError).
       #
-      def initialize(func, proto='V', rtype='L', dll='kernel32')
+      def initialize(func, proto='V', rtype='L', dll='kernel32')
+         # Convert literal data types to values that win32-api understands
+         if proto.is_a?(Array)
+            proto.each_with_index{ |pt, index|
+               if pt.length > 1
+                  proto[index].replace(DATA_TYPES[pt])
+               end
+            }
+         end
+         if rtype.length > 1
+            rtype.replace(DATA_TYPES[rtype])
+         end
          @function_name = func
          @prototype     = proto
          @return_type   = rtype == 'B' ? 'I' : rtype
          @dll_name      = dll
-         @boolean       = rtype == 'B' ? true : false
+         @boolean       = rtype == 'B' ? true : false
          begin
             @api = Win32::API.new(func, proto, rtype, dll)
@@ -354,4 +456,4 @@ module Windows
          result
       end
    end
-end
+end

data/test/tc_windows_api.rb CHANGED Viewed

@@ -43,7 +43,13 @@ class TC_Windows_API < Test::Unit::TestCase
    end
    def test_version
-      assert_equal('0.2.0', API::VERSION)
+      assert_equal('0.2.1', API::VERSION)
+   end
+   def test_full_data_types
+      assert_nothing_raised{
+         API.new('GetUserName', ['LPTSTR', 'LPDWORD'], 'BOOL', 'advapi32')
+      }
    end
    def test_auto_unicode

data/windows-api.gemspec CHANGED Viewed

@@ -2,7 +2,7 @@ require "rubygems"
 spec = Gem::Specification.new do |gem|
    gem.name        = "windows-api"
-   gem.version     = "0.2.0"
+   gem.version     = "0.2.1"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |gem|
    gem.files.reject! { |fn| fn.include? "CVS" }
    gem.require_path = "lib"
    gem.extra_rdoc_files = ["README", "CHANGES", "MANIFEST"]
-   gem.add_dependency("win32-api", ">= 1.0.0")
+   gem.add_dependency("win32-api", ">= 1.0.5")
 end
 if $0 == __FILE__

metadata CHANGED Viewed

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification
-rubygems_version: 0.9.4
-specification_version: 1
 name: windows-api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-date: 2007-09-20 00:00:00 -06:00
-summary: An easier way to create methods using Win32API
-require_paths:
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/win32utils
-rubyforge_project:
-description: An easier way to create methods using Win32API
-autorequire:
-default_executable:
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement
-  requirements:
-  - - ">"
-    - !ruby/object:Gem::Version
-      version: 0.0.0
-  version:
+  version: 0.2.1
 platform: ruby
-signing_key:
-cert_chain:
-post_install_message:
 authors:
 - Daniel J. Berger
+autorequire:
+bindir: bin
+cert_chain: []
+date: 2008-02-10 00:00:00 -07:00
+default_executable:
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: win32-api
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+    version:
+description: An easier way to create methods using Win32API
+email: djberg96@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files:
+- README
+- CHANGES
+- MANIFEST
 files:
 - lib/windows/api.rb
 - test/CVS
@@ -40,27 +43,31 @@ files:
 - README
 - test
 - windows-api.gemspec
-test_files:
-- test/tc_windows_api.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/win32utils
+post_install_message:
 rdoc_options: []
-extra_rdoc_files:
-- README
-- CHANGES
-- MANIFEST
-executables: []
-extensions: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: "0"
+  version:
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: "0"
+  version:
 requirements: []
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: win32-api
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    version:
+rubyforge_project:
+rubygems_version: 1.0.1
+signing_key:
+specification_version: 2
+summary: An easier way to create methods using Win32API
+test_files:
+- test/tc_windows_api.rb