Changeset 21655 for trunk/src/kernel32/hmfile.cpp

Timestamp:

Jun 27, 2011, 2:34:59 AM (14 years ago)

Author:

dmik

Message:

kernel32: Fixed: Closing a duplicate of a handle opened with FILE_FLAG_DELETE_ON_CLOSE would not perform file deletion if that duplicate was the last reference to the file (e.g. closed after the original handle).

File:

• trunk/src/kernel32/hmfile.cpp (modified) (2 diffs)

trunk/src/kernel32/hmfile.cpp

@@ -384 +384 @@
       SetHandleInformation(pHMHandleData, HANDLE_FLAG_INHERIT, (fInherit) ? HANDLE_FLAG_INHERIT : 0);
 
+      // Duplicate file information as well -- this is e.g. needed in
+      // CloseHandle() for the FILE_FLAG_DELETE_ON_CLOSE emulation to work
+      if (srcfileinfo) {
+        pHMHandleData->dwUserData =
+          (DWORD) new HMFileInfo(pHMHandleData->hHMHandle,
+                                 srcfileinfo->lpszFileName, NULL);
+      }
+
       SetLastError(ERROR_SUCCESS);
       return TRUE;    // OK
@@ -640 +648 @@
   DWORD curfilepos;
   map = Win32MemMap::findMapByFile(pHMHandleData->hWin32Handle);
-  if(map) {
+  if(map && map->getFileHandle() != pHMHandleData->hWin32Handle) {
       curfilepos = SetFilePointer(pHMHandleData, 0, NULL, FILE_CURRENT);