Changeset 5128 for trunk/src/kernel32

Timestamp:

Feb 14, 2001, 11:36:45 AM (25 years ago)

Author:

sandervl

Message:

TLS index allocation + RtlUnwind fixes

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (3 diffs)
• windllbase.cpp (modified) (2 diffs)
• winexebase.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.49 2001-01-29 01:22:21 bird Exp $ */
+/* $Id: exceptions.cpp,v 1.50 2001-02-14 10:36:45 sandervl Exp $ */
 
 /* WARNING: Compiling this module with ICC with optimizations turned on   */
@@ -256 +256 @@
 
 /*******************************************************************
+ *         EXC_UnwindHandler
+ *
+ * Handler for exceptions happening inside an unwind handler.
+ */
+static DWORD WIN32API EXC_UnwindHandler( WINEXCEPTION_RECORD *rec, WINEXCEPTION_FRAME *frame,
+//                              WINCONTEXT *context, WINEXCEPTION_FRAME **dispatcher )
+                                WINCONTEXT *context, LPVOID dispatcher )
+{
+    if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))
+        return ExceptionContinueSearch;
+    /* We shouldn't get here so we store faulty frame in dispatcher */
+    *(PWINEXCEPTION_FRAME*)dispatcher = ((EXC_NESTED_FRAME*)frame)->prevFrame;
+    return ExceptionCollidedUnwind;
+}
+
+/*******************************************************************
  *         EXC_CallHandler
  *
@@ -461 +477 @@
         /* Call handler */
         dprintf(("KERNEL32: RtlUnwind - calling exception handler %08X", frame->Handler));
-        rc = frame->Handler(pRecord, frame, &context, &dispatch);
+        rc = EXC_CallHandler(pRecord, frame, &context, &dispatch, frame->Handler, EXC_UnwindHandler );
         dprintf(("KERNEL32: RtlUnwind - handler returned %#x", rc));
         switch (rc)

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.23 2000-12-03 10:12:33 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.24 2001-02-14 10:36:45 sandervl Exp $ */
 
 /*
@@ -405 +405 @@
     }
 
-    //Allocate TLS index for this module
-    tlsAlloc();
-    tlsAttachThread();    //setup TLS (main thread)
-
     if(dllEntryPoint == NULL) {
         dprintf(("attachProcess not required for dll %s", szModule));

trunk/src/kernel32/winexebase.cpp

@@ -1 @@
-/* $Id: winexebase.cpp,v 1.13 2001-02-11 10:34:45 sandervl Exp $ */
+/* $Id: winexebase.cpp,v 1.14 2001-02-14 10:36:45 sandervl Exp $ */
 
 /*
@@ -110 +110 @@
   SetWin32TIB();
 
-  //Allocate TLS index for this module
-  tlsAlloc();
-  tlsAttachThread();    //setup TLS (main thread)
-
   //Set default FPU control word (no exceptions); same as in NT
   CONTROL87(0x27F, 0xFFF);

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.66 2001-01-22 18:26:51 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.67 2001-02-14 10:36:45 sandervl Exp $ */
 
 /*
@@ -628 +628 @@
     }
 
+    //Allocate TLS index for this module
+    //Must do this before dlls are loaded for this module. Some apps assume
+    //they get TLS index 0 for their main executable
+    tlsAlloc();
+    tlsAttachThread();  //setup TLS (main thread)
+
     if(!(dwFlags & (FLAG_PELDR_LOADASDATAFILE | FLAG_PELDR_SKIPIMPORTS)))
     {