September 2022 - Wine-Commits

Alistair Leslie-Hughes : ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: 493db3b1f799c9af1e3bad5fcf974aa0f3861cca URL: https://gitlab.winehq.org/wine/wine/-/commit/493db3b1f799c9af1e3bad5fcf974a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 15 19:44:38 2020 +1000 ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9d51fef1adb..2f115f02e48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2327,6 +2327,45 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case SIO_IDEAL_SEND_BACKLOG_QUERY: + { + DWORD ret; + WSAPROTOCOL_INFOA proto_info; + int proto_len, len; + struct sockaddr addr; + + if (!out_buff || out_size < sizeof(DWORD)) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + proto_len = sizeof(WSAPROTOCOL_INFOA); + ret = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *)&proto_info, &proto_len); + if (ret == SOCKET_ERROR) + return SOCKET_ERROR; + + if (proto_info.iSocketType != SOCK_STREAM) + { + SetLastError( WSAEOPNOTSUPP ); + return SOCKET_ERROR; + } + + len = sizeof(addr); + if (getpeername( s, &addr, &len ) == SOCKET_ERROR) + { + return SOCKET_ERROR; + } + + *(DWORD*)out_buff = 0x10000; /* 64k */ + + WARN("SIO_IDEAL_SEND_BACKLOG_QUERY Always returning 64k\n"); + + SetLastError( ret ); + *ret_size = sizeof(DWORD); + return 0; + } + case SIOCATMARK: { DWORD ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3e6faaffa4c..d4f430a29d2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5273,6 +5273,55 @@ static void test_get_extension_func(void) closesocket(s); } +static void test_backlog_query(void) +{ + const struct sockaddr_in addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + GUID acceptex_guid = WSAID_ACCEPTEX; + LPFN_ACCEPTEX pAcceptEx; + struct sockaddr_in destaddr; + DWORD size; + SOCKET s, listener; + int len, ret; + ULONG backlog = 0; + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(acceptex_guid), + &pAcceptEx, sizeof(pAcceptEx), &size, NULL, NULL); + ok(!ret, "failed to get AcceptEx, error %u\n", WSAGetLastError()); + + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTCONN, + "WSAIoctl() failed: %d/%d\n", ret, WSAGetLastError()); + + ret = connect(s, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(!ret, "WSAIoctl() failed: %d\n", WSAGetLastError()); + ok(backlog == 0x10000, "got %08lx\n", backlog); + + closesocket(listener); + closesocket(s); + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + backlog = 0; + ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEOPNOTSUPP, + "WSAIoctl() failed: %d/%d\n", ret, WSAGetLastError()); + closesocket(s); +} + static void test_base_handle(void) { OVERLAPPED overlapped = {0}, *overlapped_ptr; @@ -13242,6 +13291,7 @@ START_TEST( sock ) test_fionbio(); test_fionread_siocatmark(); test_get_extension_func(); + test_backlog_query(); test_get_interface_list(); test_keepalive_vals(); test_sioRoutingInterfaceQuery();

1 0

Zebediah Figura : libwine: Avoid comparing the result of pointer arithmetic to zero.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: d17fe0a7920c09a16e75b74213ae0e8bbbd1cba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d17fe0a7920c09a16e75b74213ae0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:15:30 2022 -0500 libwine: Avoid comparing the result of pointer arithmetic to zero. gcc warns about this: ../wine/libs/wine/mmap.c: In function ‘wine_mmap_add_reserved_area_obsolete’: ../wine/libs/wine/mmap.c:504:9: error: the comparison will always evaluate as ‘true’ for the pointer operand in ‘(char *)addr + (sizetype)size’ must not be NULL [-Werror=address] 504 | if (!((char *)addr + size)) size--; /* avoid wrap-around */ | ^ --- libs/wine/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index ad51153d039..1f8ae3c7720 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -501,7 +501,7 @@ void wine_mmap_add_reserved_area_obsolete( void *addr, size_t size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ LIST_FOR_EACH( ptr, &reserved_areas ) { @@ -560,7 +560,7 @@ void wine_mmap_remove_reserved_area_obsolete( void *addr, size_t size, int unmap struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ ptr = list_head( &reserved_areas ); /* find the first area covering address */

1 0

Zebediah Figura : ntdll: Calculate the necessary length after calling snprintf() in SystemWineVersionInformation.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: f66b49a4968a383bccab03dc200d5448a3ab15f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f66b49a4968a383bccab03dc200d54… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:21:48 2022 -0500 ntdll: Calculate the necessary length after calling snprintf() in SystemWineVersionInformation. This works around a spurious gcc warning: ../wine/dlls/ntdll/unix/system.c: In function ‘NtQuerySystemInformation’: ../wine/dlls/ntdll/unix/system.c:3176:36: error: ‘%s’ directive output between 0 and 2147483644 bytes may cause result to exceed ‘INT_MAX’ [-Werror=format-truncation=] 3176 | snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); | ^~ ~~~~~~~~~~ ../wine/dlls/ntdll/unix/system.c:3176:9: note: ‘snprintf’ output between 8 and 2147483780 bytes into a destination of size 4294967295 3176 | snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 83e0521a3c9..136fc80adf1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3172,8 +3172,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, struct utsname buf; uname( &buf ); - len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); + len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; if (size < len) ret = STATUS_INFO_LENGTH_MISMATCH; break; }

1 0

Zebediah Figura : ntdll: Avoid comparing the result of pointer arithmetic to zero.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: 539ef7c462852cf9b528e9d7b8fc6999ed8d5f2d URL: https://gitlab.winehq.org/wine/wine/-/commit/539ef7c462852cf9b528e9d7b8fc69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 11 17:58:45 2022 -0500 ntdll: Avoid comparing the result of pointer arithmetic to zero. gcc warns about this: ../wine/dlls/ntdll/unix/virtual.c: In function ‘mmap_add_reserved_area’: ../wine/dlls/ntdll/unix/virtual.c:241:9: error: the comparison will always evaluate as ‘true’ for the pointer operand in ‘(char *)addr + (sizetype)size’ must not be NULL [-Werror=address] 241 | if (!((char *)addr + size)) size--; /* avoid wrap-around */ | ^ --- dlls/ntdll/unix/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 96a5e095d16..e0aa410373e 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -238,7 +238,7 @@ static void mmap_add_reserved_area( void *addr, SIZE_T size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ LIST_FOR_EACH( ptr, &reserved_areas ) { @@ -287,7 +287,7 @@ static void mmap_remove_reserved_area( void *addr, SIZE_T size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ ptr = list_head( &reserved_areas ); /* find the first area covering address */

1 0

Alexandre Julliard : user32/tests: Don't print debug traces by default.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: 46164f40ab50ba7d4135d8c2226b4488269262a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/46164f40ab50ba7d4135d8c2226b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 10:22:45 2022 +0200 user32/tests: Don't print debug traces by default. This reduces the test output to stay within the 32kB limit. --- dlls/user32/tests/msg.c | 310 ++++++++++++++++++++++++------------------------ 1 file changed, 156 insertions(+), 154 deletions(-)

1 0

Alexandre Julliard : advapi32/tests: Mark some failing tests as todo.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: 5965771a9c8213eb85079dc3efa02609dfe75855 URL: https://gitlab.winehq.org/wine/wine/-/commit/5965771a9c8213eb85079dc3efa026… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 14:07:13 2022 +0200 advapi32/tests: Mark some failing tests as todo. --- dlls/advapi32/tests/lsa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 5c00298d41e..c43f313d77e 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -402,9 +402,11 @@ static void test_LsaLookupSids(void) /* English and Japanese */ check_unicode_string(&names[0].Name, L"Everyone"); else if (wcscmp(langW, L"0407") == 0) /* German */ - check_unicode_string(&names[0].Name, L"Jeder"); + todo_wine ok(!wcsicmp(names[0].Name.Buffer, L"Jeder"), "missing translation %s\n", + debugstr_w(names[0].Name.Buffer)); else if (wcscmp(langW, L"040C") == 0) /* French */ - check_unicode_string(&names[0].Name, L"Tout le monde"); + todo_wine ok(!wcsicmp(names[0].Name.Buffer, L"Tout le monde"), "missing translation %s\n", + debugstr_w(names[0].Name.Buffer)); else trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer));

1 0

Alexandre Julliard : user32/tests: Only report the first todo of a failed message sequence.
by Alexandre Julliard Sept. 16, 2022

Sept. 16, 2022

Module: wine Branch: master Commit: a72bffe768c9fe462010d7e40e20226322fb82c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a72bffe768c9fe462010d7e40e2022… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 10:18:29 2022 +0200 user32/tests: Only report the first todo of a failed message sequence. This reduces the test output to stay within the 32kB limit. --- dlls/user32/tests/msg.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8bed81b6faf..2c46d24a98f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2713,6 +2713,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex const struct recvd_message *actual; int failcount = 0, dump = 0; unsigned int count = 0; + BOOL is_wine = !strcmp(winetest_platform, "wine"); add_message(&end_of_sequence); @@ -2729,11 +2730,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: in msg 0x%04x expecting wParam 0x%Ix got 0x%Ix\n", context, count, expected->message, expected->wParam, actual->wParam); } + if (is_wine) goto done; } else { @@ -2750,11 +2752,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: in msg 0x%04x expecting lParam 0x%Ix got 0x%Ix\n", context, count, expected->message, expected->lParam, actual->lParam); } + if (is_wine) goto done; } else { @@ -2776,11 +2779,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x should %shave been sent by DefWindowProc\n", context, count, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); } + if (is_wine) goto done; } else { @@ -2831,23 +2835,25 @@ static void ok_sequence_(const struct message *expected_list, const char *contex ((expected->flags & hook) && !hCBT_hook) || ((expected->flags & winevent_hook) && !hEvent_hook) || ((expected->flags & kbd_hook) && !hKBD_hook) || - ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine"))) + ((expected->flags & winevent_hook_todo) && is_wine)) { if ((expected->flags & winevent_hook_todo) && hEvent_hook) { - todo_wine { + static int reported; + if (!reported++) todo_wine { ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, count, expected->message, actual->message); } } expected++; + goto done; } else if (todo) { failcount++; todo_wine { - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, count, expected->message, actual->message); } @@ -2868,7 +2874,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex while (expected->message && ((expected->flags & optional) || ((expected->flags & hook) && !hCBT_hook) || ((expected->flags & winevent_hook) && !hEvent_hook) || - ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine")))) + ((expected->flags & winevent_hook_todo) && is_wine))) { if ((expected->flags & winevent_hook_todo) && hEvent_hook) { @@ -2878,6 +2884,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex } } expected++; + goto done; } if (todo) @@ -2885,11 +2892,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex todo_wine { if (expected->message || actual->message) { failcount++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected %04x - actual %04x\n", context, count, expected->message, actual->message); } } + if (is_wine) goto done; } else { @@ -2902,12 +2910,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex } if( todo && !failcount) /* succeeded yet marked todo */ todo_wine { - if (!strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); } done: - if (dump) dump_sequence(expected_list, context, file, line); + if (dump && (!is_wine || winetest_debug > 1)) dump_sequence(expected_list, context, file, line); flush_sequence(); }

1 0

Eric Pouech : d3d11/tests: Introduce a clear_rtv() helper.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

Module: wine Branch: master Commit: 5fa25d00d7edca295e38030006b14f4059276116 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fa25d00d7edca295e38030006b14f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 15 19:37:20 2022 +0200 d3d11/tests: Introduce a clear_rtv() helper. This fixes warnings with gcc 12.2. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 69 ++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 31 deletions(-)

1 0

Henri Verbeet : d3d9/tests: The expected scissor rect after a reset is equal to the back-buffer dimensions.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

Module: wine Branch: master Commit: bba63771eb742470046801ca4123613b32288624 URL: https://gitlab.winehq.org/wine/wine/-/commit/bba63771eb742470046801ca412361… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 14:35:52 2022 +0200 d3d9/tests: The expected scissor rect after a reset is equal to the back-buffer dimensions. This appears to have gotten lost in commit 7623d0a6f585505302044beace53fb8ff81ae120. --- dlls/d3d9/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 119ab0b3b34..dbdce1e5871 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3644,6 +3644,7 @@ static void test_scissor_size(void) hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); ok(hr == S_OK, "Got hr %#lx.\n", hr); + SetRect(&expect, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight); ok(EqualRect(&scissorrect, &expect), "Expected rect %s, got %s.\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&scissorrect));

1 0

Henri Verbeet : d3d11/tests: Move the is_warp_device() call out of the loop in check_format_support().
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

Module: wine Branch: master Commit: e5f5bea390d263e2119e25ee8802864409719941 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5f5bea390d263e2119e25ee880286… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 11:34:27 2022 +0200 d3d11/tests: Move the is_warp_device() call out of the loop in check_format_support(). There's no point in querying this multiple times, it's not going to change. Perhaps more importantly, calling is_warp_device() inside a todo_wine block will cause "Test succeeded inside todo block: ..." messages from get_device_adapter_desc(). These appear to have been introduced by commit fcc276ecb1508d5217ec977ca530ee7d30d355b9. Arguably get_device_adapter_desc() shouldn't use ok() in the first place. --- dlls/d3d11/tests/d3d11.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e00bc7a336..bc7f8fd971d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20961,6 +20961,7 @@ static void check_format_support(ID3D11Device *device, const unsigned int *forma D3D_FEATURE_LEVEL feature_level, const struct format_support *formats, unsigned int format_count, unsigned int feature_flag, const char *feature_name) { + BOOL warp = is_warp_device(device); unsigned int i; for (i = 0; i < format_count; ++i) @@ -20971,7 +20972,7 @@ static void check_format_support(ID3D11Device *device, const unsigned int *forma if (formats[i].fl_required <= feature_level) { todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY) - ok(supported || broken(is_warp_device(device)), + ok(supported || broken(warp), "Format %#x - %s not supported, format support %#x.\n", format, feature_name, format_support[format]); continue;

1 0