Changeset 617 for trunk/src/kernel32/windll.cpp

Timestamp:

Aug 22, 1999, 1:11:11 PM (26 years ago)

Author:

sandervl

Message:

Exception handler changes

File:

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

trunk/src/kernel32/windll.cpp

@@ -1 @@
-/* $Id: windll.cpp,v 1.10 1999-08-18 17:18:00 sandervl Exp $ */
+/* $Id: windll.cpp,v 1.11 1999-08-22 11:11:11 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 #include <windll.h>
 #include <wprocess.h>
+#include "exceptions.h"
+#include "exceptutil.h"
 #include "cio.h"
 
@@ -268 +270 @@
 BOOL Win32Dll::attachProcess()
 {
+ WINEXCEPTION_FRAME exceptFrame;
+ USHORT sel;
  BOOL rc;
- USHORT sel;
 
   //Allocate TLS index for this module
@@ -282 +285 @@
   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);
+
   return rc;
 }
@@ -291 +301 @@
 BOOL Win32Dll::detachProcess()
 {
- BOOL   rc;
+ WINEXCEPTION_FRAME exceptFrame;
  USHORT sel;
+ BOOL rc;
 
   if(fSystemDll || fSkipEntryCalls) {
@@ -300 +311 @@
 
   dprintf(("detachProcess from dll %s", szModule));
+
+  //Note: The Win32 exception structure references by FS:[0] is the same
+  //      in OS/2
+  OS2SetExceptionHandler((void *)&exceptFrame);
 
   fUnloaded = TRUE;
@@ -307 +322 @@
   tlsDetachThread();    //destroy TLS (main thread)
   tlsDelete();
+
+  OS2UnsetExceptionHandler((void *)&exceptFrame);
+
   return rc;
 }
@@ -313 +331 @@
 BOOL Win32Dll::attachThread()
 {
+ WINEXCEPTION_FRAME exceptFrame;
+ BOOL               rc;
+
   if(fSystemDll || fSkipEntryCalls)
         return(TRUE);
 
   dprintf(("attachThread to dll %s", szModule));
-  return dllEntryPoint(hinstance, DLL_THREAD_ATTACH, 0);
+  //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);
+  return rc;
 }
 //******************************************************************************
@@ -323 +351 @@
 BOOL Win32Dll::detachThread()
 {
+ WINEXCEPTION_FRAME exceptFrame;
+ BOOL               rc;
+
   if(fSystemDll || fSkipEntryCalls)
         return(TRUE);
 
   dprintf(("attachThread from dll %s", szModule));
-  return dllEntryPoint(hinstance, DLL_THREAD_DETACH, 0);
+
+  //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;
 }
 //******************************************************************************