Changeset 9582 for trunk/src

Timestamp:

Jan 2, 2003, 12:50:46 PM (23 years ago)

Author:

sandervl

Message:

Set the codepage of the message queue for each new thread that is created. (done for the main thread in user32)

Location:

trunk/src/kernel32

Files:

• oslibmisc.cpp (modified) (2 diffs)
• oslibmisc.h (modified) (2 diffs)
• thread.cpp (modified) (6 diffs)

trunk/src/kernel32/oslibmisc.cpp

@@ -1 @@
-/* $Id: oslibmisc.cpp,v 1.13 2001-08-09 08:45:06 sandervl Exp $ */
+/* $Id: oslibmisc.cpp,v 1.14 2003-01-02 11:50:46 sandervl Exp $ */
 /*
  * Misc OS/2 util. procedures
@@ -271 +271 @@
 //******************************************************************************
 //******************************************************************************
+ULONG OSLibWinSetCp(ULONG hmq, ULONG codepage)
+{
+  return WinSetCp(hmq, codepage);
+}
+//******************************************************************************
+//******************************************************************************
 ULONG OSLibQueryCountry()
 {

trunk/src/kernel32/oslibmisc.h

@@ -1 @@
-/* $Id: oslibmisc.h,v 1.9 2002-02-19 13:08:19 sandervl Exp $ */
+/* $Id: oslibmisc.h,v 1.10 2003-01-02 11:50:46 sandervl Exp $ */
 /*
  * Misc util. procedures
@@ -44 +44 @@
 ULONG OSLibWinInitialize();
 ULONG OSLibWinQueryMsgQueue(ULONG hab);
+ULONG OSLibWinSetCp(ULONG hmq, ULONG codepage);
 
 //#define CTRY_NONE                        0

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.46 2002-06-11 16:36:54 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.47 2003-01-02 11:50:46 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 #include "oslibdos.h"
 #include <handlemanager.h>
+#include <codepage.h>
 
 #define DBG_LOCALLOG    DBG_thread
@@ -101 +102 @@
 //******************************************************************************
 #define MAX_CALLSTACK_SIZE 128
+#ifdef DEBUG
+static char *pszLastCaller = NULL;
+#endif
 //******************************************************************************
 void WIN32API dbg_ThreadPushCall(char *pszCaller)
@@ -112 +116 @@
     return;
     
-  teb->o.odin.dbgCallDepth++;
-  
   // add caller name to call stack trace
   int iIndex = teb->o.odin.dbgCallDepth;
@@ -124 +126 @@
   if (iIndex < MAX_CALLSTACK_SIZE)
     teb->o.odin.arrstrCallStack[iIndex] = (PVOID)pszCaller;
+
+  teb->o.odin.dbgCallDepth++;
+
+  pszLastCaller = pszCaller;
 #endif
 }
@@ -305 +311 @@
     winteb->o.odin.hab = OSLibWinInitialize();
     winteb->o.odin.hmq = OSLibWinQueryMsgQueue(winteb->o.odin.hab);
+    rc = OSLibWinSetCp(winteb->o.odin.hmq, GetDisplayCodepage());
+    dprintf(("WinSetCP was %sOK", rc ? "" : "not "));
+
     dprintf(("Win32ThreadProc: hab %x hmq %x", winteb->o.odin.hab, winteb->o.odin.hmq));
     dprintf(("Stack top 0x%x, stack end 0x%x", winteb->stack_top, winteb->stack_low));