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

Rémi Bernon : ntdll: Initialize mountmgr_unix_drive before NtDeviceIoControlFile (valgrind).
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 0eb3258a69fa168b2f9e0d44762261a150fc0ca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb3258a69fa168b2f9e0d44… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 8 09:14:20 2021 +0100 ntdll: Initialize mountmgr_unix_drive before NtDeviceIoControlFile (valgrind). Syscall param writev(vector[...]) points to uninitialised byte(s) at 0x4189DA3: writev (writev.c:26) by 0x46A5A1B: send_request (server.c:213) by 0x46A5A1B: server_call_unlocked (server.c:273) by 0x46CA54F: virtual_locked_server_call (virtual.c:2993) by 0x4681C9A: server_ioctl_file (file.c:4789) by 0x468B326: NtDeviceIoControlFile (file.c:5620) by 0x468B7AF: get_mountmgr_fs_info (file.c:1986) by 0x468B7AF: get_mountmgr_fs_info (file.c:1955) by 0x468FCBB: NtQueryVolumeInformationFile (file.c:6483) by 0x4677E88: __wine_syscall_dispatcher_xsave (in /home/rbernon/Code/build-wine/wine64/dlls/ntdll/ntdll.so) by 0x7BC0DEB3: NtQueryVolumeInformationFile (in /home/rbernon/Code/build-wine/wine64/dlls/ntdll/ntdll.dll) by 0x7B01F127: GetFileInformationByHandle (file.c:2938) by 0x7096A5C3: _fstat64 (file.c:1791) by 0x7096A941: _fstat64i32 (file.c:1877) Address 0x7ffffe30e520 is in a rw- anonymous segment Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> 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 c169b49343f..233778df3b2 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1963,13 +1963,13 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni letter = find_dos_device( unix_name ); free( unix_name ); + memset( drive, 0, sizeof(*drive) ); if (letter == -1) { struct stat st; fstat( fd, &st ); drive->unix_dev = st.st_rdev ? st.st_rdev : st.st_dev; - drive->letter = 0; } else drive->letter = 'a' + letter;

1 0

Rafał Harabień : ntdll/tests: Test getting/setting x86_64 context of x86 processes in wine64.
by Alexandre Julliard 09 Mar '21

09 Mar '21

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

Rafał Harabień : ntdll: Allow getting/setting x86_64 context of x86 processes in wine64.
by Alexandre Julliard 09 Mar '21

09 Mar '21

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ń : kernel32: Add Wow64GetThreadSelectorEntry stub.
by Alexandre Julliard 09 Mar '21

09 Mar '21

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 09 Mar '21

09 Mar '21

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

Huw Davies : riched32/tests: Use the system locale to determine rtl and multibyte behaviour.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 638dbc4b20661b5a3ce4c5de19684316cec1e16a URL: https://source.winehq.org/git/wine.git/?a=commit;h=638dbc4b20661b5a3ce4c5de… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:46 2021 +0000 riched32/tests: Use the system locale to determine rtl and multibyte behaviour. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 950c175bbbe..f361d49478e 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -53,7 +53,7 @@ static HWND new_richedit(HWND parent) { static BOOL is_rtl(void) { LOCALESIGNATURE sig; - return (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + return (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); } @@ -1440,7 +1440,7 @@ START_TEST( editor ) * RICHED32.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched32.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); + is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); test_WM_SETTEXT(); test_EM_GETTEXTRANGE();

1 0

Huw Davies : riched32/tests: Add a todo_wine for a test that has always failed.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 8dbc40be14367f360db6d340382b42fa39f15812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dbc40be14367f360db6d340… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:47 2021 +0000 riched32/tests: Add a todo_wine for a test that has always failed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index f361d49478e..f4f6ebeb709 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -155,7 +155,7 @@ static void test_WM_GETTEXTLENGTH(void) { SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + todo_wine ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); } DestroyWindow(hwndRichEdit);

1 0

Huw Davies : riched20: Remove an unused critsec.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 115c3ab2a254088d14d928404f5d166dd260c5cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=115c3ab2a254088d14d92840… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:48 2021 +0000 riched20: Remove an unused critsec. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txtsrv.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 3d0eec6f769..49d1c706076 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -34,14 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); struct text_services { - IUnknown IUnknown_inner; - ITextServices ITextServices_iface; - IUnknown *outer_unk; - LONG ref; - ITextHost *host; - CRITICAL_SECTION csTxtSrv; - ME_TextEditor *editor; - char spare[256]; + IUnknown IUnknown_inner; + ITextServices ITextServices_iface; + IUnknown *outer_unk; + LONG ref; + ITextHost *host; + ME_TextEditor *editor; + char spare[256]; /* for bug #12179 */ }; static inline struct text_services *impl_from_IUnknown( IUnknown *iface ) @@ -95,8 +94,6 @@ static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) if (!ref) { ME_DestroyEditor( services->editor ); - services->csTxtSrv.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &services->csTxtSrv ); CoTaskMemFree( services ); } return ref; @@ -378,8 +375,6 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** services = CoTaskMemAlloc( sizeof(*services) ); if (services == NULL) return E_OUTOFMEMORY; - InitializeCriticalSection( &services->csTxtSrv ); - services->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); services->ref = 1; services->host = text_host; /* Don't take a ref of the host - this would lead to a mutual dependency */ services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl;

1 0

Huw Davies : riched20: Store the host as the window prop.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: c2c3961ceab6eb0e05ebbaf4542f3c39c671c649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c3961ceab6eb0e05ebbaf4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:49 2021 +0000 riched20: Store the host as the window prop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1da34555352..291c9a3b677 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -67,6 +67,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->para_fmt.wAlignment = PFA_RIGHT; if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; + texthost->editor = NULL; return texthost; } @@ -315,16 +316,17 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost *iface, DWORD *scrollbar ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW( host->window, 0 ); const DWORD mask = WS_VSCROLL| WS_HSCROLL| ES_AUTOVSCROLL| ES_AUTOHSCROLL| ES_DISABLENOSCROLL; - if (editor) + if (host->editor) + { + *scrollbar = host->editor->styleFlags & mask; + } + else { - *scrollbar = editor->styleFlags & mask; - } else { DWORD style = GetWindowLongW( host->window, GWL_STYLE ); if (style & WS_VSCROLL) style |= ES_AUTOVSCROLL; @@ -371,20 +373,21 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *iface, DWORD mask, DWORD *bits ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW( host->window, 0 ); DWORD style; DWORD dwBits = 0; - if (editor) + if (host->editor) { - style = editor->styleFlags; - if (editor->mode & TM_RICHTEXT) + style = host->editor->styleFlags; + if (host->editor->mode & TM_RICHTEXT) dwBits |= TXTBIT_RICHTEXT; - if (editor->bWordWrap) + if (host->editor->bWordWrap) dwBits |= TXTBIT_WORDWRAP; if (style & ECO_AUTOWORDSELECTION) dwBits |= TXTBIT_AUTOWORDSEL; - } else { + } + else + { DWORD dwScrollBar; style = GetWindowLongW( host->window, GWL_STYLE ); @@ -438,11 +441,10 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWORD iNotify, void *pv) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW( host->window, 0 ); HWND hwnd = host->window; UINT id; - if (!editor || !editor->hwndParent) return S_OK; + if (!host->editor || !host->editor->hwndParent) return S_OK; id = GetWindowLongW(hwnd, GWLP_ID); @@ -465,7 +467,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWOR info->hwndFrom = hwnd; info->idFrom = id; info->code = iNotify; - SendMessageW(editor->hwndParent, WM_NOTIFY, id, (LPARAM)info); + SendMessageW( host->editor->hwndParent, WM_NOTIFY, id, (LPARAM)info ); break; } @@ -481,7 +483,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWOR case EN_MAXTEXT: case EN_SETFOCUS: case EN_VSCROLL: - SendMessageW(editor->hwndParent, WM_COMMAND, MAKEWPARAM(id, iNotify), (LPARAM)hwnd); + SendMessageW( host->editor->hwndParent, WM_COMMAND, MAKEWPARAM( id, iNotify ), (LPARAM)hwnd ); break; case EN_MSGFILTER: @@ -511,10 +513,8 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost *iface, LONG *width ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW( host->window, 0 ); - DWORD style = editor ? editor->styleFlags - : GetWindowLongW( host->window, GWL_STYLE ); + DWORD style = host->editor ? host->editor->styleFlags : GetWindowLongW( host->window, GWL_STYLE ); *width = (style & ES_SELECTIONBAR) ? 225 : 0; /* in HIMETRIC */ return S_OK; } @@ -746,7 +746,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula host->editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ host->editor->hwndParent = create->hwndParent; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host->editor ); + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host ); return TRUE; } @@ -754,6 +754,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { + struct host *host; ME_TextEditor *editor; HRESULT hr; LRESULT res = 0; @@ -761,8 +762,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, TRACE( "enter hwnd %p msg %04x (%s) %lx %lx, unicode %d\n", hwnd, msg, get_msg_name(msg), wparam, lparam, unicode ); - editor = (ME_TextEditor *)GetWindowLongPtrW( hwnd, 0 ); - if (!editor) + host = (struct host *)GetWindowLongPtrW( hwnd, 0 ); + if (!host) { if (msg == WM_NCCREATE) { @@ -774,6 +775,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else return DefWindowProcW( hwnd, msg, wparam, lparam ); } + editor = host->editor; switch (msg) { case WM_ERASEBKGND:

1 0

Byeongsik Jeon : gdi32: Move FT_Library_SetLcdFilter() to init_freetype().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: d6e83e3027900b6827862822e78e1db3d104f04a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e83e3027900b6827862822… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Mar 8 14:40:45 2021 +0000 gdi32: Move FT_Library_SetLcdFilter() to init_freetype(). Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fae4aa94a78..a2e31d4fb48 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1922,6 +1922,11 @@ static BOOL init_freetype(void) pFT_Property_Set( library, "truetype", "interpreter-version", &interpreter_version ); } +#ifdef FT_LCD_FILTER_H + if (pFT_Library_SetLcdFilter) + pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); +#endif + return TRUE; sym_not_found: @@ -3199,10 +3204,6 @@ static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT f if (needs_transform) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); -#ifdef FT_LCD_FILTER_H - if (pFT_Library_SetLcdFilter) - pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); -#endif pFT_Render_Glyph( glyph, render_mode ); src_pitch = glyph->bitmap.pitch;

1 0