September 2019 - Wine-devel

[PATCH] winex11.drv: Wait for XGrabPointer to succeed on FocusIn events.
by Rémi Bernon 20 Sep '19

20 Sep '19

Because on X11 we cannot accurately reproduce the proper non-client messages sequence when using decorated windows, applications sometimes assume it is safe to call ClipCursor with a rectangle that matches the current window position as soon as they receive a WM_ACTIVATE message. When the WM finishes moving the window, and since commit 92177b0b161e91f1d609615d89d8e3199feea33f we would retry to clip the cursor with an incorrect rectangle. Before the WM starts moving a window, an active pointer grab is usually initiated and we can use the result of XGrabPointer to decide whether the window is really focused or if we should wait until the WM has finished. This adds a pseudo modal loop that waits for XGrabPointer to succeed - without any confine window to avoid spurious cursor movements - before notifying the applications of FocusIn events. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Not sure at all how the modal loop should be, I mostly reproduced the one that is in move_resize_window, so if anyone has a better idea I'll be happy to take it. If this is too hackish, I believe it would be good to revert 92177b0b161e91f1d609615d89d8e3199feea33f, as it causes weird grabbing issues when moving windows in several games. dlls/winex11.drv/event.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f79f40c2323..e6190c56b1f 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -760,6 +760,33 @@ static const char * const focus_modes[] = "NotifyWhileGrabbed" }; +static void wait_for_pointer_ungrab( Display *display ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + XEvent *event; + + while (XGrabPointer( display, DefaultRootWindow( display ), False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime ) != GrabSuccess) + { + MSG msg; + + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + /* we still need to process the ConfigureNotify events while delaying the FocusIn */ + event = thread_data->current_event; + thread_data->current_event = NULL; + MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); + thread_data->current_event = event; + } + + XUngrabPointer( display, CurrentTime ); +} + /********************************************************************** * X11DRV_FocusIn */ @@ -784,9 +811,11 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) keyboard_grabbed = TRUE; break; case NotifyNormal: + wait_for_pointer_ungrab( event->display ); keyboard_grabbed = FALSE; break; case NotifyUngrab: + wait_for_pointer_ungrab( event->display ); keyboard_grabbed = FALSE; retry_grab_clipping_window(); return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ -- 2.23.0

3 6

[PATCH v2 resend 1/3] ntoskrnl.exe: Update the interface if it is already in the tree.
by Rémi Bernon 20 Sep '19

20 Sep '19

As we are going to reuse the same device id when re-plugging a previously plugged SDL controller, the device interfaces are still present in the tree and IoRegisterDeviceInterface was not updating the device pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/pnp.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 03c4c401f97..17d61a096a0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -622,7 +622,9 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; NTSTATUS status = STATUS_SUCCESS; + UNICODE_STRING device_path; struct device_interface *iface; + struct wine_rb_entry *entry; DWORD required; HDEVINFO set; @@ -660,19 +662,32 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla data->DevicePath[1] = '?'; TRACE("Returning path %s.\n", debugstr_w(data->DevicePath)); + RtlCreateUnicodeString( &device_path, data->DevicePath); + + entry = wine_rb_get( &device_interfaces, &device_path ); + if (entry) + { + iface = WINE_RB_ENTRY_VALUE( entry, struct device_interface, entry ); + if (iface->enabled) + ERR("Device interface %s is still enabled.\n", debugstr_us(&iface->symbolic_link)); + } + else + { + iface = heap_alloc_zero( sizeof(struct device_interface) ); + RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); + if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) + ERR("Failed to insert interface %s into tree.\n", debugstr_us(&iface->symbolic_link)); + } - iface = heap_alloc_zero( sizeof(struct device_interface) ); iface->device = device; iface->interface_class = *class_guid; - RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); if (symbolic_link) RtlCreateUnicodeString( symbolic_link, data->DevicePath); - if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) - ERR("Failed to insert interface %s into tree.\n", debugstr_us(&iface->symbolic_link)); - HeapFree( GetProcessHeap(), 0, data ); + RtlFreeUnicodeString( &device_path ); + return status; } -- 2.23.0

1 2

[PATCH] ntdll: Always add a tail to heap allocations.
by Brendan Shanks 20 Sep '19

20 Sep '19

Fixes the Rockstar Games Launcher installer (and possibly other NSIS-based installers) from crashing due to passing a too-small buffer to GetWindowInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47783 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/heap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e8ac1ffa7a..e7da86e09a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -110,9 +110,8 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) /* minimum size to start allocating large blocks */ #define HEAP_MIN_LARGE_BLOCK_SIZE 0x7f000 -/* extra size to add at the end of block for tail checking */ -#define HEAP_TAIL_EXTRA_SIZE(flags) \ - ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? ALIGNMENT : 0) +/* extra size to add at the end of block to mitigate overruns and allow tail checking */ +#define HEAP_TAIL_EXTRA_SIZE ALIGNMENT /* There will be a free list bucket for every arena size up to and including this value */ #define HEAP_MAX_SMALL_FREE_LIST 0x100 @@ -722,7 +721,7 @@ static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T size) static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) { ARENA_LARGE *arena; - SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); + SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE; LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ @@ -1674,7 +1673,7 @@ void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_ if (!heapPtr) return NULL; flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; flags |= heapPtr->flags; - rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE( flags ); + rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE; if (rounded_size < size) /* overflow */ { if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); @@ -1828,7 +1827,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); + rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE; if (rounded_size < size) goto oom; /* overflow */ if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; -- 2.17.1

2 2

[PATCH] wininet: Use username/password parameters over cached credentials.
by Alistair Leslie-Hughes 20 Sep '19

20 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 9 +++- dlls/wininet/tests/http.c | 90 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 60dab62441..74cb800020 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1700,11 +1700,18 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(authorization); } - else if (!strcmpW(header, szAuthorization) && (host = get_host_header(request))) + else { UINT data_len; char *data; + /* Dont use cached credentials when a username or Authorization was specified */ + if((request->session->userName && request->session->userName[0]) || strcmpW(header, szAuthorization)) + return TRUE; + + if (!(host = get_host_header(request))) + return TRUE; + if ((data_len = retrieve_cached_basic_authorization(request, host, NULL, &data))) { TRACE("Found cached basic authorization for %s\n", debugstr_w(host)); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f1a647346e..90a38dc3af 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2431,6 +2431,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "HEAD /upload3.txt")) + { + if (strstr(buffer, "Authorization: Basic dXNlcjE6cHdkMQ==")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } if (strstr(buffer, "/test_host_override")) { if (strstr(buffer, host_header_override)) @@ -4588,6 +4595,88 @@ static void test_basic_auth_credentials_end_session(int port) InternetCloseHandle( ses ); } +static void test_basic_auth_credentials_different(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + char buffer[0x40]; + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, "user", "pwd", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, "user1", "pwd1", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload3.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user1"), "got %s\n", buffer); + ok(size == 5, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd1"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + static void test_async_read(int port) { HINTERNET ses, con, req; @@ -5783,6 +5872,7 @@ static void test_http_connection(void) test_accept_encoding(si.port); test_basic_auth_credentials_reuse(si.port); test_basic_auth_credentials_end_session(si.port); + test_basic_auth_credentials_different(si.port); test_async_read(si.port); test_http_read(si.port); test_connection_break(si.port); -- 2.17.1

2 1

[PATCH 1/5] winegstreamer: Fix registration for the WAVE parser.
by Zebediah Figura 20 Sep '19

20 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 8503f9c7aba..1056d0d6674 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -206,7 +206,7 @@ static const AMOVIESETUP_PIN wave_parser_pin_data[] = }, { NULL, - FALSE, FALSE, FALSE, FALSE, + FALSE, TRUE, FALSE, FALSE, &GUID_NULL, NULL, ARRAY_SIZE(wave_parser_source_type_data), -- 2.23.0

2 9

[PATCH] wine.inf: Create the WindowsMediaVersion key and set its default value.
by Zebediah Figura 19 Sep '19

19 Sep '19

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47779 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3ddda8d5aad..f469703e711 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -498,6 +498,7 @@ HKLM,%CurrentVersion%\PreviewHandlers,,16 HKLM,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" +HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,,,"12.0.7601.18840" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 HKLM,%CurrentVersion%\Winlogon,,16 -- 2.23.0

1 0

[PATCH] ntdll: Execute queued APCs before starting a process.
by Zebediah Figura 19 Sep '19

19 Sep '19

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35561 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- The linked bug report is messy, but the the problem is essentially that Cygwin queues an APC inside a DLL entry point which creates a thread, and expects that thread to be running once the process starts (and without any alertable waits). Tested with current 64-bit Cygwin; the installer runs to completion with this patch, and hangs without it. dlls/ntdll/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 376a8345f48..0ab25dcc51a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3540,6 +3540,7 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) */ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { + static const LARGE_INTEGER zero; NTSTATUS status; WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -3602,6 +3603,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } RtlLeaveCriticalSection( &loader_section ); + + NtDelayExecution( TRUE, &zero ); } -- 2.23.0

1 0

[PATCH v2] user32: WARN() when WINDOWINFO cbSize is incorrect.
by Brendan Shanks 19 Sep '19

19 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47783 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Fix warning when building for Win64 dlls/user32/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3582262b7d..0523fc2479 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3847,6 +3847,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) { if (!pwi) return FALSE; if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &pwi->rcWindow, &pwi->rcClient )) return FALSE; + if (sizeof(WINDOWINFO) != pwi->cbSize) + WARN("Incorrect cbSize %d\n", pwi->cbSize); pwi->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); pwi->dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); -- 2.17.1

2 1

[PATCH] user32: WARN() when WINDOWINFO cbSize is incorrect.
by Brendan Shanks 19 Sep '19

19 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47783 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/user32/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3582262b7d..4055344c57 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3847,6 +3847,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) { if (!pwi) return FALSE; if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &pwi->rcWindow, &pwi->rcClient )) return FALSE; + if (sizeof(WINDOWINFO) != pwi->cbSize) + WARN("Incorrect cbSize %d (expected %d)\n", pwi->cbSize, sizeof(WINDOWINFO)); pwi->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); pwi->dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); -- 2.17.1

2 1

[PATCH 1/2] dwrite: Prefer Windows platform names regardless of record order.
by Nikolay Sivov 19 Sep '19

19 Sep '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 57 +++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e8efa1d196..67a1a20427 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1935,10 +1935,9 @@ static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_a static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { + int i, count, candidate_mac, candidate_unicode; const TT_NAME_V0 *header; BYTE *storage_area = 0; - USHORT count = 0; - int i, candidate; WORD format; BOOL exists; HRESULT hr; @@ -1964,7 +1963,7 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP count = GET_BE_WORD(header->count); exists = FALSE; - candidate = -1; + candidate_unicode = candidate_mac = -1; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; USHORT platform; @@ -1972,34 +1971,40 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP if (GET_BE_WORD(record->nameID) != id) continue; - /* Right now only accept unicode and windows encoded fonts */ platform = GET_BE_WORD(record->platformID); - if (platform != OPENTYPE_PLATFORM_UNICODE && - platform != OPENTYPE_PLATFORM_MAC && - platform != OPENTYPE_PLATFORM_WIN) + switch (platform) { - FIXME("platform %i not supported\n", platform); - continue; - } - - /* Skip such entries for now, fonts tend to duplicate those strings as - WIN platform entries. If font does not have WIN or MAC entry for this id, we will - use this Unicode platform entry while assuming en-US locale. */ - if (platform == OPENTYPE_PLATFORM_UNICODE) { - candidate = i; - continue; + /* Skip Unicode or Mac entries for now, fonts tend to duplicate those + strings as WIN platform entries. If font does not have WIN entry for + this id, we will use Mac or Unicode platform entry while assuming + en-US locale. */ + case OPENTYPE_PLATFORM_UNICODE: + if (candidate_unicode == -1) + candidate_unicode = i; + break; + case OPENTYPE_PLATFORM_MAC: + if (candidate_mac == -1) + candidate_mac = i; + break; + case OPENTYPE_PLATFORM_WIN: + if (opentype_decode_namerecord(header, storage_area, i, *strings)) + exists = TRUE; + break; + default: + FIXME("platform %i not supported\n", platform); + break; } - - if (!opentype_decode_namerecord(header, storage_area, i, *strings)) - continue; - - exists = TRUE; } - if (!exists) { - if (candidate != -1) - exists = opentype_decode_namerecord(header, storage_area, candidate, *strings); - else { + if (!exists) + { + if (candidate_mac != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate_mac, *strings); + + if (!exists && candidate_unicode != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate_unicode, *strings); + else + { IDWriteLocalizedStrings_Release(*strings); *strings = NULL; } -- 2.23.0

2 2