March 2021 - Wine-Commits - list.winehq.org

Rafał Harabień : kernel32: Add Wow64GetThreadSelectorEntry stub.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 45cd7ff4879d17c3730bb2228e047af7f8e334e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45cd7ff4879d17c3730bb222… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Fri Mar 5 22:30:42 2021 +0100 kernel32: Add Wow64GetThreadSelectorEntry stub. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 12 ++++++++++++ include/winbase.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0eb66a0e3b0..d14bf010383 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1617,7 +1617,7 @@ @ stdcall Wow64EnableWow64FsRedirection(long) KERNEL32_Wow64EnableWow64FsRedirection @ stdcall -import Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64GetThreadContext(long ptr) -# @ stub Wow64GetThreadSelectorEntry +@ stdcall Wow64GetThreadSelectorEntry(long long ptr) @ stdcall -import Wow64RevertWow64FsRedirection(ptr) @ stdcall Wow64SetThreadContext(long ptr) # @ stub Wow64SuspendThread diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 1f4f938af51..050bd416553 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -30,8 +30,10 @@ #include "winternl.h" #include "wine/asm.h" +#include "wine/debug.h" #include "kernel_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(thread); /*********************************************************************** * BaseThreadInitThunk (KERNEL32.@) @@ -99,6 +101,16 @@ BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context) } +/*********************************************************************** + * Wow64GetThreadSelectorEntry [KERNEL32.@] + */ +BOOL WINAPI Wow64GetThreadSelectorEntry( HANDLE thread, DWORD selector, WOW64_LDT_ENTRY *selector_entry) +{ + FIXME("(%p %u %p): stub\n", thread, selector, selector_entry); + return set_ntstatus( STATUS_NOT_IMPLEMENTED ); +} + + /********************************************************************** * SetThreadAffinityMask (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 0262e50d980..651da6d6906 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2771,6 +2771,7 @@ WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); WINBASEAPI BOOL WINAPI Wow64GetThreadContext(HANDLE, WOW64_CONTEXT *); +WINBASEAPI BOOL WINAPI Wow64GetThreadSelectorEntry(HANDLE,DWORD,WOW64_LDT_ENTRY*); WINBASEAPI BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); WINBASEAPI BOOL WINAPI Wow64SetThreadContext(HANDLE, const WOW64_CONTEXT *); WINADVAPI DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC,PVOID,PVOID);

1 0

Alexandre Julliard : ntdll: Explicitly reset the PATH variable before reloading the environment.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 9107f591d3d73a3b4040db2e13ef51d9846591c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9107f591d3d73a3b4040db2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 9 15:06:58 2021 +0100 ntdll: Explicitly reset the PATH variable before reloading the environment. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50786 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 004e76b789f..2051ad33888 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1306,7 +1306,7 @@ static WCHAR *expand_value( WCHAR *env, SIZE_T size, const WCHAR *src, SIZE_T sr * helper for add_registry_environment(). * Note that Windows happily truncates the value if it's too big. */ -static void add_registry_variables( WCHAR **env, SIZE_T *pos, SIZE_T *size, HANDLE key, BOOL append ) +static void add_registry_variables( WCHAR **env, SIZE_T *pos, SIZE_T *size, HANDLE key ) { static const WCHAR pathW[] = {'P','A','T','H'}; NTSTATUS status; @@ -1331,13 +1331,13 @@ static void add_registry_variables( WCHAR **env, SIZE_T *pos, SIZE_T *size, HAND if (info->Type == REG_EXPAND_SZ) value = expand_value( *env, *pos, data, datalen ); /* PATH is magic */ - if (append && namelen == 4 && !wcsnicmp( info->Name, pathW, 4 ) && (p = find_env_var( *env, *pos, pathW, 4 ))) + if (namelen == 4 && !wcsnicmp( info->Name, pathW, 4 ) && (p = find_env_var( *env, *pos, pathW, 4 ))) { static const WCHAR sepW[] = {';',0}; - WCHAR *newpath = malloc( (wcslen(p) - 4 + datalen) * sizeof(WCHAR) ); + WCHAR *newpath = malloc( (wcslen(p) - 3 + wcslen(value)) * sizeof(WCHAR) ); wcscpy( newpath, p + 5 ); wcscat( newpath, sepW ); - wcscat( newpath, data ); + wcscat( newpath, value ); if (value != data) free( value ); value = newpath; } @@ -1370,17 +1370,17 @@ static void add_registry_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) init_unicode_string( &nameW, syskeyW ); if (!NtOpenKey( &key, KEY_READ, &attr )) { - add_registry_variables( env, pos, size, key, FALSE ); + add_registry_variables( env, pos, size, key ); NtClose( key ); } if (!open_hkcu_key( "Environment", &key )) { - add_registry_variables( env, pos, size, key, TRUE ); + add_registry_variables( env, pos, size, key ); NtClose( key ); } if (!open_hkcu_key( "Volatile Environment", &key )) { - add_registry_variables( env, pos, size, key, TRUE ); + add_registry_variables( env, pos, size, key ); NtClose( key ); } } @@ -1708,18 +1708,28 @@ static inline void put_unicode_string( WCHAR *src, WCHAR **dst, UNICODE_STRING * */ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) { + static const WCHAR pathW[] = {'P','A','T','H'}; RTL_USER_PROCESS_PARAMETERS *params = NULL; SIZE_T size, env_pos, env_size; - WCHAR *dst; + WCHAR *dst, *p, *path = NULL; WCHAR *cmdline = build_command_line( main_wargv + 1 ); WCHAR *env = get_initial_environment( &env_pos, &env_size ); NTSTATUS status; + /* store the initial PATH value */ + if ((p = find_env_var( env, env_pos, pathW, 4 ))) + { + path = malloc( (wcslen(p + 5) + 1) * sizeof(WCHAR) ); + wcscpy( path, p + 5 ); + } add_dynamic_environment( &env, &env_pos, &env_size ); add_registry_environment( &env, &env_pos, &env_size ); env[env_pos] = 0; run_wineboot( env, env_pos ); + /* reload environment now that wineboot has run */ + set_env_var( &env, &env_pos, &env_size, pathW, 4, path ); /* reset PATH */ + free( path ); add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0;

1 0

Rafał Harabień : ntdll: Allow getting/setting x86_64 context of x86 processes in wine64.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 77481d36d3a9ce87a213424aef65ad094b42b022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77481d36d3a9ce87a213424a… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Mon Mar 1 00:42:28 2021 +0100 ntdll: Allow getting/setting x86_64 context of x86 processes in wine64. WoW64 process has two separate contexts: - x86 context used most of the time (e.g. by application code) - x86_64 context used by system when it quits x86 emulation and jumps to the kernel code A notable exception are debug registers - their state is shared. Some debuggers make use of that fact and sets/gets debug registers of x86 processes using x86_64 thread context. Add support for setting and getting debug registers using x86_64 thread context. Getting other registers is allowed too and will return values from x86 thread context. Fixes hardware breakpoints in IDA 7.0 disassembler (x86_64 app) when debugging x86 (32 bit) applications. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 9 ------- dlls/ntdll/unix/signal_x86_64.c | 59 +++++++++++++++++++++++++++++++++++++++++ server/thread.c | 22 +++++++++++++-- 3 files changed, 79 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 75765bee5a0..da88ca449fb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5841,7 +5841,6 @@ static void test_debug_registers_wow64(void) ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); ctx.Dr0 = 0x12340000; @@ -5850,14 +5849,12 @@ static void test_debug_registers_wow64(void) ctx.Dr3 = 0x12340003; ctx.Dr7 = 0x155; /* enable all breakpoints (local) */ bret = SetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "SetThreadContext failed\n"); if (bret) { ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); if (bret) { @@ -5896,22 +5893,16 @@ static void test_debug_registers_wow64(void) ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); if (ret == STATUS_SUCCESS) { - todo_wine ok(wow64_ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", wow64_ctx.Dr0); - todo_wine ok(wow64_ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", wow64_ctx.Dr1); - todo_wine ok(wow64_ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", wow64_ctx.Dr2); - todo_wine ok(wow64_ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", wow64_ctx.Dr3); - todo_wine ok(wow64_ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", wow64_ctx.Dr7); } ZeroMemory(&ctx, sizeof(ctx)); ctx.ContextFlags = CONTEXT_ALL; bret = GetThreadContext(pi.hThread, &ctx); - todo_wine ok(bret, "GetThreadContext failed\n"); if (bret) { diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2a030372fb7..7dab5fbf4ed 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1707,6 +1707,65 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) */ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { + if (from->cpu == CPU_x86) + { + /* convert the WoW64 context */ + to->ContextFlags = CONTEXT_AMD64; + if (from->flags & SERVER_CTX_CONTROL) + { + to->ContextFlags |= CONTEXT_CONTROL; + to->Rbp = from->ctl.i386_regs.ebp; + to->Rip = from->ctl.i386_regs.eip; + to->Rsp = from->ctl.i386_regs.esp; + to->SegCs = from->ctl.i386_regs.cs; + to->SegSs = from->ctl.i386_regs.ss; + to->EFlags = from->ctl.i386_regs.eflags; + } + + if (from->flags & SERVER_CTX_INTEGER) + { + to->ContextFlags |= CONTEXT_INTEGER; + to->Rax = from->integer.i386_regs.eax; + to->Rcx = from->integer.i386_regs.ecx; + to->Rdx = from->integer.i386_regs.edx; + to->Rbx = from->integer.i386_regs.ebx; + to->Rsi = from->integer.i386_regs.esi; + to->Rdi = from->integer.i386_regs.edi; + to->R8 = 0; + to->R9 = 0; + to->R10 = 0; + to->R11 = 0; + to->R12 = 0; + to->R13 = 0; + to->R14 = 0; + to->R15 = 0; + } + if (from->flags & SERVER_CTX_SEGMENTS) + { + to->ContextFlags |= CONTEXT_SEGMENTS; + to->SegDs = from->seg.i386_regs.ds; + to->SegEs = from->seg.i386_regs.es; + to->SegFs = from->seg.i386_regs.fs; + to->SegGs = from->seg.i386_regs.gs; + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + memset(&to->u.FltSave, 0, sizeof(to->u.FltSave)); + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + to->Dr0 = from->debug.i386_regs.dr0; + to->Dr1 = from->debug.i386_regs.dr1; + to->Dr2 = from->debug.i386_regs.dr2; + to->Dr3 = from->debug.i386_regs.dr3; + to->Dr6 = from->debug.i386_regs.dr6; + to->Dr7 = from->debug.i386_regs.dr7; + } + return STATUS_SUCCESS; + } + if (from->cpu != CPU_x86_64) return STATUS_INVALID_PARAMETER; to->ContextFlags = CONTEXT_AMD64 | (to->ContextFlags & 0x40); diff --git a/server/thread.c b/server/thread.c index dc02a1a9de3..e4abe4fab94 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1890,8 +1890,7 @@ DECL_HANDLER(set_thread_context) reply->self = (thread == current); if (thread->state == TERMINATED) set_error( STATUS_UNSUCCESSFUL ); - else if (context->cpu != thread->process->cpu) set_error( STATUS_INVALID_PARAMETER ); - else + else if (context->cpu == thread->process->cpu) { unsigned int system_flags = get_context_system_regs(context->cpu) & context->flags; @@ -1903,6 +1902,25 @@ DECL_HANDLER(set_thread_context) thread->context->regs.flags |= context->flags; } } + else if (context->cpu == CPU_x86_64 && thread->process->cpu == CPU_x86) + { + /* convert the WoW64 context */ + unsigned int system_flags = get_context_system_regs( context->cpu ) & context->flags; + if (system_flags) + { + set_thread_context( thread, context, system_flags ); + if (thread->context && !get_error()) + { + thread->context->regs.debug.i386_regs.dr0 = context->debug.x86_64_regs.dr0; + thread->context->regs.debug.i386_regs.dr1 = context->debug.x86_64_regs.dr1; + thread->context->regs.debug.i386_regs.dr2 = context->debug.x86_64_regs.dr2; + thread->context->regs.debug.i386_regs.dr3 = context->debug.x86_64_regs.dr3; + thread->context->regs.debug.i386_regs.dr6 = context->debug.x86_64_regs.dr6; + thread->context->regs.debug.i386_regs.dr7 = context->debug.x86_64_regs.dr7; + } + } + } + else set_error( STATUS_INVALID_PARAMETER ); release_object( thread ); }

1 0

Rafał Harabień : ntdll/tests: Test getting/setting x86_64 context of x86 processes in wine64.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: bee9f0126fe43359b87b2d9fc2c1e2577ebda4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bee9f0126fe43359b87b2d9f… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Mon Mar 1 00:42:27 2021 +0100 ntdll/tests: Test getting/setting x86_64 context of x86 processes in wine64. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8418f925565..75765bee5a0 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5816,6 +5816,120 @@ static void test_debug_registers(void) CloseHandle(thread); } +#if defined(__x86_64__) + +static void test_debug_registers_wow64(void) +{ + char cmdline[] = "C:\\windows\\syswow64\\notepad.exe"; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + WOW64_CONTEXT wow64_ctx; + CONTEXT ctx; + BOOL is_wow64; + NTSTATUS ret; + BOOL bret; + + si.cb = sizeof(si); + bret = CreateProcessA(cmdline, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(bret, "CreateProcessA failed\n"); + + bret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(bret && is_wow64, "expected Wow64 process\n"); + + SuspendThread(pi.hThread); + + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + + ctx.Dr0 = 0x12340000; + ctx.Dr1 = 0x12340001; + ctx.Dr2 = 0x12340002; + ctx.Dr3 = 0x12340003; + ctx.Dr7 = 0x155; /* enable all breakpoints (local) */ + bret = SetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "SetThreadContext failed\n"); + + if (bret) { + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + if (bret) + { + ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", ctx.Dr0); + ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", ctx.Dr1); + ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", ctx.Dr2); + ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", ctx.Dr3); + ok(ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", ctx.Dr7); + } + + ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); + wow64_ctx.ContextFlags = WOW64_CONTEXT_ALL; + ret = pRtlWow64GetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); + if (ret == STATUS_SUCCESS) + { + ok(wow64_ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", wow64_ctx.Dr0); + ok(wow64_ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", wow64_ctx.Dr1); + ok(wow64_ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", wow64_ctx.Dr2); + ok(wow64_ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", wow64_ctx.Dr3); + ok(wow64_ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", wow64_ctx.Dr7); + } + } + + wow64_ctx.Dr0 = 0x56780000; + wow64_ctx.Dr1 = 0x56780001; + wow64_ctx.Dr2 = 0x56780002; + wow64_ctx.Dr3 = 0x56780003; + wow64_ctx.Dr7 = 0x101; /* enable only the first breakpoint */ + ret = pRtlWow64SetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64SetThreadContext failed with %lx\n", ret); + + ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); + wow64_ctx.ContextFlags = WOW64_CONTEXT_ALL; + ret = pRtlWow64GetThreadContext(pi.hThread, &wow64_ctx); + ok(ret == STATUS_SUCCESS, "Wow64GetThreadContext failed with %lx\n", ret); + if (ret == STATUS_SUCCESS) + { + todo_wine + ok(wow64_ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", wow64_ctx.Dr0); + todo_wine + ok(wow64_ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", wow64_ctx.Dr1); + todo_wine + ok(wow64_ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", wow64_ctx.Dr2); + todo_wine + ok(wow64_ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", wow64_ctx.Dr3); + todo_wine + ok(wow64_ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", wow64_ctx.Dr7); + } + + ZeroMemory(&ctx, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_ALL; + bret = GetThreadContext(pi.hThread, &ctx); + todo_wine + ok(bret, "GetThreadContext failed\n"); + if (bret) + { + ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", ctx.Dr0); + ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", ctx.Dr1); + ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", ctx.Dr2); + ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", ctx.Dr3); + ok(ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", ctx.Dr7); + } + + ResumeThread(pi.hThread); + TerminateProcess(pi.hProcess, 0); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + +#endif + static DWORD debug_service_exceptions; static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -8314,6 +8428,7 @@ START_TEST(exception) test_rtlraiseexception(); test_debug_registers(); + test_debug_registers_wow64(); test_debug_service(1); test_virtual_unwind(); test___C_specific_handler();

1 0

Rémi Bernon : ntdll: Initialize dbg_offset and dbg_size (valgrind).
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: c3c4d0c37e41fef27ae06cf6784c873d6f9b68d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c4d0c37e41fef27ae06cf6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:18 2021 +0100 ntdll: Initialize dbg_offset and dbg_size (valgrind). Syscall param writev(vector[...]) points to uninitialised byte(s) at 0x4189DA3: writev (writev.c:26) by 0x46A5A0B: send_request (server.c:213) by 0x46A5A0B: server_call_unlocked (server.c:273) by 0x46A5B4F: wine_server_call (server.c:289) by 0x46C996A: virtual_create_builtin_view (virtual.c:2524) by 0x4692CB4: dlopen_dll (loader.c:1133) by 0x46931CA: open_builtin_file (loader.c:1373) by 0x46931CA: open_builtin_file (loader.c:1354) by 0x4694559: load_builtin_dll (loader.c:1457) by 0x7BC375F2: load_builtin_dll (loader.c:2348) by 0x7BC38369: load_dll (loader.c:2705) by 0x7BC39E46: import_dll (loader.c:782) by 0x7BC36CEC: fixup_imports (loader.c:1138) by 0x7BC3BE4B: LdrInitializeThunk (loader.c:3454) Address 0x32e390 is on thread 1's stack in frame #5, created by open_builtin_file (loader.c:1357) Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6adf4bb5b00..1c26d1322f8 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1068,6 +1068,8 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) info->header_size = nt->OptionalHeader.SizeOfHeaders; info->file_size = nt->OptionalHeader.SizeOfImage; info->checksum = nt->OptionalHeader.CheckSum; + info->dbg_offset = 0; + info->dbg_size = 0; info->cpu = client_cpu; info->__pad = 0; }

1 0

Paul Gofman : kernel32/tests: Add tests for {Get|Set}UserDefaultGeoName().
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 9396d3b3426f9db908ff7ee0bd7e1c3911881c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9396d3b3426f9db908ff7ee0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 8 19:34:40 2021 +0300 kernel32/tests: Add tests for {Get|Set}UserDefaultGeoName(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 215 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9396d3b3426f9db908ff…

1 0

Hugh McMaster : reg/tests: Add some tests for strings containing the characters backslash zero.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: c5b7f04eea2d88ce8b2192168d0cb9dba340551f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b7f04eea2d88ce8b219216… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 8 23:32:01 2021 +1100 reg/tests: Add some tests for strings containing the characters backslash zero. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index c91d9d9b9b8..17c89b4b692 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -318,6 +318,18 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test3", REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v string\\04 /t REG_SZ /d \"Value\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "string\\04", REG_SZ, "Value", 6, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v string5 /t REG_SZ /d \"foo\\0bar\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "string5", REG_SZ, "foo\\0bar", 9, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v \\0 /t REG_SZ /d \"Value\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "\\0", REG_SZ, "Value", 6, 0); + /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);

1 0

Hugh McMaster : reg/tests: Update value names in 'add' overwrite test.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 37ad10d92ab71e69475bdf69ff3609fae5d701b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ad10d92ab71e69475bdf69… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 8 23:32:02 2021 +1100 reg/tests: Update value names in 'add' overwrite test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 17c89b4b692..8178bd2346e 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -299,13 +299,13 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /d deadbeef /f", &r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v test0 /d deadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test", REG_SZ, "deadbeef", 9, 0); + verify_reg(hkey, "test0", REG_SZ, "deadbeef", 9, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /f", &r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v test0 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test", REG_SZ, "", 1, 0); + verify_reg(hkey, "test0", REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg/tests: Always specify the expected exit code in error messages.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 73f69d66b342af4c8339c23739ebeb1ff359e78b URL: https://source.winehq.org/git/wine.git/?a=commit;h=73f69d66b342af4c8339c237… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 8 23:32:03 2021 +1100 reg/tests: Always specify the expected exit code in error messages. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 70 ++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73f69d66b342af4c8339…

1 0

Roman Pišl : ntdll: Don't set error status if volume serial number is missing.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: dabba3cc86aa3ba6e7ba1d0863fb378828fef9f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dabba3cc86aa3ba6e7ba1d08… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Mar 7 11:50:11 2021 +0100 ntdll: Don't set error status if volume serial number is missing. Fixes regression from b14eee69c7240658252bc96b6302e98948f2c62c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50781 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index bcaf03a2d02..c169b49343f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4108,7 +4108,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, FILE_ID_INFORMATION *info = ptr; info->VolumeSerialNumber = 0; - if (!(io->u.Status = get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) ))) + if (!get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) )) info->VolumeSerialNumber = drive.serial; memset( &info->FileId, 0, sizeof(info->FileId) ); *(ULONGLONG *)&info->FileId = st.st_ino;

1 0