commit d80eb97b2933cba619e6aac32c29bf72e46ad613
author Mike McCormack <mike@codeweavers.com> Wed Sep 15 18:02:49 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Sep 15 18:02:49 2004 +0000
tree 9b7459401dd21b61d271e55758d26a9855efeda0
parent 8087fca344b17d967c87b85ce5c25b2c3cc23341

Use FILE_SHARE_DELETE when loading modules, as running an exe that's
going to be deleted should work.

dlls/kernel/process.c

diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index a9e33e7..4541278 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -195,7 +195,7 @@
 
     TRACE("looking for %s\n", debugstr_w(name) );
 
-    if ((handle = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ,
+    if ((handle = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE,
                                NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE)
     {
         /* file doesn't exist, check for builtin */
@@ -260,7 +260,7 @@
         if (SearchPathW( NULL, name, NULL, buflen, buffer, NULL ))
         {
             TRACE( "Trying native/Unix binary %s\n", debugstr_w(buffer) );
-            if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ,
+            if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE,
                                         NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE)
                 return TRUE;
         }
@@ -276,7 +276,7 @@
         {
         case LOADORDER_DLL:
             TRACE( "Trying native exe %s\n", debugstr_w(buffer) );
-            if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ,
+            if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE,
                                         NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE)
                 return TRUE;
             if (GetLastError() != ERROR_FILE_NOT_FOUND) return TRUE;

dlls/ntdll/loader.c

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index f4268b2..76e5a1d 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -1398,7 +1398,7 @@
             attr.ObjectName = &nt_name;
             attr.SecurityDescriptor = NULL;
             attr.SecurityQualityOfService = NULL;
-            if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ, 0 )) *handle = 0;
+            if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0;
             RtlFreeUnicodeString( &nt_name );
             return STATUS_SUCCESS;
         }
@@ -1445,7 +1445,7 @@
         attr.ObjectName = &nt_name;
         attr.SecurityDescriptor = NULL;
         attr.SecurityQualityOfService = NULL;
-        if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ, 0 )) *handle = 0;
+        if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0;
     }
     RtlFreeUnicodeString( &nt_name );
     return STATUS_SUCCESS;