win32-api 1.4.6 → 1.4.7

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.4.7 - 4-Dec-2010
+* An internal error formatting function now resorts to the default
+  LANGID on error 1815 (ERROR_RESOURCE_LANG_NOT_FOUND). Thanks go to
+  Little Snake for the spot.
+* Added a default Rake task and refactored the clean task.
+
 == 1.4.6 - 9-Feb-2010
 * Fixed a warning that showed up with MinGW/gcc caused by an unnecessary
   pointer dereference.

data/Rakefile

@@ -4,6 +4,17 @@ require 'rake/testtask'
 require 'rbconfig'
 include Config
 
+CLEAN.include(
+  'lib',
+  '**/*.gem',               # Gem files
+  '**/*.rbc',               # Rubinius
+  '**/*.o',                 # C object file
+  '**/*.log',               # Ruby extension build log
+  '**/Makefile',            # C Makefile
+  '**/conftest.dSYM',       # OS X build directory
+  "**/*.#{CONFIG['DLEXT']}" # C shared object
+)
+
 make = CONFIG['host_os'] =~ /mingw|cygwin/i ? 'make' : 'nmake'
 
 desc 'Build the ruby.exe.manifest if it does not already exist'
@@ -26,23 +37,6 @@ task :install => [:build] do
   }
 end
 
-desc 'Clean any build files for Win32::API'
-task :clean do
-  Dir.chdir('ext') do
-    if File.exists?('api.so') || File.exists?('win32/api.so') ||
-      File.exists?('api.obj') || File.exists?('Makefile')
-    then
-      sh "#{make} distclean"
-      rm 'win32/api.so' if File.exists?('win32/api.so')
-      rm 'api.so' if File.exists?('api.so') 
-    end
-  end
-
-  # Cleanup any files generated by the build_binary_gem task
-  rm_rf('lib') if File.exists?('lib')
-  Dir["*.gem"].each{ |f| File.delete(f) }
-end
-
 desc "Build Win32::API (but don't install it)"
 task :build => [:clean, :build_manifest] do
   Dir.chdir('ext') do
@@ -103,3 +97,5 @@ namespace 'test' do
     test.verbose = true
   end
 end
+
+task :default => 'test:all'

data/ext/win32/api.c

@@ -17,7 +17,7 @@
 #endif
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.4.5"
+#define WINDOWS_API_VERSION "1.4.7"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -56,61 +56,64 @@ static VALUE api_allocate(VALUE klass){
  * Internal use only.
  */
 char* StringError(DWORD dwError){
-   LPVOID lpMsgBuf;
-   static char buf[MAX_PATH];
-   DWORD dwLen;
-
-   // Assume ASCII error messages from the Windows API
-   dwLen = FormatMessageA(
+  LPVOID lpMsgBuf;
+  static char buf[MAX_PATH];
+  DWORD dwLen, dwLastError;
+
+  // Assume ASCII (English) error messages from the Windows API
+  dwLen = FormatMessageA(
+    FORMAT_MESSAGE_ALLOCATE_BUFFER |
+    FORMAT_MESSAGE_FROM_SYSTEM |
+    FORMAT_MESSAGE_IGNORE_INSERTS,
+    NULL,
+    dwError,
+    MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+    (LPSTR)&lpMsgBuf,
+    0,
+    NULL
+  );
+
+  dwLastError = GetLastError();
+
+  /* It appears that Windows doesn't necessarily ship with the DLL
+   * required to always use English error messages. Check for error
+   * ERROR_MUI_FILE_NOT_FOUND (15100) or ERROR_RESOURCE_LANG_NOT_FOUND (1815)
+   * and try again if necessary.
+   */
+  if(!dwLen && (dwLastError == 15100 || dwLastError == 1815)){
+    dwLen = FormatMessageA(
       FORMAT_MESSAGE_ALLOCATE_BUFFER |
       FORMAT_MESSAGE_FROM_SYSTEM |
       FORMAT_MESSAGE_IGNORE_INSERTS,
       NULL,
       dwError,
-      MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+      0,
       (LPSTR)&lpMsgBuf,
       0,
       NULL
-   );
-
-   /* It appears that Windows doesn't necessarily ship with the DLL
-    * required to always use English error messages. Check for error
-    * ERROR_MUI_FILE_NOT_FOUND (15100), and try again if necessary.
-    */
-   if(!dwLen && GetLastError() == 15100){
-      dwLen = FormatMessageA(
-         FORMAT_MESSAGE_ALLOCATE_BUFFER |
-         FORMAT_MESSAGE_FROM_SYSTEM |
-         FORMAT_MESSAGE_IGNORE_INSERTS,
-         NULL,
-         dwError,
-         0,
-         (LPSTR)&lpMsgBuf,
-         0,
-         NULL
-      );
-   }
+    );
+  }
 
-   if(!dwLen){
-      rb_raise(
-         cAPIError,
-         "Attempt to format message failed (error = '%d')",
-         GetLastError()
-      );
-   }
+  if(!dwLen){
+    rb_raise(
+      cAPIError,
+      "Attempt to format message failed (error = '%d')",
+      GetLastError()
+    );
+  }
 
-   memset(buf, 0, MAX_PATH);
+  memset(buf, 0, MAX_PATH);
 
-   /* remove \r\n */
+  // Remove \r\n at end of string.
 #ifdef HAVE_STRNCPY_S
-   strncpy_s(buf, MAX_PATH, lpMsgBuf, dwLen - 2);
+  strncpy_s(buf, MAX_PATH, lpMsgBuf, dwLen - 2);
 #else
-   strncpy(buf, lpMsgBuf, dwLen - 2);
+  strncpy(buf, lpMsgBuf, dwLen - 2);
 #endif
 
-   LocalFree(lpMsgBuf);
+  LocalFree(lpMsgBuf);
 
-   return buf;
+  return buf;
 }
 
 /*
@@ -941,6 +944,6 @@ void Init_api(){
 
    /* Constants */
 
-   /* 1.4.5: The version of the win32-api library */
+   /* 1.4.7: The version of the win32-api library */
    rb_define_const(cAPI, "VERSION", rb_str_new2(WINDOWS_API_VERSION));
 }

data/test/test_win32_api.rb

@@ -21,7 +21,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.4.5', API::VERSION)
+      assert_equal('1.4.7', API::VERSION)
    end
 
    def test_constructor_basic

data/win32-api.gemspec

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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: win32-api
 version: !ruby/object:Gem::Version 
-  version: 1.4.6
+  hash: 9
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 7
+  version: 1.4.7
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,19 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -07:00
+date: 2010-12-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
         version: 2.0.6
-    version: 
+  type: :development
+  version_requirements: *id001
 description: "    The Win32::API library is meant as a replacement for the Win32API\n    library that ships as part of the standard library. It contains several\n    advantages over Win32API, including callback support, raw function\n    pointers, an additional string type, and more.\n"
 email: djberg96@gmail.com
 executables: []
@@ -55,21 +67,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 51
+      segments: 
+      - 1
+      - 8
+      - 2
       version: 1.8.2
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: win32utils
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A superior replacement for Win32API