Changeset 130 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Jun 20, 1999, 2:46:34 PM (26 years ago)

Author:

sandervl

Message:

Activated Win32 TIB code and fixes some other things (see ChangeLog)

File:

• trunk/src/kernel32/wprocess.cpp (modified) (8 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.11 1999-06-20 10:55:36 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.12 1999-06-20 12:46:09 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
 USHORT    ProcessTIBSel = 0;
 DWORD    *TIBFlatPtr    = 0;
+
+extern "C" ULONG QueryExceptionChain();
 
 //******************************************************************************
@@ -104 +106 @@
    }
    dprintf(("InitializeTIB setup TEB with selector %x", tibsel));
+   dprintf(("InitializeTIB: FS(%x):[0] = %x", GetFS(), QueryExceptionChain()));
    return winteb;
 #else
@@ -119 +122 @@
  THDB  *thdb;
 
-   dprintf(("DestroyTIB: FS = %x", GetFS()));
+   dprintf(("DestroyTIB: FS     = %x", GetFS()));
+   dprintf(("DestroyTIB: FS:[0] = %x", QueryExceptionChain()));
 
    winteb = (TEB *)TIBFlatPtr;
@@ -134 +138 @@
    else dprintf(("Already destroyed TIB"));
 
+   dprintf(("DestroyTIB: FS(%x):[0] = %x", GetFS(), QueryExceptionChain()));
    TIBFlatPtr = NULL;
    return;
@@ -225 +230 @@
   RegisterExe(Win32TableId, NameTableId, VersionResId, Pe2lxVersion, hinstance);
 
-  dprintf(("RegisterResourceUsage: FS = %x", GetFS()));
+  dprintf(("RegisterResourceUsage: FS(%x):[0] = %x", GetFS(), QueryExceptionChain()));
 }
 //******************************************************************************
@@ -315 +320 @@
 {
   dprintf(("KERNEL32:  ExitProcess %d\n", exitcode));
-
-#ifdef WIN32_TIBSEL
-  //Restore original OS/2 TIB selector
-  DestroyTIB();
-#endif
+  dprintf(("KERNEL32:  ExitProcess FS = %x\n", GetFS()));
 
   //avoid crashes since win32 & OS/2 exception handler aren't identical
@@ -327 +328 @@
     iConsoleWaitClose();
 
-  try {
-     Win32DllExitList(-1);
-  }
-  catch(...) {
-    dprintf(("dll exitlist exception\n"));
-  }
-
-#ifndef WIN32_TIBSEL
+  Win32DllExitList(0);
+
+  //Restore original OS/2 TIB selector
+  DestroyTIB();
   SetExceptionChain((ULONG)-1);
-#endif
+
   O32_ExitProcess(exitcode);
 }