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

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

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

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: 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: 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

Alex Henrie : iphlpapi: Add GetPerTcpConnectionEStats stub.
by Alexandre Julliard 02 Jun '23

02 Jun '23

Module: wine Branch: master Commit: 870a9fcb4cceeae0c9b96e9b2dc3ce43896c229a URL: https://gitlab.winehq.org/wine/wine/-/commit/870a9fcb4cceeae0c9b96e9b2dc3ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 1 22:09:38 2023 -0600 iphlpapi: Add GetPerTcpConnectionEStats stub. Based on a patch by Austin English. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52868 --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++++- include/iphlpapi.h | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 76701d686e0..ef2c576947d 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -130,7 +130,7 @@ @ stdcall GetPerAdapterInfo( long ptr ptr ) #@ stub GetPerTcp6ConnectionEStats #@ stub GetPerTcp6ConnectionStats -#@ stub GetPerTcpConnectionEStats +@ stdcall GetPerTcpConnectionEStats( ptr long ptr long long ptr long long ptr long long ) #@ stub GetPerTcpConnectionStats @ stdcall GetRTTAndHopCount( long ptr long ptr ) #@ stub GetSessionCompartmentId diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c4921d4a5ac..f8ecb89c328 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -32,7 +32,6 @@ #include "fltdefs.h" #include "ifdef.h" #include "netioapi.h" -#include "tcpestats.h" #include "ip2string.h" #include "netiodef.h" #include "icmpapi.h" @@ -4031,6 +4030,19 @@ DWORD WINAPI SetTcpEntry(PMIB_TCPROW pTcpRow) return 0; } +/*********************************************************************** + * GetPerTcpConnectionEStats (IPHLPAPI.@) + */ +ULONG WINAPI GetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE stats, UCHAR *rw, ULONG rw_version, + ULONG rw_size, UCHAR *ro_static, ULONG ro_static_version, + ULONG ro_static_size, UCHAR *ro_dynamic, ULONG ro_dynamic_version, + ULONG ro_dynamic_size) +{ + FIXME( "(%p, %d, %p, %ld, %ld, %p, %ld, %ld, %p, %ld, %ld): stub\n", row, stats, rw, rw_version, rw_size, + ro_static, ro_static_version, ro_static_size, ro_dynamic, ro_dynamic_version, ro_dynamic_size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /****************************************************************** * SetPerTcpConnectionEStats (IPHLPAPI.@) */ diff --git a/include/iphlpapi.h b/include/iphlpapi.h index da5819c8423..35e0f134899 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -25,6 +25,7 @@ extern "C" { #include <iprtrmib.h> #include <ipexport.h> #include <iptypes.h> +#include <tcpestats.h> #define NET_STRING_IPV4_ADDRESS 0x00000001 #define NET_STRING_IPV4_SERVICE 0x00000002 @@ -85,6 +86,11 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats); DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily); +ULONG WINAPI GetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE stats, UCHAR *rw, ULONG rw_version, + ULONG rw_size, UCHAR *ro_static, ULONG ro_static_version, + ULONG ro_static_size, UCHAR *ro_dynamic, ULONG ro_dynamic_version, + ULONG ro_dynamic_size); + DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats); DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily); @@ -99,6 +105,9 @@ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute); DWORD WINAPI SetIpStatistics(PMIB_IPSTATS pIpStats); +DWORD WINAPI SetPerTcpConnectionEStats(MIB_TCPROW *row, TCP_ESTATS_TYPE state, BYTE *rw, + ULONG version, ULONG size, ULONG offset); + DWORD WINAPI SetIpTTL(UINT nTTL); DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry);

1 0

Michael Stefaniuc : ws2_32/tests: Remove superfluous casts to self.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 51f8c75cebfbe79bcab30edceb875393ec047c1a URL: https://gitlab.winehq.org/wine/wine/-/commit/51f8c75cebfbe79bcab30edceb8753… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 23 19:43:49 2023 +0200 ws2_32/tests: Remove superfluous casts to self. --- dlls/ws2_32/tests/afd.c | 18 +++++++++--------- dlls/ws2_32/tests/sock.c | 7 +------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d0191ba8dbf..1644a9dc4ff 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1429,7 +1429,7 @@ static void test_recv(void) ret = listen(listener, 1); ok(!ret, "got error %u\n", WSAGetLastError()); len = sizeof(addr); - ret = getsockname(listener, (struct sockaddr *)&addr, &len); + ret = getsockname(listener, &addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); memset(&io, 0, sizeof(io)); @@ -1439,7 +1439,7 @@ static void test_recv(void) ok(!io.Information, "got information %#Ix\n", io.Information); client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ret = connect(client, &addr, sizeof(addr)); ok(!ret, "got error %u\n", WSAGetLastError()); server = accept(listener, NULL, NULL); ok(server != -1, "got error %u\n", WSAGetLastError()); @@ -1717,7 +1717,7 @@ static void test_recv(void) ret = bind(client, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "got error %u\n", WSAGetLastError()); len = sizeof(addr); - ret = getsockname(client, (struct sockaddr *)&addr, &len); + ret = getsockname(client, &addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); memset(buffer, 0xcc, sizeof(buffer)); @@ -1725,7 +1725,7 @@ static void test_recv(void) IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - ret = sendto(server, "data", 5, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "data", 5, 0, &addr, sizeof(addr)); ok(ret == 5, "got %d\n", ret); ret = WaitForSingleObject(event, 200); @@ -1741,7 +1741,7 @@ static void test_recv(void) IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - ret = sendto(server, "moredata", 9, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "moredata", 9, 0, &addr, sizeof(addr)); ok(ret == 9, "got %d\n", ret); ret = WaitForSingleObject(event, 200); @@ -1750,7 +1750,7 @@ static void test_recv(void) ok(io.Information == 6, "got %#Ix\n", io.Information); ok(!memcmp(buffer, "mo\xccreda\xcc", 7), "got %s\n", debugstr_an(buffer, io.Information)); - ret = sendto(server, "moredata", 9, 0, (struct sockaddr *)&addr, sizeof(addr)); + ret = sendto(server, "moredata", 9, 0, &addr, sizeof(addr)); ok(ret == 9, "got %d\n", ret); /* wait for the data to be available */ @@ -2352,7 +2352,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(client, (struct sockaddr *)&addr2, &len); + ret = getsockname(client, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); @@ -2364,7 +2364,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(server, (struct sockaddr *)&addr2, &len); + ret = getsockname(server, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); @@ -2392,7 +2392,7 @@ static void test_getsockname(void) ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr), "got %#Ix\n", io.Information); len = sizeof(addr2); - ret = getsockname(client, (struct sockaddr *)&addr2, &len); + ret = getsockname(client, &addr2, &len); ok(!ret, "got error %u\n", WSAGetLastError()); ok(!memcmp(&addr, &addr2, sizeof(struct sockaddr)), "addresses didn't match\n"); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cddc4c125ff..17d5f3993e5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -836,12 +836,7 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) ((struct sockaddr_in*)&test)->sin_addr.s_addr = inet_addr("0.0.0.0"); /* Receive data echoed back & check it */ - n_recvd = do_synchronous_recvfrom ( mem->s, - mem->recv_buf, - n_expected, - 0, - (struct sockaddr *)&test, - &fromLen, + n_recvd = do_synchronous_recvfrom ( mem->s, mem->recv_buf, n_expected, 0, &test, &fromLen, par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected );

1 0

Michael Stefaniuc : wmvcore: Remove superfluous casts to self.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 19cc1dbe56a3231577df110a0d9231ce501d7321 URL: https://gitlab.winehq.org/wine/wine/-/commit/19cc1dbe56a3231577df110a0d9231… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 19 18:57:09 2023 +0200 wmvcore: Remove superfluous casts to self. --- dlls/wmvcore/async_reader.c | 2 +- dlls/wmvcore/tests/wmvcore.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index 47de592c95c..95f617b5cf8 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -1932,7 +1932,7 @@ static HRESULT WINAPI async_reader_create(IWMReader **reader) list_init(&object->async_ops); TRACE("Created async reader %p.\n", object); - *reader = (IWMReader *)&object->IWMReader_iface; + *reader = &object->IWMReader_iface; return S_OK; failed: diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9f755859481..6071ac25ad7 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1920,7 +1920,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta callback->callback_tid = GetCurrentThreadId(); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_started, 100); ok(!ret, "Wait timed out.\n"); callback->end_of_streaming_count = callback->eof_count = callback->sample_count = 0; @@ -1933,7 +1933,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_stopped, 100); ok(!ret, "Wait timed out.\n"); SetEvent(callback->got_stopped); @@ -1942,7 +1942,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta case WMT_CLOSED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ++callback->closed_count; break; @@ -1950,7 +1950,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ++callback->end_of_streaming_count; break; @@ -1958,7 +1958,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->sample_count == 0, "Got %u samples.\n", callback->sample_count); else @@ -1976,7 +1976,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(*(QWORD *)value == 3000, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->sample_count == 0, "Got %u samples.\n", callback->sample_count); else @@ -2082,7 +2082,7 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, if (stream) ok(stream->input_tid != GetCurrentThreadId(), "got wrong thread\n"); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2166,7 +2166,7 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced if (stream) ok(stream->input_tid != GetCurrentThreadId(), "got wrong thread\n"); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2191,7 +2191,7 @@ static HRESULT WINAPI callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, todo_wine_if(time % 10000) ok(time == callback->expect_time, "Got time %I64u.\n", time); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_ontime, 100); ok(!ret, "Wait timed out.\n"); SetEvent(callback->got_ontime);

1 0

Michael Stefaniuc : dbghelp: Remove superfluous casts to self.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: cf3815dc598da52a6efb480143ff73713f1f2000 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf3815dc598da52a6efb480143ff73… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 19 19:01:15 2023 +0200 dbghelp: Remove superfluous casts to self. --- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 46da2968dbb..5ab5cabecdf 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2148,7 +2148,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, subpgm->current_block ? &subpgm->current_block->symt : &subpgm->current_func->symt, dwarf2_get_cpp_name(di, name.u.string), &sig_type->symt, num_ranges); - subpgm->current_func = (struct symt_function*)inlined; + subpgm->current_func = inlined; subpgm->current_block = NULL; if (!dwarf2_fill_ranges(di, inlined->ranges, num_ranges)) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 56a47ab7dac..c6dca22883a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2683,7 +2683,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, (const unsigned char*)sym + length); if (inlined) { - curr_func = (struct symt_function*)inlined; + curr_func = inlined; block = NULL; } else @@ -2704,7 +2704,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, (const unsigned char*)sym + length); if (inlined) { - curr_func = (struct symt_function*)inlined; + curr_func = inlined; block = NULL; } else

1 0