Changeset 8436

Timestamp:

May 16, 2002, 3:45:32 PM (23 years ago)

Author:

sandervl

Message:

TLS fix for pe2lx images

Location:

trunk/src/kernel32

Files:

• winexepe2lx.cpp (modified) (4 diffs)
• winexepe2lx.h (modified) (2 diffs)

trunk/src/kernel32/winexepe2lx.cpp ¶

@@ -1 @@
-/* $Id: winexepe2lx.cpp,v 1.10 2001-07-08 02:49:47 bird Exp $ */
+/* $Id: winexepe2lx.cpp,v 1.11 2002-05-16 13:45:32 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 #include <win32k.h>
 #include "winexepe2lx.h"
+#include <cpuhlp.h>
+#include <wprocess.h>
+#include <win32api.h>
 
 #include "cio.h"            // I/O
@@ -33 +36 @@
 #include "conwin.h"         // Windows Header for console only
 #include "console.h"
+
+#include "exceptions.h"
+#include "exceptutil.h"
 
 #define DBG_LOCALLOG    DBG_winexepe2lx
@@ -198 +204 @@
     return FALSE;
 }
-
+//******************************************************************************
+//******************************************************************************
+ULONG Win32Pe2LxExe::start()
+{
+ WINEXCEPTION_FRAME exceptFrame;
+ ULONG rc;
+
+  dprintf(("Start executable %X\n", WinExe));
+
+  fExeStarted  = TRUE;
+
+  //Allocate TLS index for this module
+  tlsAlloc();
+  tlsAttachThread();    //setup TLS (main thread)
+
+  //Note: The Win32 exception structure references by FS:[0] is the same
+  //      in OS/2
+  OS2SetExceptionHandler((void *)&exceptFrame);
+  USHORT sel = SetWin32TIB(isPEImage() ? TIB_SWITCH_FORCE_WIN32 : TIB_SWITCH_DEFAULT);
+
+  //Set FPU control word to 0x27F (same as in NT)
+  CONTROL87(0x27F, 0xFFF);
+  dprintf(("KERNEL32: Win32ExeBase::start exe at %08xh\n",
+          (void*)entryPoint ));
+  rc = CallEntryPoint(entryPoint, NULL);
+
+  SetFS(sel);           //restore FS
+
+  OS2UnsetExceptionHandler((void *)&exceptFrame);
+
+  ExitProcess(rc);
+  return rc;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/winexepe2lx.h ¶

@@ -1 @@
-/* $Id: winexepe2lx.h,v 1.4 2001-07-08 02:49:47 bird Exp $ */
+/* $Id: winexepe2lx.h,v 1.5 2002-05-16 13:45:32 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
     static BOOL earlyInit();
 
+    virtual ULONG start();
+
 public:
     static BOOL fEarlyInit;