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

Timestamp:

Jun 20, 1999, 12:55:37 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.10 1999-06-19 17:58:33 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.11 1999-06-20 10:55:36 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 #include "cio.h"
 #include "versionos2.h"    /*PLF Wed  98-03-18 02:36:51*/
-
-#include <winprocess.h>
-#include <thread.h>
+#include <wprocess.h>
 
 BOOL      fExeStarted = FALSE;
@@ -43 +41 @@
 // Set up the TIB selector and memory for the current thread
 //******************************************************************************
-void InitializeTIB(BOOL fMainThread)
+TEB *InitializeTIB(BOOL fMainThread)
 {
 #ifdef WIN32_TIBSEL
@@ -56 +54 @@
         dprintf(("InitializeTIB: local thread memory alloc failed!!"));
         DebugInt3();
-        return;
+        return NULL;
    }
    if(OS2AllocSel(PAGE_SIZE, &tibsel) == FALSE)
@@ -62 +60 @@
         dprintf(("InitializeTIB: selector alloc failed!!"));
         DebugInt3();
-        return;
+        return NULL;
    }
    winteb = (TEB *)OS2SelToFlat(tibsel);
@@ -69 +67 @@
         dprintf(("InitializeTIB: DosSelToFlat failed!!"));
         DebugInt3();
-        return;
+        return NULL;
    }
    memset(winteb, 0, PAGE_SIZE);
    thdb       = (THDB *)(winteb+1);
-   TIBFlatPtr = (DWORD)winteb;
+   TIBFlatPtr = (DWORD *)winteb;
 
    winteb->except      = (PVOID)-1;               /* 00 Head of exception handling chain */
@@ -105 +103 @@
         ProcessTIBSel = tibsel;
    }
-   SetFS(tibsel);
-   dprintf(("InitializeTIB set up TEB with selector %x", tibsel));
-   return;
+   dprintf(("InitializeTIB setup TEB with selector %x", tibsel));
+   return winteb;
+#else
+   return 0;
 #endif
 }
@@ -133 +132 @@
         OS2FreeSel(thdb->teb_sel);
    }
-   else DebugInt3();
-
+   else dprintf(("Already destroyed TIB"));
+
+   TIBFlatPtr = NULL;
    return;
+#endif
+}
+/******************************************************************************/
+/******************************************************************************/
+void WIN32API RestoreOS2TIB()
+{
+#ifdef WIN32_TIBSEL
+ SHORT  orgtibsel;
+ TEB   *winteb;
+ THDB  *thdb;
+
+   winteb = (TEB *)TIBFlatPtr;
+   if(winteb) {
+        thdb = (THDB *)(winteb+1);
+        orgtibsel = thdb->OrgTIBSel;
+
+        //Restore our original FS selector
+        SetFS(orgtibsel);
+   }
+#endif
+}
+/******************************************************************************/
+/******************************************************************************/
+void WIN32API SetWin32TIB()
+{
+#ifdef WIN32_TIBSEL
+ SHORT  win32tibsel;
+ TEB   *winteb;
+ THDB  *thdb;
+
+   winteb = (TEB *)TIBFlatPtr;
+   if(winteb) {
+        thdb = (THDB *)(winteb+1);
+        win32tibsel = thdb->teb_sel;
+
+        //Restore our win32 FS selector
+        SetFS(win32tibsel);
+   }
+   else DebugInt3();
 #endif
 }
@@ -175 +214 @@
                     HINSTANCE hinstance)
 {
-#ifdef WIN32_TIBSEL
-  SetFS(ProcessTIBSel);
-#endif
+  SetWin32TIB();
 
   if(getenv("WIN32_IOPL2")) {
@@ -217 +254 @@
 //******************************************************************************
 VOID WIN32API RegisterDll(LONG Win32TableId, LONG NameTableId,
-                  LONG VersionResId, LONG Pe2lxVersion,
-              HINSTANCE hinstance)
+                          LONG VersionResId, LONG Pe2lxVersion,
+                          HINSTANCE hinstance)
 {
  WIN32DLLENTRY  pfnDllEntry;
@@ -237 +274 @@
   /* @@@PH 1998/03/17 console devices initialization */
   iConsoleDevicesRegister();
+
+  SetWin32TIB();
+  dprintf(("RegisterDll: FS = %x", GetFS()));
 }
 //******************************************************************************