December 2020 - Wine-Commits

Alexandre Julliard : makefiles: Make the tests also depend on the Unix library of the tested module.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: 74aa42a529afe216414bfeb25188ce25e47671af URL: https://source.winehq.org/git/wine.git/?a=commit;h=74aa42a529afe216414bfeb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 14:19:48 2020 +0100 makefiles: Make the tests also depend on the Unix library of the tested module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 0da3a6b092c..306a50eef5d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3564,7 +3564,6 @@ static void output_test_module( struct makefile *make ) struct strarray all_libs = add_import_libs( make, &dep_libs, make->imports, 0, 0 ); struct makefile *parent = get_parent_makefile( make ); const char *ext = make->is_cross ? "" : dll_ext; - const char *parent_ext = parent && parent->is_cross ? "" : dll_ext; const char *debug_file; char *output_file; @@ -3606,7 +3605,17 @@ static void output_test_module( struct makefile *make ) output_filenames_obj_dir( make, make->ok_files ); output( ": %s%s", obj_dir_path( make, testmodule ), ext ); - if (parent) output( " %s%s", obj_dir_path( parent, make->testdll ), parent_ext ); + if (parent) + { + output_filename( parent->is_cross ? obj_dir_path( parent, make->testdll ) + : strmake( "%s%s", obj_dir_path( parent, make->testdll ), dll_ext )); + if (parent->unixobj_files.count) + { + char *ext, *unix_lib = xstrdup( parent->module ); + if ((ext = get_extension( unix_lib ))) *ext = 0; + output_filename( strmake( "%s%s", obj_dir_path( parent, unix_lib ), dll_ext )); + } + } output( "\n" ); output( "%s %s:", obj_dir_path( make, "check" ), obj_dir_path( make, "test" )); if (!make->disabled && parent && !parent->disabled) output_filenames_obj_dir( make, make->ok_files );

1 0

Zebediah Figura : winmm: Always allocate at least MAX_PATH bytes in mmioOpenW().
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: b9407f75efeb9cf91dde4557110e35518328a3aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9407f75efeb9cf91dde4557… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 17 16:40:48 2020 -0600 winmm: Always allocate at least MAX_PATH bytes in mmioOpenW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..cb3175c5cd7 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -734,6 +734,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, if (szFileName) { INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); + if (len < MAX_PATH) len = MAX_PATH; szFn = HeapAlloc( GetProcessHeap(), 0, len ); if (!szFn) return NULL; WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL );

1 0

Haidong Yu : inetcpl.cpl: Fix memory leak in security_on_initdialog.
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: aa0296e378aa49e69daa2d2c97d47663eca4d658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa0296e378aa49e69daa2d2c… Author: Haidong Yu <yhd986(a)163.com> Date: Sun Dec 13 08:38:34 2020 +0800 inetcpl.cpl: Fix memory leak in security_on_initdialog. Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index e11caf1fc3e..4c60c42ca0e 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -323,6 +323,7 @@ static INT_PTR security_on_initdialog(HWND hsec) TRACE("using imagelist: %p\n", sd->himages); if (!sd->himages) { ERR("ImageList_Create failed!\n"); + security_on_destroy(sd); return FALSE; } SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)sd->himages);

1 0

Zebediah Figura : httpapi/tests: Sleep before calling GetOverlappedResult() in test_v2_server().
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: 0aa6f8e2ea1e3f2e852bef1a07d0d1f983870150 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa6f8e2ea1e3f2e852bef1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 16 10:51:49 2020 -0600 httpapi/tests: Sleep before calling GetOverlappedResult() in test_v2_server(). This seems to be a variation of a bug already encountered; here the kernel does not report the right value in the IOSB until after completion is signaled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48587 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index c54158d45a2..5d79197505c 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -233,9 +233,11 @@ static void test_v1_server(void) ok(ret, "Got error %u.\n", GetLastError()); ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - /* 64-bit Windows 10 version 1507 apparently suffers from a bug where it - * will report success before completely filling the buffer. Wait for a - * short interval to work around this. */ + /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 + * version 1507, but probably affecting others) suffer from a bug where the + * kernel will report success before completely filling the buffer or + * reporting the correct buffer size. Wait for a short interval to work + * around this. */ Sleep(100); ok(!req->Flags, "Got flags %#x.\n", req->Flags); @@ -1296,10 +1298,14 @@ static void test_v2_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); + ret = WaitForSingleObject(ovl.hEvent, 100); + ok(!ret, "Got %u.\n", ret); + + Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); ok(ret, "Got error %u.\n", GetLastError()); ok(ret_size > sizeof(*req), "Got size %u.\n", ret_size); - Sleep(100); ok(!req->Flags, "Got flags %#x.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n");

1 0

Paul Gofman : ws2_32/tests: Don't fail the test in test_wsaioctl() if only one interface is available.
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: e695982db3144fa1712440efbb8c53979fccaa91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e695982db3144fa1712440ef… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 17 12:38:30 2020 +0300 ws2_32/tests: Don't fail the test in test_wsaioctl() if only one interface is available. Fixes test failure on Testbot. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 98cc3881853..2b0a7354f4b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10530,7 +10530,7 @@ static void test_wsaioctl(void) ok(size && size != 0xdeadbeef && !(size % sizeof(INTERFACE_INFO)), "Got unexpected size %u.\n", size); size = 0xdeadbeef; - ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO), &size, NULL, NULL); + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO) - 1, &size, NULL, NULL); ok(ret == -1, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); ok(!size, "Got unexpected size %u.\n", size);

1 0

Alexandre Julliard : vcomp/tests: Explicitly request signed chars.
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: 114d512613487a2edeebba3244b71d5861000aef URL: https://source.winehq.org/git/wine.git/?a=commit;h=114d512613487a2edeebba32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 18:53:35 2020 +0100 vcomp/tests: Explicitly request signed chars. Fixes a test failure on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 0aea30815ec..478bb5d7cfe 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -30,17 +30,17 @@ static HMODULE vcomp_handle; typedef CRITICAL_SECTION *omp_lock_t; typedef CRITICAL_SECTION *omp_nest_lock_t; -static void (CDECL *p_vcomp_atomic_add_i1)(char *dest, char val); +static void (CDECL *p_vcomp_atomic_add_i1)(char *dest, signed char val); static void (CDECL *p_vcomp_atomic_add_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_add_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_add_i8)(LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_atomic_add_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_add_r8)(double *dest, double val); -static void (CDECL *p_vcomp_atomic_and_i1)(char *dest, char val); +static void (CDECL *p_vcomp_atomic_and_i1)(char *dest, signed char val); static void (CDECL *p_vcomp_atomic_and_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_and_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_and_i8)(LONG64 *dest, LONG64 val); -static void (CDECL *p_vcomp_atomic_div_i1)(char *dest, char val); +static void (CDECL *p_vcomp_atomic_div_i1)(char *dest, signed char val); static void (CDECL *p_vcomp_atomic_div_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_div_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_div_i8)(LONG64 *dest, LONG64 val); @@ -50,13 +50,13 @@ static void (CDECL *p_vcomp_atomic_div_ui1)(unsigned char *dest, unsigned cha static void (CDECL *p_vcomp_atomic_div_ui2)(unsigned short *dest, unsigned short val); static void (CDECL *p_vcomp_atomic_div_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_div_ui8)(ULONG64 *dest, ULONG64 val); -static void (CDECL *p_vcomp_atomic_mul_i1)(char *dest, char val); +static void (CDECL *p_vcomp_atomic_mul_i1)(char *dest, signed char val); static void (CDECL *p_vcomp_atomic_mul_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_mul_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_mul_i8)(LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_atomic_mul_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_mul_r8)(double *dest, double val); -static void (CDECL *p_vcomp_atomic_or_i1)(char *dest, char val); +static void (CDECL *p_vcomp_atomic_or_i1)(char *dest, signed char val); static void (CDECL *p_vcomp_atomic_or_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_or_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_or_i8)(LONG64 *dest, LONG64 val); @@ -72,13 +72,13 @@ static void (CDECL *p_vcomp_atomic_shr_ui1)(unsigned char *dest, unsigned int static void (CDECL *p_vcomp_atomic_shr_ui2)(unsigned short *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_shr_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_shr_ui8)(ULONG64 *dest, unsigned int val); -static void (CDECL *p_vcomp_atomic_sub_i1)(char *dest, char val); +static void (CDECL *p_vcomp_atomic_sub_i1)(char *dest, signed char val); static void (CDECL *p_vcomp_atomic_sub_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_sub_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_sub_i8)(LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_atomic_sub_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_sub_r8)(double *dest, double val); -static void (CDECL *p_vcomp_atomic_xor_i1)(char *dest, char val); +static void (CDECL *p_vcomp_atomic_xor_i1)(char *dest, signed char val); static void (CDECL *p_vcomp_atomic_xor_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_xor_i8)(LONG64 *dest, LONG64 val); @@ -1535,7 +1535,7 @@ static void test_atomic_integer8(void) { struct { - void (CDECL *func)(char *, char); + void (CDECL *func)(char *, signed char); signed char v1, v2, expected; } tests1[] =

1 0

Alex Henrie : kernel32/tests: Add tests for Get(Active|Maximum)ProcessorCount.
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: d91e951445e1109caa8b435b39611dfffd13a506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91e951445e1109caa8b435b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 10 22:55:15 2020 -0700 kernel32/tests: Add tests for Get(Active|Maximum)ProcessorCount. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7c6a0ff0a84..ea9cde5facc 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -90,6 +90,8 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void); static BOOL (WINAPI *pInitializeProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD, SIZE_T*); static BOOL (WINAPI *pUpdateProcThreadAttribute)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD_PTR, void *,SIZE_T,void*,SIZE_T*); static void (WINAPI *pDeleteProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*); +static DWORD (WINAPI *pGetActiveProcessorCount)(WORD); +static DWORD (WINAPI *pGetMaximumProcessorCount)(WORD); /* ############################### */ static char base[MAX_PATH]; @@ -270,6 +272,8 @@ static BOOL init(void) pInitializeProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "InitializeProcThreadAttributeList"); pUpdateProcThreadAttribute = (void *)GetProcAddress(hkernel32, "UpdateProcThreadAttribute"); pDeleteProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "DeleteProcThreadAttributeList"); + pGetActiveProcessorCount = (void *)GetProcAddress(hkernel32, "GetActiveProcessorCount"); + pGetMaximumProcessorCount = (void *)GetProcAddress(hkernel32, "GetMaximumProcessorCount"); return TRUE; } @@ -2320,6 +2324,23 @@ static void test_SystemInfo(void) } } +static void test_ProcessorCount(void) +{ + DWORD active, maximum; + + if (!pGetActiveProcessorCount || !pGetMaximumProcessorCount) + { + win_skip("GetActiveProcessorCount or GetMaximumProcessorCount is not available\n"); + return; + } + + active = pGetActiveProcessorCount(ALL_PROCESSOR_GROUPS); + maximum = pGetMaximumProcessorCount(ALL_PROCESSOR_GROUPS); + ok(active <= maximum, + "Number of active processors %i is greater than maximum number of processors %i\n", + active, maximum); +} + static void test_RegistryQuota(void) { BOOL ret; @@ -4257,6 +4278,7 @@ START_TEST(process) test_IsWow64Process(); test_IsWow64Process2(); test_SystemInfo(); + test_ProcessorCount(); test_RegistryQuota(); test_DuplicateHandle(); test_StartupNoConsole();

1 0

Alexandre Julliard : ntdll: Pass the correct handle to NtTerminateProcess().
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: 88a1a6933ba3a364b6b2c536719a3acf8d1de590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a1a6933ba3a364b6b2c536… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 11:58:47 2020 +0100 ntdll: Pass the correct handle to NtTerminateProcess(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49832 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3dd1c9a5c26..8e5a3a3a3a3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -124,7 +124,7 @@ void DECLSPEC_HIDDEN call_thread_func( PRTL_THREAD_START_ROUTINE entry, void *ar } __EXCEPT(call_unhandled_exception_filter) { - NtTerminateProcess( GetCurrentThread(), GetExceptionCode() ); + NtTerminateProcess( GetCurrentProcess(), GetExceptionCode() ); } __ENDTRY } @@ -140,7 +140,7 @@ void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) } __EXCEPT(call_unhandled_exception_filter) { - NtTerminateProcess( GetCurrentThread(), GetExceptionCode() ); + NtTerminateProcess( GetCurrentProcess(), GetExceptionCode() ); } __ENDTRY }

1 0

Paul Gofman : ntdll: Save unwind information in KiUserApcDispatcher() on x64.
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: 71a43335ab9da84059ff9963b36a92dad48c8cc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71a43335ab9da84059ff9963… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 17 02:05:05 2020 +0300 ntdll: Save unwind information in KiUserApcDispatcher() on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 11 +++++++++ dlls/ntdll/signal_arm64.c | 12 ++++++++++ dlls/ntdll/signal_i386.c | 12 ++++++++++ dlls/ntdll/signal_x86_64.c | 30 +++++++++++++++++++++++ dlls/ntdll/tests/exception.c | 53 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 11 --------- dlls/ntdll/unix/signal_x86_64.c | 23 ++++++++++++++++-- 7 files changed, 139 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0e80a35b0c0..512462b7066 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -175,6 +175,17 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } +/******************************************************************* + * KiUserApcDispatcher (NTDLL.@) + */ +void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, + PNTAPCFUNC func ) +{ + func( ctx, arg1, arg2 ); + NtContinue( context, TRUE ); +} + + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c31eb510382..4c4694959f0 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -523,6 +523,18 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte return NtRaiseException( rec, context, FALSE ); } + +/******************************************************************* + * KiUserApcDispatcher (NTDLL.@) + */ +void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, + PNTAPCFUNC func ) +{ + func( ctx, arg1, arg2 ); + NtContinue( context, TRUE ); +} + + /*********************************************************************** * Definitions for Win32 unwind tables */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ddc2bf6adbd..93e03ae5b8b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -218,6 +218,18 @@ __ASM_STDCALL_FUNC( KiUserExceptionDispatcher, 8, "call " __ASM_STDCALL("dispatch_exception", 8) "\n\t" "int3" ) + +/******************************************************************* + * KiUserApcDispatcher (NTDLL.@) + */ +void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, + PNTAPCFUNC func ) +{ + func( ctx, arg1, arg2 ); + NtContinue( context, TRUE ); +} + + /*********************************************************************** * save_fpu * diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a3dba815c1f..7e39991ad1a 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -590,6 +590,36 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher, "call " __ASM_NAME("dispatch_exception") "\n\t" "int3") + +/******************************************************************* + * KiUserApcDispatcher (NTDLL.@) + */ +void WINAPI dispatch_apc( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, + PNTAPCFUNC func ) +{ + func( ctx, arg1, arg2 ); + NtContinue( context, TRUE ); +} + +__ASM_GLOBAL_FUNC( KiUserApcDispatcher, + "addq $0x8,%rsp\n\t" + "mov 0x98(%rcx),%r10\n\t" /* context->Rsp */ + "mov 0xf8(%rcx),%r11\n\t" /* context->Rip */ + "mov %r11,-0x8(%r10)\n\t" + "mov %rbp,-0x10(%r10)\n\t" + "lea -0x10(%r10),%rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") + __ASM_SEH(".seh_setframe %rbp,0\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_signal_frame\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x10\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,0x10\n\t") + __ASM_CFI(".cfi_rel_offset %rip,0x8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "call " __ASM_NAME("dispatch_apc") "\n\t" + "int3") + + static ULONG64 get_int_reg( CONTEXT *context, int reg ) { return *(&context->Rax + reg); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5686e39ab9e..3a0a5ac049c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -37,6 +37,8 @@ static void *code_mem; static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); +static NTSTATUS (WINAPI *pNtQueueApcThread)(HANDLE handle, PNTAPCFUNC func, + ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3); static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); static PVOID (WINAPI *pRtlUnwind)(PVOID, PVOID, PEXCEPTION_RECORD, PVOID); static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); @@ -4061,6 +4063,55 @@ static void test_nested_exception(void) ok(got_prev_frame_exception, "Did not get nested exception in the previous frame.\n"); } +static CONTEXT test_unwind_apc_context; +static BOOL test_unwind_apc_called; + +static void CALLBACK test_unwind_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + EXCEPTION_RECORD rec; + + test_unwind_apc_called = TRUE; + memset(&rec, 0, sizeof(rec)); + pRtlUnwind((void *)test_unwind_apc_context.Rsp, (void *)test_unwind_apc_context.Rip, &rec, (void *)0xdeadbeef); + ok(0, "Should not get here.\n"); +} + +static void test_unwind_from_apc(void) +{ + NTSTATUS status; + int pass; + + if (!pNtQueueApcThread) + { + win_skip("NtQueueApcThread is not available.\n"); + return; + } + + pass = 0; + InterlockedIncrement(&pass); + RtlCaptureContext(&test_unwind_apc_context); + InterlockedIncrement(&pass); + + if (pass == 2) + { + test_unwind_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_unwind_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + SleepEx(0, TRUE); + ok(0, "Should not get here.\n"); + } + if (pass == 3) + { + ok(test_unwind_apc_called, "Test user APC was not called.\n"); + test_unwind_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_unwind_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + NtContinue(&test_unwind_apc_context, TRUE ); + ok(0, "Should not get here.\n"); + } + ok(pass == 4, "Got unexpected pass %d.\n", pass); + ok(test_unwind_apc_called, "Test user APC was not called.\n"); +} #elif defined(__arm__) static void test_thread_context(void) @@ -8073,6 +8124,7 @@ START_TEST(exception) #define X(f) p##f = (void*)GetProcAddress(hntdll, #f) X(NtGetContextThread); X(NtSetContextThread); + X(NtQueueApcThread); X(NtReadVirtualMemory); X(NtClose); X(RtlUnwind); @@ -8241,6 +8293,7 @@ START_TEST(exception) skip( "Dynamic unwind functions not found\n" ); test_extended_context(); test_copy_context(); + test_unwind_from_apc(); #elif defined(__aarch64__) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 578c7a5436c..3dd1c9a5c26 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -75,17 +75,6 @@ int __cdecl __wine_dbg_output( const char *str ) } -/******************************************************************* - * KiUserApcDispatcher (NTDLL.@) - */ -void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, - PNTAPCFUNC func ) -{ - func( ctx, arg1, arg2 ); - NtContinue( context, TRUE ); -} - - /*********************************************************************** * RtlExitUserThread (NTDLL.@) */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 3ae3b4c141e..837cd9ed654 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2073,9 +2073,28 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq %r14,%r9\n" /* arg2 */ "movq $0,0x328(%rbx)\n\t" /* amd64_thread_data()->syscall_frame */ "movq %rsi,0x20(%rsp)\n\t" /* func */ - "movq 0xa0(%rcx),%rbp\n\t" /* context.Rbp */ + "movq %rdi,%r10\n\t" + /* Set nonvolatile regs from context. */ + "movq 0xa0(%rcx),%rbp\n\t" + "movq 0x90(%rcx),%rbx\n\t" + "movq 0xa8(%rcx),%rsi\n\t" + "movq 0xb0(%rcx),%rdi\n\t" + "movq 0xd8(%rcx),%r12\n\t" + "movq 0xe0(%rcx),%r13\n\t" + "movq 0xe8(%rcx),%r14\n\t" + "movq 0xf0(%rcx),%r15\n\t" + "movdqa 0x200(%rcx),%xmm6\n\t" + "movdqa 0x210(%rcx),%xmm7\n\t" + "movdqa 0x220(%rcx),%xmm8\n\t" + "movdqa 0x230(%rcx),%xmm9\n\t" + "movdqa 0x240(%rcx),%xmm10\n\t" + "movdqa 0x250(%rcx),%xmm11\n\t" + "movdqa 0x260(%rcx),%xmm12\n\t" + "movdqa 0x270(%rcx),%xmm13\n\t" + "movdqa 0x280(%rcx),%xmm14\n\t" + "movdqa 0x290(%rcx),%xmm15\n\t" "pushq 0xf8(%rcx)\n\t" /* context.Rip */ - "jmp *%rdi" ) + "jmp *%r10" ) /***********************************************************************

1 0

Paul Gofman : ntdll: Always copy context in call_user_apc_dispatcher() on x64.
by Alexandre Julliard Dec. 17, 2020

Dec. 17, 2020

Module: wine Branch: master Commit: c72f52d7cc4353498fe5570229231d5d1cb36204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c72f52d7cc4353498fe55702… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 17 02:05:04 2020 +0300 ntdll: Always copy context in call_user_apc_dispatcher() on x64. Currently, if call_user_apc_dispatcher() is called with nonzero context, there is no guarantee that the provided context is stored above the rsp = context_ptr->Rsp - (sizeof(CONTEXT) + offsetof(frame,ret_addr)) being set. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 62 +++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 7181b48728c..3ae3b4c141e 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -250,6 +250,22 @@ C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))) C_ASSERT( sizeof(XSTATE) == 0x140 ); C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + ULONG64 save_regs[4]; + void *func; + ULONG64 align; + CONTEXT context; + ULONG64 rbp; + ULONG64 rip; +}; + +/* Should match size and offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); +C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); + struct syscall_frame { ULONG64 xmm[10 * 2]; /* xmm6-xmm15 */ @@ -266,6 +282,9 @@ struct syscall_frame ULONG64 ret_addr; }; +/* Should match the offset in call_user_apc_dispatcher(). */ +C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xf0); + struct amd64_thread_data { DWORD_PTR dr0; /* 02f0 debug registers */ @@ -2013,31 +2032,46 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) /*********************************************************************** * call_user_apc_dispatcher */ +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + return stack; +} + __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x28(%rsp),%rsi\n\t" /* func */ "movq 0x30(%rsp),%rdi\n\t" /* dispatcher */ "movq %gs:0x30,%rbx\n\t" - "jrcxz 1f\n\t" - "movq 0x98(%rcx),%rax\n\t" /* context_ptr->Rsp */ - "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ - "andq $~15,%rsp\n\t" - "jmp 2f\n" - "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq -0x4d0(%rax),%rsp\n\t" - "andq $~15,%rsp\n\t" "movq %rdx,%r12\n\t" /* ctx */ "movq %r8,%r13\n\t" /* arg1 */ "movq %r9,%r14\n\t" /* arg2 */ - "movq %rsp,%rdx\n\t" /* context */ - "movl $0x10000b,0x30(%rdx)\n\t" /* context.ContextFlags */ - "movq $~1,%rcx\n\t" - "call " __ASM_NAME("NtGetContextThread") "\n\t" - "movq %rsp,%rcx\n\t" /* context */ + "jrcxz 1f\n\t" + "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ + "jmp 2f\n\t" + "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ + "leaq 0xf0(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ + "andq $~0xf,%rdx\n\t" + "addq $8,%rsp\n\t" /* pop return address */ + "cmpq %rsp,%rdx\n\t" + "cmovbq %rdx,%rsp\n\t" + "subq $0x20,%rsp\n\t" + "call " __ASM_NAME("setup_user_apc_dispatcher_stack") "\n\t" + "movq %rax,%rsp\n\t" + "leaq 0x30(%rsp),%rcx\n\t" /* context */ "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */ - "2:\tmovq $0,0x328(%rbx)\n\t" + "movq $0,0x328(%rbx)\n\t" /* amd64_thread_data()->syscall_frame */ "movq %rsi,0x20(%rsp)\n\t" /* func */ "movq 0xa0(%rcx),%rbp\n\t" /* context.Rbp */ "pushq 0xf8(%rcx)\n\t" /* context.Rip */

1 0