Changeset 5011 for trunk/src/kernel32/mmap.cpp

Timestamp:

Jan 22, 2001, 7:26:52 PM (25 years ago)

Author:

sandervl

Message:

memory map + handle manager fixes

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.48 2001-01-14 17:16:55 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.49 2001-01-22 18:26:51 sandervl Exp $ */
 
 /*
@@ -55 +55 @@
 //******************************************************************************
 Win32MemMap::Win32MemMap(HFILE hfile, ULONG size, ULONG fdwProtect, LPSTR lpszName)
-               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0),
-                 fClosed(FALSE)
+               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0)
 {
     globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
@@ -79 +78 @@
 //******************************************************************************
 Win32MemMap::Win32MemMap(Win32PeLdrImage *pImage, ULONG baseAddress, ULONG size)
-               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0),
-                 fClosed(FALSE)
+               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0)
 {
     globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
@@ -100 +98 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32MemMap::Init(HANDLE hMemMap)
+BOOL Win32MemMap::Init()
 {
     mapMutex.enter();
@@ -138 +136 @@
 
     dprintf(("CreateFileMappingA for file %x, prot %x size %d, name %s", hMemFile, mProtFlags, mSize, lpszMapName));
-    this->hMemMap = hMemMap;
     mapMutex.leave();
     return TRUE;
@@ -195 +192 @@
 //it's handle is closed
 //******************************************************************************
-void Win32MemMap::close()
+void Win32MemMap::Release()
 {
 #ifdef DEBUG
-    dprintf(("Win32MemMap::close %s", lpszMapName));
+    dprintf(("Win32MemMap::Release %s (%d)", lpszMapName, referenced-1));
 #endif
-    fClosed = TRUE;
-    if(nrMappings == 0) {
+    --referenced;
+    if(nrMappings == 0 && referenced == 0) {
         delete this;
     }
@@ -327 +324 @@
     //if there are no more mappings left and the memory map's handle has been
     //closed, then delete the object
-    if(nrMappings == 0 && fClosed) {
+    if(nrMappings == 0 && referenced == 0) {
         delete this;
     }
@@ -333 +330 @@
 fail:
     mapMutex.leave();
-    if(nrMappings == 0 && fClosed) {
+    if(nrMappings == 0 && referenced == 0) {
         delete this;
     }
@@ -568 +565 @@
         }
         else {
-            if(!map->isClosed())
-                 CloseHandle(memmaps->hMemMap);
-            else delete map;
+            delete map;
         }
     }