Changeset 5411

Timestamp:

Mar 31, 2001, 12:39:01 PM (24 years ago)

Author:

sandervl

Message:

codepage workaround (default = 0 isntead of 1252)

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (2 diffs)
• codepage.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP ¶

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.61 2001-03-28 16:21:40 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.62 2001-03-31 10:39:01 sandervl Exp $ */
 
 /*
@@ -174 +174 @@
   dprintf(("KERNEL32:  GetOEMCP\n"));
   return(O32_GetOEMCP());
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION0(UINT, GetACP)
-{
-  return(O32_GetACP());
 }
 //******************************************************************************

trunk/src/kernel32/codepage.cpp ¶

@@ -1 @@
-/* $Id: codepage.cpp,v 1.7 2001-01-24 20:33:37 sandervl Exp $
+/* $Id: codepage.cpp,v 1.8 2001-03-31 10:39:01 sandervl Exp $
 **
 ** Module   :CODEPAGE.CPP
@@ -24 +24 @@
 static UconvObject WindowsUconv = NULL;
 
+static ULONG windowCodePage = -1;
+static ULONG displayCodePage = -1;
+
 ULONG GetDisplayCodepage()
 {
- static ULONG codepage = -1;
-
-    if(codepage == -1) {
+    if(displayCodePage == -1) {
         //default codepage is 1252 (same as default Windows codepage)
-        codepage = PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "DISPLAY", 1252);
+//      displayCodePage = PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "DISPLAY", 1252);
+        displayCodePage = PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "DISPLAY", 0);
     }
-    return codepage;
+    return displayCodePage;
 }
 
 ULONG GetWindowsCodepage()
 {
- static ULONG codepage = -1;
+    if(windowCodePage == -1) {
+        //default codepage is 1252 (same as default Windows codepage)
+//      windowCodePage = PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "WINDOWS", 1252);
+        windowCodePage = PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "WINDOWS", 0);
+    }
+    return windowCodePage;
+}
 
-    if(codepage == -1) {
-        //default codepage is 1252 (same as default Windows codepage)
-        codepage = PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "WINDOWS", 1252);
-    }
-    return codepage;
+UINT WIN32API GetACP()
+{
+    UINT codepage = GetDisplayCodepage();
+    dprintf(("GetACP -> %d", codepage));
+
+    return(codepage);
 }