Changeset 281 for trunk/src/kernel32/thread.cpp

Timestamp:

Jul 7, 1999, 10:11:58 AM (26 years ago)

Author:

sandervl

Message:

Major changes in PE2LX/KERNEL32 for TLS support. DLL VERSION INCREASED TO 3 AS THIS CHANGE MAKES IT INCOMPATIBLE WITH APPS CONVERTED WITH PREVIOUS VERSION OF PE2LX (OR WIN32K)

File:

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

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.6 1999-06-20 10:55:36 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.7 1999-07-07 08:11:10 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #include "thread.h"
 #include "except.h"
-#include "misc.h"
+#include <misc.h>
 #include <wprocess.h>
+#include <windll.h>
+#include <winexe.h>
 
 static DWORD OPEN32API Win32ThreadProc(LPVOID lpData);
@@ -46 +48 @@
 DWORD WIN32API GetCurrentThreadId()
 {
-  dprintf(("GetCurrentThreadId\n"));
-
+////  dprintf(("GetCurrentThreadId\n"));
   return(O32_GetCurrentThreadId());
 }
@@ -121 +122 @@
            exitcode));
 
-#ifdef WIN32_TIBSEL
+  Win32Dll::detachThreadFromAllDlls();  //send DLL_THREAD_DETACH message to all dlls
+  Win32Dll::tlsDetachThreadFromAllDlls(); //destroy TLS structures of all dlls
+  WinExe->tlsDetachThread();                    //destroy TLS structure of main exe
   DestroyTIB();
-#endif
   O32_ExitThread(exitcode);
 }
@@ -153 +155 @@
  WIN32THREADPROC  winthread = me->pCallback;
  LPVOID           userdata  = me->lpUserData;
+ DWORD            rc;
 
   delete me;    //only called once
@@ -158 +161 @@
   dprintf(("Win32ThreadProc %d\n", GetCurrentThreadId()));
 
-#ifdef WIN32_TIBSEL
   TEB *winteb = (TEB *)InitializeTIB();
   if(winteb == NULL) {
@@ -170 +172 @@
   thdb->entry_point = (void *)winthread;
   thdb->entry_arg   = (void *)userdata;
+
   SetWin32TIB();
-#else
-  ReplaceExceptionHandler();
-#endif
-  return(winthread(userdata));
+  WinExe->tlsAttachThread();              //setup TLS structure of main exe
+  Win32Dll::tlsAttachThreadToAllDlls(); //setup TLS structures of all dlls
+  Win32Dll::attachThreadToAllDlls();      //send DLL_THREAD_ATTACH message to all dlls
+
+  rc = winthread(userdata);
+
+  Win32Dll::detachThreadFromAllDlls();  //send DLL_THREAD_DETACH message to all dlls
+  Win32Dll::tlsDetachThreadFromAllDlls(); //destroy TLS structures of all dlls
+  WinExe->tlsDetachThread();              //destroy TLS structure of main exe
+  DestroyTIB();
+  return rc;
 }
 //******************************************************************************