commit ec7ba645dd271c05a54855dc8baf9dee298c0461
author Aric Stewart <aric@codeweavers.com> Wed Feb 04 13:58:20 2009 -0600
committer Alexandre Julliard <julliard@winehq.org> Thu Feb 05 13:13:37 2009 +0100
tree bdafe0581b764e67e661eafcba0422e44023150b
parent 8b812b413d9d1d78f1eecd2ae58c50d7d11e44fd

mlang: Handle non Japanese case in ConvertUnknownJapaneseToUnicode.

dlls/mlang/mlang.c

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index f7d8097..11fa366 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -799,22 +799,30 @@
     int code = DetectJapaneseCode(input,count);
     TRACE("Japanese code %i\n",code);
 
-    if (code == 932)
+    switch (code)
     {
+    case 0:
+        if (output)
+            rc = MultiByteToWideChar(CP_ACP,0,input,count,output,out_count);
+        else
+            rc = MultiByteToWideChar(CP_ACP,0,input,count,0,0);
+        break;
+
+    case 932:
         if (output)
             rc = MultiByteToWideChar(932,0,input,count,output,out_count);
         else
             rc = MultiByteToWideChar(932,0,input,count,0,0);
-    }
-    else if (code == 51932)
-    {
+        break;
+
+    case 51932:
         if (output)
             rc = MultiByteToWideChar(20932,0,input,count,output,out_count);
         else
             rc = MultiByteToWideChar(20932,0,input,count,0,0);
-    }
-    else if (code == 50220)
-    {
+        break;
+
+    case 50220:
         sjis_string = HeapAlloc(GetProcessHeap(),0,count);
         rc = ConvertJIS2SJIS(input,count,sjis_string);
         if (rc)
@@ -826,6 +834,7 @@
                 rc = MultiByteToWideChar(932,0,sjis_string,rc,0,0);
         }
         HeapFree(GetProcessHeap(),0,sjis_string);
+        break;
     }
     return rc;
 }