December 2021 - Wine-commits

Alexandre Julliard : wow64: Add support for user callbacks.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 716599703671fe0e003c022a21f39621fe064d67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=716599703671fe0e003c022a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:08 2021 +0100 wow64: Add support for user callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/wow64.spec | 2 +- include/winternl.h | 7 ++-- 4 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index bee186456cc..75a5df5c453 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -70,6 +70,18 @@ struct mem_header BYTE data[1]; }; +/* stack frame for user callbacks */ +struct user_callback_frame +{ + struct user_callback_frame *prev_frame; + struct mem_header *temp_list; + void **ret_ptr; + ULONG *ret_len; + NTSTATUS status; + __wine_jmp_buf jmpbuf; +}; + + SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; /* wow64win syscall table */ @@ -143,6 +155,26 @@ NTSTATUS WINAPI wow64_NtAllocateUuids( UINT *args ) } +/*********************************************************************** + * wow64_NtCallbackReturn + */ +NTSTATUS WINAPI wow64_NtCallbackReturn( UINT *args ) +{ + void *ret_ptr = get_ptr( &args ); + ULONG ret_len = get_ulong( &args ); + NTSTATUS status = get_ulong( &args ); + + struct user_callback_frame *frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; + + if (!frame) return STATUS_NO_CALLBACK_ACTIVE; + + *frame->ret_ptr = ret_ptr; + *frame->ret_len = ret_len; + frame->status = status; + __wine_longjmp( &frame->jmpbuf, 1 ); +} + + /********************************************************************** * wow64_NtClose */ @@ -793,6 +825,86 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON } +/********************************************************************** + * Wow64KiUserCallbackDispatcher (wow64.@) + */ +NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, + void **ret_ptr, ULONG *ret_len ) +{ + struct user_callback_frame frame; + + frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; + frame.temp_list = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; + frame.ret_ptr = ret_ptr; + frame.ret_len = ret_len; + + NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = &frame; + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = NULL; + + /* cf. 32-bit KeUserModeCallback */ + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + I386_CONTEXT orig_ctx, ctx = { CONTEXT_I386_FULL }; + void *args_data; + ULONG *stack; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + + stack = args_data = ULongToPtr( (ctx.Esp - len) & ~15 ); + memcpy( args_data, args, len ); + *(--stack) = 0; + *(--stack) = len; + *(--stack) = PtrToUlong( args_data ); + *(--stack) = id; + *(--stack) = 0xdeadbabe; + + orig_ctx = ctx; + ctx.Esp = PtrToUlong( stack ); + ctx.Eip = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + + if (!__wine_setjmpex( &frame.jmpbuf, NULL )) + cpu_simulate(); + else + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, + &orig_ctx, sizeof(orig_ctx) ); + } + break; + + case IMAGE_FILE_MACHINE_ARMNT: + { + ARM_CONTEXT orig_ctx, ctx = { CONTEXT_ARM_FULL }; + void *args_data; + + NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + + args_data = ULongToPtr( (ctx.Sp - len) & ~15 ); + memcpy( args_data, args, len ); + + ctx.R0 = id; + ctx.R1 = PtrToUlong( args ); + ctx.R2 = len; + ctx.Sp = PtrToUlong( args_data ); + ctx.Pc = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + + if (!__wine_setjmpex( &frame.jmpbuf, NULL )) + cpu_simulate(); + else + NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, + &orig_ctx, sizeof(orig_ctx) ); + } + break; + } + + NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame; + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list; + return frame.status; +} + + /********************************************************************** * Wow64LdrpInitialize (wow64.@) */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index cb8fed9b99c..1e122e97314 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -37,6 +37,7 @@ SYSCALL_ENTRY( NtAllocateVirtualMemoryEx ) \ SYSCALL_ENTRY( NtAreMappedFilesTheSame ) \ SYSCALL_ENTRY( NtAssignProcessToJobObject ) \ + SYSCALL_ENTRY( NtCallbackReturn ) \ SYSCALL_ENTRY( NtCancelIoFile ) \ SYSCALL_ENTRY( NtCancelIoFileEx ) \ SYSCALL_ENTRY( NtCancelTimer ) \ diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 5c3f39c50f1..e05a608d319 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -9,7 +9,7 @@ @ stub Wow64GetWow64ImageOption @ stub Wow64IsControlFlowGuardEnforced @ stub Wow64IsStackExtentsCheckEnforced -@ stub Wow64KiUserCallbackDispatcher +@ stdcall Wow64KiUserCallbackDispatcher(long ptr long ptr ptr) @ stdcall Wow64LdrpInitialize(ptr) @ stub Wow64LogPrint @ stub Wow64NotifyUnsimulateComplete diff --git a/include/winternl.h b/include/winternl.h index 5c2a1c07aeb..5b6ba98be42 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1080,9 +1080,10 @@ typedef struct _TEB64 } TEB64; /* reserved TEB64 TLS slots for Wow64 */ -#define WOW64_TLS_CPURESERVED 1 -#define WOW64_TLS_TEMPLIST 3 -#define WOW64_TLS_FILESYSREDIR 8 +#define WOW64_TLS_CPURESERVED 1 +#define WOW64_TLS_TEMPLIST 3 +#define WOW64_TLS_USERCALLBACKDATA 5 +#define WOW64_TLS_FILESYSREDIR 8 /***********************************************************************

1 0

Alexandre Julliard : ntdll: Don't try to convert binaries to 64-bit in Wow64 mode.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 679a2f531bdba5a1abbf9db44f1d0defd8a945a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=679a2f531bdba5a1abbf9db4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:13 2021 +0100 ntdll: Don't try to convert binaries to 64-bit in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 86aec79dbfc..665c4480ad4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2118,6 +2118,7 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in ULONG i, old_prot; if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return TRUE; /* already 64-bit */ + if (NtCurrentTeb()->WowTebOffset) return TRUE; /* no need to convert */ if (!info->ImageContainsCode) return TRUE; /* no need to convert */ TRACE( "%p\n", module ); @@ -2207,6 +2208,7 @@ static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info #else if (info->Machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif + if (NtCurrentTeb()->WowTebOffset) return TRUE; if (!info->ImageContainsCode) return TRUE; if (!(info->u.s.ComPlusNativeReady)) {

1 0

Alexandre Julliard : ntdll: Set the TEB offset for Wow64 mode also in 64-bit.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 1b447409cb83e1ebc6037fadbca309c304055ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b447409cb83e1ebc6037fad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 11:23:16 2021 +0100 ntdll: Set the TEB offset for Wow64 mode also in 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ca3e0a9dc81..30d8ac1553c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2128,6 +2128,15 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion; peb->ImageSubSystemMinorVersion = main_image_info.MinorSubsystemVersion; +#ifdef _WIN64 + if (main_image_info.Machine != current_machine) + { + NtCurrentTeb()->WowTebOffset = teb_offset; + NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); + set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); + } +#endif + load_global_options( &params->ImagePathName ); if (NtCurrentTeb()->WowTebOffset)

1 0

Alexandre Julliard : ntdll: Add fallback implementations for the Unix library functions.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: d10410eac2b598699a3619d6e3f908e256af3afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10410eac2b598699a3619d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:40 2021 +0100 ntdll: Add fallback implementations for the Unix library functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/loader.c | 8 ++++---- dlls/ntdll/unixlib.h | 15 ++++++--------- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 665c4480ad4..c33acd71759 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -76,8 +76,6 @@ static DWORD (WINAPI *pCtrlRoutine)(void *); SYSTEM_DLL_INIT_BLOCK LdrSystemDllInitBlock = { 0xf0 }; -const struct unix_funcs *unix_funcs = NULL; - /* windows directory */ const WCHAR windows_dir[] = L"C:\\windows"; /* system directory with trailing backslash */ @@ -4443,6 +4441,44 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } +static NTSTATUS CDECL load_so_dll_fallback( UNICODE_STRING *nt_name, void **module ) +{ + return STATUS_INVALID_IMAGE_FORMAT; +} + +static void CDECL init_builtin_dll_fallback( void *module ) +{ +} + +static NTSTATUS CDECL init_unix_lib_fallback( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) +{ + return STATUS_DLL_NOT_FOUND; +} + +static NTSTATUS CDECL unwind_builtin_dll_fallback( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, + CONTEXT *context ) +{ + return STATUS_UNSUCCESSFUL; +} + +static LONGLONG WINAPI RtlGetSystemTimePrecise_fallback(void) +{ + LARGE_INTEGER now; + NtQuerySystemTime( &now ); + return now.QuadPart; +} + +static const struct unix_funcs unix_fallbacks = +{ + load_so_dll_fallback, + init_builtin_dll_fallback, + init_unix_lib_fallback, + unwind_builtin_dll_fallback, + RtlGetSystemTimePrecise_fallback, +}; + +const struct unix_funcs *unix_funcs = &unix_fallbacks; + /*********************************************************************** * __wine_set_unix_funcs */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 61041061b32..82d099de3be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2156,14 +2156,14 @@ static ULONG_PTR get_image_address(void) */ static struct unix_funcs unix_funcs = { -#ifdef __aarch64__ - NtCurrentTeb, -#endif - RtlGetSystemTimePrecise, load_so_dll, init_builtin_dll, init_unix_lib, unwind_builtin_dll, + RtlGetSystemTimePrecise, +#ifdef __aarch64__ + NtCurrentTeb, +#endif }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 803b6a082bb..d60f8cc50e4 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,24 +26,21 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 132 +#define NTDLL_UNIXLIB_VERSION 133 struct unix_funcs { - /* Nt* functions */ -#ifdef __aarch64__ - TEB * (WINAPI *NtCurrentTeb)(void); -#endif - - /* other Win32 API functions */ - LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); - /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); + /* other Win32 API functions */ + LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); +#ifdef __aarch64__ + TEB * (WINAPI *NtCurrentTeb)(void); +#endif }; #endif /* __NTDLL_UNIXLIB_H */

1 0

Alexandre Julliard : makefiles: Support per-platform values for EXTRADLLFLAGS.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: a041075cd2c26874757e0b6e1449c23c1326241c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a041075cd2c26874757e0b6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:49 2021 +0100 makefiles: Support per-platform values for EXTRADLLFLAGS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + tools/makedep.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 7e823208840..185bc563e68 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -7,6 +7,7 @@ EXTRAINCL = $(UNWIND_CFLAGS) EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 +x86_64_EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x170000000 C_SRCS = \ actctx.c \ diff --git a/tools/makedep.c b/tools/makedep.c index 2301ecf191e..e69dc3ce0a4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4131,6 +4131,12 @@ static void load_sources( struct makefile *make ) if (make->extlib) make->staticlib = make->extlib; if (make->staticlib) make->module = make->staticlib; + if (host_cpu) + { + value = get_expanded_file_local_var( make, host_cpu, "EXTRADLLFLAGS" ); + if (value.count) make->extradllflags = value; + } + make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); make->use_msvcrt = (make->module || make->testdll || make->is_win16) &&

1 0

André Zwing : gameux/tests: Skip gamestatistic tests on win10 >= 1803.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 6282718c73bdf1648f18764c51671a57cef3c526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6282718c73bdf1648f18764c… Author: André Zwing <nerv(a)dawncrow.de> Date: Wed Dec 1 18:17:03 2021 +0100 gameux/tests: Skip gamestatistic tests on win10 >= 1803. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51716 Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index c29c6b44470..aa10156f1ab 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -158,6 +158,12 @@ static void test_gamestatisticsmgr( void ) /* this should fail, because statistics don't exist yet */ gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); + if (hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + /* With win10 1803 game explorer functionality was removed and gameux became a stub */ + win_skip("gameux is partially stubbed, skipping tests\n"); + return; + } ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef"));

1 0

Eric Pouech : winedbg: Move lex buffers inside struct parser_context.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 956a978801e1403f4944d779c183230900fa89c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=956a978801e1403f4944d779… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:05 2021 +0100 winedbg: Move lex buffers inside struct parser_context. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index ace29039753..b58875b6c31 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -458,9 +458,11 @@ struct parser_context HANDLE input; HANDLE output; unsigned line_no; + char* last_line; + size_t last_line_idx; }; -static struct parser_context dbg_parser = {NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0}; +static struct parser_context dbg_parser = {NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0, NULL, 0}; static int input_fetch_entire_line(const char* pfx, char** line) { @@ -504,11 +506,9 @@ static int input_fetch_entire_line(const char* pfx, char** line) size_t input_lex_read_buffer(char* buf, int size) { int len; - static char* last_line = NULL; - static size_t last_line_idx = 0; /* try first to fetch the remaining of an existing line */ - if (last_line_idx == 0) + if (dbg_parser.last_line_idx == 0) { char* tmp = NULL; /* no remaining chars to be read from last line, grab a brand new line up to '\n' */ @@ -527,22 +527,22 @@ size_t input_lex_read_buffer(char* buf, int size) /* FIXME: should have a pair of buffers, and switch between the two, instead of * reallocating a new one for each line */ - if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) + if (dbg_parser.last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) { HeapFree(GetProcessHeap(), 0, tmp); } else { - HeapFree(GetProcessHeap(), 0, last_line); - last_line = tmp; + HeapFree(GetProcessHeap(), 0, dbg_parser.last_line); + dbg_parser.last_line = tmp; } } - len = min(strlen(last_line + last_line_idx), size - 1); - memcpy(buf, last_line + last_line_idx, len); + len = min(strlen(dbg_parser.last_line + dbg_parser.last_line_idx), size - 1); + memcpy(buf, dbg_parser.last_line + dbg_parser.last_line_idx, len); buf[len] = '\0'; - if ((last_line_idx += len) >= strlen(last_line)) - last_line_idx = 0; + if ((dbg_parser.last_line_idx += len) >= strlen(dbg_parser.last_line)) + dbg_parser.last_line_idx = 0; return len; } @@ -585,6 +585,8 @@ void parser_handle(const char* filename, HANDLE input) } dbg_parser.line_no = 0; dbg_parser.filename = filename; + dbg_parser.last_line = NULL; + dbg_parser.last_line_idx = 0; do { __TRY

1 0

Eric Pouech : winedbg: Don't repeat last command (from empty input) when parsing a file.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 44f49d75ec27ba6109d62e090f2c27e45a70e6e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f49d75ec27ba6109d62e09… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:11 2021 +0100 winedbg: Don't repeat last command (from empty input) when parsing a file. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index b58875b6c31..612e6a4106d 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -524,10 +524,9 @@ size_t input_lex_read_buffer(char* buf, int size) len--; } - /* FIXME: should have a pair of buffers, and switch between the two, instead of - * reallocating a new one for each line - */ - if (dbg_parser.last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) + /* recall last command when empty input buffer and not parsing a file */ + if (dbg_parser.last_line && (len == 0 || (len == 1 && tmp[0] == '\n')) && + dbg_parser.output != INVALID_HANDLE_VALUE) { HeapFree(GetProcessHeap(), 0, tmp); }

1 0

Eric Pouech : winedbg: Properly escape debuggee arguments.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 94ca4be2a62cdb05adaee524084875b04b283afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ca4be2a62cdb05adaee524… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:17 2021 +0100 winedbg: Properly escape debuggee arguments. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/tgt_active.c | 106 +++++++++++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 21 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 2a2af67debe..4bcd5ba659e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -636,6 +636,88 @@ static BOOL dbg_start_debuggee(LPSTR cmdLine) return TRUE; } +/*********************************************************************** + * dbg_build_command_line + * + * (converted from dlls/ntdll/unix/env.c) + * + * Build the command line of a process from the argv array. + * + * We must quote and escape characters so that the argv array can be rebuilt + * from the command line: + * - spaces and tabs must be quoted + * 'a b' -> '"a b"' + * - quotes must be escaped + * '"' -> '\"' + * - if '\'s are followed by a '"', they must be doubled and followed by '\"', + * resulting in an odd number of '\' followed by a '"' + * '\"' -> '\\\"' + * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' + * - '\'s that are not followed by a '"' can be left as is + * 'a\b' == 'a\b' + * 'a\\b' == 'a\\b' + */ +static char *dbg_build_command_line( char **argv ) +{ + int len; + char **arg, *ret; + LPSTR p; + + len = 1; + for (arg = argv; *arg; arg++) len += 3 + 2 * strlen( *arg ); + if (!(ret = malloc( len ))) return NULL; + + p = ret; + for (arg = argv; *arg; arg++) + { + BOOL has_space, has_quote; + int i, bcount; + char *a; + + /* check for quotes and spaces in this argument (first arg is always quoted) */ + has_space = (arg == argv) || !**arg || strchr( *arg, ' ' ) || strchr( *arg, '\t' ); + has_quote = strchr( *arg, '"' ) != NULL; + + /* now transfer it to the command line */ + if (has_space) *p++ = '"'; + if (has_quote || has_space) + { + bcount = 0; + for (a = *arg; *a; a++) + { + if (*a == '\\') bcount++; + else + { + if (*a == '"') /* double all the '\\' preceding this '"', plus one */ + for (i = 0; i <= bcount; i++) *p++ = '\\'; + bcount = 0; + } + *p++ = *a; + } + } + else + { + strcpy( p, *arg ); + p += strlen( p ); + } + if (has_space) + { + /* Double all the '\' preceding the closing quote */ + for (i = 0; i < bcount; i++) *p++ = '\\'; + *p++ = '"'; + } + *p++ = ' '; + } + if (p > ret) p--; /* remove last space */ + *p = 0; + return ret; +} + + void dbg_run_debuggee(const char* args) { if (args) @@ -807,35 +889,17 @@ enum dbg_start dbg_active_attach(int argc, char* argv[]) */ enum dbg_start dbg_active_launch(int argc, char* argv[]) { - int i, len; LPSTR cmd_line; if (argc == 0) return start_error_parse; - if (!(cmd_line = HeapAlloc(GetProcessHeap(), 0, len = 1))) - { - oom_leave: - dbg_printf("Out of memory\n"); - return start_error_init; - } - cmd_line[0] = '\0'; - - for (i = 0; i < argc; i++) - { - len += strlen(argv[i]) + 1; - if (!(cmd_line = HeapReAlloc(GetProcessHeap(), 0, cmd_line, len))) - goto oom_leave; - strcat(cmd_line, argv[i]); - cmd_line[len - 2] = ' '; - cmd_line[len - 1] = '\0'; - } - + cmd_line = dbg_build_command_line(argv); if (!dbg_start_debuggee(cmd_line)) { - HeapFree(GetProcessHeap(), 0, cmd_line); + free(cmd_line); return start_error_init; } - HeapFree(GetProcessHeap(), 0, dbg_last_cmd_line); + free(dbg_last_cmd_line); dbg_last_cmd_line = cmd_line; return start_ok; }

1 0

Eric Pouech : winedbg: Properly handle escaped characters inside strings.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: d331d9cb936f047fd94c4b30b16f81d549c131ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d331d9cb936f047fd94c4b30… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:23 2021 +0100 winedbg: Properly handle escaped characters inside strings. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debug.l | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a497f34e6b0..280dcbfbc6b 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -60,6 +60,34 @@ void lexeme_flush(void) next_lexeme = 0; } +/* called with quoted string, unescape all elements inside the quotes */ +static char* unescape_string(const char* str) +{ + size_t len = strlen(str) - 2; + char* ret = lexeme_alloc_size(len + 1); + char* dst = ret; + const char* ptr; + for (ptr = str + 1; ptr < str + 1 + len; ptr++) + { + if (*ptr == '\\') + { + switch (*++ptr) + { + case 't': *dst++ = '\t'; break; + case 'r': *dst++ = '\r'; break; + case 'n': *dst++ = '\n'; break; + case '\\': *dst++ = '\\'; break; + case '"': *dst++ = '"'; break; + default: *dst++ = '\\'; *dst++ = *ptr; /* not handled, don't change */ + } + } + else + *dst++ = *ptr; + } + *dst = '\0'; + return ret; +} + #define YY_INPUT(buf,result,max_size) \ (result = input_lex_read_buffer(buf, max_size)) @@ -72,7 +100,7 @@ HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswxa] IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]* PATHNAME [\\/_a-zA-Z0-9\.~@][\\/\-_a-zA-Z0-9\.~@]* -STRING \"[^\n"]+\" +STRING \"(\\[^\n]|[^\\"\n])*\" %s FORMAT_EXPECTED %s INFO_CMD @@ -125,7 +153,7 @@ STRING \"[^\n"]+\" <FORMAT_EXPECTED>"/"{FORMAT} { dbg_lval.integer = (1 << 8) | yytext[1]; return tFORMAT; } -{STRING} { dbg_lval.string = lexeme_alloc(yytext + 1); dbg_lval.string[strlen(dbg_lval.string) - 1] = '\0'; return tSTRING; } +{STRING} { dbg_lval.string = unescape_string(yytext); return tSTRING;} <ASTRING_EXPECTED>[^\n]+ { char* p = yytext; while (*p == ' ' || *p == '\t') p++; dbg_lval.string = lexeme_alloc(p); return tSTRING; }

1 0