Changeset 1221 for trunk/src

Timestamp:

Oct 9, 1999, 3:33:25 PM (26 years ago)

Author:

sandervl

Message:

Exception changes + fixes; don't switch FS selectors for Odin32 OS/2 apps

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (2 diffs)
• oslibmisc.cpp (modified) (2 diffs)
• winexelx.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (7 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.21 1999-10-08 19:47:26 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.22 1999-10-09 13:33:23 sandervl Exp $ */
 
 /*
@@ -277 +277 @@
   int                 rc;
 
-  dprintf(("KERNEL32: RtlUnwind\n"));
+  dprintf(("KERNEL32: RtlUnwind %x %x\n", pEndFrame, pRecord));
 
   memset(&context, 0, sizeof(context));

trunk/src/kernel32/oslibmisc.cpp

@@ -1 @@
-/* $Id: oslibmisc.cpp,v 1.2 1999-09-15 23:38:01 sandervl Exp $ */
+/* $Id: oslibmisc.cpp,v 1.3 1999-10-09 13:33:24 sandervl Exp $ */
 
 /*
@@ -226 +226 @@
    {
         case TIB_STACKTOP:
+                return (ULONG)ptib->tib_pstacklimit;
+        case TIB_STACKLOW:
                 return (ULONG)ptib->tib_pstack;
-        case TIB_STACKLOW:
-                return (ULONG)ptib->tib_pstacklimit;
         default:
                 return 0;

trunk/src/kernel32/winexelx.cpp

@@ -1 @@
-/* $Id: winexelx.cpp,v 1.2 1999-09-18 17:47:10 sandervl Exp $ */
+/* $Id: winexelx.cpp,v 1.3 1999-10-09 13:33:24 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
  PPIB   ppib;
  PTIB   ptib;
+
+  //Signal to TEB management that we're a real OS/2 app and don't
+  //require setting FS to our special win32 selector
+  fIsOS2Image = TRUE;
 
   if(WinExe != NULL) //should never happen

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.35 1999-10-04 22:25:01 phaller Exp $ */
+/* $Id: wprocess.cpp,v 1.36 1999-10-09 13:33:25 sandervl Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
  *
+ *
+ * NOTE: Even though Odin32 OS/2 apps don't switch FS selectors,
+ *       we still allocate a TEB to store misc information. 
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -42 +45 @@
 //******************************************************************************
 BOOL      fFreeLibrary = FALSE;
-
+BOOL      fIsOS2Image = FALSE;  //TRUE  -> Odin32 OS/2 application (not converted!)
+                                //FALSE -> otherwise
 //Process database
 PDB       ProcessPDB = {0};
@@ -179 +183 @@
  THDB  *thdb;
 
+   //If we're running an Odin32 OS/2 application (not converted!), then we
+   //we don't switch FS selectors
+   if(fIsOS2Image) {
+        return;
+   }
+
    winteb = (TEB *)*TIBFlatPtr;
    if(winteb) {
@@ -195 +205 @@
  TEB   *winteb;
  THDB  *thdb;
+
+   //If we're running an Odin32 OS/2 application (not converted!), then we
+   //we don't switch FS selectors
+   if(fIsOS2Image) {
+        return;
+   }
 
    winteb = (TEB *)*TIBFlatPtr;
@@ -657 +673 @@
 
   dprintf(("GetVersionStruct"));
-  if(WinExe && !strcmp(WinExe->getFullPath(), modname)) {
+  if(WinExe && !stricmp(WinExe->getFullPath(), modname)) {
         winimage = (Win32ImageBase *)WinExe;
   }
@@ -677 +693 @@
   dprintf(("GetVersionSize of %s\n", modname));
 
-  if(WinExe && !strcmp(WinExe->getFullPath(), modname)) {
+  if(WinExe && !stricmp(WinExe->getFullPath(), modname)) {
         winimage = (Win32ImageBase *)WinExe;
   }