Changeset 21543 for trunk/src

Timestamp:

Jan 7, 2011, 1:01:45 AM (15 years ago)

Author:

dmik

Message:

user32: Do not change the code page of the main PM thread as Odin may be attached to a foreign process (such as Firefox through the Flash plugin) which will not expect the code page change (see #24).

File:

• trunk/src/user32/pmwindow.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -201 +201 @@
     hookInit(hab);
 
+    // we don't want to change the code page of the main thread because it may
+    // be a foreign thread (such as when we are dragged by the Flash plugin
+    // into the Firefox process) which has already performed its own
+    // initialization and does not expect the code page change
+#if 0
     BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
     dprintf(("InitPM: WinSetCP(%d) was %sOK", GetDisplayCodepage(), rc ? "" : "not "));
+#endif
 
     /* IM instace is created per message queue, that is, thread */
@@ -951 +957 @@
             extramsg.message = WINWM_CHAR;
 
-            // convert character code if needed (normally not as both
-            // Win32ThreadProc() and InitPM() set the HMQ code page to the
-            // Windows ANSI code page)
+            // convert character code if needed (normally, only on the main
+            // thread since Win32ThreadProc() sets the HMQ code page to the
+            // Windows ANSI code page so that all threads created by Win32 API
+            // will be already in the ANSI code page)
             ULONG cpFrom = WinQueryCp(HMQ_CURRENT);
             ULONG cpTo = GetDisplayCodepage();