July 2020 - Wine-commits - list.winehq.org

Zebediah Figura : winegstreamer: deinterlace belongs to the "good" set, not the "base" set.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 1a72836c372459b2928c4b8c27b90879fa2606ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a72836c372459b2928c4b8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 6 15:41:01 2020 -0500 winegstreamer: deinterlace belongs to the "good" set, not the "base" set. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e6f00842df..a32b0b0e41 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1001,7 +1001,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * * necessarily consume it. In particular, the video renderer can't. */ if (!(deinterlace = gst_element_factory_make("deinterlace", NULL))) { - ERR("Failed to create deinterlace, are %u-bit GStreamer \"base\" plugins installed?\n", + ERR("Failed to create deinterlace, are %u-bit GStreamer \"good\" plugins installed?\n", 8 * (int)sizeof(void *)); goto out; }

1 0

Alexandre Julliard : winebuild: Add a -syscall entry point flag
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: a0266339c777eafcda918a253ec8d287372fc84d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0266339c777eafcda918a25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 10:36:19 2020 +0200 winebuild: Add a -syscall entry point flag Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 7 ++++--- tools/winebuild/import.c | 2 ++ tools/winebuild/parser.c | 9 +++++++++ tools/winebuild/winebuild.man.in | 6 ++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index d0fc3dca1b..6632f9ccbb 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -175,9 +175,10 @@ struct strarray #define FLAG_REGISTER 0x0010 /* use register calling convention */ #define FLAG_PRIVATE 0x0020 /* function is private (cannot be imported) */ #define FLAG_ORDINAL 0x0040 /* function should be imported by ordinal */ -#define FLAG_THISCALL 0x0080 /* use thiscall calling convention */ -#define FLAG_FASTCALL 0x0100 /* use fastcall calling convention */ -#define FLAG_IMPORT 0x0200 /* export is imported from another module */ +#define FLAG_THISCALL 0x0080 /* function uses thiscall calling convention */ +#define FLAG_FASTCALL 0x0100 /* function uses fastcall calling convention */ +#define FLAG_SYSCALL 0x0200 /* function is a system call */ +#define FLAG_IMPORT 0x0400 /* export is imported from another module */ #define FLAG_FORWARD 0x1000 /* function is a forwarded name */ #define FLAG_EXT_LINK 0x2000 /* function links to an external symbol */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 125b6132b6..938d632be8 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -545,6 +545,7 @@ static void check_undefined_exports( DLLSPEC *spec ) ORDDEF *odp = &spec->entry_points[i]; if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; + if (odp->flags & FLAG_SYSCALL) continue; if (find_name( odp->link_name, &undef_symbols )) { switch(odp->type) @@ -587,6 +588,7 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) ORDDEF *odp = &spec->entry_points[i]; if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; + if (odp->flags & FLAG_SYSCALL) continue; output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( odp ))); } for (j = 0; j < extra_ld_symbols.count; j++) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 0207b8ac3c..66454bad3c 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -70,6 +70,7 @@ static const char * const FlagNames[] = "ordinal", /* FLAG_ORDINAL */ "thiscall", /* FLAG_THISCALL */ "fastcall", /* FLAG_FASTCALL */ + "syscall", /* FLAG_SYCALL */ "import", /* FLAG_IMPORT */ NULL }; @@ -320,6 +321,14 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) return 0; } } + if (odp->flags & FLAG_SYSCALL) + { + if (odp->type != TYPE_STDCALL) + { + error( "A syscall function must use the stdcall convention\n" ); + return 0; + } + } return 1; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 109f3824f1..c1de885dac 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -338,6 +338,12 @@ The function uses the calling convention (first two parameters in %ecx/%edx registers on i386). .TP +.B -syscall +The function is an NT system call. A system call thunk will be +generated, and the actual function will be called by the +\fI__wine_syscall_dispatcher\fR function that will be generated on the +Unix library side. +.TP .B -import The function is imported from another module. This can be used instead of a

1 0

Alexandre Julliard : winebuild: Add generation of system call thunks.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: b2d09cbb219e43a203d908199cf0ada1aa344b8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d09cbb219e43a203d90819… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 10:42:23 2020 +0200 winebuild: Add generation of system call thunks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 + tools/winebuild/import.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/spec16.c | 21 ------ tools/winebuild/spec32.c | 1 + tools/winebuild/utils.c | 16 +++++ 5 files changed, 183 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2d09cbb219e43a203d9…

1 0

Alexandre Julliard : ntdll: Use syscalls for NtCreateFile() and NtOpenFile().
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: dfa48037ec462c279bf314670d07f04696a9a25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfa48037ec462c279bf31467… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 10:47:02 2020 +0200 ntdll: Use syscalls for NtCreateFile() and NtOpenFile(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 59 ------------------------------------------ dlls/ntdll/ntdll.spec | 9 ++++--- dlls/ntdll/unix/loader.c | 17 ++++++------ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 8 +----- 5 files changed, 16 insertions(+), 78 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index f02be661d6..f650ff0d3e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -38,65 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -/************************************************************************** - * NtOpenFile [NTDLL.@] - * ZwOpenFile [NTDLL.@] - * - * Open a file. - * - * PARAMS - * handle [O] Variable that receives the file handle on return - * access [I] Access desired by the caller to the file - * attr [I] Structure describing the file to be opened - * io [O] Receives details about the result of the operation - * sharing [I] Type of shared access the caller requires - * options [I] Options for the file open - * - * RETURNS - * Success: 0. FileHandle and IoStatusBlock are updated. - * Failure: An NTSTATUS error code describing the error. - */ -NTSTATUS WINAPI NtOpenFile( PHANDLE handle, ACCESS_MASK access, - POBJECT_ATTRIBUTES attr, PIO_STATUS_BLOCK io, - ULONG sharing, ULONG options ) -{ - return unix_funcs->NtOpenFile( handle, access, attr, io, sharing, options ); -} - -/************************************************************************** - * NtCreateFile [NTDLL.@] - * ZwCreateFile [NTDLL.@] - * - * Either create a new file or directory, or open an existing file, device, - * directory or volume. - * - * PARAMS - * handle [O] Points to a variable which receives the file handle on return - * access [I] Desired access to the file - * attr [I] Structure describing the file - * io [O] Receives information about the operation on return - * alloc_size [I] Initial size of the file in bytes - * attributes [I] Attributes to create the file with - * sharing [I] Type of shared access the caller would like to the file - * disposition [I] Specifies what to do, depending on whether the file already exists - * options [I] Options for creating a new file - * ea_buffer [I] Pointer to an extended attributes buffer - * ea_length [I] Length of ea_buffer - * - * RETURNS - * Success: 0. handle and io are updated. - * Failure: An NTSTATUS error code describing the error. - */ -NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIBUTES attr, - PIO_STATUS_BLOCK io, PLARGE_INTEGER alloc_size, - ULONG attributes, ULONG sharing, ULONG disposition, - ULONG options, PVOID ea_buffer, ULONG ea_length ) -{ - return unix_funcs->NtCreateFile( handle, access, attr, io, alloc_size, attributes, - sharing, disposition, options, ea_buffer, ea_length ); -} - - /****************************************************************************** * NtReadFile [NTDLL.@] * ZwReadFile [NTDLL.@] diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0b1e91ddc9..ef38613a4e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -162,7 +162,7 @@ @ stdcall NtCreateDirectoryObject(ptr long ptr) @ stdcall NtCreateEvent(ptr long ptr long long) @ stub NtCreateEventPair -@ stdcall NtCreateFile(ptr long ptr ptr ptr long long long long ptr long) +@ stdcall -syscall NtCreateFile(ptr long ptr ptr ptr long long long long ptr long) @ stdcall NtCreateIoCompletion(ptr long ptr long) @ stdcall NtCreateJobObject(ptr long ptr) # @ stub NtCreateJobSet @@ -253,7 +253,7 @@ @ stdcall NtOpenDirectoryObject(ptr long ptr) @ stdcall NtOpenEvent(ptr long ptr) @ stub NtOpenEventPair -@ stdcall NtOpenFile(ptr long ptr ptr long long) +@ stdcall -syscall NtOpenFile(ptr long ptr ptr long long) @ stdcall NtOpenIoCompletion(ptr long ptr) @ stdcall NtOpenJobObject(ptr long ptr) @ stdcall NtOpenKey(ptr long ptr) @@ -1151,7 +1151,7 @@ @ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall -private ZwCreateEvent(ptr long ptr long long) NtCreateEvent @ stub ZwCreateEventPair -@ stdcall -private ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile +@ stdcall -private -syscall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @ stdcall -private ZwCreateJobObject(ptr long ptr) NtCreateJobObject # @ stub ZwCreateJobSet @@ -1237,7 +1237,7 @@ @ stdcall -private ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject @ stdcall -private ZwOpenEvent(ptr long ptr) NtOpenEvent @ stub ZwOpenEventPair -@ stdcall -private ZwOpenFile(ptr long ptr ptr long long) NtOpenFile +@ stdcall -private -syscall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private ZwOpenIoCompletion(ptr long ptr) NtOpenIoCompletion @ stdcall -private ZwOpenJobObject(ptr long ptr) NtOpenJobObject @ stdcall -private ZwOpenKey(ptr long ptr) NtOpenKey @@ -1583,6 +1583,7 @@ @ cdecl wine_server_send_fd(long) @ cdecl __wine_make_process_system() @ cdecl __wine_set_unix_funcs(long ptr) +@ extern __wine_syscall_dispatcher @ extern -arch=i386 __wine_ldt_copy # Debugging diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e2074f9734..2b43b69be9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -794,6 +794,7 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) const IMAGE_IMPORT_DESCRIPTOR *descr; const IMAGE_THUNK_DATA *import_list; IMAGE_THUNK_DATA *thunk_list; + void **ptr; assert( ntdll_exports ); @@ -836,14 +837,16 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) GET_FUNC( LdrInitializeThunk ); GET_FUNC( RtlUserThreadStart ); GET_FUNC( __wine_set_unix_funcs ); +#undef GET_FUNC +#define SET_PTR(name,val) \ + if ((ptr = (void *)find_named_export( ntdll_module, ntdll_exports, #name ))) *ptr = val; \ + else ERR( "%s not found\n", #name ) + + SET_PTR( __wine_syscall_dispatcher, __wine_syscall_dispatcher ); #ifdef __i386__ - { - struct ldt_copy **p__wine_ldt_copy; - GET_FUNC( __wine_ldt_copy ); - *p__wine_ldt_copy = &__wine_ldt_copy; - } + SET_PTR( __wine_ldt_copy, &__wine_ldt_copy ); #endif -#undef GET_FUNC +#undef SET_PTR } @@ -1376,7 +1379,6 @@ static struct unix_funcs unix_funcs = NtClose, NtContinue, NtCreateEvent, - NtCreateFile, NtCreateIoCompletion, NtCreateJobObject, NtCreateKeyedEvent, @@ -1407,7 +1409,6 @@ static struct unix_funcs unix_funcs = NtMapViewOfSection, NtNotifyChangeDirectoryFile, NtOpenEvent, - NtOpenFile, NtOpenIoCompletion, NtOpenJobObject, NtOpenKeyedEvent, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index e14da3ff7e..b7838355ee 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -223,6 +223,7 @@ extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, void *relay, TEB *teb ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; +extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 89ca0e960c..5f1ad1b5d9 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 70 +#define NTDLL_UNIXLIB_VERSION 71 struct unix_funcs { @@ -45,10 +45,6 @@ struct unix_funcs NTSTATUS (WINAPI *NtContinue)( CONTEXT *context, BOOLEAN alertable ); NTSTATUS (WINAPI *NtCreateEvent)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN state ); - NTSTATUS (WINAPI *NtCreateFile)( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - IO_STATUS_BLOCK *io, LARGE_INTEGER *alloc_size, - ULONG attributes, ULONG sharing, ULONG disposition, - ULONG options, void *ea_buffer, ULONG ea_length ); NTSTATUS (WINAPI *NtCreateIoCompletion)( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, ULONG threads ); NTSTATUS (WINAPI *NtCreateJobObject)( HANDLE *handle, ACCESS_MASK access, @@ -120,8 +116,6 @@ struct unix_funcs ULONG filter, BOOLEAN subtree ); NTSTATUS (WINAPI *NtOpenEvent)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); - NTSTATUS (WINAPI *NtOpenFile)( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - IO_STATUS_BLOCK *io, ULONG sharing, ULONG options ); NTSTATUS (WINAPI *NtOpenIoCompletion)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenJobObject)( HANDLE *handle, ACCESS_MASK access,

1 0

Paul Gofman : ntdll: Fix KiUserExceptionDispatcher ABI on x86.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: c198390c78acefdfd95ef3474f192a44f8e80b2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c198390c78acefdfd95ef347… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 3 13:22:23 2020 +0300 ntdll: Fix KiUserExceptionDispatcher ABI on x86. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 7 ++- dlls/ntdll/tests/exception.c | 109 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm.c | 5 +- dlls/ntdll/unix/signal_arm64.c | 5 +- dlls/ntdll/unix/signal_i386.c | 9 ++-- dlls/ntdll/unix/signal_x86_64.c | 17 ++++--- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 3 +- 8 files changed, 136 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c198390c78acefdfd95e…

1 0

Paul Gofman : ntdll: Don't call NtRaiseException() on x64 if debugger is not present.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: af3aee8a5a2852951b1fbc6e355e674fed9d4c5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3aee8a5a2852951b1fbc6e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 3 13:22:24 2020 +0300 ntdll: Don't call NtRaiseException() on x64 if debugger is not present. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 7 ++- dlls/ntdll/tests/exception.c | 114 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 113 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index dde0bb7339..c7c8b96405 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1338,7 +1338,12 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "movq %rax,0xf8(%rdx)\n\t" /* context->Rip */ "movq %rax,0x10(%rcx)\n\t" /* rec->ExceptionAddress */ "movl $1,%r8d\n\t" - "call " __ASM_NAME("NtRaiseException") "\n\t" + "movq %gs:(0x30),%rax\n\t" /* Teb */ + "movq 0x60(%rax),%rax\n\t" /* Peb */ + "cmpb $0,0x02(%rax)\n\t" /* BeingDebugged */ + "jne 1f\n\t" + "call " __ASM_NAME("dispatch_exception") "\n" + "1:\tcall " __ASM_NAME("NtRaiseException") "\n\t" "movq %rax,%rcx\n\t" "call " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7a25ffbbbc..77fcf71ba1 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1677,6 +1677,19 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST return ExceptionContinueExecution; } +static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTERS *e) +{ + EXCEPTION_RECORD *rec = e->ExceptionRecord; + CONTEXT *context = e->ContextRecord; + + trace("dbg_except_continue_vectored_handler, code %#x, eip %#x.\n", rec->ExceptionCode, context->Eip); + + got_exception = 1; + ++context->Eip; + + return EXCEPTION_CONTINUE_EXECUTION; +} + /* Use CDECL to leave arguments on stack. */ void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) { @@ -1714,8 +1727,10 @@ static void test_kiuserexceptiondispatcher(void) 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ }; void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; + BYTE patched_KiUserExceptionDispatcher_bytes[7]; void *phook_trampoline = hook_trampoline; DWORD old_protect1, old_protect2; + EXCEPTION_RECORD record; BYTE *ptr; BOOL ret; @@ -1738,7 +1753,8 @@ static void test_kiuserexceptiondispatcher(void) memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes)); - ptr = (BYTE *)pKiUserExceptionDispatcher; + + ptr = patched_KiUserExceptionDispatcher_bytes; /* mov hook_trampoline, %eax */ *ptr++ = 0xa1; *(void **)ptr = &phook_trampoline; @@ -1747,9 +1763,12 @@ static void test_kiuserexceptiondispatcher(void) *ptr++ = 0xff; *ptr++ = 0xe0; + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); got_exception = 0; run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); + ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); @@ -1761,6 +1780,25 @@ static void test_kiuserexceptiondispatcher(void) ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", dbg_except_continue_handler_eip, code_mem); + record.ExceptionCode = 0x80000003; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; /* does not matter, copied return address */ + record.NumberParameters = 0; + + AddVectoredExceptionHandler(TRUE, dbg_except_continue_vectored_handler); + + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); + got_exception = 0; + hook_called = FALSE; + + pRtlRaiseException(&record); + + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + + RemoveVectoredExceptionHandler(dbg_except_continue_vectored_handler); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect2, &old_protect2); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); @@ -2777,17 +2815,37 @@ static void *hook_exception_address; static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { - ok(hook_called, "Hook was not called.\n"); + trace("handler context->Rip %#lx, codemem %p.\n", context->Rip, code_mem); got_exception = 1; dbg_except_continue_handler_rip = (void *)context->Rip; ++context->Rip; + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, + sizeof(saved_KiUserExceptionDispatcher_bytes)); + return ExceptionContinueExecution; } +static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTERS *e) +{ + EXCEPTION_RECORD *rec = e->ExceptionRecord; + CONTEXT *context = e->ContextRecord; + + trace("dbg_except_continue_vectored_handler, code %#x, Rip %#lx.\n", rec->ExceptionCode, context->Rip); + + got_exception = 1; + if (NtCurrentTeb()->Peb->BeingDebugged || !strcmp( winetest_platform, "wine" )) + { + todo_wine_if(!NtCurrentTeb()->Peb->BeingDebugged) + ok(NtCurrentTeb()->Peb->BeingDebugged, "context->Rip misplaced for dbg breakpoint exception.\n"); + ++context->Rip; + } + return EXCEPTION_CONTINUE_EXECUTION; +} + void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) { trace("rec %p, context %p.\n", rec, context); - trace("context->Rip %#lx, context->Rsp %#lx, ContextFlags %#lx.\n", sizeof(*context), + trace("context->Rip %#lx, context->Rsp %#lx, ContextFlags %#lx.\n", context->Rip, context->Rsp, context->ContextFlags); hook_called = TRUE; @@ -2824,8 +2882,11 @@ static void test_kiuserexceptiondispatcher(void) /* offset: 27 bytes */ 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ }; + void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; + BYTE patched_KiUserExceptionDispatcher_bytes[12]; DWORD old_protect1, old_protect2; + EXCEPTION_RECORD record; BYTE *ptr; BOOL ret; @@ -2847,11 +2908,13 @@ static void test_kiuserexceptiondispatcher(void) ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); - ret = VirtualProtect(pKiUserExceptionDispatcher, 5, PAGE_EXECUTE_READWRITE, &old_protect2); + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), + PAGE_EXECUTE_READWRITE, &old_protect2); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); - memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes)); - ptr = (BYTE *)pKiUserExceptionDispatcher; + memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, + sizeof(saved_KiUserExceptionDispatcher_bytes)); + ptr = (BYTE *)patched_KiUserExceptionDispatcher_bytes; /* mov hook_trampoline, %rax */ *ptr++ = 0x48; *ptr++ = 0xb8; @@ -2861,6 +2924,8 @@ static void test_kiuserexceptiondispatcher(void) *ptr++ = 0xff; *ptr++ = 0xe0; + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); got_exception = 0; run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); ok(got_exception, "Handler was not called.\n"); @@ -2874,7 +2939,42 @@ static void test_kiuserexceptiondispatcher(void) ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", dbg_except_continue_handler_rip, code_mem); - ret = VirtualProtect(pKiUserExceptionDispatcher, 5, old_protect2, &old_protect2); + memset(&record, 0, sizeof(record)); + record.ExceptionCode = 0x80000003; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; + record.NumberParameters = 0; + + AddVectoredExceptionHandler(TRUE, dbg_except_continue_vectored_handler); + + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); + got_exception = 0; + hook_called = FALSE; + + pRtlRaiseException(&record); + + ok(got_exception, "Handler was not called.\n"); + ok(!hook_called, "Hook was called.\n"); + + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); + got_exception = 0; + hook_called = FALSE; + NtCurrentTeb()->Peb->BeingDebugged = 1; + + pRtlRaiseException(&record); + + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + + NtCurrentTeb()->Peb->BeingDebugged = 0; + + RemoveVectoredExceptionHandler(dbg_except_continue_vectored_handler); + + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), + old_protect2, &old_protect2); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());

1 0

Alexandre Julliard : ntdll/tests: Enable a few tests on all platforms.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: ec3cdaba4f018a87ef2fdfdb2e47a8b7811402f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3cdaba4f018a87ef2fdfdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 13:09:56 2020 +0200 ntdll/tests: Enable a few tests on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 77fcf71ba1..f39e6f9794 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3912,9 +3912,6 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); - test_suspend_thread(); - test_suspend_process(); - test_unload_trace(); test_kiuserexceptiondispatcher(); /* Call of Duty WWII writes to BeingDebugged then closes an invalid handle, @@ -3957,9 +3954,6 @@ START_TEST(exception) test_prot_fault(); test_dpe_exceptions(); test_wow64_context(); - test_suspend_thread(); - test_suspend_process(); - test_unload_trace(); test_kiuserexceptiondispatcher(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) @@ -3975,5 +3969,8 @@ START_TEST(exception) #endif + test_suspend_thread(); + test_suspend_process(); + test_unload_trace(); VirtualFree(code_mem, 0, MEM_RELEASE); }

1 0

Zebediah Figura : kernel32/tests: Call NtQuerySystemInformation(SystemProcessInformation) until it returns STATUS_SUCCESS.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 7ee7953c544b1f09c4a4a6a2c5e75b41ba77bf03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee7953c544b1f09c4a4a6a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 6 21:05:59 2020 -0500 kernel32/tests: Call NtQuerySystemInformation(SystemProcessInformation) until it returns STATUS_SUCCESS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/toolhelp.c | 69 +++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 7d27f22196..3bc07ec84f 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -230,45 +230,44 @@ static DWORD WINAPI get_id_thread(void* curr_pid) ok(found == FALSE, "The thread order is not strictly consistent\n"); /* Determine the order by NtQuerySystemInformation function */ - pcs_buffer = NULL; - status = pNtQuerySystemInformation(SystemProcessInformation, pcs_buffer, buf_size, &buf_size); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Failed with %x\n", status); - if (status == STATUS_INFO_LENGTH_MISMATCH) + + while ((status = NtQuerySystemInformation(SystemProcessInformation, + pcs_buffer, buf_size, &buf_size)) == STATUS_INFO_LENGTH_MISMATCH) { - pcs_buffer = HeapAlloc(GetProcessHeap(), 0, buf_size); - ok(pcs_buffer != NULL, "Unable to allocate space\n"); - found = FALSE; - matched_idx = -1; - - status = NtQuerySystemInformation(SystemProcessInformation, pcs_buffer, buf_size, &buf_size); - do { - spi = (SYSTEM_PROCESS_INFORMATION*)&pcs_buffer[pcs_offset]; - if (spi->UniqueProcessId == curr_pid) - { - found = TRUE; - break; - } - pcs_offset += spi->NextEntryOffset; - } while (spi->NextEntryOffset != 0); + free(pcs_buffer); + pcs_buffer = malloc(buf_size); + } + ok(status == STATUS_SUCCESS, "got %#x\n", status); + found = FALSE; + matched_idx = -1; - ok(found && spi, "No process found\n"); - for (i = 0; i < spi->dwThreadCount; i++) + do + { + spi = (SYSTEM_PROCESS_INFORMATION*)&pcs_buffer[pcs_offset]; + if (spi->UniqueProcessId == curr_pid) { - tid = HandleToULong(spi->ti[i].ClientId.UniqueThread); - if (matched_idx > 0) - { - thread_traversed[matched_idx++] = tid; - if (matched_idx >= NUM_THREADS) break; - } - else if (tid == thread_ids[0]) - { - matched_idx = 0; - thread_traversed[matched_idx++] = tid; - } + found = TRUE; + break; } - } - if (pcs_buffer) - HeapFree(GetProcessHeap(), 0, pcs_buffer); + pcs_offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(found && spi, "No process found\n"); + for (i = 0; i < spi->dwThreadCount; i++) + { + tid = HandleToULong(spi->ti[i].ClientId.UniqueThread); + if (matched_idx > 0) + { + thread_traversed[matched_idx++] = tid; + if (matched_idx >= NUM_THREADS) break; + } + else if (tid == thread_ids[0]) + { + matched_idx = 0; + thread_traversed[matched_idx++] = tid; + } + } + free(pcs_buffer); ok(matched_idx > 0, "No thread id match found\n");

1 0

Zebediah Figura : ntdll: Reimplement NtQuerySystemInformation(SystemProcessInformation) using a single server call.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 8622eb326fb8120fc038e27947e61677d4124f15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8622eb326fb8120fc038e279… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 6 21:06:00 2020 -0500 ntdll: Reimplement NtQuerySystemInformation(SystemProcessInformation) using a single server call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 178 +++++++++++++++++------------------------ include/wine/server_protocol.h | 41 +++++++++- server/process.c | 68 ++++++++++++++++ server/protocol.def | 30 +++++++ server/request.h | 6 ++ server/trace.c | 52 ++++++++++++ 6 files changed, 270 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8622eb326fb8120fc038…

1 0

Zebediah Figura : iphlpapi: Reimplement get_pid_map() using the list_processes request.
by Alexandre Julliard 07 Jul '20

07 Jul '20

Module: wine Branch: master Commit: 747573f1e4f4195772b055f5c4af227a58964f55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=747573f1e4f4195772b055f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 6 21:06:01 2020 -0500 iphlpapi: Reimplement get_pid_map() using the list_processes request. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 85 ++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 11d52d4d65..03e53abfb4 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1887,56 +1887,69 @@ struct pid_map static struct pid_map *get_pid_map( unsigned int *num_entries ) { - HANDLE snapshot = NULL; struct pid_map *map; - unsigned int i = 0, count = 16, size = count * sizeof(*map); + unsigned int i = 0, map_count = 16, buffer_len = 4096, process_count, pos = 0; NTSTATUS ret; + char *buffer = NULL, *new_buffer; - if (!(map = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_len ))) return NULL; - SERVER_START_REQ( create_snapshot ) + for (;;) + { + SERVER_START_REQ( list_processes ) + { + wine_server_set_reply( req, buffer, buffer_len ); + ret = wine_server_call( req ); + buffer_len = reply->info_size; + process_count = reply->process_count; + } + SERVER_END_REQ; + + if (ret != STATUS_INFO_LENGTH_MISMATCH) break; + + if (!(new_buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, buffer_len ))) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return NULL; + } + } + + if (!(map = HeapAlloc( GetProcessHeap(), 0, map_count * sizeof(*map) ))) { - req->flags = SNAP_PROCESS; - req->attributes = 0; - if (!(ret = wine_server_call( req ))) - snapshot = wine_server_ptr_handle( reply->handle ); + HeapFree( GetProcessHeap(), 0, buffer ); + return NULL; } - SERVER_END_REQ; - *num_entries = 0; - while (ret == STATUS_SUCCESS) + for (i = 0; i < process_count; ++i) { - SERVER_START_REQ( next_process ) + const struct process_info *process; + + pos = (pos + 7) & ~7; + process = (const struct process_info *)(buffer + pos); + + if (i >= map_count) { - req->handle = wine_server_obj_handle( snapshot ); - req->reset = (i == 0); - if (!(ret = wine_server_call( req ))) + struct pid_map *new_map; + map_count *= 2; + if (!(new_map = HeapReAlloc( GetProcessHeap(), 0, map, map_count * sizeof(*map)))) { - if (i >= count) - { - struct pid_map *new_map; - count *= 2; - size = count * sizeof(*new_map); - - if (!(new_map = HeapReAlloc( GetProcessHeap(), 0, map, size ))) - { - HeapFree( GetProcessHeap(), 0, map ); - map = NULL; - goto done; - } - map = new_map; - } - map[i].pid = reply->pid; - map[i].unix_pid = reply->unix_pid; - (*num_entries)++; - i++; + HeapFree( GetProcessHeap(), 0, map ); + HeapFree( GetProcessHeap(), 0, buffer ); + return NULL; } + map = new_map; } - SERVER_END_REQ; + + map[i].pid = process->pid; + map[i].unix_pid = process->unix_pid; + + pos += sizeof(struct process_info) + process->name_len; + pos = (pos + 7) & ~7; + pos += process->thread_count * sizeof(struct thread_info); } -done: - NtClose( snapshot ); + HeapFree( GetProcessHeap(), 0, buffer ); + *num_entries = process_count; return map; }

1 0