June 2023 - Wine-Commits - list.winehq.org

Jinoh Kang : server: Update parent window region when exposing previously invisible window.
by Alexandre Julliard June 2, 2023

June 2, 2023

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

Alex Henrie : iphlpapi/tests: Use ~0u instead of ~0ul in testGetIpNetTable.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 75de502ba4861b03e98714f1bebcb41adadb51d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/75de502ba4861b03e98714f1bebcb4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 2 09:43:27 2023 -0600 iphlpapi/tests: Use ~0u instead of ~0ul in testGetIpNetTable. Fixes warnings on GCC 13. --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 8002afc0a89..b9ca9e569b3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -419,12 +419,12 @@ static void testGetIpNetTable(void) } igmp3_found = ssdp_found = FALSE; - prev_idx = ~0ul; + prev_idx = ~0u; for (i = 0; i < buf->dwNumEntries; ++i) { if (buf->table[i].dwIndex != prev_idx) { - if (prev_idx != ~0ul) + if (prev_idx != ~0u) { ok( igmp3_found, "%s not found, iface index %lu.\n", ntoa( igmp3_addr ), prev_idx); ok( ssdp_found || broken(!ssdp_found) /* 239.255.255.250 is always present since Win10 */,

1 0

Eric Pouech : dbghelp: Reimplement EnumerateLoadedModules().
by Alexandre Julliard June 2, 2023

June 2, 2023

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: Review old-wow64 expected values.
by Alexandre Julliard June 2, 2023

June 2, 2023

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

June 2, 2023

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

June 2, 2023

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

Eric Pouech : dbghelp/tests: Add more tests for module imagename handling.
by Alexandre Julliard June 2, 2023

June 2, 2023

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

Zebediah Figura : winebuild: Use the lretw mnemonic in wine_call_to_16().
by Alexandre Julliard June 2, 2023

June 2, 2023

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

Zebediah Figura : winebuild: Use segment prefixes in 16-bit stack switching code instead of writing out byte values.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 63a6f01a7092bbdefea49eec7046c4182b5f6c67 URL: https://gitlab.winehq.org/wine/wine/-/commit/63a6f01a7092bbdefea49eec7046c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 18 01:00:16 2023 -0500 winebuild: Use segment prefixes in 16-bit stack switching code instead of writing out byte values. Presumably at one point there were assemblers that choked on these. However, currently we use segment prefixes elsewhere in wine (namely, in the syscall dispatcher), and it seems fair to assume that a sane compiler should support them. --- tools/winebuild/relay.c | 60 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index b86a88aae24..c14a3a70b17 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -134,10 +134,10 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) { output( "\tcall 1f\n" ); output( "1:\tpopl %%ecx\n" ); - output( "\t.byte 0x2e\n\tmovl %s-1b(%%ecx),%%edx\n", asm_name("CallTo16_DataSelector") ); + output( "\tmovl %%cs:%s-1b(%%ecx),%%edx\n", asm_name("CallTo16_DataSelector") ); } else - output( "\t.byte 0x2e\n\tmovl %s,%%edx\n", asm_name("CallTo16_DataSelector") ); + output( "\tmovl %%cs:%s,%%edx\n", asm_name("CallTo16_DataSelector") ); /* Load 32-bit segment registers */ output( "\tmovw %%dx, %%ds\n" ); @@ -148,7 +148,7 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) else output( "\tmovw %s, %%fs\n", asm_name("CallTo16_TebSelector") ); - output( "\t.byte 0x64\n\tmov (%d),%%gs\n", GS_OFFSET ); + output( "\tmov %%fs:(%d),%%gs\n", GS_OFFSET ); /* Translate STACK16FRAME base to flat offset in %edx */ output( "\tmovw %%ss, %%dx\n" ); @@ -166,12 +166,12 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) if (reg_func) output( "\tpopl %%ecx\n" ); /* Get the 32-bit stack pointer from the TEB and complete STACK16FRAME */ - output( "\t.byte 0x64\n\tmovl (%d), %%ebp\n", STACKOFFSET ); + output( "\tmovl %%fs:(%d), %%ebp\n", STACKOFFSET ); output( "\tpushl %%ebp\n" ); /* Switch stacks */ - output( "\t.byte 0x64\n\tmovw %%ss, (%d)\n", STACKOFFSET + 2 ); - output( "\t.byte 0x64\n\tmovw %%sp, (%d)\n", STACKOFFSET ); + output( "\tmovw %%ss, %%fs:(%d)\n", STACKOFFSET + 2 ); + output( "\tmovw %%sp, %%fs:(%d)\n", STACKOFFSET ); output( "\tpushl %%ds\n" ); output( "\tpopl %%ss\n" ); output( "\tmovl %%ebp, %%esp\n" ); @@ -198,9 +198,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tcall *0x26(%%edx)\n"); /* FIELD_OFFSET(STACK16FRAME,entry_point) */ /* Switch stack back */ - output( "\t.byte 0x64\n\tmovw (%d), %%ss\n", STACKOFFSET+2 ); - output( "\t.byte 0x64\n\tmovzwl (%d), %%esp\n", STACKOFFSET ); - output( "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET ); + output( "\tmovw %%fs:(%d), %%ss\n", STACKOFFSET+2 ); + output( "\tmovzwl %%fs:(%d), %%esp\n", STACKOFFSET ); + output( "\tpopl %%fs:(%d)\n", STACKOFFSET ); /* Restore registers and return directly to caller */ output( "\taddl $8, %%esp\n" ); @@ -257,9 +257,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tmovzwl 0x2c(%%edx),%%eax\n"); /* FIELD_OFFSET(STACK16FRAME,ip) */ output( "\tmovl %%eax,0xb8(%%esp)\n" ); /* Eip */ - output( "\t.byte 0x64\n\tmovzwl (%d), %%eax\n", STACKOFFSET+2 ); + output( "\tmovzwl %%fs:(%d), %%eax\n", STACKOFFSET+2 ); output( "\tmovl %%eax,0xc8(%%esp)\n" ); /* SegSs */ - output( "\t.byte 0x64\n\tmovzwl (%d), %%eax\n", STACKOFFSET ); + output( "\tmovzwl %%fs:(%d), %%eax\n", STACKOFFSET ); output( "\taddl $0x2c,%%eax\n"); /* FIELD_OFFSET(STACK16FRAME,ip) */ output( "\tmovl %%eax,0xc4(%%esp)\n" ); /* Esp */ #if 0 @@ -290,9 +290,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tleal -748(%%ebp),%%ebx\n" ); /* sizeof(CONTEXT) + FIELD_OFFSET(STACK32FRAME,ebp) */ /* Switch stack back */ - output( "\t.byte 0x64\n\tmovw (%d), %%ss\n", STACKOFFSET+2 ); - output( "\t.byte 0x64\n\tmovzwl (%d), %%esp\n", STACKOFFSET ); - output( "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET ); + output( "\tmovw %%fs:(%d), %%ss\n", STACKOFFSET+2 ); + output( "\tmovzwl %%fs:(%d), %%esp\n", STACKOFFSET ); + output( "\tpopl %%fs:(%d)\n", STACKOFFSET ); /* Get return address to CallFrom16 stub */ output( "\taddw $0x14,%%sp\n" ); /* FIELD_OFFSET(STACK16FRAME,callfrom_ip)-4 */ @@ -335,9 +335,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) else { /* Switch stack back */ - output( "\t.byte 0x64\n\tmovw (%d), %%ss\n", STACKOFFSET+2 ); - output( "\t.byte 0x64\n\tmovzwl (%d), %%esp\n", STACKOFFSET ); - output( "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET ); + output( "\tmovw %%fs:(%d), %%ss\n", STACKOFFSET+2 ); + output( "\tmovzwl %%fs:(%d), %%esp\n", STACKOFFSET ); + output( "\tpopl %%fs:(%d)\n", STACKOFFSET ); /* Restore registers */ output( "\tpopl %%edx\n" ); @@ -398,22 +398,22 @@ static void BuildCallTo16Core( int reg_func ) output_cfi( ".cfi_rel_offset %%esi,-8" ); output( "\tpushl %%edi\n" ); output_cfi( ".cfi_rel_offset %%edi,-12" ); - output( "\t.byte 0x64\n\tmov %%gs,(%d)\n", GS_OFFSET ); + output( "\tmov %%gs,%%fs:(%d)\n", GS_OFFSET ); /* Setup exception frame */ - output( "\t.byte 0x64\n\tpushl (%d)\n", STACKOFFSET ); + output( "\tpushl %%fs:(%d)\n", STACKOFFSET ); output( "\tpushl 16(%%ebp)\n" ); /* handler */ - output( "\t.byte 0x64\n\tpushl (0)\n" ); - output( "\t.byte 0x64\n\tmovl %%esp,(0)\n" ); + output( "\tpushl %%fs:(0)\n" ); + output( "\tmovl %%esp,%%fs:(0)\n" ); /* Call the actual CallTo16 routine (simulate a lcall) */ output( "\tpushl %%cs\n" ); output( "\tcall .L%s\n", name ); /* Remove exception frame */ - output( "\t.byte 0x64\n\tpopl (0)\n" ); + output( "\tpopl %%fs:(0)\n" ); output( "\taddl $4, %%esp\n" ); - output( "\t.byte 0x64\n\tpopl (%d)\n", STACKOFFSET ); + output( "\tpopl %%fs:(%d)\n", STACKOFFSET ); if ( !reg_func ) { @@ -468,9 +468,9 @@ static void BuildCallTo16Core( int reg_func ) /* Switch to the 16-bit stack */ output( "\tmovl %%esp,%%edx\n" ); - output( "\t.byte 0x64\n\tmovw (%d),%%ss\n", STACKOFFSET + 2); - output( "\t.byte 0x64\n\tmovw (%d),%%sp\n", STACKOFFSET ); - output( "\t.byte 0x64\n\tmovl %%edx,(%d)\n", STACKOFFSET ); + output( "\tmovw %%fs:(%d),%%ss\n", STACKOFFSET + 2); + output( "\tmovw %%fs:(%d),%%sp\n", STACKOFFSET ); + output( "\tmovl %%edx,%%fs:(%d)\n", STACKOFFSET ); /* Make %bp point to the previous stackframe (built by CallFrom16) */ output( "\tmovzwl %%sp,%%ebp\n" ); @@ -541,20 +541,20 @@ static void BuildRet16Func(void) /* Restore 32-bit segment registers */ - output( "\t.byte 0x2e\n\tmovl %s", asm_name("CallTo16_DataSelector") ); + output( "\tmovl %%cs:%s", asm_name("CallTo16_DataSelector") ); output( "-%s,%%edi\n", asm_name("__wine_call16_start") ); output( "\tmovw %%di,%%ds\n" ); output( "\tmovw %%di,%%es\n" ); - output( "\t.byte 0x2e\n\tmov %s", asm_name("CallTo16_TebSelector") ); + output( "\tmov %%cs:%s", asm_name("CallTo16_TebSelector") ); output( "-%s,%%fs\n", asm_name("__wine_call16_start") ); - output( "\t.byte 0x64\n\tmov (%d),%%gs\n", GS_OFFSET ); + output( "\tmov %%fs:(%d),%%gs\n", GS_OFFSET ); /* Restore the 32-bit stack */ output( "\tmovw %%di,%%ss\n" ); - output( "\t.byte 0x64\n\tmovl (%d),%%esp\n", STACKOFFSET ); + output( "\tmovl %%fs:(%d),%%esp\n", STACKOFFSET ); /* Return to caller */

1 0

Paul Gofman : ws2_32: Test wait alertability in WSAGetOverlappedResult().
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: a56e0ba4d401f4ec86dae51e2c7a9178156c86fe URL: https://gitlab.winehq.org/wine/wine/-/commit/a56e0ba4d401f4ec86dae51e2c7a91… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 26 20:37:56 2023 -0600 ws2_32: Test wait alertability in WSAGetOverlappedResult(). --- dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b47922c645a..cff4acb0b3c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12657,6 +12657,20 @@ static void test_WSAGetOverlappedResult(void) } } + overlapped.Internal = STATUS_PENDING; + overlapped.hEvent = CreateEventW(NULL, TRUE, TRUE, NULL); + + apc_count = 0; + ret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); + ok(ret, "QueueUserAPC returned %d\n", ret); + ret = WSAGetOverlappedResult(s, &overlapped, &size, TRUE, &flags); + ok(ret && (GetLastError() == ERROR_IO_PENDING || !WSAGetLastError()), + "Got ret %d, err %lu.\n", ret, GetLastError()); + ok(!apc_count, "got apc_count %d.\n", apc_count); + SleepEx(0, TRUE); + ok(apc_count == 1, "got apc_count %d.\n", apc_count); + + CloseHandle(overlapped.hEvent); closesocket(s); }

1 0