April 2024 - Wine-Commits - list.winehq.org

Alexandre Julliard : rpcrt4: Leave some space on the stack for varargs when called from ARM64EC code.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: wine Branch: master Commit: 3c8fc4927d7253c06aeb7147da759a2f3d5ff171 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c8fc4927d7253c06aeb7147da759a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 19 14:52:03 2024 +0200 rpcrt4: Leave some space on the stack for varargs when called from ARM64EC code. --- dlls/rpcrt4/ndr_stubless.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index dc0ef58e280..cbb8b617912 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1017,14 +1017,14 @@ __ASM_GLOBAL_FUNC( NdrClientCall2, CLIENT_CALL_RETURN __attribute__((naked)) NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING fmt, ... ) { asm( ".seh_proc \"#NdrClientCall2\"\n\t" - "stp x29, x30, [sp, #-0x10]!\n\t" - ".seh_save_fplr_x 0x10\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" ".seh_endprologue\n\t" "stp x2, x3, [x4, #-0x10]!\n\t" "mov x2, x4\n\t" /* stack */ "mov x3, #0\n\t" /* fpu_stack */ "bl \"#NdrpClientCall2\"\n\t" - "ldp x29, x30, [sp], #0x10\n\t" + "ldp x29, x30, [sp], #0x20\n\t" "ret\n\t" ".seh_endproc" ); } @@ -1981,14 +1981,14 @@ __ASM_GLOBAL_FUNC( NdrAsyncClientCall, CLIENT_CALL_RETURN __attribute__((naked)) NdrAsyncClientCall( PMIDL_STUB_DESC desc, PFORMAT_STRING fmt, ... ) { asm( ".seh_proc \"#NdrAsyncClientCall\"\n\t" - "stp x29, x30, [sp, #-0x10]!\n\t" - ".seh_save_fplr_x 0x10\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" ".seh_endprologue\n\t" "stp x2, x3, [x4, #-0x10]!\n\t" "mov x2, x4\n\t" /* stack */ "mov x3, #0\n\t" /* fpu_stack */ "bl \"#ndr_async_client_call\"\n\t" - "ldp x29, x30, [sp], #0x10\n\t" + "ldp x29, x30, [sp], #0x20\n\t" "ret\n\t" ".seh_endproc" ); } @@ -2365,14 +2365,14 @@ __ASM_GLOBAL_FUNC( NdrClientCall3, CLIENT_CALL_RETURN __attribute__((naked)) NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ) { asm( ".seh_proc \"#NdrClientCall3\"\n\t" - "stp x29, x30, [sp, #-0x10]!\n\t" - ".seh_save_fplr_x 0x10\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" ".seh_endprologue\n\t" "str x3, [x4, #-0x8]!\n\t" "mov x3, x4\n\t" /* stack */ "mov x4, #0\n\t" /* fpu_stack */ "bl \"#ndr64_client_call\"\n\t" - "ldp x29, x30, [sp], #0x10\n\t" + "ldp x29, x30, [sp], #0x20\n\t" "ret\n\t" ".seh_endproc" ); } @@ -2437,14 +2437,14 @@ __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, CLIENT_CALL_RETURN __attribute__((naked)) Ndr64AsyncClientCall( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ) { asm( ".seh_proc \"#Ndr64AsyncClientCall\"\n\t" - "stp x29, x30, [sp, #-0x10]!\n\t" - ".seh_save_fplr_x 0x10\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" ".seh_endprologue\n\t" "str x3, [x4, #-0x8]!\n\t" "mov x3, x4\n\t" /* stack */ "mov x4, #0\n\t" /* fpu_stack */ "bl \"#ndr64_async_client_call\"\n\t" - "ldp x29, x30, [sp], #0x10\n\t" + "ldp x29, x30, [sp], #0x20\n\t" "ret\n\t" ".seh_endproc" ); }

1 0

Jacek Caban : ntdll: Use mangled function names in ARM64EC assembly.
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: b87589757b82b36a8a58ca26f6dcabb550826ceb URL: https://gitlab.winehq.org/wine/wine/-/commit/b87589757b82b36a8a58ca26f6dcab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 19:28:12 2024 +0100 ntdll: Use mangled function names in ARM64EC assembly. --- dlls/ntdll/signal_arm64ec.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index eef3f125732..e9e9b2a6bb3 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1752,7 +1752,7 @@ __ASM_GLOBAL_FUNC( "#KiUserExceptionDispatcher", ".seh_endprologue\n\t" "add x0, sp, #0x390\n\t" /* rec (context + 1) */ "mov x1, sp\n\t" /* context */ - "bl dispatch_exception_arm64ec\n\t" + "bl \"#dispatch_exception_arm64ec\"\n\t" "brk #1" ) @@ -1778,7 +1778,7 @@ __ASM_GLOBAL_FUNC( "#KiUserApcDispatcher", "ldp x2, x3, [sp, #0x10]\n\t" /* arg2, arg3 */ "ldr w4, [sp, #0x20]\n\t" /* alertable */ "add x5, sp, #0x30\n\t" /* context */ - "bl " __ASM_NAME("dispatch_apc") "\n\t" + "bl \"#dispatch_apc\"\n\t" "brk #1" ) @@ -1804,8 +1804,8 @@ __ASM_GLOBAL_FUNC( "#KiUserCallbackDispatcher", "mov x2, x0\n\t" /* status */ "mov x1, #0\n\t" /* ret_len */ "mov x0, x1\n\t" /* ret_ptr */ - "bl " __ASM_NAME("NtCallbackReturn") "\n\t" - "bl " __ASM_NAME("RtlRaiseStatus") "\n\t" + "bl \"#NtCallbackReturn\"\n\t" + "bl \"#RtlRaiseStatus\"\n\t" "brk #1" ) @@ -1853,7 +1853,7 @@ static void __attribute__((used)) capture_context( CONTEXT *context, UINT cpsr, */ void __attribute__((naked)) RtlCaptureContext( CONTEXT *context ) { - asm( ".seh_proc RtlCaptureContext\n\t" + asm( ".seh_proc \"#RtlCaptureContext\"\n\t" ".seh_endprologue\n\t" "stp x8, x0, [x0, #0x78]\n\t" /* context->Rax,Rcx */ "stp x1, x27, [x0, #0x88]\n\t" /* context->Rdx,Rbx */ @@ -1892,7 +1892,7 @@ void __attribute__((naked)) RtlCaptureContext( CONTEXT *context ) "mrs x1, nzcv\n\t" "mrs x2, fpcr\n\t" "mrs x3, fpsr\n\t" - "b capture_context\n\t" + "b \"#capture_context\"\n\t" ".seh_endproc" ); } @@ -1938,7 +1938,7 @@ static int __attribute__((used)) do_setjmpex( _JUMP_BUFFER *buf, UINT fpcr, UINT */ int __attribute__((naked)) NTDLL__setjmpex( _JUMP_BUFFER *buf, void *frame ) { - asm( ".seh_proc NTDLL__setjmpex\n\t" + asm( ".seh_proc \"#NTDLL__setjmpex\"\n\t" ".seh_endprologue\n\t" "stp x1, x27, [x0]\n\t" /* jmp_buf->Frame,Rbx */ "mov x1, sp\n\t" @@ -1953,7 +1953,7 @@ int __attribute__((naked)) NTDLL__setjmpex( _JUMP_BUFFER *buf, void *frame ) "stp d14, d15, [x0, #0xe0]\n\t" /* jmp_buf->Xmm14,Xmm15 */ "mrs x1, fpcr\n\t" "mrs x2, fpsr\n\t" - "b do_setjmpex\n\t" + "b \"#do_setjmpex\"\n\t" ".seh_endproc" ); } @@ -2306,7 +2306,7 @@ static void __attribute__((naked)) arm64x_check_call(void) "add x0, sp, #0x58\n\t" /* x9 = &target */ "mov x1, x10\n\t" /* x10 = exit_thunk */ "mov x2, x11\n\t" /* x11 = dest */ - "bl " __ASM_NAME("check_call") "\n\t" + "bl \"#check_call\"\n\t" "mov x11, x0\n\t" "ldp x0, x1, [sp, #0x10]\n\t" "ldp x2, x3, [sp, #0x20]\n\t" @@ -2384,7 +2384,7 @@ LONG __attribute__((naked)) __C_ExecuteExceptionFilter( EXCEPTION_POINTERS *ptrs */ void __attribute((naked)) RtlRaiseException( EXCEPTION_RECORD *rec ) { - asm( ".seh_proc RtlRaiseException\n\t" + asm( ".seh_proc \"#RtlRaiseException\"\n\t" "sub sp, sp, #0x4d0\n\t" /* sizeof(context) */ ".seh_stackalloc 0x4d0\n\t" "stp x29, x30, [sp, #-0x20]!\n\t" @@ -2393,7 +2393,7 @@ void __attribute((naked)) RtlRaiseException( EXCEPTION_RECORD *rec ) ".seh_save_any_reg x0, 0x10\n\t" ".seh_endprologue\n\t" "add x0, sp, #0x20\n\t" - "bl RtlCaptureContext\n\t" + "bl \"#RtlCaptureContext\"\n\t" "add x1, sp, #0x20\n\t" /* context pointer */ "ldr x0, [sp, #0x10]\n\t" /* rec */ "ldr x2, [x1, #0xf8]\n\t" /* context->Rip */ @@ -2404,10 +2404,10 @@ void __attribute((naked)) RtlRaiseException( EXCEPTION_RECORD *rec ) "ldr x3, [x18, #0x60]\n\t" /* peb */ "ldrb w2, [x3, #2]\n\t" /* peb->BeingDebugged */ "cbnz w2, 1f\n\t" - "bl dispatch_exception\n" + "bl \"#dispatch_exception\"\n" "1:\tmov w2, #1\n\t" - "bl NtRaiseException\n\t" - "b RtlRaiseStatus\n\t" /* does not return */ + "bl \"#NtRaiseException\"\n\t" + "b \"#RtlRaiseStatus\"\n\t" /* does not return */ ".seh_endproc" ); } @@ -2436,7 +2436,7 @@ void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) */ void __attribute__((naked)) RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) { - asm( ".seh_proc RtlUserThreadStart\n\t" + asm( ".seh_proc \"#RtlUserThreadStart\"\n\t" "stp x29, x30, [sp, #-16]!\n\t" ".seh_save_fplr_x 16\n\t" ".seh_endprologue\n\t" @@ -2500,7 +2500,7 @@ __ASM_GLOBAL_FUNC( "#process_breakpoint", */ void __attribute__((naked)) DbgUiRemoteBreakin( void *arg ) { - asm( ".seh_proc DbgUiRemoteBreakin\n\t" + asm( ".seh_proc \"#DbgUiRemoteBreakin\"\n\t" "stp x29, x30, [sp, #-16]!\n\t" ".seh_save_fplr_x 16\n\t" ".seh_endprologue\n\t" @@ -2508,9 +2508,9 @@ void __attribute__((naked)) DbgUiRemoteBreakin( void *arg ) "ldr x0, [x18, #0x60]\n\t" /* NtCurrentTeb()->Peb */ "ldrb w0, [x0, 0x02]\n\t" /* peb->BeingDebugged */ "cbz w0, 1f\n\t" - "bl DbgBreakPoint\n" + "bl \"#DbgBreakPoint\"\n" "1:\tmov w0, #0\n\t" - "bl RtlExitUserThread\n" + "bl \"#RtlExitUserThread\"\n" "DbgUiRemoteBreakin_handler:\n\t" "mov sp, x1\n\t" /* frame */ "b 1b\n\t" @@ -2523,7 +2523,7 @@ void __attribute__((naked)) DbgUiRemoteBreakin( void *arg ) */ void __attribute__((naked)) DbgBreakPoint(void) { - asm( ".seh_proc DbgBreakPoint\n\t" + asm( ".seh_proc \"#DbgBreakPoint\"\n\t" ".seh_endprologue\n\t" "brk #0xf000\n\t" "ret\n\t" @@ -2536,7 +2536,7 @@ void __attribute__((naked)) DbgBreakPoint(void) */ void __attribute__((naked)) DbgUserBreakPoint(void) { - asm( ".seh_proc DbgUserBreakPoint\n\t" + asm( ".seh_proc \"#DbgUserBreakPoint\"\n\t" ".seh_endprologue\n\t" "brk #0xf000\n\t" "ret\n\t"

1 0

Jinoh Kang : kernel32/tests: Document which fields may be overwritten later in gen_forward_chain_testdll().
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: d6e39da995097967082dcf6d87ec0cd4b4769dfc URL: https://gitlab.winehq.org/wine/wine/-/commit/d6e39da995097967082dcf6d87ec0c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Apr 17 23:22:52 2024 +0900 kernel32/tests: Document which fields may be overwritten later in gen_forward_chain_testdll(). Const correctness is helpful for figuring out which fields are mutable and which ones are intended to stay constant. --- dlls/kernel32/tests/loader.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ac2fa7779cc..8b332e479e6 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2450,14 +2450,17 @@ static HANDLE gen_forward_chain_testdll( char testdll_path[MAX_PATH], }; struct expdesc { - IMAGE_EXPORT_DIRECTORY dir; + const IMAGE_EXPORT_DIRECTORY dir; + DWORD functions[2]; - DWORD names[2]; - WORD name_ords[2]; - char str_forward_test_func[32]; - char str_forward_test_func2[32]; - char dll_name[MAX_PATH]; - char strpool[2][MAX_PATH + 16]; + + const DWORD names[2]; + const WORD name_ords[2]; + const char str_forward_test_func[32]; + const char str_forward_test_func2[32]; + + char dll_name[MAX_PATH]; /* dynamically populated */ + char strpool[2][MAX_PATH + 16]; /* for names of export forwarders */ } expdesc = { .dir = { .Characteristics = 0, @@ -2471,8 +2474,8 @@ static HANDLE gen_forward_chain_testdll( char testdll_path[MAX_PATH], .AddressOfNameOrdinals = edata_rva + offsetof(struct expdesc, name_ords), }, .functions = { - text_rva + 0x4, - text_rva + 0x8, + text_rva + 0x4, /* may be overwritten */ + text_rva + 0x8, /* may be overwritten */ }, .names = { edata_rva + offsetof(struct expdesc, str_forward_test_func), @@ -2487,11 +2490,12 @@ static HANDLE gen_forward_chain_testdll( char testdll_path[MAX_PATH], }; struct impdesc { - IMAGE_IMPORT_DESCRIPTOR descr[2]; - IMAGE_THUNK_DATA original_thunks[3]; - IMAGE_THUNK_DATA thunks[3]; - struct { WORD hint; char name[32]; } impname_forward_test_func; - char module[MAX_PATH]; + const IMAGE_IMPORT_DESCRIPTOR descr[2]; + const IMAGE_THUNK_DATA original_thunks[3]; + const IMAGE_THUNK_DATA thunks[3]; + const struct { WORD hint; char name[32]; } impname_forward_test_func; + + char module[MAX_PATH]; /* dynamically populated */ } impdesc = { .descr = { {

1 0

Jinoh Kang : kernel32/tests: Fix argument order in subtest_export_forwarder_dep_chain() calls.
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: c014ff7afe70055ee5abfcb0d01bc8144e7a3d6d URL: https://gitlab.winehq.org/wine/wine/-/commit/c014ff7afe70055ee5abfcb0d01bc8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Apr 17 23:21:48 2024 +0900 kernel32/tests: Fix argument order in subtest_export_forwarder_dep_chain() calls. The parameter types are (size_t, size_t, BOOL). Fixes: 4baada41a03ad577db3932334f48eda881a96f56 --- dlls/kernel32/tests/loader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 73cb6372f7f..ac2fa7779cc 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2821,23 +2821,23 @@ static void test_export_forwarder_dep_chain(void) { winetest_push_context( "no import" ); /* export forwarder does not introduce a dependency on its own */ - subtest_export_forwarder_dep_chain( 2, FALSE, 0 ); + subtest_export_forwarder_dep_chain( 2, 0, FALSE ); winetest_pop_context(); winetest_push_context( "static import of export forwarder" ); - subtest_export_forwarder_dep_chain( 2, TRUE, 0 ); + subtest_export_forwarder_dep_chain( 2, 0, TRUE ); winetest_pop_context(); winetest_push_context( "static import of chained export forwarder" ); - subtest_export_forwarder_dep_chain( 3, TRUE, 0 ); + subtest_export_forwarder_dep_chain( 3, 0, TRUE ); winetest_pop_context(); winetest_push_context( "dynamic import of export forwarder" ); - subtest_export_forwarder_dep_chain( 2, FALSE, 1 ); + subtest_export_forwarder_dep_chain( 2, 1, FALSE ); winetest_pop_context(); winetest_push_context( "dynamic import of chained export forwarder" ); - subtest_export_forwarder_dep_chain( 3, FALSE, 2 ); + subtest_export_forwarder_dep_chain( 3, 2, FALSE ); winetest_pop_context(); }

1 0

Tim Clem : winemac.drv: Hide app's dock icon when it wouldn't have a taskbar item on Windows.
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: f0efb2e46a7fb2a00f85196a4a06bd50eda560b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0efb2e46a7fb2a00f85196a4a06bd… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Feb 15 09:53:08 2024 -0800 winemac.drv: Hide app's dock icon when it wouldn't have a taskbar item on Windows. Hide the icon when an app has no visible windows, or when all of its visible windows would have no taskbar entry (i.e., they are owned or have WS_EX_TOOLWINDOW or WS_EX_NOACTIVATE, but not WS_EX_APPWINDOW). The dock icon returns if those conditions are no longer satisfied. This behavior is behind a Mac Driver registry key, EagerDockIconHiding (defaulting to true), to allow toggling it on a per-app or global basis. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 74 +++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 23 +++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/macdrv_main.c | 4 +++ dlls/winemac.drv/window.c | 8 +++++ 7 files changed, 112 insertions(+), 2 deletions(-)

1 0

Zhiyi Zhang : uxtheme/tests: Test that scrollbar parts should have very few #ffffff pixels.
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: ab091b28cb4bb3b654e673f3b0e2d648b42cc65e URL: https://gitlab.winehq.org/wine/wine/-/commit/ab091b28cb4bb3b654e673f3b0e2d6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 18 10:28:13 2024 +0800 uxtheme/tests: Test that scrollbar parts should have very few #ffffff pixels. --- dlls/uxtheme/tests/system.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 30c5fbce161..c2da0af7853 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2633,12 +2633,15 @@ static void test_GetThemeBackgroundRegion(void) DestroyWindow(hwnd); } -static void test_theme(void) +static void test_theme(BOOL v6) { + static const int scrollbar_width = 200, scrollbar_height = 50; + int x, y, white_count = 0, white_percent; BOOL transparent; HTHEME htheme; HRESULT hr; HWND hwnd; + HDC hdc; if (!IsThemeActive()) { @@ -2675,6 +2678,34 @@ static void test_theme(void) CloseThemeData(htheme); DestroyWindow(hwnd); + + /* Test that scrollbar parts should have very few #ffffff pixels */ + hwnd = CreateWindowA(WC_SCROLLBARA, "scrollbar", WS_POPUP | WS_VISIBLE, 0, 0, scrollbar_width, + scrollbar_height, 0, 0, 0, NULL); + ok(!!hwnd, "CreateWindowA failed, error %#lx.\n", GetLastError()); + flush_events(); + hdc = GetDC(hwnd); + + for (y = 0; y < scrollbar_height; y++) + { + for (x = 0; x < scrollbar_width; x++) + { + COLORREF color = GetPixel(hdc, x, y); + ok(color != CLR_INVALID, "GetPixel failed.\n"); + if (color == 0xffffff) + white_count++; + } + } + + white_percent = white_count * 100 / (scrollbar_width * scrollbar_height); + if (v6) + todo_wine + ok(white_percent < 4, "Expected #ffffff pixels less than 4%%.\n"); + else + ok(white_percent < 50, "Expected #ffffff pixels less than 50%%.\n"); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); } static void test_ShouldSystemUseDarkMode(void) @@ -2760,13 +2791,14 @@ START_TEST(system) test_DrawThemeParentBackground(); test_DrawThemeBackgroundEx(); test_GetThemeBackgroundRegion(); - test_theme(); + test_theme(FALSE); test_ShouldSystemUseDarkMode(); test_ShouldAppsUseDarkMode(); if (load_v6_module(&ctx_cookie, &ctx)) { test_EnableThemeDialogTexture(); + test_theme(TRUE); unload_v6_module(ctx_cookie, ctx); }

1 0

Zhiyi Zhang : light.msstyles: Use #fefefe instead of #ffffff for scrollbar parts.
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: 730b6c0162ad45bef59294f943c6ca2325d749d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/730b6c0162ad45bef59294f943c6ca… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 17 16:20:01 2024 +0800 light.msstyles: Use #fefefe instead of #ffffff for scrollbar parts. Fix Imperium: Greek Wars (1183470) launcher scrollbar largely drawn as transparent. The application sets a hardcoded #ffffff as the color key for transparency. On Windows, the scrollbar parts only have very few #ffffff pixels so the scrollbar is drawn as basically opaque. If a theme that have many 0xffffff pixels is being used, then the bug reproduces as well on Windows. I don't want to change the light theme style for this. So let's work around this by using #fefefe instead of #ffffff. This have little difference visually. Based on investigation done by Santino Mazza. --- dlls/light.msstyles/blue_scrollbar_arrows.bmp | Bin 17818 -> 17818 bytes dlls/light.msstyles/blue_scrollbar_arrows.svg | 12 ++++++------ .../blue_scrollbar_thumb_horizontal.bmp | Bin 5238 -> 5238 bytes .../blue_scrollbar_thumb_horizontal.svg | 4 ++-- .../blue_scrollbar_thumb_vertical.bmp | Bin 2998 -> 2998 bytes .../blue_scrollbar_thumb_vertical.svg | 4 ++-- dlls/uxtheme/tests/system.c | 1 - 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.bmp b/dlls/light.msstyles/blue_scrollbar_arrows.bmp index b877407fbf4..b39c6cb91c4 100644 Binary files a/dlls/light.msstyles/blue_scrollbar_arrows.bmp and b/dlls/light.msstyles/blue_scrollbar_arrows.bmp differ diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.svg b/dlls/light.msstyles/blue_scrollbar_arrows.svg index ed5587ba36a..c2e7093f481 100644 --- a/dlls/light.msstyles/blue_scrollbar_arrows.svg +++ b/dlls/light.msstyles/blue_scrollbar_arrows.svg @@ -8,9 +8,9 @@ </cc:Work> </rdf:RDF> </metadata> - <rect x="-1.875e-5" width="4.4979" height="89.959" fill="#fff"/> + <rect x="-1.875e-5" width="4.4979" height="89.959" fill="#fefefe"/> <g stroke-width=".26458"> - <g fill="#fff"> + <g fill="#fefefe"> <rect x=".13229" y=".13229" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> <g stroke="#3096fa"> <rect x=".13229" y="4.6302" width="4.2334" height="4.2333" rx=".52917" ry=".52917"/> @@ -21,24 +21,24 @@ </g> </g> <rect x=".13229" y="9.1281" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <g fill="#fff"> + <g fill="#fefefe"> <rect x=".13229" y="13.626" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> <rect x=".13229" y="18.124" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> <rect x=".13229" y="22.622" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> </g> <rect x=".13229" y="27.12" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <g fill="#fff"> + <g fill="#fefefe"> <rect x=".13229" y="31.618" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> <rect x=".13229" y="36.116" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> <rect x=".13229" y="40.614" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> </g> <rect x=".13229" y="45.111" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <g fill="#fff"> + <g fill="#fefefe"> <rect x=".13229" y="49.609" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> <rect x=".13229" y="54.107" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> <rect x=".13229" y="58.605" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> </g> <rect x=".13229" y="63.103" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <rect x=".13229" y="67.601" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="67.601" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fefefe" stroke="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp index 50a98885b3f..34ef504c929 100644 Binary files a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp and b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp differ diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg index c4c3adcffa3..d05b9b11b46 100644 --- a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg +++ b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg @@ -8,8 +8,8 @@ </cc:Work> </rdf:RDF> </metadata> - <g fill="#fff"> - <rect x="-7.0588e-5" width="5.2918" height="22.49" fill="#fff" stroke-width=".070005"/> + <g fill="#fefefe"> + <rect x="-7.0588e-5" width="5.2918" height="22.49" fill="#fefefe" stroke-width=".070005"/> <g stroke-width=".26458"> <rect x=".13229" y=".13229" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#aeaeae"/> <rect x=".13229" y="4.6302" width="5.0272" height="4.2333" rx=".52918" ry=".52918" stroke="#3096fa"/> diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp index 95fdd8d150c..e9d05452c94 100644 Binary files a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp and b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp differ diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg index d42f84082a2..61f0bde183c 100644 --- a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg +++ b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg @@ -8,8 +8,8 @@ </cc:Work> </rdf:RDF> </metadata> - <rect y="-.00012353" width="4.4979" height="14.552" fill="#fff" stroke-width=".26458"/> - <g fill="#fff" stroke-width=".26458"> + <rect y="-.00012353" width="4.4979" height="14.552" fill="#fefefe" stroke-width=".26458"/> + <g fill="#fefefe" stroke-width=".26458"> <rect transform="rotate(90)" x=".13229" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#aeaeae"/> <rect transform="rotate(90)" x="3.0426" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#3096fa"/> <rect transform="rotate(90)" x="11.774" y="-4.3656" width="2.6458" height="4.2333" rx=".52916" ry=".52916" stroke="#3096fa"/> diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c2da0af7853..9a6739e1c16 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2699,7 +2699,6 @@ static void test_theme(BOOL v6) white_percent = white_count * 100 / (scrollbar_width * scrollbar_height); if (v6) - todo_wine ok(white_percent < 4, "Expected #ffffff pixels less than 4%%.\n"); else ok(white_percent < 50, "Expected #ffffff pixels less than 50%%.\n");

1 0

Brendan Shanks : dxgi: Add IDXGISwapChain4 stubs for D3D11.
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: fbfc8df4bb0bedff6832c55a3db10f5e239d99af URL: https://gitlab.winehq.org/wine/wine/-/commit/fbfc8df4bb0bedff6832c55a3db10f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Apr 10 10:23:38 2024 -0700 dxgi: Add IDXGISwapChain4 stubs for D3D11. Microsoft Flight Simulator (2020) requires IDXGISwapChain4. --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 151 +++++++++++++++++++++++++---------------------- 3 files changed, 84 insertions(+), 71 deletions(-)

1 0

Brendan Shanks : dxgi: Add IDXGISwapChain3 stubs for D3D11.
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: 3c3bfbfde772a0c93f33ac3295b299d756c8e875 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c3bfbfde772a0c93f33ac3295b299… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Apr 10 10:19:15 2024 -0700 dxgi: Add IDXGISwapChain3 stubs for D3D11. --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 173 +++++++++++++++++++++++++++++------------------ dlls/dxgi/tests/dxgi.c | 4 +- 4 files changed, 112 insertions(+), 69 deletions(-)

1 0

Brendan Shanks : dxgi: Add IDXGISwapChain2 stubs for D3D11.
by Alexandre Julliard April 18, 2024

April 18, 2024

Module: wine Branch: master Commit: 3fdf97a22eafe6522f547835b8d5f49d12d1278d URL: https://gitlab.winehq.org/wine/wine/-/commit/3fdf97a22eafe6522f547835b8d5f4… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Apr 10 10:10:54 2024 -0700 dxgi: Add IDXGISwapChain2 stubs for D3D11. --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 178 ++++++++++++++++++++++++++++++++--------------- 3 files changed, 122 insertions(+), 60 deletions(-)

1 0