Changeset 1670 for trunk/src/kernel32/windllbase.cpp

Timestamp:

Nov 9, 1999, 8:22:33 PM (26 years ago)

Author:

sandervl

Message:

thread fixes + heap wrappers

File:

• trunk/src/kernel32/windllbase.cpp (modified) (7 diffs)

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.3 1999-11-09 14:19:47 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.4 1999-11-09 19:22:32 sandervl Exp $ */
 
 /*
@@ -102 +102 @@
  WINEXCEPTION_FRAME exceptFrame;
  USHORT sel;
- BOOL rc;
+ THDB *thdb;
+ BOOL rc, fSetExceptionHandler;
 
   if(fAttachedToProcess)
@@ -108 +109 @@
 
   fAttachedToProcess = TRUE;
+
+  thdb = GetThreadTHDB();
+  fSetExceptionHandler = (!thdb || thdb->teb_sel != GetFS());
+
+  //Note: The Win32 exception structure references by FS:[0] is the same
+  //      in OS/2
+  if(fSetExceptionHandler) {
+        OS2SetExceptionHandler((void *)&exceptFrame);
+        sel = SetWin32TIB();
+  }
 
   //Allocate TLS index for this module
@@ -115 +126 @@
   if(fSkipEntryCalls || dllEntryPoint == NULL) {
         dprintf(("attachProcess not required for dll %s", szModule));
+        if(fSetExceptionHandler) {
+                SetFS(sel);
+                OS2UnsetExceptionHandler((void *)&exceptFrame);
+        }
         return(TRUE);
   }
@@ -120 +135 @@
   dprintf(("attachProcess to dll %s", szModule));
 
-  //Note: The Win32 exception structure references by FS:[0] is the same
-  //      in OS/2
-  OS2SetExceptionHandler((void *)&exceptFrame);
-
-  sel = SetWin32TIB();
   rc = dllEntryPoint(hinstance, DLL_PROCESS_ATTACH, 0);
-  SetFS(sel);
-
-  OS2UnsetExceptionHandler((void *)&exceptFrame);
-
+
+  dprintf(("attachProcess to dll %s DONE", szModule));
+
+  if(fSetExceptionHandler) {
+        SetFS(sel);
+        OS2UnsetExceptionHandler((void *)&exceptFrame);
+  }
   return rc;
 }
@@ -174 +187 @@
 
   dprintf(("attachThread to dll %s", szModule));
-  //Note: The Win32 exception structure references by FS:[0] is the same
-  //      in OS/2
-  OS2SetExceptionHandler((void *)&exceptFrame);
 
   rc = dllEntryPoint(hinstance, DLL_THREAD_ATTACH, 0);
 
-  OS2UnsetExceptionHandler((void *)&exceptFrame);
+  dprintf(("attachThread to dll %s DONE", szModule));
+
   return rc;
 }
@@ -195 +206 @@
   dprintf(("attachThread from dll %s", szModule));
 
-  //Note: The Win32 exception structure references by FS:[0] is the same
-  //      in OS/2
-  OS2SetExceptionHandler((void *)&exceptFrame);
-
   rc =  dllEntryPoint(hinstance, DLL_THREAD_DETACH, 0);
-
-  OS2UnsetExceptionHandler((void *)&exceptFrame);
   return rc;
 }