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

Biswapriyo Nath : include: Add missing TS_STATUS constants in textstor.idl.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 8204a0b864df984366f36b0b42074858c79fd8e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8204a0b864df984366f36b0b420748… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Mar 22 11:44:11 2023 +0530 include: Add missing TS_STATUS constants in textstor.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/textstor.idl | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index c6d88c7d04a..5aa1279bbde 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -37,13 +37,25 @@ cpp_quote("#define TS_S_ASYNC MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_ const ULONG TS_DEFAULT_SELECTION = ~0u; -const DWORD TS_SD_READONLY = 0x001; -const DWORD TS_SD_LOADING = 0x002; - -const DWORD TS_SS_DISJOINTSEL = 0x001; -const DWORD TS_SS_REGIONS = 0x002; -const DWORD TS_SS_TRANSITORY = 0x004; -const DWORD TS_SS_NOHIDDENTEXT = 0x008; +const DWORD TS_SD_READONLY = 0x001; +const DWORD TS_SD_LOADING = 0x002; +const DWORD TS_SD_RESERVED = 0x004; +const DWORD TS_SD_TKBAUTOCORRECTENABLE = 0x008; +const DWORD TS_SD_TKBPREDICTIONENABLE = 0x010; +const DWORD TS_SD_UIINTEGRATIONENABLE = 0x020; +const DWORD TS_SD_INPUTPANEMANUALDISPLAYENABLE = 0x040; +const DWORD TS_SD_EMBEDDEDHANDWRITINGVIEW_ENABLED = 0x080; +const DWORD TS_SD_EMBEDDEDHANDWRITINGVIEW_VISIBLE = 0x100; + +const DWORD TS_SD_MASKALL = (TS_SD_READONLY | TS_SD_LOADING); + +const DWORD TS_SS_DISJOINTSEL = 0x001; +const DWORD TS_SS_REGIONS = 0x002; +const DWORD TS_SS_TRANSITORY = 0x004; +const DWORD TS_SS_NOHIDDENTEXT = 0x008; +const DWORD TS_SS_TKBAUTOCORRECTENABLE = 0x010; +const DWORD TS_SS_TKBPREDICTIONENABLE = 0x020; +const DWORD TS_SS_UWPCONTROL = 0x040; const DWORD TS_AS_TEXT_CHANGE = 0x01; const DWORD TS_AS_SEL_CHANGE = 0x02;

1 0

Alex Henrie : include: Allow multiple definitions on GCC with DECLSPEC_SELECTANY.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 44e1e9438c867b6adfecaad6e87967f6fe26c7e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/44e1e9438c867b6adfecaad6e87967… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 8 22:04:59 2023 -0700 include: Allow multiple definitions on GCC with DECLSPEC_SELECTANY. Needed to compile Tera Term. As far as I can tell, GCC has always supported __attribute__((weak)). --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 66f6b7ad809..e15ac364ef2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -118,6 +118,8 @@ extern "C" { #define DECLSPEC_SELECTANY __declspec(selectany) #elif defined(__MINGW32__) #define DECLSPEC_SELECTANY __attribute__((selectany)) +#elif defined(__GNUC__) +#define DECLSPEC_SELECTANY __attribute__((weak)) #else #define DECLSPEC_SELECTANY #endif

1 0

Eric Pouech : kernel32/tests: Extend the tests for load/unload debug events on Wow64.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: d203beb5e5dd7e6cd19a18e1cbb281b1a11b7a2f URL: https://gitlab.winehq.org/wine/wine/-/commit/d203beb5e5dd7e6cd19a18e1cbb281… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Mar 12 18:11:30 2023 +0100 kernel32/tests: Extend the tests for load/unload debug events on Wow64. Showing that: - load events for 64bit DLLs are generated for a WOW64 process. - unload events for 64bit DLLs are not generated for a WOW64 process (as any other unload event on process teardown). - a 32bit startup exception is generated as well (with a specific exception code) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 153 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 2491b1093f1..64662709e2a 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1077,6 +1077,158 @@ static void test_debug_loop(int argc, char **argv) ok(ret, "DeleteFileA failed, last error %#lx.\n", GetLastError()); } +struct find_main_window +{ + DWORD pid; + unsigned count; + HWND windows[5]; +}; + +static BOOL CALLBACK enum_windows_callback(HWND handle, LPARAM lParam) +{ + struct find_main_window* fmw = (struct find_main_window*)lParam; + DWORD pid = 0; + + if (GetWindowThreadProcessId(handle, &pid) && fmw->pid == pid && + !GetWindow(handle, GW_OWNER)) + { + ok(fmw->count < ARRAY_SIZE(fmw->windows), "Too many windows\n"); + if (fmw->count < ARRAY_SIZE(fmw->windows)) + fmw->windows[fmw->count++] = handle; + } + return TRUE; +} + +static void close_main_windows(DWORD pid) +{ + struct find_main_window fmw = {pid, 0}; + unsigned i; + + EnumWindows(enum_windows_callback, (LPARAM)&fmw); + ok(fmw.count, "no window found\n"); + for (i = 0; i < fmw.count; i++) + PostMessageA(fmw.windows[i], WM_CLOSE, 0, 0); +} + +static void test_debug_loop_wow64(void) +{ + WCHAR buffer[MAX_PATH], *p; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + BOOL ret; + unsigned order = 0, bp_order = 0, bpwx_order = 0, num_ntdll = 0, num_wow64 = 0; + + /* checking conditions for running this test */ + if (GetSystemWow64DirectoryW( buffer, ARRAY_SIZE(buffer) ) && sizeof(void*) > sizeof(int) && pGetMappedFileNameW) + { + wcscat( buffer, L"\\msinfo32.exe" ); + ret = GetFileAttributesW( buffer ) != INVALID_FILE_ATTRIBUTES; + } + else ret = FALSE; + if (!ret) + { + skip("Skipping test on incompatible config\n"); + return; + } + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + ret = CreateProcessW( NULL, buffer, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi ); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); + + for (;;) + { + DEBUG_EVENT ev; + + ++order; + ret = WaitForDebugEvent( &ev, 2000 ); + if (!ret) break; + + switch (ev.dwDebugEventCode) + { + case CREATE_PROCESS_DEBUG_EVENT: + break; + case LOAD_DLL_DEBUG_EVENT: + if (!pGetMappedFileNameW( pi.hProcess, ev.u.LoadDll.lpBaseOfDll, buffer, ARRAY_SIZE(buffer) )) buffer[0] = L'\0'; + if ((p = wcsrchr( buffer, '\\' ))) p++; + else p = buffer; + if (!memcmp( p, L"wow64", 5 * sizeof(WCHAR) )) + { + /* on Win10, wow64cpu's load dll event is received after first exception */ + ok(bpwx_order == 0, "loaddll for wow64 DLLs should appear before exception\n"); + num_wow64++; + } + else if (!wcsicmp( p, L"ntdll.dll" )) + { + ok(bp_order == 0 && bpwx_order == 0, "loaddll on ntdll should appear before exception\n"); + num_ntdll++; + } + break; + case EXCEPTION_DEBUG_EVENT: + if (ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) + bp_order = order; + else if (ev.u.Exception.ExceptionRecord.ExceptionCode == STATUS_WX86_BREAKPOINT) + bpwx_order = order; + } + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); + if (!ret) break; + } + + /* gracefully terminates msinfo32 */ + close_main_windows( pi.dwProcessId ); + + /* eat up the remaining events... not generating unload dll events in case of process termination */ + for (;;) + { + DEBUG_EVENT ev; + + ret = WaitForDebugEvent( &ev, 2000 ); + if (!ret || ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; + switch (ev.dwDebugEventCode) + { + default: + ok(0, "Unexpected event: %lu\n", ev.dwDebugEventCode); + /* fall through */ + case EXIT_PROCESS_DEBUG_EVENT: + case EXIT_THREAD_DEBUG_EVENT: + ret = ContinueDebugEvent( ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE ); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); + break; + } + } + + ret = WaitForSingleObject( pi.hProcess, 2000 ); + if (ret != WAIT_OBJECT_0) + { + DWORD ec; + ret = GetExitCodeProcess( pi.hProcess, &ec ); + ok(ret, "GetExitCodeProcess failed: %lu\n", GetLastError()); + ok(ec != STILL_ACTIVE, "GetExitCodeProcess still active\n"); + } + + ret = CloseHandle( pi.hThread ); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); + ret = CloseHandle( pi.hProcess ); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); + + if (strcmp( winetest_platform, "wine" ) || num_wow64) /* windows or new wine wow */ + { + ok(num_ntdll == 2, "Expecting two ntdll instances\n"); + ok(num_wow64 >= 3, "Expecting more than 3 wow64*.dll\n"); + } + else /* Wine's old wow, or 32/64 bit only configurations */ + { + ok(num_ntdll == 1, "Expecting one ntdll instances\n"); + ok(num_wow64 == 0, "Expecting more no wow64*.dll\n"); + } + ok(bp_order, "Expecting 1 bp exceptions\n"); + todo_wine + { + ok(bpwx_order, "Expecting 1 bpwx exceptions\n"); + ok(bp_order < bpwx_order, "Out of order bp exceptions\n"); + } +} + static void doChildren(int argc, char **argv) { const char *arguments = "debugger children last"; @@ -2284,6 +2436,7 @@ START_TEST(debugger) test_ExitCode(); test_RemoteDebugger(); test_debug_loop(myARGC, myARGV); + test_debug_loop_wow64(); test_debug_children(myARGV[0], DEBUG_PROCESS, TRUE, FALSE); test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE);

1 0

Rémi Bernon : dinput: Return DI_SETTINGSNOTSAVED when DIDSAM_FORCESAVE is used.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: bf22424e2af276d0e1b9641bcbbfe63f25159824 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf22424e2af276d0e1b9641bcbbfe6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 16:57:27 2023 +0100 dinput: Return DI_SETTINGSNOTSAVED when DIDSAM_FORCESAVE is used. --- dlls/dinput/device.c | 1 + dlls/dinput/tests/joystick8.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 0df0199317b..41baa630989 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2022,6 +2022,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D free( data_format.rgodf ); if (FAILED(hr)) return hr; + if (flags == DIDSAM_FORCESAVE) return DI_SETTINGSNOTSAVED; if (!data_format.dwNumObjs) return DI_NOEFFECT; return hr; } diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 7947e6e33cc..a74dab6dc52 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -818,7 +818,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e /* first SetActionMap call for a user always return DI_SETTINGSNOTSAVED */ hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); @@ -829,7 +828,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_DEFAULT ); ok( hr == DI_NOEFFECT, "SetActionMap returned %#lx\n", hr ); hr = IDirectInputDevice8_SetActionMap( device, &voice_action_format, NULL, DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); memset( prop_username.wsz, 0, sizeof(prop_username.wsz) ); @@ -874,10 +872,8 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e /* DIDSAM_FORCESAVE always returns DI_SETTINGSNOTSAVED */ hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); check_diactionformatw( &action_format, &expect_action_format_1 ); @@ -946,7 +942,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "SetActionMap returned %#lx\n", hr ); check_diactionformatw( &action_format, &expect_action_format_2_filled ); hr = IDirectInputDevice8_SetActionMap( device, &action_format, L"username", DIDSAM_FORCESAVE ); - todo_wine ok( hr == DI_SETTINGSNOTSAVED, "SetActionMap returned %#lx\n", hr ); check_diactionformatw( &action_format, &expect_action_format_2_filled );

1 0

Alexandre Julliard : include: Declare some missing ntdll functions, and fix the sorting.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 687068e7d6b52f170312ebae65cd8bc884cfd097 URL: https://gitlab.winehq.org/wine/wine/-/commit/687068e7d6b52f170312ebae65cd8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 13:12:44 2023 +0100 include: Declare some missing ntdll functions, and fix the sorting. --- dlls/kernel32/heap.c | 2 - dlls/kernelbase/memory.c | 3 -- include/winternl.h | 131 +++++++++++++++++++++++++++-------------------- 3 files changed, 75 insertions(+), 61 deletions(-)

1 0

Alexandre Julliard : kernelbase: Use RtlGetNativeSystemInformation() to implement GetNativeSystemInfo().
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: ccd964049334df285e5caba54fea42c031bdec5a URL: https://gitlab.winehq.org/wine/wine/-/commit/ccd964049334df285e5caba54fea42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 13:19:43 2023 +0100 kernelbase: Use RtlGetNativeSystemInformation() to implement GetNativeSystemInfo(). --- dlls/kernel32/tests/process.c | 18 ++++-- dlls/kernelbase/memory.c | 130 +++++++++++++++++++++--------------------- 2 files changed, 77 insertions(+), 71 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 1e30ba73bbf..3c4a02e7cc8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2202,12 +2202,12 @@ static void test_IsWow64Process2(void) #if defined(__i386__) || defined(__x86_64__) ok(machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", machine); - expect_native = IMAGE_FILE_MACHINE_AMD64; + ok( native_machine == IMAGE_FILE_MACHINE_AMD64 || + native_machine == IMAGE_FILE_MACHINE_ARM64, "got %#x\n", native_machine); + expect_native = native_machine; #else skip("not supported architecture\n"); #endif - ok(native_machine == expect_native, "got %#x\n", native_machine); - ret = TerminateProcess(pi.hProcess, 0); ok(ret, "TerminateProcess error\n"); @@ -2279,6 +2279,7 @@ static void test_SystemInfo(void) { SYSTEM_INFO si, nsi; BOOL is_wow64; + USHORT machine, native_machine; if (!pGetNativeSystemInfo) { @@ -2297,9 +2298,14 @@ static void test_SystemInfo(void) ok(S(U(nsi)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64, "Expected PROCESSOR_ARCHITECTURE_AMD64, got %d\n", S(U(nsi)).wProcessorArchitecture); - ok(nsi.dwProcessorType == PROCESSOR_AMD_X8664, - "Expected PROCESSOR_AMD_X8664, got %ld\n", - nsi.dwProcessorType); + if (pIsWow64Process2 && pIsWow64Process2(GetCurrentProcess(), &machine, &native_machine) && + native_machine == IMAGE_FILE_MACHINE_ARM64) + { + ok(nsi.dwProcessorType == PROCESSOR_INTEL_PENTIUM, "got %ld\n", nsi.dwProcessorType); + ok(nsi.wProcessorLevel == 15, "got %d\n", nsi.wProcessorLevel); + ok(nsi.wProcessorRevision == 0x40a, "got %d\n", nsi.wProcessorRevision); + } + else ok(nsi.dwProcessorType == PROCESSOR_AMD_X8664, "got %ld\n", nsi.dwProcessorType); } } else diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 094556eaba2..c4a484b5a30 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -83,61 +83,24 @@ SIZE_T WINAPI GetLargePageMinimum(void) } -/*********************************************************************** - * GetNativeSystemInfo (kernelbase.@) - */ -void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) -{ - USHORT current_machine, native_machine; - - GetSystemInfo( si ); - RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); - if (!current_machine) return; - switch (native_machine) - { - case IMAGE_FILE_MACHINE_AMD64: - si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; - si->dwProcessorType = PROCESSOR_AMD_X8664; - break; - case IMAGE_FILE_MACHINE_ARM64: - si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; - si->dwProcessorType = 0; - break; - default: - FIXME( "Add the proper information for %x in wow64 mode\n", native_machine ); - } -} - - -/*********************************************************************** - * GetSystemInfo (kernelbase.@) - */ -void WINAPI DECLSPEC_HOTPATCH GetSystemInfo( SYSTEM_INFO *si ) +static void fill_system_info( SYSTEM_INFO *si, const SYSTEM_BASIC_INFORMATION *basic_info, + const SYSTEM_CPU_INFORMATION *cpu_info ) { - SYSTEM_BASIC_INFORMATION basic_info; - SYSTEM_CPU_INFORMATION cpu_info; - - if (!set_ntstatus( NtQuerySystemInformation( SystemBasicInformation, - &basic_info, sizeof(basic_info), NULL )) || - !set_ntstatus( NtQuerySystemInformation( SystemCpuInformation, - &cpu_info, sizeof(cpu_info), NULL ))) - return; - - si->u.s.wProcessorArchitecture = cpu_info.ProcessorArchitecture; + si->u.s.wProcessorArchitecture = cpu_info->ProcessorArchitecture; si->u.s.wReserved = 0; - si->dwPageSize = basic_info.PageSize; - si->lpMinimumApplicationAddress = basic_info.LowestUserAddress; - si->lpMaximumApplicationAddress = basic_info.HighestUserAddress; - si->dwActiveProcessorMask = basic_info.ActiveProcessorsAffinityMask; - si->dwNumberOfProcessors = basic_info.NumberOfProcessors; - si->dwAllocationGranularity = basic_info.AllocationGranularity; - si->wProcessorLevel = cpu_info.ProcessorLevel; - si->wProcessorRevision = cpu_info.ProcessorRevision; - - switch (cpu_info.ProcessorArchitecture) + si->dwPageSize = basic_info->PageSize; + si->lpMinimumApplicationAddress = basic_info->LowestUserAddress; + si->lpMaximumApplicationAddress = basic_info->HighestUserAddress; + si->dwActiveProcessorMask = basic_info->ActiveProcessorsAffinityMask; + si->dwNumberOfProcessors = basic_info->NumberOfProcessors; + si->dwAllocationGranularity = basic_info->AllocationGranularity; + si->wProcessorLevel = cpu_info->ProcessorLevel; + si->wProcessorRevision = cpu_info->ProcessorRevision; + + switch (cpu_info->ProcessorArchitecture) { case PROCESSOR_ARCHITECTURE_INTEL: - switch (cpu_info.ProcessorLevel) + switch (cpu_info->ProcessorLevel) { case 3: si->dwProcessorType = PROCESSOR_INTEL_386; break; case 4: si->dwProcessorType = PROCESSOR_INTEL_486; break; @@ -146,23 +109,11 @@ void WINAPI DECLSPEC_HOTPATCH GetSystemInfo( SYSTEM_INFO *si ) default: si->dwProcessorType = PROCESSOR_INTEL_PENTIUM; break; } break; - case PROCESSOR_ARCHITECTURE_PPC: - switch (cpu_info.ProcessorLevel) - { - case 1: si->dwProcessorType = PROCESSOR_PPC_601; break; - case 3: - case 6: si->dwProcessorType = PROCESSOR_PPC_603; break; - case 4: si->dwProcessorType = PROCESSOR_PPC_604; break; - case 9: si->dwProcessorType = PROCESSOR_PPC_604; break; - case 20: si->dwProcessorType = PROCESSOR_PPC_620; break; - default: si->dwProcessorType = 0; - } - break; case PROCESSOR_ARCHITECTURE_AMD64: si->dwProcessorType = PROCESSOR_AMD_X8664; break; case PROCESSOR_ARCHITECTURE_ARM: - switch (cpu_info.ProcessorLevel) + switch (cpu_info->ProcessorLevel) { case 4: si->dwProcessorType = PROCESSOR_ARM_7TDMI; break; default: si->dwProcessorType = PROCESSOR_ARM920; @@ -172,13 +123,62 @@ void WINAPI DECLSPEC_HOTPATCH GetSystemInfo( SYSTEM_INFO *si ) si->dwProcessorType = 0; break; default: - FIXME( "Unknown processor architecture %x\n", cpu_info.ProcessorArchitecture ); + FIXME( "Unknown processor architecture %x\n", cpu_info->ProcessorArchitecture ); si->dwProcessorType = 0; break; } } +/*********************************************************************** + * GetNativeSystemInfo (kernelbase.@) + */ +void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) +{ + SYSTEM_BASIC_INFORMATION basic_info; + SYSTEM_CPU_INFORMATION cpu_info; + + if (is_wow64) + { + USHORT current_machine, native_machine; + + RtlWow64GetProcessMachines( 0, &current_machine, &native_machine ); + if (native_machine != IMAGE_FILE_MACHINE_AMD64) + { + GetSystemInfo( si ); + si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; + return; + } + } + + if (!set_ntstatus( RtlGetNativeSystemInformation( SystemBasicInformation, + &basic_info, sizeof(basic_info), NULL )) || + !set_ntstatus( RtlGetNativeSystemInformation( SystemCpuInformation, + &cpu_info, sizeof(cpu_info), NULL ))) + return; + + fill_system_info( si, &basic_info, &cpu_info ); +} + + +/*********************************************************************** + * GetSystemInfo (kernelbase.@) + */ +void WINAPI DECLSPEC_HOTPATCH GetSystemInfo( SYSTEM_INFO *si ) +{ + SYSTEM_BASIC_INFORMATION basic_info; + SYSTEM_CPU_INFORMATION cpu_info; + + if (!set_ntstatus( NtQuerySystemInformation( SystemBasicInformation, + &basic_info, sizeof(basic_info), NULL )) || + !set_ntstatus( NtQuerySystemInformation( SystemCpuInformation, + &cpu_info, sizeof(cpu_info), NULL ))) + return; + + fill_system_info( si, &basic_info, &cpu_info ); +} + + /*********************************************************************** * GetSystemFileCacheSize (kernelbase.@) */

1 0

Alexandre Julliard : wow64: Allow the CPU backend to override CPU information.
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: d41117b61ed3ccc34900c76611f6ce7b534521ce URL: https://gitlab.winehq.org/wine/wine/-/commit/d41117b61ed3ccc34900c76611f6ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 13:20:00 2023 +0100 wow64: Allow the CPU backend to override CPU information. --- dlls/wow64/syscall.c | 3 ++- dlls/wow64/system.c | 4 +++- dlls/wow64/wow64_private.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index d057fcc256e..06dd9822a08 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -110,7 +110,7 @@ static void (WINAPI *pBTCpuSimulate)(void); static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); static void * (WINAPI *p__wine_get_unix_opcode)(void); static void * (WINAPI *pKiRaiseUserExceptionDispatcher)(void); - +void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) = NULL; void *dummy = RtlUnwind; @@ -842,6 +842,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSetContext ); GET_PTR( BTCpuSimulate ); + GET_PTR( BTCpuUpdateProcessorInformation ); GET_PTR( __wine_get_unix_opcode ); module = load_64bit_module( L"wow64win.dll" ); diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index 5d111cc942d..21e191b8a29 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -337,7 +337,9 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformation( UINT *args ) case SystemCpuInformation: /* SYSTEM_CPU_INFORMATION */ case SystemEmulationProcessorInformation: /* SYSTEM_CPU_INFORMATION */ - return NtQuerySystemInformation( SystemEmulationProcessorInformation, ptr, len, retlen ); + status = NtQuerySystemInformation( SystemEmulationProcessorInformation, ptr, len, retlen ); + if (!status && pBTCpuUpdateProcessorInformation) pBTCpuUpdateProcessorInformation( ptr ); + return status; case SystemBasicInformation: /* SYSTEM_BASIC_INFORMATION */ case SystemEmulationBasicInformation: /* SYSTEM_BASIC_INFORMATION */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 7eef4da3ad9..bba191ad439 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -38,6 +38,7 @@ extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; extern ULONG_PTR highest_user_address DECLSPEC_HIDDEN; extern ULONG_PTR default_zero_bits DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; +extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) DECLSPEC_HIDDEN; struct object_attr64 {

1 0

Alexandre Julliard : wow64: Convert token and debug port in NtCreateUserProcess().
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: c4adc651df11f038cf9470ebcd951e4ae1c56574 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4adc651df11f038cf9470ebcd951e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 15:23:48 2023 +0100 wow64: Convert token and debug port in NtCreateUserProcess(). --- dlls/wow64/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 48e5ad57228..2182491bbfb 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -184,6 +184,8 @@ static PS_ATTRIBUTE_LIST *ps_attributes_32to64( PS_ATTRIBUTE_LIST **attr, const } break; case PS_ATTRIBUTE_PARENT_PROCESS: + case PS_ATTRIBUTE_DEBUG_PORT: + case PS_ATTRIBUTE_TOKEN: ret->Attributes[i].Size = sizeof(HANDLE); ret->Attributes[i].ValuePtr = LongToHandle( attr32->Attributes[i].Value ); break;

1 0

Zebediah Figura : ddraw: Factor out a ddraw_texture_rename_to() helper from ddraw_surface1_Flip().
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: f103da7c69cc18aaf63f08a752d870b7049d9d20 URL: https://gitlab.winehq.org/wine/wine/-/commit/f103da7c69cc18aaf63f08a752d870… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 25 17:00:20 2022 -0600 ddraw: Factor out a ddraw_texture_rename_to() helper from ddraw_surface1_Flip(). --- dlls/ddraw/surface.c | 94 +++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 53 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4d8812cf106..eaa036b21bf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1325,6 +1325,36 @@ static unsigned int ddraw_swap_interval_from_flags(DWORD flags) } } +static void ddraw_texture_rename_to(struct ddraw_texture *dst_texture, struct wined3d_texture *wined3d_texture, + struct wined3d_texture *draw_texture, struct wined3d_rendertarget_view *rtv, void *texture_memory) +{ + struct ddraw_surface *dst_surface = dst_texture->root; + struct wined3d_rendertarget_view *current_rtv; + + /* We don't have to worry about potential texture bindings, since + * flippable surfaces can never be textures. */ + + current_rtv = wined3d_device_context_get_rendertarget_view(dst_surface->ddraw->immediate_context, 0); + if (current_rtv == dst_surface->wined3d_rtv) + wined3d_device_context_set_rendertarget_views(dst_surface->ddraw->immediate_context, 0, 1, &rtv, FALSE); + wined3d_rendertarget_view_set_parent(rtv, dst_surface); + dst_surface->wined3d_rtv = rtv; + + if (dst_surface->sub_resource_idx) + ERR("Invalid sub-resource index %u for surface %p.\n", dst_surface->sub_resource_idx, dst_surface); + + wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface); + if (draw_texture) + wined3d_texture_set_sub_resource_parent(draw_texture, 0, dst_surface); + wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), dst_texture); + if (draw_texture) + wined3d_resource_set_parent(wined3d_texture_get_resource(draw_texture), dst_texture); + dst_surface->wined3d_texture = wined3d_texture; + dst_surface->draw_texture = draw_texture; + + dst_texture->texture_memory = texture_memory; +} + /* FRAPS hooks IDirectDrawSurface::Flip and expects the version 1 method to be called when the * game uses later interfaces. */ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface, @@ -1333,9 +1363,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src); struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture; - struct wined3d_rendertarget_view *tmp_rtv, *src_rtv, *rtv; - DDSCAPS caps = {DDSCAPS_FLIP}; struct wined3d_texture *texture, *draw_texture; + struct wined3d_rendertarget_view *tmp_rtv; + DDSCAPS caps = {DDSCAPS_FLIP}; IDirectDrawSurface *current; void *texture_memory; HRESULT hr; @@ -1359,10 +1389,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * } tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); - if (dst_impl->sub_resource_idx) - ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; - rtv = wined3d_device_context_get_rendertarget_view(dst_impl->ddraw->immediate_context, 0); dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); texture_memory = dst_ddraw_texture->texture_memory; draw_texture = dst_impl->draw_texture; @@ -1386,24 +1413,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * } } - src_rtv = ddraw_surface_get_rendertarget_view(src_impl); - if (rtv == dst_impl->wined3d_rtv) - wined3d_device_context_set_rendertarget_views(dst_impl->ddraw->immediate_context, 0, 1, &src_rtv, FALSE); - wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); - dst_impl->wined3d_rtv = src_rtv; - wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); - if (src_impl->draw_texture) - wined3d_texture_set_sub_resource_parent(src_impl->draw_texture, 0, dst_impl); src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - dst_ddraw_texture->texture_memory = src_ddraw_texture->texture_memory; - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), dst_ddraw_texture); - if (src_impl->draw_texture) - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->draw_texture), dst_ddraw_texture); + + ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture, + ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory); + dst_ddraw_texture = src_ddraw_texture; - if (src_impl->sub_resource_idx) - ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); - dst_impl->wined3d_texture = src_impl->wined3d_texture; - dst_impl->draw_texture = src_impl->draw_texture; } else { @@ -1423,44 +1438,17 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * } src_impl = impl_from_IDirectDrawSurface(current); - src_rtv = ddraw_surface_get_rendertarget_view(src_impl); - if (rtv == dst_impl->wined3d_rtv) - wined3d_device_context_set_rendertarget_views(dst_impl->ddraw->immediate_context, - 0, 1, &src_rtv, FALSE); - wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); - dst_impl->wined3d_rtv = src_rtv; - wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); - if (src_impl->draw_texture) - wined3d_texture_set_sub_resource_parent(src_impl->draw_texture, 0, dst_impl); src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - dst_ddraw_texture->texture_memory = src_ddraw_texture->texture_memory; - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), dst_ddraw_texture); - if (src_impl->draw_texture) - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->draw_texture), dst_ddraw_texture); + + ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture, + ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory); + dst_ddraw_texture = src_ddraw_texture; - if (src_impl->sub_resource_idx) - ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); - dst_impl->wined3d_texture = src_impl->wined3d_texture; - dst_impl->draw_texture = src_impl->draw_texture; dst_impl = src_impl; } } - /* We don't have to worry about potential texture bindings, since - * flippable surfaces can never be textures. */ - if (rtv == src_impl->wined3d_rtv) - wined3d_device_context_set_rendertarget_views(dst_impl->ddraw->immediate_context, 0, 1, &tmp_rtv, FALSE); - wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); - src_impl->wined3d_rtv = tmp_rtv; - wined3d_texture_set_sub_resource_parent(texture, 0, src_impl); - if (draw_texture) - wined3d_texture_set_sub_resource_parent(draw_texture, 0, src_impl); - dst_ddraw_texture->texture_memory = texture_memory; - wined3d_resource_set_parent(wined3d_texture_get_resource(texture), dst_ddraw_texture); - if (draw_texture) - wined3d_resource_set_parent(wined3d_texture_get_resource(draw_texture), dst_ddraw_texture); - src_impl->wined3d_texture = texture; - src_impl->draw_texture = draw_texture; + ddraw_texture_rename_to(dst_ddraw_texture, texture, draw_texture, tmp_rtv, texture_memory); if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) {

1 0

Zebediah Figura : wined3d: Pass parent ops to wined3d_texture_set_sub_resource_parent().
by Alexandre Julliard 22 Mar '23

22 Mar '23

Module: wine Branch: master Commit: 4f8635bd78a4858426e02fa1defe61fae11bfc9f URL: https://gitlab.winehq.org/wine/wine/-/commit/4f8635bd78a4858426e02fa1defe61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 23 23:42:22 2022 -0600 wined3d: Pass parent ops to wined3d_texture_set_sub_resource_parent(). So that we can allow setting the sub resource and parent ops not from the texture_sub_resource_created() callback, and also that we can "detach" a wined3d surface from ddraw after creating it, so that we can recreate the backing wined3d texture, viz. in SetSurfaceDesc(). --- dlls/ddraw/surface.c | 15 ++++++++++++--- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index eaa036b21bf..a881572e027 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -29,6 +29,8 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); +static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops; + static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDrawGammaControl *iface) { return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawGammaControl_iface); @@ -1343,9 +1345,16 @@ static void ddraw_texture_rename_to(struct ddraw_texture *dst_texture, struct wi if (dst_surface->sub_resource_idx) ERR("Invalid sub-resource index %u for surface %p.\n", dst_surface->sub_resource_idx, dst_surface); - wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface); if (draw_texture) - wined3d_texture_set_sub_resource_parent(draw_texture, 0, dst_surface); + { + wined3d_texture_set_sub_resource_parent(draw_texture, 0, dst_surface, &ddraw_surface_wined3d_parent_ops); + wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface, &ddraw_null_wined3d_parent_ops); + } + else + { + wined3d_texture_set_sub_resource_parent(wined3d_texture, 0, dst_surface, &ddraw_surface_wined3d_parent_ops); + } + wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), dst_texture); if (draw_texture) wined3d_resource_set_parent(wined3d_texture_get_resource(draw_texture), dst_texture); @@ -6132,7 +6141,7 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d assert(parent->wined3d_texture == draw_texture); parent->draw_texture = draw_texture; parent->wined3d_texture = wined3d_texture; - wined3d_texture_set_sub_resource_parent(wined3d_texture, i, parent); + wined3d_texture_set_sub_resource_parent(wined3d_texture, i, parent, &ddraw_null_wined3d_parent_ops); wined3d_texture_incref(wined3d_texture); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 33b938ad460..c6e80f45766 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4329,7 +4329,7 @@ void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *tex } void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, - unsigned int sub_resource_idx, void *parent) + unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops) { TRACE("texture %p, sub_resource_idx %u, parent %p.\n", texture, sub_resource_idx, parent); @@ -4337,6 +4337,7 @@ void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *textu return; texture->sub_resources[sub_resource_idx].parent = parent; + texture->sub_resources[sub_resource_idx].parent_ops = parent_ops; } HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2980568d94e..0f7c7938c39 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -307,7 +307,7 @@ @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) -@ cdecl wined3d_texture_set_sub_resource_parent(ptr long ptr) +@ cdecl wined3d_texture_set_sub_resource_parent(ptr long ptr ptr) @ cdecl wined3d_texture_update_desc(ptr long long long long long long ptr long) @ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5d8a1156b21..4535892fb5f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2866,7 +2866,7 @@ unsigned int __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, un HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y); void __cdecl wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, - unsigned int sub_resource_idx, void *parent); + unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, unsigned int sub_resource_idx, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality,

1 0