Changeset 10459 for trunk/src

Timestamp:

Feb 13, 2004, 6:37:25 PM (22 years ago)

Author:

sandervl

Message:

Allocate memory for the map during CreateFileMapping and free it when the map is destroyed

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.67 2004-01-11 11:57:53 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.68 2004-02-13 17:37:25 sandervl Exp $ */
 
 /*
@@ -172 +172 @@
 #endif
     }
+    // Allocate the memory for the map right now
+    if(allocateMap() == FALSE) {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        goto fail;
+    }
 
     dprintf(("CreateFileMappingA for file %x, prot %x size %d, name %s", hMemFile, mProtFlags, mSize, lpszMapName));
@@ -196 +201 @@
     }
     if(pMapping && !image) {
+        dprintf(("Free map memory"));
         if(lpszMapName) {
                 OSLibDosFreeMem(pMapping);
@@ -727 +733 @@
     }
 
-    if(allocateMap() == FALSE) {
-        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-        goto fail;
-    }
-
     mapview = new Win32MemMapView(this, offset, (size == 0) ? (mSize - offset) : size, fdwAccess);
     if(mapview == NULL) {
@@ -785 +786 @@
     delete view;
 
-    if(nrMappings == 0) {
-        VirtualFree(pMapping, 0, MEM_RELEASE);
-        pMapping = NULL;
-    }
     mapMutex.leave();