Changeset 3999 for trunk/src

Timestamp:

Aug 12, 2000, 9:32:19 AM (25 years ago)

Author:

sandervl

Message:

CreateFile fix (don't add write access when creating files)

Location:

trunk/src/kernel32

Files:

• hmfile.cpp (modified) (3 diffs)
• oslibdos.cpp (modified) (3 diffs)

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.15 2000-08-11 18:42:54 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.16 2000-08-12 07:32:18 sandervl Exp $ */
 
 /*
@@ -108 +108 @@
      hTemplate = 0;
 
-  //SvL: Open32 doesn't like this flag
-  if(pHMHandleData->dwShare & FILE_SHARE_DELETE) {
-        pHMHandleData->dwShare &= ~FILE_SHARE_DELETE;
-  }
+  //TODO: FILE_SHARE_DELETE
 #ifdef SHARE_WORKAROUND
-  pHMHandleData->dwShare = FILE_SHARE_READ | FILE_SHARE_WRITE;
+  pHMHandleData->dwShare |= (FILE_SHARE_READ | FILE_SHARE_WRITE);
 #endif
   hFile = OSLibDosCreateFile((LPSTR)lpFileName,
@@ -122 +119 @@
                              pHMHandleData->dwFlags,
                              hTemplate);
-#ifdef SHARE_WORKAROUND
-  if (hFile == INVALID_HANDLE_ERROR) {
-        //could be a read-only drive -> FILE_SHARE_WRITE is illegal
-        pHMHandleData->dwShare = FILE_SHARE_READ;
-        hFile = OSLibDosCreateFile((LPSTR)lpFileName,
-                             pHMHandleData->dwAccess,
-                             pHMHandleData->dwShare,
-                             (LPSECURITY_ATTRIBUTES)lpSecurityAttributes,
-                             pHMHandleData->dwCreation,
-                             pHMHandleData->dwFlags,
-                             hTemplate);
-  }
-#endif
 
   if (hFile != INVALID_HANDLE_ERROR)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.37 2000-08-11 10:56:17 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.38 2000-08-12 07:32:19 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -782 +782 @@
         openMode |= OPEN_ACCESS_WRITEONLY;
 
+#if 0
+   //SvL: Not true; verified in NT! (also messed up access of files on 
+   //     readonly volumes)
+   //     CreateFile with OPEN_ALWAYS & GENERIC_READ on non-existing file
+   //     -> creates 0 size file, WriteFile is not allowed
+   //     Same in OS/2.
    /* if creating a file, access cannot be readonly! */
    if (openFlag & OPEN_ACTION_CREATE_IF_NEW &&
@@ -788 +794 @@
         openMode |= OPEN_ACCESS_READWRITE;
    }
+#endif
 
    int retry = 0;