commit fbace6eefee927dca6768c3ef6d6e2d2b9eaa1c5
author Alexandre Julliard <julliard@winehq.org> Tue Apr 04 20:35:45 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Apr 04 20:35:45 2000 +0000
tree e6c2ed72d2bef40aa3103792b8cf110c17508c0e
parent 8a971bfec0283ad38ae09d4b01a5f5b4dfd359ea

Added a per-drive FailReadOnly flag, and removed the global
--failreadonly option.

files/file.c

diff --git a/files/file.c b/files/file.c
index f10a9bd..206667f 100644
--- a/files/file.c
+++ b/files/file.c
@@ -42,7 +42,6 @@
 #include "global.h"
 #include "heap.h"
 #include "msdos.h"
-#include "options.h"
 #include "ldt.h"
 #include "process.h"
 #include "task.h"
@@ -322,11 +321,13 @@
  * Implementation of CreateFile. Takes a Unix path name.
  */
 HANDLE FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
-                         LPSECURITY_ATTRIBUTES sa, DWORD creation,
-                         DWORD attributes, HANDLE template )
+                        LPSECURITY_ATTRIBUTES sa, DWORD creation,
+                        DWORD attributes, HANDLE template, BOOL fail_read_only )
 {
+    DWORD err;
     struct create_file_request *req = get_req_buffer();
 
+ restart:
     req->access  = access;
     req->inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
     req->sharing = sharing;
@@ -334,22 +335,19 @@
     req->attrs   = attributes;
     lstrcpynA( req->name, filename, server_remaining(req->name) );
     SetLastError(0);
-    server_call( REQ_CREATE_FILE );
+    err = server_call( REQ_CREATE_FILE );
 
     /* If write access failed, retry without GENERIC_WRITE */
 
-    if ((req->handle == -1) && !Options.failReadOnly &&
-        (access & GENERIC_WRITE)) 
+    if ((req->handle == -1) && !fail_read_only && (access & GENERIC_WRITE)) 
     {
-    	DWORD lasterror = GetLastError();
-
-	if ((lasterror == ERROR_ACCESS_DENIED) ||
-	    (lasterror == ERROR_WRITE_PROTECT)) {
+	if ((err == ERROR_ACCESS_DENIED) || (err == ERROR_WRITE_PROTECT))
+        {
 	    TRACE("Write access failed for file '%s', trying without "
 		  "write access", filename);
-            return FILE_CreateFile( filename, access & ~GENERIC_WRITE, sharing,
-                                    sa, creation, attributes, template );
-    }
+            access &= ~GENERIC_WRITE;
+            goto restart;
+        }
     }
 
     if (req->handle == -1)
@@ -491,7 +489,8 @@
     }
 
     return FILE_CreateFile( full_name.long_name, access, sharing,
-                            sa, creation, attributes, template );
+                            sa, creation, attributes, template,
+                            DRIVE_GetFlags(full_name.drive) & DRIVE_FAIL_READ_ONLY );
 }
 
 
@@ -917,7 +916,8 @@
     }
 
     hFileRet = FILE_CreateFile( full_name.long_name, access, sharing,
-                                NULL, OPEN_EXISTING, 0, -1 );
+                                NULL, OPEN_EXISTING, 0, -1,
+                                DRIVE_GetFlags(full_name.drive) & DRIVE_FAIL_READ_ONLY );
     if (hFileRet == HFILE_ERROR) goto not_found;
 
     GetFileTime( hFileRet, NULL, NULL, &filetime );