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

Timestamp:

Mar 6, 2003, 11:22:27 AM (22 years ago)

Author:

sandervl

Message:

KSO: logging changes; fast PID & TID retrieval; added functions to set/clear the odin environment (fs, exception handler)

File:

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

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.71 2003-03-03 16:41:03 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.72 2003-03-06 10:22:26 sandervl Exp $ */
 
 /*
@@ -610 +610 @@
                 szModName, iObj, offObj);
     }
-    
+
 /*  This is very dangerous. Can hang PM.
     rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, message, "Application Error",
@@ -715 +715 @@
     char   szLineException[128];
     char   szLineExceptionType[128];
-    
+
     szLineException[0]  = 0;                                              /* initialize */
     szLineExceptionType[0] = 0;                                              /* initialize */
@@ -813 +813 @@
     case XCPT_DATATYPE_MISALIGNMENT:
         strcpy(szLineException, "Datatype Misalignment");
-        sprintf(szLineExceptionType, "R/W %08x alignment %08x at %08x.", pERepRec->ExceptionInfo[0], 
+        sprintf(szLineExceptionType, "R/W %08x alignment %08x at %08x.", pERepRec->ExceptionInfo[0],
                 pERepRec->ExceptionInfo[1], pERepRec->ExceptionInfo[2]);
         break;
@@ -914 +914 @@
     }
 
-    sprintf(szTrapDump, "---[Exception Information]------------\n   %s", szLineException);
-
-    strcat(szTrapDump, " (");
+    sprintf(szTrapDump, "---[Exception Information]------------\n   %s (", szLineException);
 
     if (fExcptSoftware == TRUE)            /* software or hardware generated ? */
@@ -935 +933 @@
     strcat(szTrapDump, ")\n");                                    /* add trailing brace */
 
+    if (szLineExceptionType[0])
+        sprintf(szTrapDump + strlen(szTrapDump), "   %s\n", szLineExceptionType);
 
     rc = DosQueryModFromEIP(&ulModule, &ulObject, sizeof(szModule),
@@ -947 +947 @@
         strcat(szTrapDump, szLineException);
     }
-    else 
+    else
     {   /* fault in DosAllocMem allocated memory, hence PE loader.. */
         Win32ImageBase * pMod;
@@ -1007 +1007 @@
 
         sprintf(szLineException, "   Env[0]=%08x Env[1]=%08x Env[2]=%08x Env[3]=%08x\n",
-                 pCtxRec->ctx_env[0], pCtxRec->ctx_env[1], 
+                 pCtxRec->ctx_env[0], pCtxRec->ctx_env[1],
                  pCtxRec->ctx_env[2], pCtxRec->ctx_env[3]);
         strcat(szTrapDump, szLineException);
@@ -1053 +1053 @@
 //Override filename of exception log (expects full path)
 //*****************************************************************************
-void WIN32API SetCustomExceptionLog(LPSTR lpszLogName) 
+void WIN32API SetCustomExceptionLog(LPSTR lpszLogName)
 {
     strcpy(szExceptionLogFileName, lpszLogName);
@@ -1059 +1059 @@
 //*****************************************************************************
 //*****************************************************************************
-void WIN32API SetExceptionLogging(BOOL fEnable) 
+void WIN32API SetExceptionLogging(BOOL fEnable)
 {
     fExceptionLoggging = fEnable;
@@ -1088 +1088 @@
                  OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYNONE,
                  0L);                            /* No extended attribute */
-    
+
     if(rc == NO_ERROR) {
         DosSetFilePtr(hFile, 0, FILE_END, &ulBytesWritten);
@@ -1095 +1095 @@
 
             lpszExeName = WinExe->getModuleName();
-            
+
             if(lpszExeName) {
                 DosWrite(hFile, "\n", 2, &ulBytesWritten);
@@ -1340 +1340 @@
 
         dprintf(("KERNEL32: OS2ExceptionHandler: Continue and kill\n"));
-        
+
         pCtxRec->ctx_RegEip = (ULONG)KillWin32Process;
         pCtxRec->ctx_RegEsp = pCtxRec->ctx_RegEsp + 0x10;
@@ -1351 +1351 @@
     {
         //NOTE:!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        //Don't print anything here -> fatal hang if exception occurred 
+        //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;
     }