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

Timestamp:

Jul 7, 2009, 7:40:22 PM (16 years ago)

Author:

vladest

Message:

Added functionality, required for Flash10 to kernel32

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -352 +352 @@
 
   // walk the exception chain
-  while( (pFrame != NULL) && (pFrame != ((void *)0xFFFFFFFF)) )
+  while( (pFrame != NULL) && ((ULONG)((ULONG)pFrame & 0xFFFFF000) != 0xFFFFF000) )
   {
         dprintf(("KERNEL32: RtlDispatchException - pframe=%08X, pframe->Prev=%08X", pFrame, pFrame->Prev));
@@ -492 +492 @@
   PrintWin32ExceptionChain(frame);
 
-  while ((frame != (PWINEXCEPTION_FRAME)0xffffffff) && (frame != pEndFrame))
+  while (((ULONG)((ULONG)frame & 0xFFFFF000) != 0xFFFFF000) && (frame != pEndFrame))
   {
         /* Check frame address */
@@ -711 +711 @@
 //               any local buffers also can be made static to save
 //               stack space and possibly avoid out of stack exception.
-    if(pERepRec->ExceptionNum == XCPT_GUARD_PAGE_VIOLATION)    
+    if(pERepRec->ExceptionNum == XCPT_GUARD_PAGE_VIOLATION)
     {
         strcpy(szTrapDump, "Guard Page Violation");
         return;
     }
-    
+
     PSZ    pszExceptionName = "<unknown>";        /* points to name/type excpt */
     APIRET rc               = XCPT_CONTINUE_SEARCH;        /* excpt-dep.  code */
@@ -963 +963 @@
         static char szSYMInfo[260];
         static char Name[260];
-        
+
         DosQueryModuleName(ulModule, sizeof(Name), Name);
 
@@ -1294 +1294 @@
 
             map = Win32MemMapNotify::findMapByView(pERepRec->ExceptionInfo[1], &offset, accessflag);
-            if(!map) 
+            if(!map)
                 goto continueFail;
 
@@ -1309 +1309 @@
     }
 continueFail:
+
+    /*
+     * vladest: OK, try to implement write AUTOCOMMIT
+     * last chance after MMAP commit is failed
+     */
+    if (XCPT_ACCESS_VIOLATION == pERepRec->ExceptionNum &&
+        (/*pERepRec->ExceptionInfo[0] == XCPT_READ_ACCESS ||*/
+         pERepRec->ExceptionInfo[0] == XCPT_WRITE_ACCESS) &&
+        pERepRec->ExceptionInfo[1] != XCPT_DATA_UNKNOWN)
+    {
+        ULONG offset, accessflag;
+
+        DosQueryMem((PVOID) pERepRec->ExceptionInfo[1],
+                    &offset, &accessflag);
+        dprintf(("KERNEL32: OS2ExceptionHandler: failed address info 0x%X size 0x%X. flag %X\n",
+                 pERepRec->ExceptionInfo[1], offset, accessflag));
+        /* check for valid address */
+        if (!pERepRec->ExceptionInfo[1] ||
+            pERepRec->ExceptionInfo[1] == 0xAAAAAAAA ||
+            !offset || offset == 0xAAAAAAAA)
+            goto CrashAndBurn;
+        /* memory committed, but no write access */
+        if (accessflag & PAG_GUARD)
+            accessflag &=~PAG_GUARD;
+
+        DosSetMem((PVOID) pERepRec->ExceptionInfo[1], offset,
+                  accessflag | PAG_WRITE | PAG_COMMIT);
+        dprintf(("KERNEL32: OS2ExceptionHandler: commiting 0x%X size 0x%X\n",
+                 pERepRec->ExceptionInfo[1], offset));
+        goto continueexecution;
+    }
+
 
 ////#define DEBUGSTACK
@@ -1344 +1376 @@
         USHORT *eip = (USHORT *)pCtxRec->ctx_RegEip;
 
-        if(teb && eip && *eip == SETTHREADCONTEXT_INVALID_LOCKOPCODE) 
+        if(teb && eip && *eip == SETTHREADCONTEXT_INVALID_LOCKOPCODE)
         {
             //Is this a pending SetThreadContext exception?
             //(see detailed description in the HMDeviceThreadClass::SetThreadContext method)
-            if(teb->o.odin.context.ContextFlags) 
+            if(teb->o.odin.context.ContextFlags)
             {
                 dprintfException(pERepRec, pERegRec, pCtxRec, p);
@@ -1488 +1520 @@
         //Make sure we detect a stack overflow condition before the system does
         if(!fIsOS2Image &&
-            pERepRec->ExceptionInfo[1]  >= stackbottom && 
+            pERepRec->ExceptionInfo[1]  >= stackbottom &&
             pERepRec->ExceptionInfo[1]  <  stacktop
-           ) 
+           )
         {//this is a guard page exception for the thread stack
             APIRET rc;
             ULONG ulAddress, cbSize, ulMemFlags;
-  
+
             //round down to page boundary
             ulAddress = pERepRec->ExceptionInfo[1] & ~0xFFF;
@@ -1506 +1538 @@
 #endif
 
-            if(ulAddress == stackbottom + PAGE_SIZE) 
+            if(ulAddress == stackbottom + PAGE_SIZE)
             {//we don't have any stack left, throw an XCPT_UNABLE_TO_GROW_STACK
              //exception
@@ -1550 +1582 @@
         if(ret == TRUE)
             goto continueexecution;
-            }            
+            }
         }
 
@@ -1565 +1597 @@
 //#ifdef DEBUG
 //        dprintfException(pERepRec, pERegRec, pCtxRec, p);
-//#endif      
+//#endif
         goto continuesearch;
     }
@@ -1653 +1685 @@
   PEXCEPTIONREGISTRATIONRECORD pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)QueryExceptionChain();
 
-  while(pExceptRec != 0 && (ULONG)pExceptRec != -1) 
+  while(pExceptRec != 0 && (ULONG)pExceptRec != -1)
   {
-        if(pExceptRec->ExceptionHandler == OS2ExceptionHandler) 
+        if(pExceptRec->ExceptionHandler == OS2ExceptionHandler)
         {
             fFound = TRUE;
@@ -1662 +1694 @@
         pExceptRec = pExceptRec->prev_structure;
   }
-  if(!fFound) 
+  if(!fFound)
   {
       OS2SetExceptionHandler(pExceptionRegRec);
@@ -1670 +1702 @@
 //*****************************************************************************
 // Remove exception handler if it was registered previously
-// 
+//
 //*****************************************************************************
 void WIN32API ODIN_UnsetExceptionHandler(void *pExceptionRegRec)
@@ -1678 +1710 @@
   BOOL   fFound = FALSE;
 
-  while(pExceptRec != 0 && (ULONG)pExceptRec != -1) 
+  while(pExceptRec != 0 && (ULONG)pExceptRec != -1)
   {
-        if(pExceptRec == pExceptionRegRec) 
+        if(pExceptRec == pExceptionRegRec)
         {
             fFound = TRUE;
@@ -1691 +1723 @@
   pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)QueryExceptionChain();
 
-  if(fFound && pExceptRec != (PEXCEPTIONREGISTRATIONRECORD)pExceptionRegRec) 
+  if(fFound && pExceptRec != (PEXCEPTIONREGISTRATIONRECORD)pExceptionRegRec)
   {
       dprintf(("ERROR: ODIN_UnsetExceptionHandler: INSIDE!!!: exc rec %p, head %p\n", pExceptionRegRec, pExceptRec));