wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Zebediah Figura : rpcrt4: Add SEH annotations to Ndr64AsyncClientCall().
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 37ae068773677a35342a594448d1bbabf9feb94a URL: https://gitlab.winehq.org/wine/wine/-/commit/37ae068773677a35342a594448d1bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:04:49 2022 -0500 rpcrt4: Add SEH annotations to Ndr64AsyncClientCall(). --- dlls/rpcrt4/ndr_stubless.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 3a4bfc72df1..890b248cfb8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2307,6 +2307,8 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_async_client_call( MIDL_STUBLESS_PROXY_INFO __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, "subq $0x28,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x28\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") "movq %r9,0x48(%rsp)\n\t" "leaq 0x48(%rsp),%r9\n\t"

1 0

Zebediah Figura : rpcrt4: Make Ndr64AsyncClientCall() SEH-compatible.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 16713f52456d86c34eb5f0268468e044ada9d162 URL: https://gitlab.winehq.org/wine/wine/-/commit/16713f52456d86c34eb5f0268468e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:04:32 2022 -0500 rpcrt4: Make Ndr64AsyncClientCall() SEH-compatible. --- dlls/rpcrt4/ndr_stubless.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index e15c93d2310..3a4bfc72df1 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2306,11 +2306,11 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_async_client_call( MIDL_STUBLESS_PROXY_INFO #ifdef __x86_64__ __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x20(%rsp),%r9\n\t" - "pushq $0\n\t" - "subq $0x20,%rsp\n\t" + "subq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq %r9,0x48(%rsp)\n\t" + "leaq 0x48(%rsp),%r9\n\t" + "movq $0,0x20(%rsp)\n\t" "call " __ASM_NAME("ndr64_async_client_call") "\n\t" "addq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")

1 0

Zebediah Figura : msvcrt: Add SEH annotations for sse2_memcpy().
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 57140421378ade6a5b5dea32bb94a1e8ab92906f URL: https://gitlab.winehq.org/wine/wine/-/commit/57140421378ade6a5b5dea32bb94a1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 17:02:24 2022 -0500 msvcrt: Add SEH annotations for sse2_memcpy(). This allows unwinding from a crash inside the function. --- dlls/msvcrt/string.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index dd392abd203..c598a6fa76f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2817,8 +2817,11 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) #define MEMMOVE_INIT \ "pushq " SRC_REG "\n\t" \ + __ASM_SEH(".seh_pushreg " SRC_REG "\n\t") \ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ "pushq " DEST_REG "\n\t" \ + __ASM_SEH(".seh_pushreg " DEST_REG "\n\t") \ + __ASM_SEH(".seh_endprologue\n\t") \ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ "movq %rcx, " DEST_REG "\n\t" \ "movq %rdx, " SRC_REG "\n\t"

1 0

Gijs Vermeulen : msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 3f47b478b4508a2010bbe4a8a365abe70e929707 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f47b478b4508a2010bbe4a8a365ab… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Sep 2 23:16:25 2022 +0200 msvcp140: Add _ExceptionHolder::ReportUnhandledError stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53614 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/concrt140/details.c | 9 +++++++++ dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/details.c | 9 +++++++++ dlls/msvcp_win/msvcp_win.spec | 6 +++--- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 8fd186eb71d..e6711db6983 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -1075,6 +1075,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void) return FALSE; } +/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ */ +/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ */ +/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4) +void __thiscall _ExceptionHolder__ReportUnhandledError(void *this) +{ + FIXME("(%p) stub\n", this); +} + __ASM_BLOCK_BEGIN(concurrency_details_vtables) __ASM_VTABLE(_Concurrent_queue_base_v4, VTABLE_ADD_FUNC(_Concurrent_queue_base_v4_dummy) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e7bdcd0378e..232a2b959a2 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1085,9 +1085,9 @@ @ stub -arch=win64 ?CaptureCallstack@platform@details@Concurrency@@YA_KPEAPEAX_K1@Z @ cdecl ?GetCurrentThreadId@platform@details@Concurrency@@YAJXZ() kernel32.GetCurrentThreadId @ stub ?GetNextAsyncId@platform@details@Concurrency@@YAIXZ -@ stub -arch=arm ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ -@ stub -arch=i386 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ -@ stub -arch=win64 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError +@ thiscall -arch=i386 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ(ptr) _ExceptionHolder__ReportUnhandledError +@ cdecl -arch=win64 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError @ cdecl -arch=arm ?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=i386 ?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z(ptr long str) _Locinfo__Addcats @ cdecl -arch=win64 ?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z(ptr long str) _Locinfo__Addcats diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index d2a741b4998..767b20b2334 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -1089,6 +1089,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void) FIXME("() stub\n"); return FALSE; } + +/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ */ +/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ */ +/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4) +void __thiscall _ExceptionHolder__ReportUnhandledError(void *this) +{ + FIXME("(%p) stub\n", this); +} #endif __ASM_BLOCK_BEGIN(concurrency_details_vtables) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 3ba0ce1dfba..d2fae9f1e14 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1085,9 +1085,9 @@ @ stub -arch=win64 ?CaptureCallstack@platform@details@Concurrency@@YA_KPEAPEAX_K1@Z @ cdecl ?GetCurrentThreadId@platform@details@Concurrency@@YAJXZ() msvcp140.?GetCurrentThreadId@platform@details@Concurrency@@YAJXZ @ stub ?GetNextAsyncId@platform@details@Concurrency@@YAIXZ -@ stub -arch=arm ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ -@ stub -arch=i386 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ -@ stub -arch=win64 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ(ptr) msvcp140.?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ +@ thiscall -arch=i386 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ(ptr) msvcp140.?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ +@ cdecl -arch=win64 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ(ptr) msvcp140.?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ @ cdecl -arch=arm ?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z(ptr long str) msvcp140.?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z @ thiscall -arch=i386 ?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z(ptr long str) msvcp140.?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z @ cdecl -arch=win64 ?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z(ptr long str) msvcp140.?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z

1 0

Francois Gouget : msvcrt: Fix the spelling of a comment.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 8f51e6bd47595fb4df53e06cdcf5e0fb2612ed58 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f51e6bd47595fb4df53e06cdcf5e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 5 09:56:02 2022 +0200 msvcrt: Fix the spelling of a comment. --- dlls/msvcrt/undname.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 8eb3a12057f..eb95da98435 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1509,7 +1509,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case '9': function_name = "`vcall'"; break; case 'A': function_name = "`typeof'"; break; case 'B': function_name = "`local static guard'"; break; - case 'C': sym->result = (char*)"`string'"; /* string literal: followed by string encoding (native nevers undecode it) */ + case 'C': sym->result = (char*)"`string'"; /* string literal: followed by string encoding (native never undecode it) */ /* FIXME: should unmangle the whole string for error reporting */ if (*sym->current && sym->current[strlen(sym->current) - 1] == '@') ret = TRUE; goto done;

1 0

Stefan Dösinger : include/test.h: Don't use \e.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: c7e57bc5142dc3c03e19edc4fcf1030f64290fe1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7e57bc5142dc3c03e19edc4fcf103… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 6 14:32:10 2022 +0300 include/test.h: Don't use \e. Msvc does not support it. --- include/wine/test.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index d1036f9dcd4..605081607f1 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -300,14 +300,14 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } -static const char color_reset[] = "\e[0m"; -static const char color_dark_red[] = "\e[31m"; -static const char color_dark_purple[] = "\e[35m"; -static const char color_green[] = "\e[32m"; -static const char color_yellow[] = "\e[33m"; -static const char color_blue[] = "\e[34m"; -static const char color_bright_red[] = "\e[1;91m"; -static const char color_bright_purple[] = "\e[1;95m"; +static const char color_reset[] = "\x1b[0m"; +static const char color_dark_red[] = "\x1b[31m"; +static const char color_dark_purple[] = "\x1b[35m"; +static const char color_green[] = "\x1b[32m"; +static const char color_yellow[] = "\x1b[33m"; +static const char color_blue[] = "\x1b[34m"; +static const char color_bright_red[] = "\x1b[1;91m"; +static const char color_bright_purple[] = "\x1b[1;95m"; static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void winetest_printf( const char *msg, ... )

1 0

Stefan Dösinger : include/test.h: Don't use strcasecmp.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 802016d0ebb0d4de55ae61f9b80c3855f91399e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/802016d0ebb0d4de55ae61f9b80c38… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 6 14:12:30 2022 +0300 include/test.h: Don't use strcasecmp. Fixes building tests in Visual Studio with msvc's own crt headers. --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 505f0daaaf4..d1036f9dcd4 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -743,7 +743,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) { - BOOL automode = !strcasecmp(p, "auto"); + BOOL automode = !strcmp(p, "auto"); winetest_color = automode ? isatty( fileno( stdout ) ) : atoi(p); /* enable ANSI support for Windows console */ if (winetest_color)

1 0

Nikolay Sivov : crypt32/tests: Use CRT allocation functions.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: a63d7c06a9c6eb2530d585994d4def113b393370 URL: https://gitlab.winehq.org/wine/wine/-/commit/a63d7c06a9c6eb2530d585994d4def… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 7 08:28:26 2022 +0300 crypt32/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/crypt32/tests/base64.c | 59 ++++++++++++++-------------- dlls/crypt32/tests/cert.c | 92 ++++++++++++++++++++++---------------------- dlls/crypt32/tests/encode.c | 41 ++++++++++---------- dlls/crypt32/tests/message.c | 16 ++++---- dlls/crypt32/tests/msg.c | 4 +- dlls/crypt32/tests/oid.c | 4 +- dlls/crypt32/tests/store.c | 32 +++++++-------- 7 files changed, 123 insertions(+), 125 deletions(-)

1 0

Stefan Dösinger : ddraw/tests: Avoid picking a large mode on Win10 in find_different_mode_callback.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 1c5bfc120d157fd6486d243f4ce4cdce0e2dbde5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c5bfc120d157fd6486d243f4ce4cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 6 19:59:47 2022 +0300 ddraw/tests: Avoid picking a large mode on Win10 in find_different_mode_callback. --- dlls/ddraw/tests/ddraw1.c | 9 +++++++-- dlls/ddraw/tests/ddraw2.c | 13 +++++++++---- dlls/ddraw/tests/ddraw4.c | 13 +++++++++---- dlls/ddraw/tests/ddraw7.c | 13 +++++++++---- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 531b16520a1..7d2e93ece61 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14224,8 +14224,13 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height) { - param->new_width = surface_desc->dwWidth; - param->new_height = surface_desc->dwHeight; + /* See test_coop_level_mode_set_enum_cb() for why enumeration might accidentally continue. */ + if (!param->new_width || (param->new_width < registry_mode.dmPelsWidth + && param->new_height < registry_mode.dmPelsHeight)) + { + param->new_width = surface_desc->dwWidth; + param->new_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4c20a774b05..bc370396640 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15205,10 +15205,15 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { - param->new_width = surface_desc->dwWidth; - param->new_height = surface_desc->dwHeight; - param->new_frequency = surface_desc->dwRefreshRate; - param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + /* See test_coop_level_mode_set_enum_cb() for why enumeration might accidentally continue. */ + if (!param->new_width || (param->new_width < registry_mode.dmPelsWidth + && param->new_height < registry_mode.dmPelsHeight)) + { + param->new_width = surface_desc->dwWidth; + param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 10cf8f88fd6..de438982703 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18255,10 +18255,15 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { - param->new_width = surface_desc->dwWidth; - param->new_height = surface_desc->dwHeight; - param->new_frequency = surface_desc->dwRefreshRate; - param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + /* See test_coop_level_mode_set_enum_cb() for why enumeration might accidentally continue. */ + if (!param->new_width || (param->new_width < registry_mode.dmPelsWidth + && param->new_height < registry_mode.dmPelsHeight)) + { + param->new_width = surface_desc->dwWidth; + param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 062e8430a75..1d1ed1d15ac 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18522,10 +18522,15 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { - param->new_width = surface_desc->dwWidth; - param->new_height = surface_desc->dwHeight; - param->new_frequency = surface_desc->dwRefreshRate; - param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + /* See test_coop_level_mode_set_enum_cb() for why enumeration might accidentally continue. */ + if (!param->new_width || (param->new_width < registry_mode.dmPelsWidth + && param->new_height < registry_mode.dmPelsHeight)) + { + param->new_width = surface_desc->dwWidth; + param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + } return DDENUMRET_CANCEL; }

1 0

Stefan Dösinger : ddraw/tests: Avoid picking a large mode on Win10 in test_coop_level_mode_set_enum_cb.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: fc9f3bbfa5971ee5138e3067a6d5b7f952b4bdb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc9f3bbfa5971ee5138e3067a6d5b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 6 19:20:35 2022 +0300 ddraw/tests: Avoid picking a large mode on Win10 in test_coop_level_mode_set_enum_cb. --- dlls/ddraw/tests/ddraw1.c | 15 +++++++++++++-- dlls/ddraw/tests/ddraw2.c | 15 +++++++++++++-- dlls/ddraw/tests/ddraw4.c | 15 +++++++++++++-- dlls/ddraw/tests/ddraw7.c | 15 +++++++++++++-- 4 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 94d41dbc34d..531b16520a1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2874,8 +2874,19 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC *surface_ if (surface_desc->dwWidth == param->ddraw_width && surface_desc->dwHeight == param->ddraw_height) return DDENUMRET_OK; - param->user32_width = surface_desc->dwWidth; - param->user32_height = surface_desc->dwHeight; + /* The docs say the DDENUMRET_CANCEL below cancels the enumeration, so the check should be + * redundant. However, since Windows 10 this no longer works and the enumeration continues + * until all supported modes are enumerated. Win8 and earlier do cancel. + * + * Unrelatedly, some testbot machines report high res modes like 1920x1080, but suffer from + * some problems when we actually try to set them (w10pro64 and its localization siblings). + * Try to stay below the registry mode if possible. */ + if (!param->user32_width || (surface_desc->dwWidth < registry_mode.dmPelsWidth + && surface_desc->dwHeight < registry_mode.dmPelsHeight)) + { + param->user32_width = surface_desc->dwWidth; + param->user32_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d5b72793526..4c20a774b05 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2971,8 +2971,19 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC *surface_ if (surface_desc->dwWidth == param->ddraw_width && surface_desc->dwHeight == param->ddraw_height) return DDENUMRET_OK; - param->user32_width = surface_desc->dwWidth; - param->user32_height = surface_desc->dwHeight; + /* The docs say the DDENUMRET_CANCEL below cancels the enumeration, so the check should be + * redundant. However, since Windows 10 this no longer works and the enumeration continues + * until all supported modes are enumerated. Win8 and earlier do cancel. + * + * Unrelatedly, some testbot machines report high res modes like 1920x1080, but suffer from + * some problems when we actually try to set them (w10pro64 and its localization siblings). + * Try to stay below the registry mode if possible. */ + if (!param->user32_width || (surface_desc->dwWidth < registry_mode.dmPelsWidth + && surface_desc->dwHeight < registry_mode.dmPelsHeight)) + { + param->user32_width = surface_desc->dwWidth; + param->user32_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 471f6fc3f09..10cf8f88fd6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3209,8 +3209,19 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface if (surface_desc->dwWidth == param->ddraw_width && surface_desc->dwHeight == param->ddraw_height) return DDENUMRET_OK; - param->user32_width = surface_desc->dwWidth; - param->user32_height = surface_desc->dwHeight; + /* The docs say the DDENUMRET_CANCEL below cancels the enumeration, so the check should be + * redundant. However, since Windows 10 this no longer works and the enumeration continues + * until all supported modes are enumerated. Win8 and earlier do cancel. + * + * Unrelatedly, some testbot machines report high res modes like 1920x1080, but suffer from + * some problems when we actually try to set them (w10pro64 and its localization siblings). + * Try to stay below the registry mode if possible. */ + if (!param->user32_width || (surface_desc->dwWidth < registry_mode.dmPelsWidth + && surface_desc->dwHeight < registry_mode.dmPelsHeight)) + { + param->user32_width = surface_desc->dwWidth; + param->user32_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 15ab548ebc6..062e8430a75 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2860,8 +2860,19 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface if (surface_desc->dwWidth == param->ddraw_width && surface_desc->dwHeight == param->ddraw_height) return DDENUMRET_OK; - param->user32_width = surface_desc->dwWidth; - param->user32_height = surface_desc->dwHeight; + /* The docs say the DDENUMRET_CANCEL below cancels the enumeration, so the check should be + * redundant. However, since Windows 10 this no longer works and the enumeration continues + * until all supported modes are enumerated. Win8 and earlier do cancel. + * + * Unrelatedly, some testbot machines report high res modes like 1920x1080, but suffer from + * some problems when we actually try to set them (w10pro64 and its localization siblings). + * Try to stay below the registry mode if possible. */ + if (!param->user32_width || (surface_desc->dwWidth < registry_mode.dmPelsWidth + && surface_desc->dwHeight < registry_mode.dmPelsHeight)) + { + param->user32_width = surface_desc->dwWidth; + param->user32_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; }

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2022