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

Zebediah Figura : ws2_32/tests: Move address/string conversion tests to protocol.c.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 8b208093545d040b9bc5d5bac62e8fe57e0e566a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b208093545d040b9bc5d5ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 28 16:26:33 2021 -0500 ws2_32/tests: Move address/string conversion tests to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 631 +++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 659 ------------------------------------------- 2 files changed, 631 insertions(+), 659 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b208093545d040b9bc5…

1 0

Zebediah Figura : ws2_32/tests: Move namespace provider tests to protocol.c.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: b7c3135444a8bca58915f839c7f1b8996ae89736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7c3135444a8bca58915f839… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 28 16:26:34 2021 -0500 ws2_32/tests: Move namespace provider tests to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 221 +++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 221 ------------------------------------------- 2 files changed, 221 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c3135444a8bca58915…

1 0

Rémi Bernon : user32: Move ToUnicodeEx from wineandroid.drv to user32.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 95d8f40fdf606aa79503bb32296e3d338a87b67a URL: https://source.winehq.org/git/wine.git/?a=commit;h=95d8f40fdf606aa79503bb32… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 29 09:53:52 2021 +0200 user32: Move ToUnicodeEx from wineandroid.drv to user32. As a fallback implementation, using English keyboard layout. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/input.c | 80 ++++++++++++++++++++++++-- dlls/wineandroid.drv/keyboard.c | 94 ------------------------------- dlls/wineandroid.drv/wineandroid.drv.spec | 1 - 4 files changed, 77 insertions(+), 100 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 7ac77141696..e5855e1c51b 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -286,7 +286,7 @@ static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) static INT CDECL nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { - return 0; + return -2; /* use default implementation */ } static BOOL CDECL nulldrv_UnloadKeyboardLayout( HKL layout ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 805bfe3e9de..24942f72aa1 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -877,11 +877,83 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, /**************************************************************************** * ToUnicodeEx (USER32.@) */ -INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, - LPWSTR lpwStr, int size, UINT flags, HKL hkl) +INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, + WCHAR *str, int size, UINT flags, HKL layout ) { - if (!lpKeyState) return 0; - return USER_Driver->pToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, hkl); + BOOL shift, ctrl, numlock; + WCHAR buffer[2]; + INT len; + + TRACE_(keyboard)( "virt %u, scan %u, state %p, str %p, size %d, flags %x, layout %p.\n", + virt, scan, state, str, size, flags, layout ); + + if (!state) return 0; + if ((len = USER_Driver->pToUnicodeEx( virt, scan, state, str, size, flags, layout )) >= -1) return len; + + shift = state[VK_SHIFT] & 0x80; + ctrl = state[VK_CONTROL] & 0x80; + numlock = state[VK_NUMLOCK] & 0x01; + + /* FIXME: English keyboard layout specific */ + + if (scan & 0x8000) buffer[0] = 0; /* key up */ + else if (!ctrl) + { + switch (virt) + { + case VK_BACK: buffer[0] = '\b'; break; + case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; + case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; + case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; + case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; + case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; + case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; + case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; + case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; + case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; + case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; + case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; + case VK_RETURN: buffer[0] = '\r'; break; + case VK_SPACE: buffer[0] = ' '; break; + case VK_TAB: buffer[0] = '\t'; break; + case VK_MULTIPLY: buffer[0] = '*'; break; + case VK_ADD: buffer[0] = '+'; break; + case VK_SUBTRACT: buffer[0] = '-'; break; + case VK_DIVIDE: buffer[0] = '/'; break; + default: + if (virt >= '0' && virt <= '9') + buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; + else if (virt >= 'A' && virt <= 'Z') + buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; + else if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift) + buffer[0] = '0' + virt - VK_NUMPAD0; + else if (virt == VK_DECIMAL && numlock && !shift) + buffer[0] = '.'; + else + buffer[0] = 0; + break; + } + } + else /* Control codes */ + { + switch (virt) + { + case VK_OEM_4: buffer[0] = 0x1b; break; + case VK_OEM_5: buffer[0] = 0x1c; break; + case VK_OEM_6: buffer[0] = 0x1d; break; + case VK_SUBTRACT: buffer[0] = 0x1e; break; + default: + if (virt >= 'A' && virt <= 'Z') buffer[0] = virt - 'A' + 1; + else buffer[0] = 0; + break; + } + } + buffer[1] = 0; + len = wcslen( buffer ); + lstrcpynW( str, buffer, size ); + + TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_w(str) ); + return len; } /**************************************************************************** diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 0a6ede0ec5f..04565c3fad8 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -750,100 +750,6 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k } -/*********************************************************************** - * ANDROID_ToUnicodeEx - */ -INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, - LPWSTR buf, int size, UINT flags, HKL hkl ) -{ - WCHAR buffer[2]; - BOOL shift = state[VK_SHIFT] & 0x80; - BOOL ctrl = state[VK_CONTROL] & 0x80; - BOOL numlock = state[VK_NUMLOCK] & 0x01; - - buffer[0] = buffer[1] = 0; - - if (scan & 0x8000) return 0; /* key up */ - - /* FIXME: hardcoded layout */ - - if (!ctrl) - { - switch (virt) - { - case VK_BACK: buffer[0] = '\b'; break; - case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; - case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; - case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; - case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; - case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; - case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; - case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; - case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; - case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; - case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; - case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; - case VK_RETURN: buffer[0] = '\r'; break; - case VK_SPACE: buffer[0] = ' '; break; - case VK_TAB: buffer[0] = '\t'; break; - case VK_MULTIPLY: buffer[0] = '*'; break; - case VK_ADD: buffer[0] = '+'; break; - case VK_SUBTRACT: buffer[0] = '-'; break; - case VK_DIVIDE: buffer[0] = '/'; break; - default: - if (virt >= '0' && virt <= '9') - { - buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; - break; - } - if (virt >= 'A' && virt <= 'Z') - { - buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; - break; - } - if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift) - { - buffer[0] = '0' + virt - VK_NUMPAD0; - break; - } - if (virt == VK_DECIMAL && numlock && !shift) - { - buffer[0] = '.'; - break; - } - break; - } - } - else /* Control codes */ - { - if (virt >= 'A' && virt <= 'Z') - buffer[0] = virt - 'A' + 1; - else - { - switch (virt) - { - case VK_OEM_4: - buffer[0] = 0x1b; - break; - case VK_OEM_5: - buffer[0] = 0x1c; - break; - case VK_OEM_6: - buffer[0] = 0x1d; - break; - case VK_SUBTRACT: - buffer[0] = 0x1e; - break; - } - } - } - - lstrcpynW( buf, buffer, size ); - TRACE( "returning %d / %s\n", strlenW( buffer ), debugstr_wn(buf, strlenW( buffer ))); - return strlenW( buffer ); -} - - /*********************************************************************** * ANDROID_GetKeyNameText */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 00de23de27e..6f27c1586b3 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -7,7 +7,6 @@ @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText @ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx -@ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl SetCursor(long) ANDROID_SetCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx

1 0

Zebediah Figura : ws2_32/tests: Move address lookup tests to protocol.c.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: edd9ef9c276f6113e9fbf7dea010030df348c16e URL: https://source.winehq.org/git/wine.git/?a=commit;h=edd9ef9c276f6113e9fbf7de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 28 16:26:30 2021 -0500 ws2_32/tests: Move address lookup tests to protocol.c. sock.c is huge. This doesn't bother some people, but I find that it can be harder to navigate and slower to compile. Splitting it is tricky, but I think there's a pretty natural divide between functions that operate on sockets (e.g. bind, listen, recv, getsockname) and functions that don't (e.g. get*info, inet_*, get*by*, WSC*). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 809 ++++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 805 ------------------------------------------ 2 files changed, 808 insertions(+), 806 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=edd9ef9c276f6113e9fb…

1 0

Alexandre Julliard : kernelbase: Use RtlWow64GetProcessMachines() to get native system information.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 9b0a8f5f49f941d42ed08b1546c50203c0b07ad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0a8f5f49f941d42ed08b15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 29 16:19:27 2021 +0200 kernelbase: Use RtlWow64GetProcessMachines() to get native system information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 13 +++++++--- dlls/kernelbase/process.c | 65 +---------------------------------------------- 2 files changed, 11 insertions(+), 67 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index fb5f5100399..4e03267cbb5 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -74,14 +74,21 @@ SIZE_T WINAPI GetLargePageMinimum(void) */ void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) { + USHORT current_machine, native_machine; + GetSystemInfo( si ); - if (!is_wow64) return; - switch (si->u.s.wProcessorArchitecture) + RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); + if (!current_machine) return; + switch (native_machine) { - case PROCESSOR_ARCHITECTURE_INTEL: + case PROCESSOR_ARCHITECTURE_AMD64: si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; si->dwProcessorType = PROCESSOR_AMD_X8664; break; + case PROCESSOR_ARCHITECTURE_ARM64: + si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; + si->dwProcessorType = 0; + break; default: FIXME( "Add the proper information for %d in wow64 mode\n", si->u.s.wProcessorArchitecture ); } diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 2b0287432fb..ae91168ecf4 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -952,70 +952,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsProcessorFeaturePresent ( DWORD feature ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, USHORT *native_machine ) { - BOOL wow64; - SYSTEM_INFO si; - - TRACE( "(%p,%p,%p)\n", process, machine, native_machine ); - - if (!IsWow64Process( process, &wow64 )) - return FALSE; - - if (wow64) - { - if (process != GetCurrentProcess()) - { -#if defined(__i386__) || defined(__x86_64__) - *machine = IMAGE_FILE_MACHINE_I386; -#else - FIXME("not implemented for other process\n"); - *machine = IMAGE_FILE_MACHINE_UNKNOWN; -#endif - } - else - { - IMAGE_NT_HEADERS *nt; - nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); - *machine = nt->FileHeader.Machine; - } - - if (!native_machine) return TRUE; - - GetNativeSystemInfo( &si ); - } - else - { - *machine = IMAGE_FILE_MACHINE_UNKNOWN; - - if (!native_machine) return TRUE; - -#ifdef _WIN64 - GetSystemInfo( &si ); -#else - GetNativeSystemInfo( &si ); -#endif - } - - switch (si.u.s.wProcessorArchitecture) - { - case PROCESSOR_ARCHITECTURE_INTEL: - *native_machine = IMAGE_FILE_MACHINE_I386; - break; - case PROCESSOR_ARCHITECTURE_ARM: - *native_machine = IMAGE_FILE_MACHINE_ARMNT; - break; - case PROCESSOR_ARCHITECTURE_AMD64: - *native_machine = IMAGE_FILE_MACHINE_AMD64; - break; - case PROCESSOR_ARCHITECTURE_ARM64: - *native_machine = IMAGE_FILE_MACHINE_ARM64; - break; - default: - FIXME("unknown architecture %u\n", si.u.s.wProcessorArchitecture); - *native_machine = IMAGE_FILE_MACHINE_UNKNOWN; - break; - } - - return TRUE; + return set_ntstatus( RtlWow64GetProcessMachines( process, machine, native_machine )); }

1 0

Alexandre Julliard : ntdll: Implement RtlWow64GetProcessMachines().
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: f2c1470c7c4799c620cdbc5195a8823fdd51ae16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c1470c7c4799c620cdbc51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 29 16:18:30 2021 +0200 ntdll: Implement RtlWow64GetProcessMachines(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 25 +++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 14 ++++++++++++++ include/winternl.h | 1 + 4 files changed, 41 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cade83da4b1..198a7287302 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1068,6 +1068,7 @@ @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) +@ stdcall RtlWow64GetProcessMachines(long ptr ptr) @ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) @ stdcall -arch=x86_64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index a86eb80e0cc..8621d4f4123 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -49,6 +49,31 @@ PEB * WINAPI RtlGetCurrentPeb(void) } +/********************************************************************** + * RtlWow64GetProcessMachines (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetProcessMachines( HANDLE process, USHORT *current_ret, USHORT *native_ret ) +{ + ULONG i, machines[8]; + USHORT current = 0, native = 0; + NTSTATUS status; + + status = NtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + machines, sizeof(machines), NULL ); + if (status) return status; + for (i = 0; machines[i]; i++) + { + USHORT flags = HIWORD(machines[i]); + USHORT machine = LOWORD(machines[i]); + if (flags & 4 /* native machine */) native = machine; + else if (flags & 8 /* current machine */) current = machine; + } + if (current_ret) *current_ret = current; + if (native_ret) *native_ret = native; + return status; +} + + /********************************************************************** * RtlCreateUserProcess (NTDLL.@) */ diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f12b2862a99..1b20937de50 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -25,6 +25,7 @@ static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -82,6 +83,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtQuerySystemInformation); NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); + NTDLL_GET_PROC(RtlWow64GetProcessMachines); NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); NTDLL_GET_PROC(NtQueryInformationThread); @@ -2920,6 +2922,18 @@ static void test_process_architecture( HANDLE process, USHORT expect_machine, US &buffer, len, &len ); ok( status == STATUS_BUFFER_TOO_SMALL, "failed %x\n", status ); ok( len == (i + 1) * sizeof(DWORD), "wrong len %u\n", len ); + + if (pRtlWow64GetProcessMachines) + { + USHORT current = 0xdead, native = 0xbeef; + status = pRtlWow64GetProcessMachines( process, &current, &native ); + ok( !status, "failed %x\n", status ); + if (expect_machine == expect_native) + ok( current == 0, "wrong current machine %x / %x\n", current, expect_machine ); + else + ok( current == expect_machine, "wrong current machine %x / %x\n", current, expect_machine ); + ok( native == expect_native, "wrong native machine %x / %x\n", native, expect_native ); + } } static void test_query_architectures(void) diff --git a/include/winternl.h b/include/winternl.h index dd2bdbbebbe..fece32a6f5c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4252,6 +4252,7 @@ NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); +NTSYSAPI NTSTATUS WINAPI RtlWow64GetProcessMachines(HANDLE,USHORT*,USHORT*); #ifdef __x86_64__ NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE, WOW64_CONTEXT *); NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE, const WOW64_CONTEXT *);

1 0

Alexandre Julliard : ntdll: Implement RtlWow64IsWowGuestMachineSupported().
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 4f8ede8e7665328a2a3ccd303875e239bf443512 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f8ede8e7665328a2a3ccd30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 29 17:15:15 2021 +0200 ntdll: Implement RtlWow64IsWowGuestMachineSupported(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 22 ++++++++++++++++++++++ dlls/ntdll/tests/info.c | 26 ++++++++++++++++++++++++++ include/winternl.h | 1 + 4 files changed, 50 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 431ab7c6db7..4da9ea5a0b1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1071,6 +1071,7 @@ @ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) @ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) +@ stdcall RtlWow64IsWowGuestMachineSupported(long ptr) @ stdcall -arch=x86_64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index f42dc6d8201..dbb94cfb8b7 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -86,6 +86,28 @@ NTSTATUS WINAPI RtlWow64GetProcessMachines( HANDLE process, USHORT *current_ret, } +/********************************************************************** + * RtlWow64IsWowGuestMachineSupported (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64IsWowGuestMachineSupported( USHORT machine, BOOLEAN *supported ) +{ + ULONG i, machines[8]; + HANDLE process = 0; + NTSTATUS status; + + status = NtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + machines, sizeof(machines), NULL ); + if (status) return status; + *supported = FALSE; + for (i = 0; machines[i]; i++) + { + if (HIWORD(machines[i]) & 4 /* native machine */) continue; + if (machine == LOWORD(machines[i])) *supported = TRUE; + } + return status; +} + + /********************************************************************** * RtlCreateUserProcess (NTDLL.@) */ diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index af53c696cdf..d27ec576637 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVO static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static USHORT (WINAPI * pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI * pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); +static NTSTATUS (WINAPI * pRtlWow64IsWowGuestMachineSupported)(USHORT,BOOLEAN*); static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -86,6 +87,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(RtlGetNativeSystemInformation); NTDLL_GET_PROC(RtlWow64GetCurrentMachine); NTDLL_GET_PROC(RtlWow64GetProcessMachines); + NTDLL_GET_PROC(RtlWow64IsWowGuestMachineSupported); NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); NTDLL_GET_PROC(NtQueryInformationThread); @@ -3017,6 +3019,30 @@ static void test_query_architectures(void) USHORT machine = pRtlWow64GetCurrentMachine(); ok( machine == current_machine, "wrong machine %x / %x\n", machine, current_machine ); } + if (pRtlWow64IsWowGuestMachineSupported) + { + BOOLEAN ret = 0xcc; + status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_I386, &ret ); + ok( !status, "failed %x\n", status ); + ok( ret == (native_machine == IMAGE_FILE_MACHINE_AMD64 || + native_machine == IMAGE_FILE_MACHINE_ARM64), "wrong result %u\n", ret ); + ret = 0xcc; + status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARMNT, &ret ); + ok( !status, "failed %x\n", status ); + ok( ret == (native_machine == IMAGE_FILE_MACHINE_ARM64), "wrong result %u\n", ret ); + ret = 0xcc; + status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_AMD64, &ret ); + ok( !status, "failed %x\n", status ); + ok( !ret, "wrong result %u\n", ret ); + ret = 0xcc; + status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARM64, &ret ); + ok( !status, "failed %x\n", status ); + ok( !ret, "wrong result %u\n", ret ); + ret = 0xcc; + status = pRtlWow64IsWowGuestMachineSupported( 0xdead, &ret ); + ok( !status, "failed %x\n", status ); + ok( !ret, "wrong result %u\n", ret ); + } } static void test_thread_lookup(void) diff --git a/include/winternl.h b/include/winternl.h index 5067fa8ae34..82014d7fb11 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4258,6 +4258,7 @@ NTSYSAPI NTSTATUS WINAPI RtlWow64GetProcessMachines(HANDLE,USHORT*,USHORT*); NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE, WOW64_CONTEXT *); NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE, const WOW64_CONTEXT *); #endif +NTSYSAPI NTSTATUS WINAPI RtlWow64IsWowGuestMachineSupported(USHORT,BOOLEAN*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE); NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG);

1 0

Rémi Bernon : user32: Don't translate control codes when alt is pressed.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 37db87eff68e0fdc8397852e327797a12f17d24c URL: https://source.winehq.org/git/wine.git/?a=commit;h=37db87eff68e0fdc8397852e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 29 09:53:53 2021 +0200 user32: Don't translate control codes when alt is pressed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 24942f72aa1..a79f80ed190 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -880,7 +880,7 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ) { - BOOL shift, ctrl, numlock; + BOOL shift, ctrl, alt, numlock; WCHAR buffer[2]; INT len; @@ -890,6 +890,7 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, if (!state) return 0; if ((len = USER_Driver->pToUnicodeEx( virt, scan, state, str, size, flags, layout )) >= -1) return len; + alt = state[VK_MENU] & 0x80; shift = state[VK_SHIFT] & 0x80; ctrl = state[VK_CONTROL] & 0x80; numlock = state[VK_NUMLOCK] & 0x01; @@ -934,7 +935,7 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, break; } } - else /* Control codes */ + else if (!alt) /* Control codes */ { switch (virt) { @@ -948,6 +949,7 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, break; } } + else buffer[0] = 0; buffer[1] = 0; len = wcslen( buffer ); lstrcpynW( str, buffer, size );

1 0

Alexandre Julliard : ntdll: Implement RtlWow64GetCurrentMachine().
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 6c2f19c0a72e84579da5fe7d5433de426858a4ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2f19c0a72e84579da5fe7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 29 17:14:20 2021 +0200 ntdll: Implement RtlWow64GetCurrentMachine(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 12 ++++++++++++ dlls/ntdll/tests/info.c | 8 ++++++++ include/winternl.h | 1 + 4 files changed, 22 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 198a7287302..431ab7c6db7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1068,6 +1068,7 @@ @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) +@ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) @ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) @ stdcall -arch=x86_64 RtlWow64SetThreadContext(long ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 8621d4f4123..f42dc6d8201 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -49,6 +49,18 @@ PEB * WINAPI RtlGetCurrentPeb(void) } +/********************************************************************** + * RtlWow64GetCurrentMachine (NTDLL.@) + */ +USHORT WINAPI RtlWow64GetCurrentMachine(void) +{ + USHORT current, native; + + RtlWow64GetProcessMachines( GetCurrentProcess(), &current, &native ); + return current ? current : native; +} + + /********************************************************************** * RtlWow64GetProcessMachines (NTDLL.@) */ diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1b20937de50..af53c696cdf 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -25,6 +25,7 @@ static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static USHORT (WINAPI * pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI * pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); @@ -83,6 +84,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtQuerySystemInformation); NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); + NTDLL_GET_PROC(RtlWow64GetCurrentMachine); NTDLL_GET_PROC(RtlWow64GetProcessMachines); NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); @@ -3009,6 +3011,12 @@ static void test_query_architectures(void) CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); } + + if (pRtlWow64GetCurrentMachine) + { + USHORT machine = pRtlWow64GetCurrentMachine(); + ok( machine == current_machine, "wrong machine %x / %x\n", machine, current_machine ); + } } static void test_thread_lookup(void) diff --git a/include/winternl.h b/include/winternl.h index fece32a6f5c..5067fa8ae34 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4252,6 +4252,7 @@ NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); +NTSYSAPI USHORT WINAPI RtlWow64GetCurrentMachine(void); NTSYSAPI NTSTATUS WINAPI RtlWow64GetProcessMachines(HANDLE,USHORT*,USHORT*); #ifdef __x86_64__ NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE, WOW64_CONTEXT *);

1 0

Francois Gouget : winetest/build-patterns: Identify patterns with new and possibly fixed failures.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: tools Branch: master Commit: c3edbe618701c29e1768afcb13664711c3fd6143 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c3edbe618701c29e1768afc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 29 09:54:19 2021 +0200 winetest/build-patterns: Identify patterns with new and possibly fixed failures. Show the patterns with new failures first, then those that always failed, and finally those that do not have any recent failure and thus may be fixed. This should help catch new failures while they are fresh. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 113 +++++++++++++++++++++++++++++++++++++++++------- winetest/winetest.conf | 3 ++ 2 files changed, 100 insertions(+), 16 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index e87fabc..32bae6b 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -31,7 +31,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir/; +use vars qw/$workdir $gitdir $patternbuilds/; require "winetest.conf"; my $name0=$0; @@ -262,9 +262,19 @@ my %reports; # should be included in that test's failure pattern. # # - failtype -# The type of the most recent failure (see fail_type()). +# The type of the most recent failure (see fail_type(), last). # In particular this distinguishes random failures from non-random ones. # +# - first +# The @sortedbuilds index of the oldest build with a failure matching +# failtype. So if failtype is 'random' this ignores any 'missing dll' +# failures that may have occurred before. +# scalar(@sortedbuilds) if there is no failure. +# +# - last +# The @sortedbuilds index of the most recent build with a failure. +# -1 if there is none. +# # - status # A hashtable of test results indexed by the build name. my %tests; @@ -388,11 +398,16 @@ foreach my $testname (keys %tests) next if (!$testreport); # Record information about the failures for this report: + # - The index of the first (oldest) and last (most recent) failures. + # Initialized for easy min / max calculations. + $testreport->{first} = @sortedbuilds; + $testreport->{last} = -1; # - Type of failure: random or not (missing dll, etc.) $testreport->{failtype} = ""; - foreach my $build (@sortedbuilds) + for my $i (0..(a)sortedbuilds-1) { + my $build = $sortedbuilds[$i]; my $status = $testreport->{status}->{$build->{name}}; if (!defined $status) { @@ -419,7 +434,13 @@ foreach my $testname (keys %tests) # missing dll to the test running and crashing. # Either way the relevant round of failures starts now. $testreport->{failed} = 1; - last; + $testreport->{first} = $i; + $testreport->{last} = $i; + $testreport->{failtype} = $failtype; + } + else + { + $testreport->{last} = $i; } } } @@ -525,8 +546,9 @@ sub get_status_html($$) sub write_patterns_list($$$$) { - my ($html, $pagereports, $mainpage, $testnames) = @_; + my ($html, $pagereports, $mainpage, $list) = @_; + my $testnames = $list->{testnames}; for my $i (0..@$testnames-1) { my $testname = $testnames->[$i]; @@ -537,9 +559,9 @@ sub write_patterns_list($$$$) print $html " <small>(<a href='$mainpage#$testname'>see all results</a></small>)" if ($mainpage); print $html "<div class='ralign'>"; - my $href = $i ? $testnames->[$i-1] : ""; - print $html "<a href='#$href'>↑</a>"; - $href = $i+1 < @$testnames ? $testnames->[$i+1] : undef; + my $href = $i ? $testnames->[$i-1] : $list->{prevunit}; + print $html "<a href='#$href'>↑</a>" if (defined $href); + $href = $i+1 < @$testnames ? $testnames->[$i+1] : $list->{nextunit}; print $html "<a href='#$href'>↓</a>" if (defined $href); print $html "</div></div>\n"; @@ -669,18 +691,37 @@ sub write_patterns_page($$$) <div class="main"> EOF - # Build a list of test units that will appear on this page so we can - # link them to each other. - my $testnames = []; + # Show the test units with recent failures first. + # Also use these lists to link the test units to each other. + my %lists = ( + recent => {title => "Recent failures", + desc => "have recent failures (that is failures that did not happen for the $patternbuilds oldest builds).", + testnames => []}, + regular => {title => "Regular failures", + desc => "had failures.", + testnames => []}, + old => {title => "Old failures", + desc => "had no failure in the most recent $patternbuilds builds. Fixed or just rare failures?", + testnames => []}, + ); foreach my $testname (sort keys %tests) { my $test = $tests{$testname}; - my $addtest; + + my $first = @sortedbuilds; + my $last = -1; foreach my $reportdir (keys %$pagereports) { my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); - $addtest = 1; + + $first = $testreport->{first} if ($testreport->{first} < $first); + # For non-random failures we only care about the transition to + # the failure state, which is recorded in 'first'. + my $replast = $testreport->{failtype} eq "random" ? $testreport->{last} : + $testreport->{first} == @sortedbuilds ? -1 : + $testreport->{first}; + $last = $replast if ($replast > $last); foreach my $status (values %{$testreport->{status}}) { @@ -689,12 +730,52 @@ EOF $test->{colors}->{$status} = undef; } } - push @$testnames, $testname if ($addtest); + next if ($last == -1); # no report had a pattern of interest + + my $listid = ($last < @sortedbuilds - $patternbuilds) ? "old" : + ($first > $patternbuilds) ? "recent" : + "regular"; + push @{$lists{$listid}->{testnames}}, $testname; + } + + # Generate the lists index (and up test unit links) + print $html "<h1>$title</h1>\n"; + print $html "<ul>\n"; + my @listids = ("recent", "regular", "old"); + my $prevunit = ""; + foreach my $listid (@listids) + { + my $list = $lists{$listid}; + my $count = @{$list->{testnames}}; + next if (!$count); + print $html "<li><a href='#$listid'>$count test units</a> $list->{desc}</li>\n"; + $list->{prevunit} = $prevunit; + $prevunit = $list->{testnames}->[-1]; + } + print $html "</ul>\n"; + + # Link the last test unit of each list to the first one of the next list + my $nextunit; + foreach my $listid (reverse @listids) + { + my $list = $lists{$listid}; + my $count = @{$list->{testnames}}; + next if (!$count); + $list->{nextunit} = $nextunit; + $nextunit = $list->{testnames}->[0]; } + # Generate the test unit lists themselves my $mainpage = $subpage ? "patterns.html" : ""; - print $html "<h2>$title</h2>\n"; - write_patterns_list($html, $pagereports, $mainpage, $testnames); + foreach my $listid (@listids) + { + my $list = $lists{$listid}; + my $count = @{$list->{testnames}}; + next if (!$count); + print $html "<h2 id='$listid'>$list->{title}</h2>\n"; + write_patterns_list($html, $pagereports, $mainpage, $list); + } + print $html "</div></body></html>\n"; close($html); diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 84824a2..f193f8e 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -24,4 +24,7 @@ $maxunitsize = 32 * 1024; # This should be in line with programs\winetest\send.c $maxfilesize = 1.5 * 1024 * 1024; +# The number of builds after which a failure is considered old / new +$patternbuilds = 10; + 1; # keep require happy

1 0