Title: [217859] trunk/Source/WebCore
Revision
217859
Author
[email protected]
Date
2017-06-06 15:04:19 -0700 (Tue, 06 Jun 2017)

Log Message

Allow FileReader to open files multiple times

If multiple file readers open files they are prevented by default due to
Windows' file locking.

Allow FileReader to open multiple files for reading at the same time on wincairo
https://bugs.webkit.org/show_bug.cgi?id=172632

Patch by Isaac Devine <[email protected]> on 2017-06-06
Reviewed by Darin Adler.

* platform/win/FileSystemWin.cpp:
(WebCore::openFile): Use the appropriate sharing options to allow multiple opens

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (217858 => 217859)


--- trunk/Source/WebCore/ChangeLog	2017-06-06 21:46:29 UTC (rev 217858)
+++ trunk/Source/WebCore/ChangeLog	2017-06-06 22:04:19 UTC (rev 217859)
@@ -1,3 +1,18 @@
+2017-06-06  Isaac Devine  <[email protected]>
+
+        Allow FileReader to open files multiple times
+
+        If multiple file readers open files they are prevented by default due to
+        Windows' file locking.
+
+        Allow FileReader to open multiple files for reading at the same time on wincairo
+        https://bugs.webkit.org/show_bug.cgi?id=172632
+
+        Reviewed by Darin Adler.
+
+        * platform/win/FileSystemWin.cpp:
+        (WebCore::openFile): Use the appropriate sharing options to allow multiple opens
+
 2017-06-06  Beth Dakin  <[email protected]>
 
         Netflix seeking quirk should also apply to Now Playing, and should always use the 

Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (217858 => 217859)


--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp	2017-06-06 21:46:29 UTC (rev 217858)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp	2017-06-06 22:04:19 UTC (rev 217859)
@@ -339,10 +339,12 @@
 {
     DWORD desiredAccess = 0;
     DWORD creationDisposition = 0;
+    DWORD shareMode = 0;
     switch (mode) {
     case OpenForRead:
         desiredAccess = GENERIC_READ;
         creationDisposition = OPEN_EXISTING;
+        shareMode = FILE_SHARE_READ;
         break;
     case OpenForWrite:
         desiredAccess = GENERIC_WRITE;
@@ -353,7 +355,7 @@
     }
 
     String destination = path;
-    return CreateFile(destination.charactersWithNullTermination().data(), desiredAccess, 0, 0, creationDisposition, FILE_ATTRIBUTE_NORMAL, 0);
+    return CreateFile(destination.charactersWithNullTermination().data(), desiredAccess, shareMode, 0, creationDisposition, FILE_ATTRIBUTE_NORMAL, 0);
 }
 
 void closeFile(PlatformFileHandle& handle)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to