[PATCH v2 0/1] MR9725: Revert "dwrite: Use uppercase paths for local file loader keys."

[Nikolay Sivov (＠nsivov)]

It's possible to get system font files paths in unix-path format,
if there is no drive configured that allows access to corresponding
trees. When this happens registry font list starts using unix paths,
and those can't be modified the same way regular win32 paths could be.

This fixes a regression caused by 2a2cc34db71.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58811
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

--
  v2: Revert "dwrite: Use uppercase paths for local file loader keys."
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9725

[PATCH v2 1/1] Revert "dwrite: Use uppercase paths for local file loader keys."

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

It's possible to get system font files paths in unix-path format,
if there is no drive configured that allows access to corresponding
trees. When this happens registry font list starts using unix paths,
and those can't be modified the same way regular win32 paths could be.

This fixes a regression caused by 2a2cc34d.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58811
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/dwrite/font.c       | 1 -
 dlls/dwrite/tests/font.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index b0f72010e31..c1aae46738a 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -5775,7 +5775,6 @@ HRESULT get_local_refkey(const WCHAR *path, const FILETIME *writetime, void **ke
 
     refkey->writetime = *writetime;
     memcpy(refkey->name, path, len * sizeof(WCHAR));
-    wcsupr(refkey->name);
 
     *key = refkey;
 
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index a39d8a36413..c7aaf8f71f7 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -3515,7 +3515,7 @@ static void test_CreateFontFileReference(void)
     ok(hr == S_OK, "Failed to get ref key, hr %#lx.\n", hr);
     ok(key1_size == key2_size, "Unexpected key sizes %u, %u.\n", key1_size, key2_size);
     if (key1_size == key2_size)
-        ok(!memcmp(key1, key2, key1_size), "Expected matching keys.\n");
+        todo_wine ok(!memcmp(key1, key2, key1_size), "Expected matching keys.\n");
 
     hr = IDWriteFontFile_GetLoader(file, &loader);
     ok(hr == S_OK, "Unexpected hr %#lx.\n",hr);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9725

[Nikolay Sivov (＠nsivov)]

v2: revert uppercasing for all paths

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9725#note_125153