Changeset 4613 for trunk/src/kernel32/exceptions.cpp

Timestamp:

Nov 18, 2000, 5:20:06 PM (25 years ago)

Author:

sandervl

Message:

MN: exception fix for ES == FS

File:

• trunk/src/kernel32/exceptions.cpp (modified) (2 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.47 2000-10-18 17:09:31 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.48 2000-11-18 16:20:06 sandervl Exp $ */
 
 /* WARNING: Compiling this module with ICC with optimizations turned on   */
@@ -1102 +1102 @@
                 goto continueFail;
         }
+//------------->>> WARNING: potentially dangerous workaround!!
+        /* Some apps set ES = FS and Odin doesn't like that!       */
+        /* Note: maybe we could even check for ES != DS? But maybe */
+        /* that might cause more harm than good...                 */
+        if (pCtxRec->ContextFlags & CONTEXT_SEGMENTS)
+            if (pCtxRec->ctx_SegEs == pCtxRec->ctx_SegFs) {
+                /* Let's just reset ES to the DS value and hope it's okay */
+                pCtxRec->ctx_SegEs = pCtxRec->ctx_SegDs;
+                goto continueexecution;
+        }
+
         switch(pERepRec->ExceptionInfo[0]) {
         case XCPT_READ_ACCESS: