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

Timestamp:

Sep 10, 2000, 11:54:07 PM (25 years ago)

Author:

sandervl

Message:

memory map fixes + extra reg keys for init

File:

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

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.19 2000-09-03 09:32:19 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.20 2000-09-10 21:54:06 sandervl Exp $ */
 
 /*
@@ -314 +314 @@
     if(fdwOdinOptions) 
     {
-        if(CreateFile(srcfileinfo->lpszFileName, pHMHandleData,
+        HMHANDLEDATA duphdata;
+
+        memcpy(&duphdata, pHMHandleData, sizeof(duphdata));
+        duphdata.dwCreation = OPEN_EXISTING;
+
+        if(CreateFile(srcfileinfo->lpszFileName, &duphdata,
                       srcfileinfo->lpSecurityAttributes, NULL) == NO_ERROR) 
         {
+                memcpy(pHMHandleData, &duphdata, sizeof(duphdata));
+                SetLastError(ERROR_SUCCESS);
                 return TRUE;
         }
-        dprintf(("ERROR: DuplicateHandle; CreateFile %s failed!", 
+        dprintf(("ERROR: DuplicateHandle; CreateFile %s failed -> trying DosDupHandle instead!", 
                   srcfileinfo->lpszFileName));
-        return FALSE;
+        //SvL: IE5 setup opens file with DENYREADWRITE, so CreateFile can't
+        //     be used for duplicating the handle; try DosDupHandle instead
     }
     
@@ -339 +347 @@
     }
     else {
+      SetLastError(ERROR_SUCCESS);
       pHMHandleData->hHMHandle = *desthandle;
       return TRUE;    // OK