Changeset 21337 for trunk/src

Timestamp:

Jul 11, 2009, 10:46:36 PM (16 years ago)

Author:

vladest

Message:

1. Fixed Flash10 installer (bad pointer passed to GlobalFree)
2. Autocommit improoved. Added address and size alignment. Added return code check

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (1 diff)
• heap.cpp (modified) (1 diff)

trunk/src/kernel32/exceptions.cpp

@@ -1334 +1334 @@
             accessflag &=~PAG_GUARD;
 
-        DosSetMem((PVOID) pERepRec->ExceptionInfo[1], offset,
+        /* set memory aligned on page size and with size counting alignment */
+        ULONG rc = DosSetMem((PVOID) (pERepRec->ExceptionInfo[1] & 0xFFFFF000),
+                             offset + (pERepRec->ExceptionInfo[1] - (pERepRec->ExceptionInfo[1] & 0xFFFFF000)),
                   accessflag | PAG_WRITE | PAG_COMMIT);
-        dprintf(("KERNEL32: OS2ExceptionHandler: commiting 0x%X size 0x%X\n",
-                 pERepRec->ExceptionInfo[1], offset));
-        goto continueexecution;
+        dprintf(("KERNEL32: OS2ExceptionHandler: commiting 0x%X size 0x%X. RC: %i\n",
+                 pERepRec->ExceptionInfo[1] & 0xFFFFF000,
+                 offset + (pERepRec->ExceptionInfo[1] - (pERepRec->ExceptionInfo[1] & 0xFFFFF000)),
+                           rc));
+        if (NO_ERROR == rc)
+            goto continueexecution;
+        else
+            goto CrashAndBurn;
     }
 

trunk/src/kernel32/heap.cpp

@@ -621 +621 @@
   // any may not terminate w/o setting SetLastError()
   // plus returning 0 means "OK"!
-#if 0
+#if 1
    /* verify lpMem address */
    if (hmem >= (HGLOBAL)ulMaxAddr || hmem < (HGLOBAL)0x10000)