win32-api 1.4.1-x86-mswin32-60 → 1.4.2-x86-mswin32-60

data/CHANGES

@@ -1,3 +1,8 @@
+= 1.4.2 - 31-May-2009
+* Updated the internal StringError() function to better handle the possibility
+  of the English .mui file not being found. Thanks go to Michel Demazure for
+  the spot.
+
 = 1.4.1 - 29-May-2009
 * Callback handling improvements.
 * Updated the gemspec description.

data/ext/win32/api.c

@@ -17,7 +17,7 @@
 #endif
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.4.1"
+#define WINDOWS_API_VERSION "1.4.2"
 
 #define _T_VOID     0
 #define _T_LONG     1
@@ -60,7 +60,7 @@ char* StringError(DWORD dwError){
    static char buf[MAX_PATH];
    DWORD dwLen;
 
-   /* Assume ASCII error messages from the Windows API */
+   // Assume ASCII error messages from the Windows API
    dwLen = FormatMessageA(
       FORMAT_MESSAGE_ALLOCATE_BUFFER |
       FORMAT_MESSAGE_FROM_SYSTEM |
@@ -73,8 +73,31 @@ char* StringError(DWORD dwError){
       NULL
    );
 
-   if(!dwLen)
-      rb_raise(cAPIError, "Attempt to format message failed");
+   /* 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()
+      );
+   }
 
    memset(buf, 0, MAX_PATH);
 
@@ -921,6 +944,6 @@ void Init_api(){
 
    /* Constants */
 
-   /* 1.4.1: The version of this library, returned as a String */
+   /* 1.4.2: The version of this library, returned as a String */
    rb_define_const(cAPI, "VERSION", rb_str_new2(WINDOWS_API_VERSION));
 }

data/test/test_win32_api.rb

@@ -20,7 +20,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.4.1', API::VERSION)
+      assert_equal('1.4.2', API::VERSION)
    end
 
    def test_constructor_basic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-api
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.2
 platform: x86-mswin32-60
 authors: 
 - Daniel J. Berger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-29 00:00:00 -06:00
+date: 2009-05-31 00:00:00 -06:00
 default_executable: 
 dependencies: []