Changeset 17040

Timestamp:

08/04/08 02:37:31 (5 years ago)

Author:

saturday06

Message:

iconv...???

Location:

lang/cplusplus/i3

Files:

• intl/loadmsgcat.c.windows-utf16 (modified) (1 diff)
• src/LibintlUtf16le.h (modified) (1 diff)

lang/cplusplus/i3/intl/loadmsgcat.c.windows-utf16

@@ -5 +5 @@
 /**/
 
+#include <windows.h>
 int
 open_windows_utf8(const char *pathname8, int flags)
 {
-    wchar_t  pathname16[1000] = {};
-    { // iconv
-        iconv_t  cd;
-        wchar_t* pathname16_iterator;
-        size_t   pathname16_bytes_left;
-        char*    pathname8_iterator;
-        size_t   pathname8_bytes_left;
-        int      result;
-
-        pathname16_iterator = (char*)pathname16;
-        pathname16_bytes_left = sizeof(pathname16) -1;//"-1" for null term
-        pathname8_iterator = pathname8;
-        pathname8_bytes_left = strlen(pathname8);
-        
-        cd = iconv_open("UTF-16LE", "UTF-8");
-
-        result = iconv(cd, 
-                       &pathname8_iterator, 
-                       &pathname8_bytes_left,
-                       (char*)&pathname16_iterator,
-                       &pathname16_bytes_left);
-        
-        if (result == -1) {
-            errno = EACCES;
-            return -1;
-        }
-        
-        iconv_close(cd);
+    wchar_t pathname16[1000];
+    if (0 == MultiByteToWideChar(
+            CP_UTF8,
+            0,
+            pathname8,
+            -1,
+            pathname16,
+            sizeof(pathname16))) {
+        return -1;
     }
     return _wopen(pathname16, flags);

lang/cplusplus/i3/src/LibintlUtf16le.h

@@ -23 +23 @@
 
 namespace i3 {
-    extern const char* locale_dir_utf8_;
+    extern const char* windows_locale_dir_utf8_;
 }
 #undef LOCALEDIR
-#define LOCALEDIR (i3::locale_dir_utf8_)
+#define LOCALEDIR (i3::windows_locale_dir_utf8_)
 
 #endif