gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile().

ZusiDisplay sometimes loads the same font file into two different PrivateFontCollections using two threads, so there is a race condition when the file is opened without the FILE_SHARE_READ sharing mode. The second call to GdipPrivateAddFontFile() might fail if the first one hasn't closed the file handle yet.

gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile().
b3bf30e7 · Florian Will · Alexandre Julliard · 0ebf3222 · b3bf30e7 · b3bf30e7
Commit b3bf30e7 authored Feb 28, 2023 by Florian Will Committed by Alexandre Julliard Mar 02, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

font.c dlls/gdiplus/font.c +1 -1

font.c dlls/gdiplus/tests/font.c +1 -1

No files found.
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -1110,7 +1110,7 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCON

    if (!collection || !name) return InvalidParameter;

-    file = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
+    file = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
    if (file == INVALID_HANDLE_VALUE) return InvalidParameter;

    if (!GetFileSizeEx(file, &size) || size.u.HighPart)

--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -91,7 +91,7 @@ static void test_long_name(void)
    ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed: %ld\n", GetLastError());

    stat = GdipPrivateAddFontFile(fonts, path);
-    todo_wine ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat);
+    ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat);

    CloseHandle(file);