wine-commits June 2023

wine-commits@winehq.org

1 participants
633 discussions

Jinoh Kang : server: Update parent window region when exposing previously invisible window.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 078b0219aa4a3ead156e94b5d31202d58b0bb504 URL: https://gitlab.winehq.org/wine/wine/-/commit/078b0219aa4a3ead156e94b5d31202… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat May 20 23:20:36 2023 +0900 server: Update parent window region when exposing previously invisible window. Fixes: 33617af8145b6fadfe41d48968a728ff57b3064b Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54949 --- dlls/user32/tests/msg.c | 8 +------- server/window.c | 5 +++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5caf845d215..a7c1cf802e0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5793,7 +5793,7 @@ static void test_messages(void) test_WM_SETREDRAW(hchild); ShowWindow(hchild, SW_SHOW); - ok_sequence(WmShowChildSeq, "ShowWindow(SW_SHOW):child", TRUE); + ok_sequence(WmShowChildSeq, "ShowWindow(SW_SHOW):child", FALSE); /* check parent messages too */ log_all_parent_messages++; @@ -9467,12 +9467,10 @@ static void test_swp_paint_region_on_show(void) "GetUpdateRgn on child shall succeed\n" ); result = GetRgnBox( hrgn_actual, &rect_actual ); - todo_wine_if (result == NULLREGION) ok( result == SIMPLEREGION, "GetRgnBox (on parent) returned %d\n", result ); if (result == COMPLEXREGION) dump_region( hrgn_actual ); rect_expect = rect_1; - todo_wine_if (IsRectEmpty( &rect_actual )) ok( EqualRect( &rect_actual, &rect_expect ), "parent update region: got %s, expected %s\n", wine_dbgstr_rect( &rect_actual ), wine_dbgstr_rect( &rect_expect ) ); @@ -9506,12 +9504,10 @@ static void test_swp_paint_region_on_show(void) "GetUpdateRgn on child shall succeed\n" ); result = GetRgnBox( hrgn_actual, &rect_actual ); - todo_wine_if (result == NULLREGION) ok( result == SIMPLEREGION, "GetRgnBox (on parent) returned %d\n", result ); if (result == COMPLEXREGION) dump_region( hrgn_actual ); rect_expect = rect_2; - todo_wine_if (IsRectEmpty( &rect_actual )) ok( EqualRect( &rect_actual, &rect_expect ), "parent update region: got %s, expected %s\n", wine_dbgstr_rect( &rect_actual ), wine_dbgstr_rect( &rect_expect ) ); @@ -9565,12 +9561,10 @@ static void test_swp_paint_region_on_extend_zerosize(void) "GetUpdateRgn on child shall succeed\n" ); result = GetRgnBox( hrgn_actual, &rect_actual ); - todo_wine_if (result == NULLREGION) ok( result == SIMPLEREGION, "GetRgnBox (on parent) returned %d\n", result ); if (result == COMPLEXREGION) dump_region( hrgn_actual ); rect_expect = rect_1; - todo_wine_if (IsRectEmpty( &rect_actual )) ok( EqualRect( &rect_actual, &rect_expect ), "parent update region: got %s, expected %s\n", wine_dbgstr_rect( &rect_actual ), wine_dbgstr_rect( &rect_expect ) ); diff --git a/server/window.c b/server/window.c index f713ed224aa..01082b90b69 100644 --- a/server/window.c +++ b/server/window.c @@ -1766,8 +1766,9 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left, win->window_rect.top - old_window_rect->top ); - if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) - : subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) + if (is_region_empty( old_vis_rgn ) || + (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) + : subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ))) { if (!is_region_empty( new_vis_rgn )) {

1 0

Jinoh Kang : user32/tests: Test for update region after showing a child window.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: c368dfebbb451761d1354f23060c775e6fb02d74 URL: https://gitlab.winehq.org/wine/wine/-/commit/c368dfebbb451761d1354f23060c77… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat May 20 22:38:00 2023 +0900 user32/tests: Test for update region after showing a child window. --- dlls/user32/tests/msg.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 624d86899b3..5caf845d215 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9430,6 +9430,164 @@ static void test_swp_paint_regions(void) subtest_swp_paint_regions( 0, "SimpleWindowClassWithParentDC", "SimpleWindowClass" ); } +static void test_swp_paint_region_on_show(void) +{ + HRGN hrgn_actual_child = CreateRectRgn( 0, 0, 0, 0 ); + HRGN hrgn_actual = CreateRectRgn( 0, 0, 0, 0 ); + const RECT rect_1 = { 10, 10, 100, 100 }; + const RECT rect_2 = { 20, 20, 120, 120 }; + RECT rect_expect_child, rect_expect; + RECT rect_actual_child, rect_actual; + HWND hparent, hchild; + int result; + + hparent = CreateWindowExA( 0, "SimpleWindowClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 80, 80, 200, 200, NULL, 0, 0, NULL ); + ok( hparent != 0, "Creating parent window returned error %lu\n", GetLastError() ); + + hchild = CreateWindowExA( 0, "SimpleWindowClass", "Test child", WS_CHILD | WS_BORDER, + 0, 0, 100, 100, hparent, 0, 0, NULL ); + ok( hchild != 0, "Creating child window returned error %lu\n", GetLastError() ); + + if (winetest_debug > 1) trace("testing show window (no move / size)\n"); + + SetWindowPos( hchild, HWND_TOP, + rect_1.left, rect_1.top, rect_1.right - rect_1.left, rect_1.bottom - rect_1.top, + SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOZORDER ); + + UpdateWindow( hparent ); + flush_events(); + + SetWindowPos( hchild, HWND_TOP, 0, 0, 0, 0, + SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE ); + + ok( GetUpdateRgn( hparent, hrgn_actual, FALSE ) != ERROR, + "GetUpdateRgn on parent shall succeed\n" ); + ok( GetUpdateRgn( hchild, hrgn_actual_child, FALSE ) != ERROR, + "GetUpdateRgn on child shall succeed\n" ); + + result = GetRgnBox( hrgn_actual, &rect_actual ); + todo_wine_if (result == NULLREGION) + ok( result == SIMPLEREGION, "GetRgnBox (on parent) returned %d\n", result ); + if (result == COMPLEXREGION) dump_region( hrgn_actual ); + + rect_expect = rect_1; + todo_wine_if (IsRectEmpty( &rect_actual )) + ok( EqualRect( &rect_actual, &rect_expect ), "parent update region: got %s, expected %s\n", + wine_dbgstr_rect( &rect_actual ), wine_dbgstr_rect( &rect_expect ) ); + + result = GetRgnBox( hrgn_actual_child, &rect_actual_child ); + ok( result == SIMPLEREGION, "GetRgnBox (on child) returned %d\n", result ); + if (result == COMPLEXREGION) dump_region( hrgn_actual_child ); + + ok( GetClientRect( hchild, &rect_expect_child ), "GetClientRect failed\n" ); + ok( EqualRect( &rect_actual_child, &rect_expect_child ), "child update region: got %s, expected %s\n", + wine_dbgstr_rect( &rect_actual_child ), wine_dbgstr_rect( &rect_expect_child ) ); + + if (winetest_debug > 1) trace("testing show window (with move / resize)\n"); + + SetWindowPos( hchild, HWND_TOP, + rect_1.left, rect_1.top, rect_1.right - rect_1.left, rect_1.bottom - rect_1.top, + SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOZORDER ); + + UpdateWindow( hparent ); + flush_events(); + + SetWindowPos( hchild, HWND_TOP, + rect_2.left, + rect_2.top, + rect_2.right - rect_2.left, + rect_2.bottom - rect_2.top, + SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER ); + + ok( GetUpdateRgn( hparent, hrgn_actual, FALSE ) != ERROR, + "GetUpdateRgn on parent shall succeed\n" ); + ok( GetUpdateRgn( hchild, hrgn_actual_child, FALSE ) != ERROR, + "GetUpdateRgn on child shall succeed\n" ); + + result = GetRgnBox( hrgn_actual, &rect_actual ); + todo_wine_if (result == NULLREGION) + ok( result == SIMPLEREGION, "GetRgnBox (on parent) returned %d\n", result ); + if (result == COMPLEXREGION) dump_region( hrgn_actual ); + + rect_expect = rect_2; + todo_wine_if (IsRectEmpty( &rect_actual )) + ok( EqualRect( &rect_actual, &rect_expect ), "parent update region: got %s, expected %s\n", + wine_dbgstr_rect( &rect_actual ), wine_dbgstr_rect( &rect_expect ) ); + + result = GetRgnBox( hrgn_actual_child, &rect_actual_child ); + ok( result == SIMPLEREGION, "GetRgnBox (on child) returned %d\n", result ); + if (result == COMPLEXREGION) dump_region( hrgn_actual_child ); + + ok( GetClientRect( hchild, &rect_expect_child ), "GetClientRect failed\n" ); + ok( EqualRect( &rect_actual_child, &rect_expect_child ), "child update region: got %s, expected %s\n", + wine_dbgstr_rect( &rect_actual_child ), wine_dbgstr_rect( &rect_expect_child ) ); + + DestroyWindow( hchild ); + DestroyWindow( hparent ); + DeleteObject( hrgn_actual_child ); + DeleteObject( hrgn_actual ); +} + +static void test_swp_paint_region_on_extend_zerosize(void) +{ + HRGN hrgn_actual_child = CreateRectRgn( 0, 0, 0, 0 ); + HRGN hrgn_actual = CreateRectRgn( 0, 0, 0, 0 ); + const RECT rect_1 = { 10, 10, 100, 100 }; + RECT rect_expect_child, rect_expect; + RECT rect_actual_child, rect_actual; + HWND hparent, hchild; + int result; + + hparent = CreateWindowExA( 0, "SimpleWindowClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 80, 80, 200, 200, NULL, 0, 0, NULL ); + ok( hparent != 0, "Creating parent window returned error %lu\n", GetLastError() ); + + hchild = CreateWindowExA( 0, "SimpleWindowClass", "Test child (no border)", WS_CHILD | WS_VISIBLE, + 10, 10, 0, 0, hparent, 0, 0, NULL ); + ok( hchild != 0, "Creating child window returned error %lu\n", GetLastError() ); + + if (winetest_debug > 1) trace("testing extending zero-size window\n"); + + UpdateWindow( hparent ); + flush_events(); + + SetWindowPos( hchild, HWND_TOP, + rect_1.left, + rect_1.top, + rect_1.right - rect_1.left, + rect_1.bottom - rect_1.top, + SWP_NOACTIVATE | SWP_NOZORDER ); + + ok( GetUpdateRgn( hparent, hrgn_actual, FALSE ) != ERROR, + "GetUpdateRgn on parent shall succeed\n" ); + ok( GetUpdateRgn( hchild, hrgn_actual_child, FALSE ) != ERROR, + "GetUpdateRgn on child shall succeed\n" ); + + result = GetRgnBox( hrgn_actual, &rect_actual ); + todo_wine_if (result == NULLREGION) + ok( result == SIMPLEREGION, "GetRgnBox (on parent) returned %d\n", result ); + if (result == COMPLEXREGION) dump_region( hrgn_actual ); + + rect_expect = rect_1; + todo_wine_if (IsRectEmpty( &rect_actual )) + ok( EqualRect( &rect_actual, &rect_expect ), "parent update region: got %s, expected %s\n", + wine_dbgstr_rect( &rect_actual ), wine_dbgstr_rect( &rect_expect ) ); + + result = GetRgnBox( hrgn_actual_child, &rect_actual_child ); + ok( result == SIMPLEREGION, "GetRgnBox (on child) returned %d\n", result ); + if (result == COMPLEXREGION) dump_region( hrgn_actual_child ); + + ok( GetClientRect( hchild, &rect_expect_child ), "GetClientRect failed\n" ); + ok( EqualRect( &rect_actual_child, &rect_expect_child ), "child update region: got %s, expected %s\n", + wine_dbgstr_rect( &rect_actual_child ), wine_dbgstr_rect( &rect_expect_child ) ); + + DestroyWindow( hchild ); + DestroyWindow( hparent ); + DeleteObject( hrgn_actual_child ); + DeleteObject( hrgn_actual ); +} + static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) { static const struct movesize_test { @@ -19693,6 +19851,8 @@ START_TEST(msg) test_wmime_keydown_message(); test_paint_messages(); test_swp_paint_regions(); + test_swp_paint_region_on_show(); + test_swp_paint_region_on_extend_zerosize(); test_hvredraw(); test_interthread_messages(); test_message_conversion();

1 0

Eric Pouech : dbghelp: Reimplement EnumerateLoadedModules().
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: af7b97e780d7cd50fbde79c8b17706184f548185 URL: https://gitlab.winehq.org/wine/wine/-/commit/af7b97e780d7cd50fbde79c8b17706… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 16 20:21:09 2023 +0200 dbghelp: Reimplement EnumerateLoadedModules(). - correctly taking into accoung SYMOPT_INCLUDE_32BIT_MODULES option - converting, for 32bit modules requested from a 64bit module, the system32 paths into syswow64 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/Makefile.in | 2 +- dlls/dbghelp/module.c | 139 +++++++++++++++++++++++++++++++------------ dlls/dbghelp/tests/dbghelp.c | 35 ----------- 3 files changed, 103 insertions(+), 73 deletions(-)

1 0

Eric Pouech : dbghelp/tests: Add more tests for module imagename handling.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 79bae0ed374eb8ae9c196b6d786ced21d6452d79 URL: https://gitlab.winehq.org/wine/wine/-/commit/79bae0ed374eb8ae9c196b6d786ced… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 16 20:21:09 2023 +0200 dbghelp/tests: Add more tests for module imagename handling. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 493 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 493 insertions(+)

1 0

Eric Pouech : dbghelp/tests: Review old-wow64 expected values.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: ed532a36b313fae15bb8b8b8367a73b93291eea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed532a36b313fae15bb8b8b8367a73… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 16 20:21:09 2023 +0200 dbghelp/tests: Review old-wow64 expected values. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 75 +++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index f45516c2882..cec462ee2f0 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -764,16 +764,34 @@ static void test_loaded_modules(void) ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); - todo_wine - ok(aggregation.count_32bit == 1 && aggregation.count_64bit, "Wrong bitness aggregation count %u %u\n", - aggregation.count_32bit, aggregation.count_64bit); - ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 1, "Wrong kind aggregation count %u %u\n", - aggregation.count_exe, aggregation.count_ntdll); - todo_wine - ok(aggregation.count_systemdir > 2 && aggregation.count_64bit == aggregation.count_systemdir && aggregation.count_wowdir == 1, - "Wrong directory aggregation count %u %u\n", - aggregation.count_systemdir, aggregation.count_wowdir); - + switch (get_process_kind(pi.hProcess)) + { + default: + ok(0, "Unknown process kind\n"); + break; + case PCSKIND_WINE_OLD_WOW64: + todo_wine + ok(aggregation.count_32bit == 1 && !aggregation.count_64bit, "Wrong bitness aggregation count %u %u\n", + aggregation.count_32bit, aggregation.count_64bit); + todo_wine + ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 0, "Wrong kind aggregation count %u %u\n", + aggregation.count_exe, aggregation.count_ntdll); + todo_wine + ok(aggregation.count_systemdir == 0 && aggregation.count_wowdir == 1, + "Wrong directory aggregation count %u %u\n", + aggregation.count_systemdir, aggregation.count_wowdir); + break; + case PCSKIND_WOW64: + todo_wine + ok(aggregation.count_32bit == 1 && aggregation.count_64bit, "Wrong bitness aggregation count %u %u\n", + aggregation.count_32bit, aggregation.count_64bit); + ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 1, "Wrong kind aggregation count %u %u\n", + aggregation.count_exe, aggregation.count_ntdll); + todo_wine + ok(aggregation.count_systemdir > 2 && aggregation.count_64bit == aggregation.count_systemdir && aggregation.count_wowdir == 1, + "Wrong directory aggregation count %u %u\n", + aggregation.count_systemdir, aggregation.count_wowdir); + } ret = SymRefreshModuleList(pi.hProcess); ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); @@ -805,15 +823,34 @@ static void test_loaded_modules(void) ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation2); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); - ok(aggregation2.count_32bit && aggregation2.count_64bit, "Wrong bitness aggregation count %u %u\n", - aggregation2.count_32bit, aggregation2.count_64bit); - todo_wine - ok(aggregation2.count_exe == 2 && aggregation2.count_ntdll == 2, "Wrong kind aggregation count %u %u\n", - aggregation2.count_exe, aggregation2.count_ntdll); - todo_wine - ok(aggregation2.count_systemdir > 2 && aggregation2.count_64bit == aggregation2.count_systemdir && aggregation2.count_wowdir > 2, - "Wrong directory aggregation count %u %u\n", - aggregation2.count_systemdir, aggregation2.count_wowdir); + switch (get_process_kind(pi.hProcess)) + { + case PCSKIND_ERROR: + break; + case PCSKIND_WINE_OLD_WOW64: + todo_wine + ok(aggregation2.count_32bit && !aggregation2.count_64bit, "Wrong bitness aggregation count %u %u\n", + aggregation2.count_32bit, aggregation2.count_64bit); + todo_wine + ok(aggregation2.count_exe == 2 && aggregation2.count_ntdll == 1, "Wrong kind aggregation count %u %u\n", + aggregation2.count_exe, aggregation2.count_ntdll); + todo_wine + ok(aggregation2.count_systemdir == 0 && aggregation2.count_32bit == aggregation2.count_wowdir + 1 && aggregation2.count_wowdir > 2, + "Wrong directory aggregation count %u %u\n", + aggregation2.count_systemdir, aggregation2.count_wowdir); + break; + default: + ok(aggregation2.count_32bit && aggregation2.count_64bit, "Wrong bitness aggregation count %u %u\n", + aggregation2.count_32bit, aggregation2.count_64bit); + todo_wine + ok(aggregation2.count_exe == 2 && aggregation2.count_ntdll == 2, "Wrong kind aggregation count %u %u\n", + aggregation2.count_exe, aggregation2.count_ntdll); + todo_wine + ok(aggregation2.count_systemdir > 2 && aggregation2.count_64bit == aggregation2.count_systemdir && aggregation2.count_wowdir > 2, + "Wrong directory aggregation count %u %u\n", + aggregation2.count_systemdir, aggregation2.count_wowdir); + break; + } ret = SymRefreshModuleList(pi.hProcess); ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError());

1 0

Eric Pouech : dbghelp/tests: Fix process kind detection on old Windows machines.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 76d922983d1f9eb12da1576ca6706ca7f4914eab URL: https://gitlab.winehq.org/wine/wine/-/commit/76d922983d1f9eb12da1576ca6706c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue May 16 20:21:09 2023 +0200 dbghelp/tests: Fix process kind detection on old Windows machines. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 276faf0101a..f45516c2882 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -571,12 +571,14 @@ static enum process_kind get_process_kind_internal(HANDLE process) { USHORT m1, m2; - if (!pIsWow64Process2) + if (!pIsWow64Process2) /* only happens on old Win 8 and early win 1064v1507 */ { BOOL is_wow64; - return is_win64 ? PCSKIND_64BIT : - IsWow64Process(process, &is_wow64) && is_wow64 ? PCSKIND_WOW64 : - PCSKIND_32BIT; + + if (!strcmp(winetest_platform, "wine") || !IsWow64Process(process, &is_wow64)) + return PCSKIND_ERROR; + if (is_wow64) return PCSKIND_WOW64; + return is_win64 ? PCSKIND_64BIT : PCSKIND_32BIT; } if (!pIsWow64Process2(process, &m1, &m2)) return PCSKIND_ERROR; if (m1 == IMAGE_FILE_MACHINE_UNKNOWN && get_machine_bitness(m2) == 32) return PCSKIND_32BIT;

1 0

Alexandre Julliard : ntdll: Use the default ABI for all functions on the Unix side.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: b337c5b1a1757b2abbc90a7c6955d64242861ab9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b337c5b1a1757b2abbc90a7c6955d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 09:35:29 2023 +0200 ntdll: Use the default ABI for all functions on the Unix side. --- dlls/ntdll/unix/signal_x86_64.c | 31 ++++++++++++++++++++++++------- include/msvcrt/corecrt.h | 4 ++++ include/windef.h | 6 +++++- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a1ee73fe5fb..48443799ef6 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2694,10 +2694,12 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "leaq -0x98(%rbp),%rcx\n" "2:\n\t" #endif - "leaq 0x28(%rsp),%rsi\n\t" /* first argument */ + "movq 0x28(%rsp),%r12\n\t" /* 5th argument */ + "movq 0x30(%rsp),%r13\n\t" /* 6th argument */ + "leaq 0x38(%rsp),%rsi\n\t" /* 7th argument */ "movq %rcx,%rsp\n\t" "movq 0x00(%rcx),%rax\n\t" - "movq 0x18(%rcx),%rdx\n\t" + "movq 0x18(%rcx),%r11\n\t" /* 2nd argument */ "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ @@ -2708,7 +2710,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "jae 5f\n\t" "movq 24(%rbx),%rcx\n\t" /* table->ArgumentTable */ "movzbl (%rcx,%rax),%ecx\n\t" - "subq $0x20,%rcx\n\t" + "subq $0x30,%rcx\n\t" "jbe 1f\n\t" "subq %rcx,%rsp\n\t" "shrq $3,%rcx\n\t" @@ -2716,8 +2718,12 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq %rsp,%rdi\n\t" "cld\n\t" "rep; movsq\n" - "1:\tmovq %r10,%rcx\n\t" - "subq $0x20,%rsp\n\t" + "1:\tmovq %r10,%rdi\n\t" /* 1st argument */ + "movq %r11,%rsi\n\t" /* 2nd argument */ + "movq %r8,%rdx\n\t" /* 3rd argument */ + "movq %r9,%rcx\n\t" /* 4th argument */ + "movq %r12,%r8\n\t" /* 5th argument */ + "movq %r13,%r9\n\t" /* 6th argument */ "movq (%rbx),%r10\n\t" /* table->ServiceTable */ "callq *(%r10,%rax,8)\n\t" "leaq -0x98(%rbp),%rcx\n\t" @@ -2732,8 +2738,19 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "1:\n\t" #endif "testl $0x48,%edx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ - "jz 4f\n\t" - "testl $3,%r14d\n\t" /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */ + "jnz 2f\n\t" + "movaps 0x1c0(%rcx),%xmm6\n\t" + "movaps 0x1d0(%rcx),%xmm7\n\t" + "movaps 0x1e0(%rcx),%xmm8\n\t" + "movaps 0x1f0(%rcx),%xmm9\n\t" + "movaps 0x200(%rcx),%xmm10\n\t" + "movaps 0x210(%rcx),%xmm11\n\t" + "movaps 0x220(%rcx),%xmm12\n\t" + "movaps 0x230(%rcx),%xmm13\n\t" + "movaps 0x240(%rcx),%xmm14\n\t" + "movaps 0x250(%rcx),%xmm15\n\t" + "jmp 4f\n" + "2:\ttestl $3,%r14d\n\t" /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */ "jz 3f\n\t" "movq %rax,%r11\n\t" "movl $7,%eax\n\t" diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 02f3c2f8a09..9ad707824ff 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -29,6 +29,10 @@ # error You cannot use config.h with msvcrt #endif +#ifdef WINE_UNIX_LIB +# error msvcrt headers cannot be used in Unix code +#endif + #ifndef _WIN32 # define _WIN32 #endif diff --git a/include/windef.h b/include/windef.h index 827e9f92a26..28aa7d6a237 100644 --- a/include/windef.h +++ b/include/windef.h @@ -54,7 +54,11 @@ extern "C" { # endif #endif -#if !defined(_MSC_VER) && !defined(__MINGW32__) +#ifdef WINE_UNIX_LIB +# define __stdcall +# define __cdecl +# define __fastcall +#elif !defined(_MSC_VER) && !defined(__MINGW32__) # undef __stdcall # ifdef __i386__ # ifdef __GNUC__

1 0

Alexandre Julliard : ntdll: Use the sysv ABI for setjmp/longjmp on the Unix side.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 48537f4e1edaf14404e4567cbaedf21bc06a3767 URL: https://gitlab.winehq.org/wine/wine/-/commit/48537f4e1edaf14404e4567cbaedf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 09:35:10 2023 +0200 ntdll: Use the sysv ABI for setjmp/longjmp on the Unix side. --- dlls/ntdll/unix/signal_x86_64.c | 72 ++++++++++++++--------------------------- include/wine/unixlib.h | 4 +-- 2 files changed, 26 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 87ecec252e7..a1ee73fe5fb 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1853,8 +1853,8 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, if (ntdll_get_thread_data()->jmp_buf) { TRACE_(seh)( "returning to handler\n" ); - RCX_sig(sigcontext) = (ULONG_PTR)ntdll_get_thread_data()->jmp_buf; - RDX_sig(sigcontext) = 1; + RDI_sig(sigcontext) = (ULONG_PTR)ntdll_get_thread_data()->jmp_buf; + RSI_sig(sigcontext) = 1; RIP_sig(sigcontext) = (ULONG_PTR)__wine_longjmp; ntdll_get_thread_data()->jmp_buf = NULL; } @@ -2921,31 +2921,19 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, * __wine_setjmpex */ __ASM_GLOBAL_FUNC( __wine_setjmpex, - "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ - "movq %rbx,0x8(%rcx)\n\t" /* jmp_buf->Rbx */ + "movq %rsi,(%rdi)\n\t" /* jmp_buf->Frame */ + "movq %rbx,0x8(%rdi)\n\t" /* jmp_buf->Rbx */ "leaq 0x8(%rsp),%rax\n\t" - "movq %rax,0x10(%rcx)\n\t" /* jmp_buf->Rsp */ - "movq %rbp,0x18(%rcx)\n\t" /* jmp_buf->Rbp */ - "movq %rsi,0x20(%rcx)\n\t" /* jmp_buf->Rsi */ - "movq %rdi,0x28(%rcx)\n\t" /* jmp_buf->Rdi */ - "movq %r12,0x30(%rcx)\n\t" /* jmp_buf->R12 */ - "movq %r13,0x38(%rcx)\n\t" /* jmp_buf->R13 */ - "movq %r14,0x40(%rcx)\n\t" /* jmp_buf->R14 */ - "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ + "movq %rax,0x10(%rdi)\n\t" /* jmp_buf->Rsp */ + "movq %rbp,0x18(%rdi)\n\t" /* jmp_buf->Rbp */ + "movq %r12,0x30(%rdi)\n\t" /* jmp_buf->R12 */ + "movq %r13,0x38(%rdi)\n\t" /* jmp_buf->R13 */ + "movq %r14,0x40(%rdi)\n\t" /* jmp_buf->R14 */ + "movq %r15,0x48(%rdi)\n\t" /* jmp_buf->R15 */ "movq (%rsp),%rax\n\t" - "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ - "stmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ - "fnstcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ - "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ - "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ - "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ - "movdqa %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ - "movdqa %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ - "movdqa %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ - "movdqa %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ - "movdqa %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ - "movdqa %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ - "movdqa %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ + "movq %rax,0x50(%rdi)\n\t" /* jmp_buf->Rip */ + "stmxcsr 0x58(%rdi)\n\t" /* jmp_buf->MxCsr */ + "fnstcw 0x5c(%rdi)\n\t" /* jmp_buf->FpCsr */ "xorq %rax,%rax\n\t" "retq" ) @@ -2954,30 +2942,18 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex, * __wine_longjmp */ __ASM_GLOBAL_FUNC( __wine_longjmp, - "movq %rdx,%rax\n\t" /* retval */ - "movq 0x8(%rcx),%rbx\n\t" /* jmp_buf->Rbx */ - "movq 0x18(%rcx),%rbp\n\t" /* jmp_buf->Rbp */ - "movq 0x20(%rcx),%rsi\n\t" /* jmp_buf->Rsi */ - "movq 0x28(%rcx),%rdi\n\t" /* jmp_buf->Rdi */ - "movq 0x30(%rcx),%r12\n\t" /* jmp_buf->R12 */ - "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ - "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ - "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ - "ldmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "movq %rsi,%rax\n\t" /* retval */ + "movq 0x8(%rdi),%rbx\n\t" /* jmp_buf->Rbx */ + "movq 0x18(%rdi),%rbp\n\t" /* jmp_buf->Rbp */ + "movq 0x30(%rdi),%r12\n\t" /* jmp_buf->R12 */ + "movq 0x38(%rdi),%r13\n\t" /* jmp_buf->R13 */ + "movq 0x40(%rdi),%r14\n\t" /* jmp_buf->R14 */ + "movq 0x48(%rdi),%r15\n\t" /* jmp_buf->R15 */ + "ldmxcsr 0x58(%rdi)\n\t" /* jmp_buf->MxCsr */ "fnclex\n\t" - "fldcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ - "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ - "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ - "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ - "movdqa 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ - "movdqa 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ - "movdqa 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ - "movdqa 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ - "movdqa 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ - "movdqa 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ - "movdqa 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ - "movq 0x50(%rcx),%rdx\n\t" /* jmp_buf->Rip */ - "movq 0x10(%rcx),%rsp\n\t" /* jmp_buf->Rsp */ + "fldcw 0x5c(%rdi)\n\t" /* jmp_buf->FpCsr */ + "movq 0x50(%rdi),%rdx\n\t" /* jmp_buf->Rip */ + "movq 0x10(%rdi),%rsp\n\t" /* jmp_buf->Rsp */ "jmp *%rdx" ) #endif /* __x86_64__ */ diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index aa97e7d0843..f853f1c6a31 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -52,9 +52,9 @@ typedef struct { __int64 reg[24]; } __wine_jmp_buf; typedef struct { int reg; } __wine_jmp_buf; #endif -extern int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, +extern int __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, EXCEPTION_REGISTRATION_RECORD *frame ); -extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ); +extern void DECLSPEC_NORETURN __wine_longjmp( __wine_jmp_buf *buf, int retval ); extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); #define __TRY \

1 0

Alexandre Julliard : ntdll: Use the sysv ABI for the %fs allocation function.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: e2fac05854736e1d2b2a353af0f1382b7eda4fad URL: https://gitlab.winehq.org/wine/wine/-/commit/e2fac05854736e1d2b2a353af0f138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 09:32:59 2023 +0200 ntdll: Use the sysv ABI for the %fs allocation function. --- dlls/ntdll/unix/signal_x86_64.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 508a3a5b323..87ecec252e7 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -88,17 +88,17 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } -extern int CDECL alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; +extern int alloc_fs_sel( int sel, void *base ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( alloc_fs_sel, /* switch to 32-bit stack */ "pushq %rbx\n\t" - "pushq %rdi\n\t" - "movq %rsp,%rdi\n\t" - "movl 0x4(%rdx),%esp\n\t" /* Tib.StackBase */ + "pushq %r12\n\t" + "movq %rsp,%r12\n\t" + "movl 0x4(%rsi),%esp\n\t" /* Tib.StackBase */ "subl $0x20,%esp\n\t" /* setup modify_ldt struct on 32-bit stack */ - "movl %ecx,(%rsp)\n\t" /* entry_number */ - "movl %edx,4(%rsp)\n\t" /* base */ + "movl %edi,(%rsp)\n\t" /* entry_number */ + "movl %esi,4(%rsp)\n\t" /* base */ "movl $~0,8(%rsp)\n\t" /* limit */ "movl $0x41,12(%rsp)\n\t" /* seg_32bit | usable */ /* invoke 32-bit syscall */ @@ -107,8 +107,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, "int $0x80\n\t" /* restore stack */ "movl (%rsp),%eax\n\t" /* entry_number */ - "movq %rdi,%rsp\n\t" - "popq %rdi\n\t" + "movq %r12,%rsp\n\t" + "popq %r12\n\t" "popq %rbx\n\t" "ret" );

1 0

Zebediah Figura : winebuild: Use the lretw mnemonic in wine_call_to_16().
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 6bcfab4ca66350a2f603218f12d76f3b99e752dc URL: https://gitlab.winehq.org/wine/wine/-/commit/6bcfab4ca66350a2f603218f12d76f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 18 01:02:00 2023 -0500 winebuild: Use the lretw mnemonic in wine_call_to_16(). We already use it in the __wine_spec_callfrom16_* functions. --- tools/winebuild/relay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index c14a3a70b17..d06be8fc371 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -519,8 +519,7 @@ static void BuildCallTo16Core( int reg_func ) } /* Jump to the called routine */ - output( "\t.byte 0x66\n" ); - output( "\tlret\n" ); + output( "\tlretw\n" ); /* Function footer */ output_function_size( func_name );

1 0

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 June 2023