- Wine-Commits - list.winehq.org

Jinoh Kang : riched20: Wrap marked paragraphs at Text Services initialization.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: b70eb32c5f3e506181d9e1e9fbef62e9baf3674d URL: https://gitlab.winehq.org/wine/wine/-/commit/b70eb32c5f3e506181d9e1e9fbef62… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jul 1 13:22:46 2023 +0900 riched20: Wrap marked paragraphs at Text Services initialization. Today, CreateTextServices() returns an Rich Edit object without row start and end marks, which are expected to exist by many Rich Edit operations as well as EM_* message handlers. This leads to a crash when certain messages (e.g., EM_SCROLLCARET) are sent to the Rich Edit object via ITextServices::TxSendMessage(), unless ME_WrapMarkedParagraphs() has been called beforehand. Fix this by calling wrap_marked_paras_dc() early in the initialization process. This is not a problem for windowed Rich Edit controls, which already calls ME_WrapMarkedParagraphs() before the user or application starts interacting with it. --- dlls/riched20/para.c | 1 + dlls/riched20/tests/txtsrv.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 357d6797c8c..6085816f315 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -222,6 +222,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) wine_rb_init( &editor->marked_paras, para_mark_compare ); para_mark_add( editor, para ); ME_DestroyContext(&c); + wrap_marked_paras_dc( editor, hdc, FALSE ); ITextHost_TxReleaseDC( editor->texthost, hdc ); } diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 830a95e37c5..63d622a6755 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -1292,6 +1292,23 @@ static void test_set_selection_message( void ) ITextHost_Release( host ); } +static void test_scrollcaret( void ) +{ + ITextServices *txtserv; + ITextHost *host; + LRESULT result; + HRESULT hr; + + if (!init_texthost(&txtserv, &host)) + return; + + hr = ITextServices_TxSendMessage(txtserv, EM_SCROLLCARET, 0, 0, &result); + ok( hr == S_OK, "got %08lx\n", hr ); + + ITextServices_Release( txtserv ); + ITextHost_Release( host ); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -1326,6 +1343,7 @@ START_TEST( txtsrv ) test_TxGetScroll(); test_notifications(); test_set_selection_message(); + test_scrollcaret(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); }

1 0

Alexandre Julliard : ntdll: Implement RtlWow64GetSharedInfoProcess().
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 257221843f6fc8fb0b96ba4a8873e4e9c6588f84 URL: https://gitlab.winehq.org/wine/wine/-/commit/257221843f6fc8fb0b96ba4a8873e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 16:56:50 2023 +0200 ntdll: Implement RtlWow64GetSharedInfoProcess(). --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 15 ++++++++++++ dlls/ntdll/tests/wow64.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 2 ++ 4 files changed, 78 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2be318b128a..011f0648522 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1104,6 +1104,7 @@ @ stdcall -arch=win64 RtlWow64GetCurrentCpuArea(ptr ptr ptr) @ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) +@ stdcall RtlWow64GetSharedInfoProcess(long ptr ptr) @ stdcall -arch=win64 RtlWow64GetThreadContext(long ptr) @ stdcall -arch=win64 RtlWow64GetThreadSelectorEntry(long ptr long ptr) @ stdcall RtlWow64IsWowGuestMachineSupported(long ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 3f78559d8df..09cc86889b9 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -128,6 +128,21 @@ NTSTATUS WINAPI RtlWow64GetProcessMachines( HANDLE process, USHORT *current_ret, } +/********************************************************************** + * RtlWow64GetSharedInfoProcess (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetSharedInfoProcess( HANDLE process, BOOLEAN *is_wow64, WOW64INFO *info ) +{ + PEB32 *peb32; + NTSTATUS status = NtQueryInformationProcess( process, ProcessWow64Information, + &peb32, sizeof(peb32), NULL ); + if (status) return status; + if (peb32) status = NtReadVirtualMemory( process, peb32 + 1, info, sizeof(*info), NULL ); + *is_wow64 = !!peb32; + return status; +} + + /********************************************************************** * RtlWow64IsWowGuestMachineSupported (NTDLL.@) */ diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 46523d47c46..e9f1c10ec43 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -21,6 +21,7 @@ #include "ntdll_test.h" #include "winioctl.h" +#include "winuser.h" #include "ddk/wdm.h" static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); @@ -28,6 +29,7 @@ static NTSTATUS (WINAPI *pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS,v static NTSTATUS (WINAPI *pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); static USHORT (WINAPI *pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI *pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); +static NTSTATUS (WINAPI *pRtlWow64GetSharedInfoProcess)(HANDLE,BOOLEAN*,WOW64INFO*); static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE,WOW64_CONTEXT*); static NTSTATUS (WINAPI *pRtlWow64IsWowGuestMachineSupported)(USHORT,BOOLEAN*); static NTSTATUS (WINAPI *pNtMapViewOfSectionEx)(HANDLE,HANDLE,PVOID*,const LARGE_INTEGER*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); @@ -87,6 +89,7 @@ static void init(void) GET_PROC( RtlGetNativeSystemInformation ); GET_PROC( RtlWow64GetCurrentMachine ); GET_PROC( RtlWow64GetProcessMachines ); + GET_PROC( RtlWow64GetSharedInfoProcess ); GET_PROC( RtlWow64GetThreadContext ); GET_PROC( RtlWow64IsWowGuestMachineSupported ); #ifdef _WIN64 @@ -278,6 +281,9 @@ static void test_peb_teb(void) RTL_USER_PROCESS_PARAMETERS params; RTL_USER_PROCESS_PARAMETERS32 params32; ULONG_PTR peb_ptr; + ULONG buffer[16]; + WOW64INFO *wow64info = (WOW64INFO *)buffer; + BOOLEAN wow64; Wow64DisableWow64FsRedirection( &redir ); @@ -370,6 +376,47 @@ static void test_peb_teb(void) params32.EnvironmentSize, params.EnvironmentSize ); } + ResumeThread( pi.hThread ); + WaitForInputIdle( pi.hProcess, 1000 ); + + if (pRtlWow64GetSharedInfoProcess) + { + ULONG i, peb_data[0x200]; + + wow64 = 0xcc; + memset( buffer, 0xcc, sizeof(buffer) ); + status = pRtlWow64GetSharedInfoProcess( pi.hProcess, &wow64, wow64info ); + ok( !status, "RtlWow64GetSharedInfoProcess failed %lx\n", status ); + ok( wow64 == TRUE, "wrong wow64 %u\n", wow64 ); + todo_wine_if (!wow64info->NativeSystemPageSize) /* not set in old wow64 */ + { + ok( wow64info->NativeSystemPageSize == 0x1000, "wrong page size %lx\n", + wow64info->NativeSystemPageSize ); + ok( wow64info->CpuFlags == (native_machine == IMAGE_FILE_MACHINE_AMD64 ? WOW64_CPUFLAGS_MSFT64 : WOW64_CPUFLAGS_SOFTWARE), + "wrong flags %lx\n", wow64info->CpuFlags ); + ok( wow64info->NativeMachineType == native_machine, "wrong machine %x / %x\n", + wow64info->NativeMachineType, native_machine ); + ok( wow64info->EmulatedMachineType == IMAGE_FILE_MACHINE_I386, "wrong machine %x\n", + wow64info->EmulatedMachineType ); + } + ok( buffer[sizeof(*wow64info) / sizeof(ULONG)] == 0xcccccccc, "buffer set %lx\n", + buffer[sizeof(*wow64info) / sizeof(ULONG)] ); + if (ReadProcessMemory( pi.hProcess, (void *)peb_ptr, peb_data, sizeof(peb_data), &res )) + { + ULONG limit = (sizeof(peb_data) - sizeof(wow64info)) / sizeof(ULONG); + for (i = 0; i < limit; i++) + { + if (!memcmp( peb_data + i, wow64info, sizeof(*wow64info) )) + { + trace( "wow64info found at %lx\n", i * 4 ); + break; + } + } + ok( i < limit, "wow64info not found in PEB\n" ); + } + } + else win_skip( "RtlWow64GetSharedInfoProcess not supported\n" ); + ret = DebugActiveProcess( pi.dwProcessId ); ok( ret, "debugging failed\n" ); if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; @@ -416,6 +463,19 @@ static void test_peb_teb(void) ok( proc_info.PebBaseAddress == teb.Peb, "wrong peb %p / %p\n", proc_info.PebBaseAddress, teb.Peb ); + ResumeThread( pi.hThread ); + WaitForInputIdle( pi.hProcess, 1000 ); + + if (pRtlWow64GetSharedInfoProcess) + { + wow64 = 0xcc; + memset( buffer, 0xcc, sizeof(buffer) ); + status = pRtlWow64GetSharedInfoProcess( pi.hProcess, &wow64, wow64info ); + ok( !status, "RtlWow64GetSharedInfoProcess failed %lx\n", status ); + ok( !wow64, "wrong wow64 %u\n", wow64 ); + ok( buffer[0] == 0xcccccccc, "buffer set %lx\n", buffer[0] ); + } + TerminateProcess( pi.hProcess, 0 ); CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); diff --git a/include/winternl.h b/include/winternl.h index faa8621c152..f57b5b43d37 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4013,6 +4013,7 @@ typedef struct _WOW64INFO ULONG unknown[5]; USHORT NativeMachineType; USHORT EmulatedMachineType; + ULONG unknown2; } WOW64INFO; #define WOW64_CPUFLAGS_MSFT64 0x01 @@ -4820,6 +4821,7 @@ NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); NTSYSAPI USHORT WINAPI RtlWow64GetCurrentMachine(void); NTSYSAPI NTSTATUS WINAPI RtlWow64GetProcessMachines(HANDLE,USHORT*,USHORT*); +NTSYSAPI NTSTATUS WINAPI RtlWow64GetSharedInfoProcess(HANDLE,BOOLEAN*,WOW64INFO*); NTSYSAPI NTSTATUS WINAPI RtlWow64IsWowGuestMachineSupported(USHORT,BOOLEAN*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE);

1 0

Alexandre Julliard : kernelbase: Use ProcessWow64Information to retrieve the 32-bit PEB.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 7261aca185e090e9f802b5b73d12c33d16fd67f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7261aca185e090e9f802b5b73d12c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 14:14:33 2023 +0200 kernelbase: Use ProcessWow64Information to retrieve the 32-bit PEB. --- dlls/kernelbase/debug.c | 58 +++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 4353b0590f3..7132f63bb52 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -824,37 +824,39 @@ struct module_iterator }; -/* Caller must ensure that wow64=TRUE is only passed from 64bit for 'process' being a wow64 process */ -static BOOL init_module_iterator( struct module_iterator *iter, HANDLE process, BOOL wow64 ) +static BOOL init_module_iterator_wow64( struct module_iterator *iter, HANDLE process ) +{ + PEB_LDR_DATA32 *ldr_data32_ptr; + DWORD ldr_data32, first_module; + PEB32 *peb32; + + iter->wow64 = TRUE; + if (!set_ntstatus( NtQueryInformationProcess( process, ProcessWow64Information, + &peb32, sizeof(peb32), NULL ))) + return FALSE; + if (!ReadProcessMemory( process, &peb32->LdrData, &ldr_data32, sizeof(ldr_data32), NULL )) + return FALSE; + ldr_data32_ptr = (PEB_LDR_DATA32 *)(DWORD_PTR) ldr_data32; + if (!ReadProcessMemory( process, &ldr_data32_ptr->InLoadOrderModuleList.Flink, + &first_module, sizeof(first_module), NULL )) + return FALSE; + iter->head = (LIST_ENTRY *)&ldr_data32_ptr->InLoadOrderModuleList; + iter->current = (LIST_ENTRY *)(DWORD_PTR)first_module; + iter->process = process; + return TRUE; +} + + +static BOOL init_module_iterator( struct module_iterator *iter, HANDLE process ) { PROCESS_BASIC_INFORMATION pbi; PPEB_LDR_DATA ldr_data; - /* get address of PEB */ + iter->wow64 = FALSE; if (!set_ntstatus( NtQueryInformationProcess( process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL ))) return FALSE; - iter->wow64 = wow64; - if (wow64) - { - PEB_LDR_DATA32 *ldr_data32_ptr; - DWORD ldr_data32, first_module; - PEB32 *peb32; - - peb32 = (PEB32 *)((char *)pbi.PebBaseAddress + 0x1000); - if (!ReadProcessMemory( process, &peb32->LdrData, &ldr_data32, sizeof(ldr_data32), NULL )) - return FALSE; - ldr_data32_ptr = (PEB_LDR_DATA32 *)(DWORD_PTR) ldr_data32; - if (!ReadProcessMemory( process, &ldr_data32_ptr->InLoadOrderModuleList.Flink, - &first_module, sizeof(first_module), NULL )) - return FALSE; - iter->head = (LIST_ENTRY *)&ldr_data32_ptr->InLoadOrderModuleList; - iter->current = (LIST_ENTRY *)(DWORD_PTR)first_module; - iter->process = process; - return TRUE; - } - /* read address of LdrData from PEB */ if (!ReadProcessMemory( process, &pbi.PebBaseAddress->LdrData, &ldr_data, sizeof(ldr_data), NULL )) return FALSE; @@ -907,7 +909,7 @@ static BOOL get_ldr_module( HANDLE process, HMODULE module, LDR_DATA_TABLE_ENTRY struct module_iterator iter; INT ret; - if (!init_module_iterator( &iter, process, FALSE )) return FALSE; + if (!init_module_iterator( &iter, process )) return FALSE; while ((ret = module_iterator_next( &iter )) > 0) /* When hModule is NULL we return the process image - which will be @@ -935,7 +937,7 @@ static BOOL get_ldr_module32( HANDLE process, HMODULE module, LDR_DATA_TABLE_ENT return FALSE; } #endif - if (!init_module_iterator( &iter, process, TRUE )) return FALSE; + if (!init_module_iterator_wow64( &iter, process )) return FALSE; while ((ret = module_iterator_next( &iter )) > 0) /* When hModule is NULL we return the process image - which will be @@ -1101,12 +1103,12 @@ BOOL WINAPI EnumProcessModulesEx( HANDLE process, HMODULE *module, DWORD count, if (is_win64 && target_wow64 && (list_mode & LIST_MODULES_32BIT)) { - if (!init_module_iterator( &iter, process, TRUE ) || module_push_all( &mp, &iter ) < 0) + if (!init_module_iterator_wow64( &iter, process ) || module_push_all( &mp, &iter ) < 0) return FALSE; } if (!(is_win64 && list_mode == LIST_MODULES_32BIT)) { - if (init_module_iterator( &iter, process, FALSE )) + if (init_module_iterator( &iter, process )) { if (is_win64 && target_wow64 && (list_mode & LIST_MODULES_64BIT)) /* Don't add main module twice in _ALL mode */ @@ -1120,7 +1122,7 @@ BOOL WINAPI EnumProcessModulesEx( HANDLE process, HMODULE *module, DWORD count, */ if (list_mode == LIST_MODULES_DEFAULT) { - if (init_module_iterator( &iter, process, TRUE ) && module_iterator_next( &iter ) > 0) + if (init_module_iterator_wow64( &iter, process ) && module_iterator_next( &iter ) > 0) module_push_iter( &mp, &iter ); else ret = -1;

1 0

Alexandre Julliard : wow64: Use ProcessWow64Information to retrieve the 32-bit PEB.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 168ce9164faf4ce768e9f9f1f5f8415f5c097ca7 URL: https://gitlab.winehq.org/wine/wine/-/commit/168ce9164faf4ce768e9f9f1f5f841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 15:37:14 2023 +0200 wow64: Use ProcessWow64Information to retrieve the 32-bit PEB. --- dlls/wow64/syscall.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 0f8135859bc..e741654a056 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -873,7 +873,7 @@ static const WCHAR *get_cpu_dll_name(void) */ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **context ) { - TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); + PEB32 *peb32; HMODULE module, ntdll; UNICODE_STRING str = RTL_CONSTANT_STRING( L"ntdll.dll" ); SYSTEM_BASIC_INFORMATION info; @@ -884,7 +884,8 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex NtQuerySystemInformation( SystemEmulationBasicInformation, &info, sizeof(info), NULL ); highest_user_address = (ULONG_PTR)info.HighestUserAddress; default_zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; - wow64info = (WOW64INFO *)((PEB32 *)ULongToPtr( teb32->Peb ) + 1); + NtQueryInformationProcess( GetCurrentProcess(), ProcessWow64Information, &peb32, sizeof(peb32), NULL ); + wow64info = (WOW64INFO *)(peb32 + 1); wow64info->NativeSystemPageSize = 0x1000; wow64info->NativeMachineType = native_machine; wow64info->EmulatedMachineType = current_machine;

1 0

Alexandre Julliard : psapi/tests: Use MAX_PATH size for arrays holding file paths.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: b1f603d8bca63095be73956fc1e959bc1afb99ba URL: https://gitlab.winehq.org/wine/wine/-/commit/b1f603d8bca63095be73956fc1e959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 14:08:37 2023 +0200 psapi/tests: Use MAX_PATH size for arrays holding file paths. --- dlls/psapi/tests/psapi_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 8d7b169703a..e7e5e5f04e6 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -76,7 +76,7 @@ static void test_EnumProcesses(void) static void test_EnumProcessModules(void) { - char buffer[200] = "C:\\windows\\system32\\msinfo32.exe"; + char buffer[MAX_PATH] = "C:\\windows\\system32\\msinfo32.exe"; PROCESS_INFORMATION pi = {0}; STARTUPINFOA si = {0}; void *cookie; @@ -140,7 +140,7 @@ static void test_EnumProcessModules(void) if (sizeof(void *) == 8) { MODULEINFO info; - char name[40]; + char name[MAX_PATH]; HMODULE hmods[3]; strcpy(buffer, "C:\\windows\\syswow64\\msinfo32.exe"); @@ -224,8 +224,8 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap { void* cookie; DWORD needed; - char buffer[80]; - char buffer2[80]; + char buffer[MAX_PATH]; + char buffer2[MAX_PATH]; MODULEINFO info; int i, j; BOOL ret; @@ -334,7 +334,7 @@ static BOOL snapshot_are_disjoint(const struct moduleex_snapshot* seta, const st static void snapshot_check_first_main_module(const struct moduleex_snapshot* snap, HANDLE proc, const char* filename) { - char buffer[80]; + char buffer[MAX_PATH]; MODULEINFO info; const char* modname; BOOL ret; @@ -359,7 +359,7 @@ static void snapshot_check_first_main_module(const struct moduleex_snapshot* sna static unsigned int snapshot_count_in_dir(const struct moduleex_snapshot* snap, HANDLE proc, const char* dirname) { unsigned int count = 0; - char buffer[128]; + char buffer[MAX_PATH]; size_t dirname_len = strlen(dirname); BOOL ret; int i; @@ -375,7 +375,7 @@ static unsigned int snapshot_count_in_dir(const struct moduleex_snapshot* snap, static void test_EnumProcessModulesEx(void) { - char buffer[200] = "C:\\windows\\system32\\msinfo32.exe"; + char buffer[MAX_PATH] = "C:\\windows\\system32\\msinfo32.exe"; PROCESS_INFORMATION pi = {0}; STARTUPINFOA si = {0}; void *cookie;

1 0

Alexandre Julliard : ntdll: Return the 32-bit PEB for NtQueryInformationProcess(ProcessWow64Information).
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: fb5cfacce5c6450a4b0b0edafc9e9cc21d73552e URL: https://gitlab.winehq.org/wine/wine/-/commit/fb5cfacce5c6450a4b0b0edafc9e9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 13:43:26 2023 +0200 ntdll: Return the 32-bit PEB for NtQueryInformationProcess(ProcessWow64Information). --- dlls/ntdll/tests/info.c | 5 ++++- dlls/ntdll/tests/wow64.c | 7 +++++++ dlls/ntdll/unix/process.c | 11 ++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index fafbd1ac997..877978b6b3c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1735,7 +1735,8 @@ static void test_query_process_wow64(void) status = NtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %Ix\n", is_wow64, pbi[0]); - ok( pbi[0] != dummy, "pbi[0] %Ix\n", pbi[0]); + if (is_wow64) + ok( (void *)pbi[0] == NtCurrentTeb()->Peb, "pbi[0] %Ix / %p\n", pbi[0], NtCurrentTeb()->Peb); ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]); /* Test written size on 64 bit by checking high 32 bit buffer */ if (sizeof(ULONG_PTR) > sizeof(DWORD)) @@ -1750,6 +1751,8 @@ static void test_query_process_wow64(void) status = NtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %Ix\n", is_wow64, pbi[0]); + if (is_wow64) + ok( (void *)pbi[0] == NtCurrentTeb()->Peb, "pbi[0] %Ix / %p\n", pbi[0], NtCurrentTeb()->Peb); ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]); ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %ld\n", ReturnLength); diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index b99b22fb1af..46523d47c46 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -277,6 +277,7 @@ static void test_peb_teb(void) PEB32 peb32; RTL_USER_PROCESS_PARAMETERS params; RTL_USER_PROCESS_PARAMETERS32 params32; + ULONG_PTR peb_ptr; Wow64DisableWow64FsRedirection( &redir ); @@ -317,6 +318,12 @@ static void test_peb_teb(void) ok( !status, "ProcessBasicInformation failed %lx\n", status ); ok( proc_info.PebBaseAddress == teb.Peb, "wrong peb %p / %p\n", proc_info.PebBaseAddress, teb.Peb ); + status = NtQueryInformationProcess( pi.hProcess, ProcessWow64Information, + &peb_ptr, sizeof(peb_ptr), NULL ); + ok( !status, "ProcessWow64Information failed %lx\n", status ); + ok( (void *)peb_ptr == (is_wow64 ? teb.Peb : ULongToPtr(teb32.Peb)), + "wrong peb %p\n", (void *)peb_ptr ); + if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; ok( res == sizeof(peb), "wrong len %Ix\n", res ); ok( !peb.BeingDebugged, "BeingDebugged is %u\n", peb.BeingDebugged ); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 140a93583b4..30bd6f083bd 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1430,9 +1430,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class case ProcessWow64Information: len = sizeof(ULONG_PTR); if (size != len) return STATUS_INFO_LENGTH_MISMATCH; - else if (!info) ret = STATUS_ACCESS_VIOLATION; - else if (!handle) ret = STATUS_INVALID_HANDLE; - else if (handle == GetCurrentProcess()) *(ULONG_PTR *)info = is_wow64(); + if (handle == GetCurrentProcess()) + *(ULONG_PTR *)info = is_old_wow64() ? (ULONG_PTR)peb : (ULONG_PTR)wow_peb; else { ULONG_PTR val = 0; @@ -1440,10 +1439,12 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class SERVER_START_REQ( get_process_info ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) val = (reply->machine != native_machine); + ret = wine_server_call( req ); + if (!ret && !is_machine_64bit( reply->machine ) && is_machine_64bit( native_machine )) + val = reply->peb + 0x1000; } SERVER_END_REQ; - *(ULONG_PTR *)info = val; + if (!ret) *(ULONG_PTR *)info = val; } break;

1 0

Alexandre Julliard : ntdll: Fix returned length for some info classes in NtQueryInformationProcess().
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 7e521b4db353bcfb60976d89009636bec8e16a8d URL: https://gitlab.winehq.org/wine/wine/-/commit/7e521b4db353bcfb60976d89009636… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 13:41:13 2023 +0200 ntdll: Fix returned length for some info classes in NtQueryInformationProcess(). --- dlls/ntdll/tests/info.c | 65 ++++++++++++++++++++++++++++++++------------- dlls/ntdll/unix/process.c | 67 ++++++++++++++++++++--------------------------- dlls/wow64/process.c | 7 +++-- 3 files changed, 81 insertions(+), 58 deletions(-)

1 0

Tim Clem : wow64win: Consistently marshal HINSTANCEs and HMODULEs as pointers.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: wine Branch: master Commit: 7107a9b1027693ba90fb8dfd11f5c51fba7e13c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7107a9b1027693ba90fb8dfd11f5c5… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Jul 10 14:23:50 2023 -0700 wow64win: Consistently marshal HINSTANCEs and HMODULEs as pointers. In large address aware binaries, these can be > 0x7fffffff, and using the handle functions will result in them being incorrectly extended to 0xffffffffxxxxxxxx. --- dlls/wow64win/user.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 80759765359..8065a05f44a 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1467,10 +1467,10 @@ NTSTATUS WINAPI wow64_NtUserCreateWindowEx( UINT *args ) int height = get_ulong( &args ); HWND parent = get_handle( &args ); HMENU menu = get_handle( &args ); - HINSTANCE instance = get_handle( &args ); + HINSTANCE instance = get_ptr( &args ); void *params = get_ptr( &args ); DWORD flags = get_ulong( &args ); - HINSTANCE client_instance = get_handle( &args ); + HINSTANCE client_instance = get_ptr( &args ); DWORD unk = get_ulong( &args ); BOOL ansi = get_ulong( &args ); @@ -1856,7 +1856,7 @@ NTSTATUS WINAPI wow64_NtUserGetClassInfoEx( UINT *args ) wc32->lpfnWndProc = PtrToUlong( wc.lpfnWndProc ); wc32->cbClsExtra = wc.cbClsExtra; wc32->cbWndExtra = wc.cbWndExtra; - wc32->hInstance = HandleToUlong( wc.hInstance ); + wc32->hInstance = PtrToUlong( wc.hInstance ); wc32->hIcon = HandleToUlong( wc.hIcon ); wc32->hCursor = HandleToUlong( wc.hCursor ); wc32->hbrBackground = HandleToUlong( wc.hbrBackground ); @@ -3810,7 +3810,7 @@ NTSTATUS WINAPI wow64_NtUserSetWinEventHook( UINT *args ) { DWORD event_min = get_ulong( &args ); DWORD event_max = get_ulong( &args ); - HMODULE inst = get_handle( &args ); + HMODULE inst = get_ptr( &args ); UNICODE_STRING32 *module32 = get_ptr( &args ); WINEVENTPROC proc = get_ptr(&args ); DWORD pid = get_ulong( &args ); @@ -3886,7 +3886,7 @@ NTSTATUS WINAPI wow64_NtUserSetWindowWord( UINT *args ) NTSTATUS WINAPI wow64_NtUserSetWindowsHookEx( UINT *args ) { - HINSTANCE inst = get_handle( &args ); + HINSTANCE inst = get_ptr( &args ); UNICODE_STRING32 *module32 = get_ptr( &args ); DWORD tid = get_ulong( &args ); INT id = get_ulong( &args );

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "postfix_expr" rule.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: vkd3d Branch: master Commit: aec9ea085ed7522d8a323e496480fb75b6f5b8ea URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aec9ea085ed7522d8a323e496480f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:15:35 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "postfix_expr" rule. --- libs/vkd3d-shader/hlsl.y | 73 +++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 02a51604..6bf87f8f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -133,11 +133,6 @@ static void yyerror(YYLTYPE *loc, void *scanner, struct hlsl_ctx *ctx, const cha hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "%s", s); } -static struct hlsl_ir_node *node_from_list(struct list *list) -{ - return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); -} - static struct hlsl_ir_node *node_from_block(struct hlsl_block *block) { return LIST_ENTRY(list_tail(&block->instrs), struct hlsl_ir_node, entry); @@ -719,7 +714,7 @@ struct hlsl_ir_node *hlsl_add_load_component(struct hlsl_ctx *ctx, struct list * return load; } -static bool add_record_access(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record, +static bool add_record_access(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *record, unsigned int idx, const struct vkd3d_shader_location *loc) { struct hlsl_ir_node *index, *c; @@ -728,11 +723,11 @@ static bool add_record_access(struct hlsl_ctx *ctx, struct list *instrs, struct if (!(c = hlsl_new_uint_constant(ctx, idx, loc))) return false; - list_add_tail(instrs, &c->entry); + hlsl_block_add_instr(block, c); if (!(index = hlsl_new_index(ctx, record, c, loc))) return false; - list_add_tail(instrs, &index->entry); + hlsl_block_add_instr(block, index); return true; } @@ -1170,7 +1165,7 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str return 0; hlsl_block_add_block(&expr, block); - if (!add_implicit_conversion(ctx, &expr.instrs, node_from_list(&expr.instrs), + if (!add_implicit_conversion(ctx, &expr.instrs, node_from_block(&expr), hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), loc)) { hlsl_block_cleanup(&expr); @@ -1183,7 +1178,7 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str progress |= hlsl_copy_propagation_execute(ctx, &expr); } while (progress); - node = node_from_list(&expr.instrs); + node = node_from_block(&expr); if (node->type == HLSL_IR_CONSTANT) { constant = hlsl_ir_constant(node); @@ -1882,10 +1877,10 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in return copy; } -static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrement, bool post, +static bool add_increment(struct hlsl_ctx *ctx, struct hlsl_block *block, bool decrement, bool post, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_node *lhs = node_from_list(instrs); + struct hlsl_ir_node *lhs = node_from_block(block); struct hlsl_ir_node *one; if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST) @@ -1894,9 +1889,9 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem if (!(one = hlsl_new_int_constant(ctx, 1, loc))) return false; - list_add_tail(instrs, &one->entry); + hlsl_block_add_instr(block, one); - if (!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, one)) + if (!add_assignment(ctx, block_to_list(block), lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, one)) return false; if (post) @@ -1905,7 +1900,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem if (!(copy = hlsl_new_copy(ctx, lhs))) return false; - list_add_tail(instrs, &copy->entry); + hlsl_block_add_instr(block, copy); /* Post increment/decrement expressions are considered const. */ if (!(copy->data_type = hlsl_type_clone(ctx, copy->data_type, 0, HLSL_MODIFIER_CONST))) @@ -3824,7 +3819,7 @@ fail: return NULL; } -static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type, +static struct hlsl_block *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type, struct parse_initializer *params, const struct vkd3d_shader_location *loc) { struct hlsl_ir_load *load; @@ -3857,7 +3852,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type hlsl_block_add_instr(params->instrs, &load->node); vkd3d_free(params->args); - return block_to_list(params->instrs); + return params->instrs; } static unsigned int hlsl_offset_dim_count(enum hlsl_sampler_dim dim) @@ -4564,7 +4559,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> declaration %type <list> declaration_statement -%type <list> postfix_expr %type <list> primary_expr %type <list> struct_declaration_without_vars %type <list> type_specs @@ -4602,6 +4596,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <block> logicor_expr %type <block> loop_statement %type <block> mul_expr +%type <block> postfix_expr %type <block> relational_expr %type <block> shift_expr %type <block> selection_statement @@ -6123,11 +6118,14 @@ primary_expr: postfix_expr: primary_expr + { + $$ = list_to_block($1); + } | postfix_expr OP_INC { if (!add_increment(ctx, $1, false, true, &@2)) { - destroy_instr_list($1); + destroy_block($1); YYABORT; } $$ = $1; @@ -6136,14 +6134,14 @@ postfix_expr: { if (!add_increment(ctx, $1, true, true, &@2)) { - destroy_instr_list($1); + destroy_block($1); YYABORT; } $$ = $1; } | postfix_expr '.' any_identifier { - struct hlsl_ir_node *node = node_from_list($1); + struct hlsl_ir_node *node = node_from_block($1); if (node->data_type->class == HLSL_CLASS_STRUCT) { @@ -6171,7 +6169,7 @@ postfix_expr: hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Invalid swizzle \"%s\".", $3); YYABORT; } - list_add_tail($1, &swizzle->entry); + hlsl_block_add_instr($1, swizzle); $$ = $1; } else @@ -6182,17 +6180,17 @@ postfix_expr: } | postfix_expr '[' expr ']' { - struct hlsl_ir_node *array = node_from_list($1), *index = node_from_block($3); + struct hlsl_ir_node *array = node_from_block($1), *index = node_from_block($3); - list_move_head($1, &$3->instrs); - destroy_block($3); + hlsl_block_add_block($3, $1); + destroy_block($1); - if (!add_array_access(ctx, $1, array, index, &@2)) + if (!add_array_access(ctx, block_to_list($3), array, index, &@2)) { - destroy_instr_list($1); + destroy_block($3); YYABORT; } - $$ = $1; + $$ = $3; } /* var_modifiers is necessary to avoid shift/reduce conflicts. */ @@ -6233,14 +6231,14 @@ postfix_expr: } | postfix_expr '.' any_identifier '(' func_arguments ')' { - struct hlsl_ir_node *object = node_from_list($1); + struct hlsl_ir_node *object = node_from_block($1); - list_move_tail($1, &$5.instrs->instrs); + hlsl_block_add_block($1, $5.instrs); vkd3d_free($5.instrs); - if (!add_method_call(ctx, $1, object, $3, &$5, &@3)) + if (!add_method_call(ctx, block_to_list($1), object, $3, &$5, &@3)) { - hlsl_free_instr_list($1); + destroy_block($1); vkd3d_free($5.args); YYABORT; } @@ -6250,12 +6248,9 @@ postfix_expr: unary_expr: postfix_expr - { - $$ = list_to_block($1); - } | OP_INC unary_expr { - if (!add_increment(ctx, block_to_list($2), false, false, &@1)) + if (!add_increment(ctx, $2, false, false, &@1)) { destroy_block($2); YYABORT; @@ -6264,7 +6259,7 @@ unary_expr: } | OP_DEC unary_expr { - if (!add_increment(ctx, block_to_list($2), true, false, &@1)) + if (!add_increment(ctx, $2, true, false, &@1)) { destroy_block($2); YYABORT; @@ -6447,7 +6442,9 @@ conditional_expr: logicor_expr | logicor_expr '?' expr ':' assignment_expr { - struct hlsl_ir_node *cond = node_from_block($1), *first = node_from_block($3), *second = node_from_block($5); + struct hlsl_ir_node *cond = node_from_block($1); + struct hlsl_ir_node *first = node_from_block($3); + struct hlsl_ir_node *second = node_from_block($5); struct hlsl_type *common_type; hlsl_block_add_block($1, $3);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from binary and ternary expression rules.
by Alexandre Julliard July 11, 2023

July 11, 2023

Module: vkd3d Branch: master Commit: e222a786a1d22ee4dc7c7e0f578af87b454e2a24 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e222a786a1d22ee4dc7c7e0f578af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:09:21 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from binary and ternary expression rules. --- libs/vkd3d-shader/hlsl.y | 120 ++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 63 deletions(-)

1 0