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

Timestamp:

Jun 19, 1999, 3:57:51 PM (26 years ago)

Author:

sandervl

Message:

Changes for Win32 TIB allocation (not activated)

File:

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

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.8 1999-06-17 22:06:10 phaller Exp $ */
-
-/*
- *
- * Project Odin Software License can be found in LICENSE.TXT
- *
- */
+/* $Id: wprocess.cpp,v 1.9 1999-06-19 13:57:51 sandervl Exp $ */
+
 /*
  * Win32 process functions
  *
  * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
+ *
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -31 +29 @@
 #include "versionos2.h"    /*PLF Wed  98-03-18 02:36:51*/
 
+#include <winprocess.h>
+#include <thread.h>
+
 BOOL      fExeStarted = FALSE;
 BOOL      fFreeLibrary = FALSE;
 
+//Process database
+PDB       ProcessPDB = {0};  
+USHORT    ProcessTIBSel = 0;
+USHORT    OS2Selector   = 0;
+
+//#define WIN32_TIBSEL
+//******************************************************************************
+// Set up the TIB selector and memory for the current thread
+//******************************************************************************
+void InitializeTIB(BOOL fMainThread)
+{
+#ifdef WIN32_TIBSEL
+  TEB   *winteb;
+  THDB  *thdb;
+
+  USHORT tibsel;
+
+   if(OS2AllocSel(PAGE_SIZE, &tibsel) == FALSE)
+   {
+        dprintf(("InitializeTIB: selector alloc failed!!"));
+        DebugInt3();
+        return;
+   }
+   winteb = (TEB *)OS2SelToFlat(tibsel);
+   if(winteb == NULL) 
+   {
+        dprintf(("InitializeTIB: DosSelToFlat failed!!"));
+        DebugInt3();
+        return;
+   }
+   memset(winteb, 0, PAGE_SIZE);
+   thdb = (THDB *)(winteb+1);
+
+   winteb->except      = (PVOID)-1;               /* 00 Head of exception handling chain */
+   winteb->stack_top   = (PVOID)OS2GetTIB(TIB_STACKTOP); /* 04 Top of thread stack */
+   winteb->stack_low   = (PVOID)OS2GetTIB(TIB_STACKLOW); /* 08 Stack low-water mark */
+   winteb->htask16     = (USHORT)OS2GetPIB(PIB_TASKHNDL); /* 0c Win16 task handle */
+   winteb->stack_sel   = getSS();                 /* 0e 16-bit stack selector */
+   winteb->self        = winteb;                  /* 18 Pointer to this structure */
+   winteb->flags       = TEBF_WIN32;              /* 1c Flags */
+   winteb->queue       = 0;                       /* 28 Message queue */
+   winteb->tls_ptr     = &thdb->tls_array[0];     /* 2c Pointer to TLS array */
+   winteb->process     = &ProcessPDB;             /* 30 owning process (used by NT3.51 applets)*/
+
+   memcpy(&thdb->teb, winteb, sizeof(TEB));
+   thdb->process         = &ProcessPDB;
+   thdb->exit_code       = 0x103; /* STILL_ACTIVE */
+   thdb->teb_sel         = tibsel;
+
+   if(OS2GetPIB(PIB_TASKTYPE) == TASKTYPE_PM) 
+   {
+        thdb->flags      = 0;  //todo gui
+   }
+   else thdb->flags      = 0;  //todo textmode
+
+   if(fMainThread)
+   {
+        //todo initialize PDB during process creation
+        //todo: initialize TLS array if required
+        //TLS in executable always TLS index 0?
+        ProcessTIBSel = tibsel;
+        OS2Selector   = GetFS();        //0x150b
+   }
+   SetFS(tibsel);
+   dprintf(("InitializeTIB set up TEB with selector %x", tibsel));
+   return;
+#endif
+}
+//******************************************************************************
+// Destroy the TIB selector and memory for the current thread
+//******************************************************************************
+void DestroyTIB()
+{
+   dprintf(("DestroyTIB: FS = %x", GetFS()));
+#ifdef WIN32_TIBSEL
+   OS2FreeSel(ProcessTIBSel);
+   return;
+#endif
+}
 /******************************************************************************/
 //SvL: 4-10-'98: Put in separate procedure, as ICC changes FS:0 when there
@@ -71 +151 @@
                     HINSTANCE hinstance)
 {
+#ifdef WIN32_TIBSEL
+  SetFS(ProcessTIBSel);
+#endif
+
   if(getenv("WIN32_IOPL2")) {
     io_init1();
@@ -80 +164 @@
   RegisterExe(Win32TableId, NameTableId, VersionResId, Pe2lxVersion, hinstance);
 
-  //NOTE: Breaks Quake 2 if enabled
-  if(getenv("WIN32_NOEXCEPTION")) {
-    ChangeTIBStack();   //disable exceptions
-  }
+  dprintf(("RegisterResourceUsage: FS = %x", GetFS()));
 }
 //******************************************************************************
@@ -171 +252 @@
   dprintf(("KERNEL32:  ExitProcess %d\n", exitcode));
 
+#ifdef WIN32_TIBSEL
+  //Restore original OS/2 TIB selector
+  SetFS(OS2Selector);
+#endif
+
   //avoid crashes since win32 & OS/2 exception handler aren't identical
   //(terminate process generates two exceptions)
@@ -183 +269 @@
     dprintf(("dll exitlist exception\n"));
   }
+
+#ifndef WIN32_TIBSEL
   SetExceptionChain((ULONG)-1);
+#endif
   O32_ExitProcess(exitcode);
 }
@@ -363 +452 @@
 
   dprintf(("KERNEL32:  GetCommandLine %s\n", cmdline));
+#ifdef WIN32_TIBSEL
+  dprintf(("KERNEL32:  FS = %x\n", GetFS()));
+#else
   //SvL: Replace original startup code exception handler
   ReplaceExceptionHandler();
+#endif
   return(cmdline);
 }
@@ -374 +467 @@
          char *asciicmdline = NULL;
 
+#ifdef WIN32_TIBSEL
+    dprintf(("KERNEL32:  FS = %x\n", GetFS()));
+#else
     //SvL: Replace original startup code exception handler
     ReplaceExceptionHandler();
+#endif
 
     if(UnicodeCmdLine)
@@ -381 +478 @@
 
     if(WinExe) {
-    asciicmdline = WinExe->getCommandLine();
+        asciicmdline = WinExe->getCommandLine();
     }
     if(asciicmdline == NULL) //not used for converted exes
-    asciicmdline = O32_GetCommandLine();
+        asciicmdline = O32_GetCommandLine();
 
     if(asciicmdline) {