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

Timestamp:

Feb 27, 2003, 6:16:26 PM (22 years ago)

Author:

sandervl

Message:

Don't call WinMessageBox from the unhandled exception filter as that can hang PM

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.69 2003-02-21 08:50:26 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.70 2003-02-27 17:16:26 sandervl Exp $ */
 
 /*
@@ -610 +610 @@
                 szModName, iObj, offObj);
     }
-
+    
+/*  This is very dangerous. Can hang PM.
     rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, message, "Application Error",
                        0, MB_ABORTRETRYIGNORE | MB_ERROR);
@@ -623 +624 @@
        return WINEXCEPTION_EXECUTE_HANDLER;
     }
+*/
+    return WINEXCEPTION_EXECUTE_HANDLER;
 }
 /*****************************************************************************
@@ -1242 +1245 @@
             goto continueFail;
         }
-        BOOL ret = map->commitPage(offset, fWriteAccess);
+        BOOL ret = map->commitPage(pERepRec->ExceptionInfo[1], offset, fWriteAccess);
         map->Release();
         if(ret == TRUE)
@@ -1346 +1349 @@
     //@@@PH: growing thread stacks might need special treatment
     case XCPT_GUARD_PAGE_VIOLATION:
-        //SvL: don't print anything here -> fatal hang if happens inside fprintf
-        //dprintf(("KERNEL32: OS2ExceptionHandler: trying to grow stack (continue search)"));
+    {
+        //NOTE:!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        //Don't print anything here -> fatal hang if exception occurred 
+        //inside fprintf
+        //NOTE:!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+        Win32MemMap *map;
+        BOOL  fWriteAccess = FALSE, ret;
+        ULONG offset, accessflag;
+
+        switch(pERepRec->ExceptionInfo[0]) {
+        case XCPT_READ_ACCESS:
+                accessflag = MEMMAP_ACCESS_READ;
+                break;
+        case XCPT_WRITE_ACCESS:
+                accessflag = MEMMAP_ACCESS_WRITE;
+                fWriteAccess = TRUE;
+                break;
+        default:
+                goto continueGuardException;
+        }
+
+        map = Win32MemMapView::findMapByView(pERepRec->ExceptionInfo[1], &offset, accessflag);
+        if(map == NULL) {
+            goto continueGuardException;
+        }
+        ret = map->commitGuardPage(pERepRec->ExceptionInfo[1], offset, fWriteAccess);
+        map->Release();
+        if(ret == TRUE)
+            goto continueexecution;
+
+continueGuardException:
         goto continuesearch;
+    }