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

Timestamp:

May 6, 2003, 2:06:11 PM (22 years ago)

Author:

sandervl

Message:

Fixed closing of parent file handle by duplicate memory map; Compare file names instead of handles when checking for duplicate file maps

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.65 2003-04-02 11:03:31 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.66 2003-05-06 12:06:10 sandervl Exp $ */
 
 /*
@@ -75 +75 @@
 Win32MemMap::Win32MemMap(HANDLE hfile, ULONG size, ULONG fdwProtect, LPSTR lpszName)
                : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), 
-                 image(0), pWriteBitmap(NULL)
+                 image(0), pWriteBitmap(NULL), lpszFileName(NULL)
 {
     DosEnterCriticalSection(&globalmapcritsect);
@@ -101 +101 @@
 Win32MemMap::Win32MemMap(Win32PeLdrImage *pImage, ULONG baseAddress, ULONG size)
                : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), 
-                 image(0), pWriteBitmap(NULL)
+                 image(0), pWriteBitmap(NULL), lpszFileName(NULL)
 {
     DosEnterCriticalSection(&globalmapcritsect);
@@ -127 +127 @@
     if(hMemFile != -1)
     {
+        lpszFileName = (char *)_smalloc(MMAP_MAX_FILENAME_LENGTH);
+        if(HMGetFileNameFromHandle(hMemFile, lpszFileName, MMAP_MAX_FILENAME_LENGTH) == FALSE) {
+            return FALSE;
+        }
 #if 0
         if(DuplicateHandle(GetCurrentProcess(), hMemFile, GetCurrentProcess(),
@@ -181 +185 @@
     if(lpszMapName) {
         free(lpszMapName);
+    }
+    if(lpszFileName) {
+        free(lpszFileName);
     }
     if(pMapping && !image) {
@@ -917 +924 @@
 Win32MemMap *Win32MemMap::findMapByFile(HANDLE hFile)
 {
+  DWORD processId = GetCurrentProcessId();
+  char  szFileName[260];
+
   if(hFile == -1)
+    return NULL;
+
+  if(HMGetFileNameFromHandle(hFile, szFileName, sizeof(szFileName)) == FALSE)
     return NULL;
 
@@ -926 +939 @@
   {
     while(map) {
-        if(map->hOrgMemFile == hFile)
-            break;
+        //TODO: we currently don't support sharing file maps between processes
+        if(map->mProcessId == processId && map->lpszFileName) 
+        {
+            if(!strcmp(map->lpszFileName, szFileName))
+                break;
+        }
         map = map->next;
     }