Changeset 21339 for trunk/src/kernel32/virtual.cpp

Timestamp:

Aug 14, 2009, 5:18:10 PM (16 years ago)

Author:

vladest

Message:

1. Attempt to add support for DosAllocMem at specific address
2. Fixed crashes in Handle manager when its tries to access non initialized pointer

File:

• trunk/src/kernel32/virtual.cpp (modified) (9 diffs)

trunk/src/kernel32/virtual.cpp

@@ -339 +339 @@
     if(dwProtect & PAGE_NOACCESS)     *lpdwOS2Attr |= PAG_READ; //can't do this in OS/2
 }
+
+
+#define OBJ_LOCSPECIFIC 0x1000
 //******************************************************************************
 //NOTE: Do NOT set the last error to ERROR_SUCCESS if successful. Windows
@@ -377 +380 @@
     remainder  = cbSize & 0xFFF;
     cbSize    &= ~0xFFF;
-    if(remainder) 
+    if(remainder)
         cbSize += PAGE_SIZE;
 
@@ -398 +401 @@
         flag |= PAG_READ|PAG_WRITE;
     }
-    
+
     //just do this if other options are used
     if(!(flag & (PAG_READ | PAG_WRITE | PAG_EXECUTE)) || flag == 0)
@@ -410 +413 @@
         Win32MemMap *map;
         ULONG offset, nrpages, accessflags = 0;
-    
+
         nrpages = cbSize >> PAGE_SHIFT;
         if(cbSize & 0xFFF)
@@ -431 +434 @@
             return lpvAddress;
         }
+        /* trying to allocate memory at specified address */
+        if(fdwAllocationType & MEM_RESERVE)
+        {
+            rc = OSLibDosAllocMem(&Address, cbSize, flag |OBJ_LOCSPECIFIC);
+            dprintf(("Allocation at specified address: %x. rc: %i", Address, rc));
+            if (rc)
+            {
+                SetLastError(ERROR_OUTOFMEMORY);
+                return NULL;
+            }
+            dprintf(("Allocated at specified address: %x. rc: %i", Address, rc));
+            return(Address);
+        }
     }
 
@@ -443 +459 @@
         //might try to commit larger part with same base address
         if(rc == OSLIB_ERROR_ACCESS_DENIED && cbSize > PAGE_SIZE )
-        { 
-            while(cbSize) 
+        {
+            while(cbSize)
             {
                 //check if the app tries to commit an already commited part of memory or change the protection flags
                 ULONG size = cbSize, os2flags, newrc;
                 newrc = OSLibDosQueryMem(lpvAddress, &size, &os2flags);
-                if(newrc == 0) 
+                if(newrc == 0)
                 {
-                    if(os2flags & PAG_COMMIT) 
+                    if(os2flags & PAG_COMMIT)
                     {
                         dprintf(("VirtualAlloc: commit on committed memory"));
@@ -457 +473 @@
                         {   //change protection flags
                             DWORD tmp;
-                            if(VirtualProtect(lpvAddress, size, fdwProtect, &tmp) == FALSE) 
+                            if(VirtualProtect(lpvAddress, size, fdwProtect, &tmp) == FALSE)
                             {
                                 dprintf(("ERROR: VirtualAlloc: commit on committed memory -> VirtualProtect failed!!"));
@@ -464 +480 @@
                         }
                     }
-                    else 
+                    else
                     {   //commit this page (or range of pages)
                         rc = OSLibDosSetMem(lpvAddress, size, flag);
@@ -489 +505 @@
             if(rc == OSLIB_ERROR_INVALID_ADDRESS) {
                 rc = OSLibDosAllocMem(&Address, cbSize, flag );
-            }           
+            }
             else {
                 if(rc) {