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

Timestamp:

Jun 19, 1999, 7:58:50 PM (26 years ago)

Author:

sandervl

Message:

More TIB changes

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.9 1999-06-19 13:57:51 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.10 1999-06-19 17:58:33 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 PDB       ProcessPDB = {0};  
 USHORT    ProcessTIBSel = 0;
-USHORT    OS2Selector   = 0;
-
-//#define WIN32_TIBSEL
+DWORD    *TIBFlatPtr    = 0;
+
 //******************************************************************************
 // Set up the TIB selector and memory for the current thread
@@ -52 +51 @@
   USHORT tibsel;
 
+   //Allocate one dword to store the flat address of our TEB
+   TIBFlatPtr = (DWORD *)OS2AllocThreadLocalMemory(1);
+   if(TIBFlatPtr == 0) {
+        dprintf(("InitializeTIB: local thread memory alloc failed!!"));
+        DebugInt3();
+        return;
+   }
    if(OS2AllocSel(PAGE_SIZE, &tibsel) == FALSE)
    {
@@ -66 +72 @@
    }
    memset(winteb, 0, PAGE_SIZE);
-   thdb = (THDB *)(winteb+1);
+   thdb       = (THDB *)(winteb+1);
+   TIBFlatPtr = (DWORD)winteb;
 
    winteb->except      = (PVOID)-1;               /* 00 Head of exception handling chain */
@@ -83 +90 @@
    thdb->exit_code       = 0x103; /* STILL_ACTIVE */
    thdb->teb_sel         = tibsel;
+   thdb->OrgTIBSel       = GetFS();
 
    if(OS2GetPIB(PIB_TASKTYPE) == TASKTYPE_PM) 
@@ -96 +104 @@
         //TLS in executable always TLS index 0?
         ProcessTIBSel = tibsel;
-        OS2Selector   = GetFS();        //0x150b
    }
    SetFS(tibsel);
@@ -108 +115 @@
 void DestroyTIB()
 {
+#ifdef WIN32_TIBSEL
+ SHORT  orgtibsel;
+ TEB   *winteb;
+ THDB  *thdb;
+
    dprintf(("DestroyTIB: FS = %x", GetFS()));
-#ifdef WIN32_TIBSEL
-   OS2FreeSel(ProcessTIBSel);
+
+   winteb = (TEB *)TIBFlatPtr;
+   if(winteb) {
+        thdb = (THDB *)(winteb+1);
+        orgtibsel = thdb->OrgTIBSel;
+
+        //Restore our original FS selector
+        SetFS(orgtibsel);
+
+        //And free our own
+        OS2FreeSel(thdb->teb_sel);
+   }
+   else DebugInt3();
+
    return;
 #endif
@@ -254 +278 @@
 #ifdef WIN32_TIBSEL
   //Restore original OS/2 TIB selector
-  SetFS(OS2Selector);
+  DestroyTIB();
 #endif