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

Timestamp:

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

Author:

sandervl

Message:

Exception handler changes

File:

• trunk/src/kernel32/wintls.cpp (modified) (6 diffs)

trunk/src/kernel32/wintls.cpp

@@ -1 @@
-/* $Id: wintls.cpp,v 1.3 1999-07-09 15:58:54 sandervl Exp $ */
+/* $Id: wintls.cpp,v 1.4 1999-08-22 11:11:11 sandervl Exp $ */
 /*
  * Win32 TLS API functions
@@ -13 +13 @@
 #include <thread.h>
 #include <wprocess.h>
+#include <except.h>
+#include "exceptutil.h"
 
 //******************************************************************************
@@ -49 +51 @@
 void Win32Image::tlsAttachThread()      //setup TLS structures for new thread
 {
+ EXCEPTION_FRAME exceptFrame;
  PIMAGE_TLS_CALLBACK *pCallback;
- TEB  *winteb;
- char *tibmem;
+ USHORT sel;
+ TEB   *winteb;
+ char  *tibmem;
 
    if(!tlsAddress) 
@@ -86 +90 @@
         while(*pCallback) {
                 dprintf(("tlsAttachThread: calling TLS Callback %x", *pCallback));
+
+                OS2SetExceptionHandler((void *)&exceptFrame);   
+                sel = SetWin32TIB();
                 (*pCallback)((LPVOID)hinstance, DLL_THREAD_ATTACH, 0);
+                SetFS(sel);
+                OS2UnsetExceptionHandler((void *)&exceptFrame);
+
                 dprintf(("tlsAttachThread: finished calling TLS Callback %x", *pCallback));
                 *pCallback++;
@@ -97 +107 @@
 void Win32Image::tlsDetachThread()      //destroy TLS structures
 {
+ EXCEPTION_FRAME exceptFrame;
  PIMAGE_TLS_CALLBACK *pCallback;
- TEB  *winteb;
+ USHORT sel;
+ TEB   *winteb;
 
    if(!tlsAddress) 
@@ -109 +121 @@
         while(*pCallback) {
                 dprintf(("tlsDetachThread: calling TLS Callback %x", *pCallback));
+
+                OS2SetExceptionHandler((void *)&exceptFrame);   
+                sel = SetWin32TIB();
                 (*pCallback)((LPVOID)hinstance, DLL_THREAD_DETACH, 0);
+                SetFS(sel);
+                OS2UnsetExceptionHandler((void *)&exceptFrame);
+
                 dprintf(("tlsDetachThread: finished calling TLS Callback %x", *pCallback));
                 *pCallback++;