Changeset 126 for pjproject/trunk/pjlib/src/pj/os_error_win32.c

Timestamp:

Jan 20, 2006 9:03:36 PM (18 years ago)

Author:

bennylp

Message:

Completed testing for WinCE port

File:

• pjproject/trunk/pjlib/src/pj/os_error_win32.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/os_error_win32.c

@@ -22 +22 @@
 #include <pj/compat/sprintf.h>
 #include <pj/compat/vsprintf.h>
+#include <pj/unicode.h>
 #include <pj/string.h>
 
@@ -122 +123 @@
 {
     int len;
+    PJ_DECL_UNICODE_TEMP_BUF(wbuf,128);
 
     pj_assert(buf != NULL);
@@ -132 +134 @@
      */
 
+#if PJ_NATIVE_STRING_IS_UNICODE
     len = FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM 
                          | FORMAT_MESSAGE_IGNORE_INSERTS,
@@ -137 +140 @@
                          os_errcode,
                          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
-                         (LPTSTR)buf,
-                         (DWORD)bufsize,
+                         wbuf,
+                         sizeof(wbuf),
                          NULL);
+    if (len) {
+        pj_unicode_to_ansi(wbuf, len, buf, bufsize);
+    }
+#else
+    len = FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM 
+                         | FORMAT_MESSAGE_IGNORE_INSERTS,
+                         NULL,
+                         os_errcode,
+                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
+                         buf,
+                         bufsize,
+                         NULL);
+#endif
 
     if (!len) {