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

Timestamp:

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

Author:

sandervl

Message:

memory map + handle manager fixes

File:

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

trunk/src/kernel32/hmmmap.cpp

@@ -1 @@
-/* $Id: hmmmap.cpp,v 1.15 2000-09-10 21:54:06 sandervl Exp $ */
+/* $Id: hmmmap.cpp,v 1.16 2001-01-22 18:26:51 sandervl Exp $ */
 
 /*
@@ -56 +56 @@
                                              DWORD size_high, /* [in] High-order 32 bits of object size */
                                              DWORD size_low,  /* [in] Low-order 32 bits of object size */
-                                             LPCSTR name,     /* [in] Name of file-mapping object */ 
-                                             HFILE *hOldMap)  // if create an existing memmap, return handle of old one
+                                             LPCSTR name)     /* [in] Name of file-mapping object */ 
 {
  Win32MemMap *map;
@@ -95 +94 @@
         //Is it allowed to open an existing view with different flags?
         //(i.e. write access to readonly object)
-        //Return handle of existing file mapping
-        dprintf(("CreateFileMapping: Return handle of existing file mapping %s", name));
+        dprintf(("CreateFileMapping: duplicate handle of existing file mapping %s", name));
+
+        //if map already exists, we must create a new handle to the existing
+        //map object and return ERROR_ALREADY_EXISTS
         map->AddRef();
-        *hOldMap = map->getMapHandle();
-        return ERROR_ALREADY_EXISTS;
+        pHMHandleData->dwUserData = (ULONG)map;
+        pHMHandleData->dwInternalType = HMTYPE_MEMMAP;
+        return ERROR_ALREADY_EXISTS;
   }
   else {
@@ -109 +111 @@
         } 
 
-        if(map->Init(pHMHandleData->hHMHandle) == FALSE) {
+        if(map->Init() == FALSE) {
                 dprintf(("CreateFileMappingA: init failed!"));
                 delete map;
@@ -218 +220 @@
   //view of the file is unmapped.
   map = (Win32MemMap *)pHMHandleData->dwUserData;
-  map->close();
+  map->Release();
 
   return NO_ERROR;