Changeset 21308 for trunk/src/kernel32

Timestamp:

Jun 18, 2009, 6:27:45 PM (16 years ago)

Author:

ydario

Message:

Minor updates, backout imm changes.

Location:

trunk/src/kernel32

Files:

• initkernel32.cpp (modified) (5 diffs)
• oslibmisc.cpp (modified) (2 diffs)
• oslibmisc.h (modified) (1 diff)
• thread.cpp (modified) (3 diffs)
• windllbase.cpp (modified) (1 diff)

trunk/src/kernel32/initkernel32.cpp

@@ -60 +60 @@
 #include <stats.h>
 #include <heapshared.h>
+#include <heapstring.h>
 #include <_ras.h>
 
@@ -71 +72 @@
  extern DWORD kernel32_PEResTab;
 }
+
+extern PFN pfnImSetMsgQueueProperty;
 
        ULONG   flAllocMem = 0;    /* flag to optimize DosAllocMem to use all the memory on SMP machines */
@@ -79 +82 @@
        BOOL    fInit     = FALSE;
        BOOL    fWin32k   = FALSE;
+       HMODULE imHandle = 0;
+       char    szModName[ 256 ] = "";
 
 /****************************************************************************/
@@ -224 +229 @@
             CODEPAGE_Init();
 
+            if( IsDBCSEnv() && DosLoadModule( szModName, sizeof( szModName ), "OS2IM.DLL", &imHandle ) == 0 )
+                DosQueryProcAddr( imHandle, 140, NULL, &pfnImSetMsgQueueProperty );
+
             InitSystemInfo(ulSysinfo);
             //Set up environment as found in NT
@@ -272 +280 @@
     dprintf(("kernel32 exit %d\n", ulReason));
 
+    if( IsDBCSEnv() && imHandle )
+        DosFreeModule( imHandle );
+
     //Flush and delete all open memory mapped files
     Win32MemMap::deleteAll();

trunk/src/kernel32/oslibmisc.cpp

@@ -28 +28 @@
 #include "dbglocal.h"
 
+typedef APIRET ( APIENTRY *PFN_IMSETMSGQUEUEPROPERTY )( HMQ, ULONG );
+
+PFN_IMSETMSGQUEUEPROPERTY pfnImSetMsgQueueProperty = NULL;
+
 //******************************************************************************
 //TODO: not reentrant!
@@ -351 +355 @@
 //******************************************************************************
 //******************************************************************************
-
+ULONG OSLibImSetMsgQueueProperty( ULONG hmq, ULONG ulFlag )
+{
+    USHORT sel;
+    APIRET rc;
+
+    if( !pfnImSetMsgQueueProperty )
+        return 1;
+
+    sel = RestoreOS2FS();
+    rc = pfnImSetMsgQueueProperty( hmq, ulFlag );
+    SetFS( sel );
+
+    return rc;
+}
+//******************************************************************************
+//******************************************************************************
+

trunk/src/kernel32/oslibmisc.h

@@ -103 +103 @@
 void OSLibQueryBeginLibpath(char *lpszBeginlibpath, int size);
 
+ULONG OSLibImSetMsgQueueProperty( ULONG hmq, ULONG ulFlag );
+
 #ifdef __cplusplus
 }

trunk/src/kernel32/thread.cpp

@@ -34 +34 @@
 #include <handlemanager.h>
 #include <codepage.h>
+#include <heapstring.h>
 
 #include "hmhandle.h"
@@ -48 +49 @@
 
 static ULONG priorityclass = NORMAL_PRIORITY_CLASS;
+
+#define MQP_INSTANCE_PERMQ              0x00000001 // from os2im.h
 
 //******************************************************************************
@@ -689 +692 @@
     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));
+
+    if( IsDBCSEnv())
+        /* IM instace is created per message queue, that is, thread */
+        OSLibImSetMsgQueueProperty( winteb->o.odin.hmq, MQP_INSTANCE_PERMQ );
 
     //Note: The Win32 exception structure referenced by FS:[0] is the same

trunk/src/kernel32/windllbase.cpp

@@ -708 +708 @@
         PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "CRTDLL32", "CRTDLL");
     }
+    if(PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "IMM32", "", renameddll,
+                                sizeof(renameddll)-1) <= 1)
+    {
+        PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "IMM32", "IMM32OS2");
+        PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "IMM32OS2", "IMM32");
+    }
 }
 //******************************************************************************