Changeset 22010

Timestamp:

Aug 6, 2012, 2:01:29 AM (13 years ago)

Author:

dmik

Message:

kernel32: Disable Win32 TIB switch completely by default.

Previously, It was ON until the EXE type had been identified (e.g. when
loading KERNEL32.DLL and the DLLs it drags in). This could make
some apps spin in an exception handler loop (like OpenOffice
trying to load JVM.DLL).

This closes #83.

Location:

trunk/src/kernel32

Files:

• winexelx.cpp (modified) (1 diff)
• winexepe2lx.cpp (modified) (1 diff)
• winexepeldr.cpp (modified) (1 diff)
• wprocess.cpp (modified) (1 diff)

trunk/src/kernel32/winexelx.cpp

@@ -47 +47 @@
  PTIB   ptib;
 
-  if (!fForceWin32TIB) {
+  if (fForceWin32TIB) {
+      fSwitchTIBSel = TRUE;
+  } else {
       //Signal to TEB management that we're a real OS/2 app and don't
       //require setting FS to our special win32 selector

trunk/src/kernel32/winexepe2lx.cpp

@@ -128 +128 @@
     Win32Pe2LxImage(hinstance, fWin32k)
 {
+    //Signal to TEB management that we're an ummodified Win32 app and
+    //require setting FS to our special win32 selector
+    fSwitchTIBSel = TRUE;
 }
 

trunk/src/kernel32/winexepeldr.cpp

@@ -168 +168 @@
                    Win32PeLdrImage(szFileName, TRUE)
 {
+    //Signal to TEB management that we're an ummodified Win32 app and
+    //require setting FS to our special win32 selector
+    fSwitchTIBSel = TRUE;
+
     dprintf(("Win32PeLdrExe ctor: %s", szFileName));
     this->fConsoleApp = fConsoleApp;

trunk/src/kernel32/wprocess.cpp

@@ -81 +81 @@
 BOOL    fIsOS2Image = FALSE;            /* TRUE  -> Odin32 OS/2 application (not converted!) */
                                         /* FALSE -> otherwise */
-BOOL    fSwitchTIBSel = TRUE;           // TRUE  -> switch TIB selectors
+BOOL    fSwitchTIBSel = FALSE;          // TRUE  -> switch TIB selectors
                                         // FALSE -> don't
 BOOL    fForceWin32TIB = FALSE;         // TRUE  -> force TIB switch