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

Rémi Bernon : winex11: Remove now unnecessary user locale change checks.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 9d72a71f57a0afafe49eb2bc5438c9632e1e76fe URL: https://gitlab.winehq.org/wine/wine/-/commit/9d72a71f57a0afafe49eb2bc5438c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 27 11:19:22 2023 +0100 winex11: Remove now unnecessary user locale change checks. --- dlls/winex11.drv/keyboard.c | 57 --------------------------------------------- 1 file changed, 57 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 616728be621..b1c47d5258e 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1514,39 +1514,6 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) TRACE("detected layout is \"%s\"\n", main_key_tab[kbd_layout].comment); } -static HKL get_locale_kbd_layout(void) -{ - LCID layout; - LANGID langid; - - /* FIXME: - * - * layout = main_key_tab[kbd_layout].lcid; - * - * Winword uses return value of GetKeyboardLayout as a codepage - * to translate ANSI keyboard messages to unicode. But we have - * a problem with it: for instance Polish keyboard layout is - * identical to the US one, and therefore instead of the Polish - * locale id we return the US one. - */ - - NtQueryDefaultLocale( TRUE, &layout ); - - /* - * Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout = MAKELONG( layout, 0xe001 ); /* IME */ - else - layout |= layout << 16; - - return (HKL)(UINT_PTR)layout; -} - /********************************************************************** * X11DRV_InitKeyboard @@ -1818,18 +1785,6 @@ void X11DRV_InitKeyboard( Display *display ) pthread_mutex_unlock( &kbd_mutex ); } -static BOOL match_x11_keyboard_layout(HKL hkl) -{ - const DWORD isIME = 0xE0000000; - HKL xHkl = get_locale_kbd_layout(); - - /* if the layout is an IME, only match the low word (LCID) */ - if (((ULONG_PTR)hkl & isIME) == isIME) - return (LOWORD(hkl) == LOWORD(xHkl)); - else - return (hkl == xHkl); -} - /*********************************************************************** * ActivateKeyboardLayout (X11DRV.@) @@ -1845,13 +1800,6 @@ BOOL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) return FALSE; } - if (!match_x11_keyboard_layout(hkl)) - { - RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); - FIXME("setting keyboard of different locales not supported\n"); - return FALSE; - } - return TRUE; } @@ -1968,8 +1916,6 @@ UINT X11DRV_MapVirtualKeyEx( UINT wCode, UINT wMapType, HKL hkl ) Display *display = thread_init_display(); TRACE("wCode=0x%x, wMapType=%d, hkl %p\n", wCode, wMapType, hkl); - if (!match_x11_keyboard_layout(hkl)) - FIXME("keyboard layout %p is not supported\n", hkl); pthread_mutex_lock( &kbd_mutex ); @@ -2338,9 +2284,6 @@ INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, return 0; } - if (!match_x11_keyboard_layout(hkl)) - FIXME_(key)("keyboard layout %p is not supported\n", hkl); - if ((lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80)) { TRACE_(key)("Ctrl+Alt+[key] won't generate a character\n");

1 0

Rémi Bernon : win32u: Prevent user locale change in NtUserActivateKeyboardLayout.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: c0366cbb2e5126901de99b7742032a9ad3d9b69b URL: https://gitlab.winehq.org/wine/wine/-/commit/c0366cbb2e5126901de99b7742032a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 27 11:19:22 2023 +0100 win32u: Prevent user locale change in NtUserActivateKeyboardLayout. --- dlls/win32u/input.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 8f71f93e0fe..11bb129134c 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1193,6 +1193,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) { struct user_thread_info *info = get_user_thread_info(); HKL old_layout; + LCID locale; HWND focus; TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); @@ -1206,6 +1207,13 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) return 0; } + if (NtQueryDefaultLocale( TRUE, &locale ) || LOWORD(layout) != locale) + { + RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); + FIXME_(keyboard)( "Changing user locale is not supported\n" ); + return 0; + } + if (!user_driver->pActivateKeyboardLayout( layout, flags )) return 0;

1 0

Rémi Bernon : win32u: Keep the current user locale when loading layout.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 27c5abe3783638707928de7ad38a7a32468b6661 URL: https://gitlab.winehq.org/wine/wine/-/commit/27c5abe3783638707928de7ad38a7a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 9 09:48:53 2023 +0100 win32u: Keep the current user locale when loading layout. --- dlls/user32/input.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 2f4dc06f6ce..8f3cd8acae7 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -439,7 +439,8 @@ BOOL WINAPI BlockInput(BOOL fBlockIt) HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) { WCHAR layout_path[MAX_PATH], value[5]; - DWORD value_size, tmp; + LCID locale = GetUserDefaultLCID(); + DWORD id, value_size, tmp; HKEY hkey; HKL layout; @@ -449,6 +450,9 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) if (HIWORD( tmp )) layout = UlongToHandle( tmp ); else layout = UlongToHandle( MAKELONG( LOWORD( tmp ), LOWORD( tmp ) ) ); + if (!((UINT_PTR)layout >> 28)) id = LOWORD( tmp ); + else id = HIWORD( layout ); /* IME or aliased layout */ + wcscpy( layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\" ); wcscat( layout_path, name ); @@ -456,11 +460,12 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) { value_size = sizeof(value); if (!RegGetValueW( hkey, NULL, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size )) - layout = UlongToHandle( MAKELONG( LOWORD( tmp ), 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff) ) ); + id = 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff); RegCloseKey( hkey ); } + layout = UlongToHandle( MAKELONG( locale, id ) ); if ((flags & KLF_ACTIVATE) && NtUserActivateKeyboardLayout( layout, 0 )) return layout; /* FIXME: semi-stub: returning default layout */

1 0

Rémi Bernon : win32u: Keep the current user locale when enumerating layouts.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: d12dda395f498045edb44a6597cb4a482d27beaa URL: https://gitlab.winehq.org/wine/wine/-/commit/d12dda395f498045edb44a6597cb4a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 17:06:24 2023 +0100 win32u: Keep the current user locale when enumerating layouts. The low word of the enumerated HKL is the desired user locale, the high word is either the keyboard layout LANGID, or the keyboard "Layout Id" for additional layouts with the same LANGID. --- dlls/win32u/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index c11d542037d..8f71f93e0fe 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1273,10 +1273,10 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) tmp = wcstoul( key_info->Name, NULL, 16 ); if (query_reg_ascii_value( subkey, "Layout Id", value_info, sizeof(buffer) ) && value_info->Type == REG_SZ) - tmp = MAKELONG( LOWORD( tmp ), - 0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff) ); + tmp = 0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff); NtClose( subkey ); + tmp = MAKELONG( LOWORD( layout ), LOWORD( tmp ) ); if (layout == UlongToHandle( tmp )) continue; count++;

1 0

Derek Lesho : winegstreamer/media_source: Close bytestream in ::Shutdown.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: ab80ee17fa050e36511a602b228209a60a8b43b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab80ee17fa050e36511a602b228209… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Mar 7 18:59:53 2023 +0100 winegstreamer/media_source: Close bytestream in ::Shutdown. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 1 - dlls/winegstreamer/media_source.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 73cdadef2da..540001676bf 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1080,7 +1080,6 @@ static void test_source_resolver(void) hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(bytestream_closed, "Missing IMFByteStream::Close call\n"); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 542189b28f5..1b57d8bfba8 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1344,6 +1344,7 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) IMFPresentationDescriptor_Release(source->pres_desc); IMFMediaEventQueue_Shutdown(source->event_queue); + IMFByteStream_Close(source->byte_stream); IMFByteStream_Release(source->byte_stream); for (i = 0; i < source->stream_count; i++)

1 0

Derek Lesho : mfplat/tests: Test bytestream closing behavior in IMFMediaSource::Shutdown.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 698cc602f0cb5c0c3537e19aea648399b29886b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/698cc602f0cb5c0c3537e19aea6483… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Mar 7 18:59:06 2023 +0100 mfplat/tests: Test bytestream closing behavior in IMFMediaSource::Shutdown. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 33b17b8df41..73cdadef2da 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -720,9 +720,19 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected return ret; } +static const IMFByteStreamVtbl *bytestream_vtbl_orig; + +static int bytestream_closed = 0; +static HRESULT WINAPI bytestream_wrapper_Close(IMFByteStream *iface) +{ + bytestream_closed = 1; + return bytestream_vtbl_orig->Close(iface); +} + static void test_source_resolver(void) { struct test_callback *callback, *callback2; + IMFByteStreamVtbl bytestream_vtbl_wrapper; IMFSourceResolver *resolver, *resolver2; IMFPresentationDescriptor *descriptor; IMFSchemeHandler *scheme_handler; @@ -826,6 +836,12 @@ static void test_source_resolver(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + /* Wrap ::Close to test when the media source calls it */ + bytestream_vtbl_orig = stream->lpVtbl; + bytestream_vtbl_wrapper = *bytestream_vtbl_orig; + bytestream_vtbl_wrapper.Close = bytestream_wrapper_Close; + stream->lpVtbl = &bytestream_vtbl_wrapper; + hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"video/mp4"); @@ -1059,9 +1075,14 @@ static void test_source_resolver(void) IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); + ok(!bytestream_closed, "IMFByteStream::Close called unexpectedly\n"); + hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(bytestream_closed, "Missing IMFByteStream::Close call\n"); + hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);

1 0

Alexandre Julliard : wineboot: Use the SystemProcessorBrandString query instead of cpuid.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: e3e0c3a91a1253222d1237a5a3e91fe27ba3cde6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3e0c3a91a1253222d1237a5a3e91f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 14 17:33:42 2023 +0100 wineboot: Use the SystemProcessorBrandString query instead of cpuid. --- programs/wineboot/wineboot.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 117fd4caf9b..f89852e3f17 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -386,29 +386,10 @@ static void get_vendorid( WCHAR *buf ) regs_to_str( regs + 1, 12, buf ); } -static void get_namestring( WCHAR *buf ) -{ - int regs[4] = {0, 0, 0, 0}; - int i; - - __cpuid( regs, 0x80000000 ); - if (regs[0] >= 0x80000004) - { - __cpuid( regs, 0x80000002 ); - regs_to_str( regs, 16, buf ); - __cpuid( regs, 0x80000003 ); - regs_to_str( regs, 16, buf + 16 ); - __cpuid( regs, 0x80000004 ); - regs_to_str( regs, 16, buf + 32 ); - } - for (i = lstrlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0; -} - #else /* __i386__ || __x86_64__ */ static void get_identifier( WCHAR *buf, size_t size, const WCHAR *arch ) { } static void get_vendorid( WCHAR *buf ) { } -static void get_namestring( WCHAR *buf ) { } #endif /* __i386__ || __x86_64__ */ @@ -653,11 +634,13 @@ static void create_hardware_registry_keys(void) SYSTEM_CPU_INFORMATION sci; PROCESSOR_POWER_INFORMATION* power_info; ULONG sizeof_power_info = sizeof(PROCESSOR_POWER_INFORMATION) * NtCurrentTeb()->Peb->NumberOfProcessors; - WCHAR id[60], namestr[49], vendorid[13]; + ULONG name_buffer[16]; + WCHAR id[60], vendorid[13]; - get_namestring( namestr ); get_vendorid( vendorid ); NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); + if (NtQuerySystemInformation( SystemProcessorBrandString, name_buffer, sizeof(name_buffer), NULL )) + name_buffer[0] = 0; power_info = HeapAlloc( GetProcessHeap(), 0, sizeof_power_info ); if (power_info == NULL) @@ -724,7 +707,8 @@ static void create_hardware_registry_keys(void) RegSetValueExW( hkey, L"FeatureSet", 0, REG_DWORD, (BYTE *)&sci.ProcessorFeatureBits, sizeof(DWORD) ); set_reg_value( hkey, L"Identifier", id ); /* TODO: report ARM properly */ - set_reg_value( hkey, L"ProcessorNameString", namestr ); + RegSetValueExA( hkey, "ProcessorNameString", 0, REG_SZ, (const BYTE *)name_buffer, + strlen( (char *)name_buffer ) + 1 ); set_reg_value( hkey, L"VendorIdentifier", vendorid ); RegSetValueExW( hkey, L"~MHz", 0, REG_DWORD, (BYTE *)&power_info[i].MaxMhz, sizeof(DWORD) ); RegCloseKey( hkey );

1 0

Alexandre Julliard : ntdll: Fix some CPU information tests on ARM64.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: b72c2dca0184efb732619d5dbd14b0672a7bb3e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b72c2dca0184efb732619d5dbd14b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 14 16:39:06 2023 +0100 ntdll: Fix some CPU information tests on ARM64. --- dlls/ntdll/tests/info.c | 112 +++++++++++++++++++++++++++-------------------- dlls/ntdll/unix/system.c | 2 + 2 files changed, 67 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index cf074076c96..2cd76a8c87e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -303,68 +303,76 @@ static void test_query_basic(void) static void test_query_cpu(void) { - DWORD status; - ULONG ReturnLength; - SYSTEM_CPU_INFORMATION sci, sci2; + NTSTATUS status; + ULONG len; + SYSTEM_CPU_INFORMATION sci, sci2, sci3; memset(&sci, 0xcc, sizeof(sci)); - status = pNtQuerySystemInformation(SystemCpuInformation, &sci, sizeof(sci), &ReturnLength); + status = pNtQuerySystemInformation(SystemCpuInformation, &sci, sizeof(sci), &len); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); - - /* Check if we have some return values */ - if (winetest_debug > 1) trace("Processor FeatureSet : %08lx\n", sci.ProcessorFeatureBits); - ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08lx\n", - sci.ProcessorFeatureBits); + ok( sizeof(sci) == len, "Inconsistent length %ld\n", len); memset(&sci2, 0xcc, sizeof(sci2)); - status = pRtlGetNativeSystemInformation(SystemCpuInformation, &sci2, sizeof(sci2), &ReturnLength); + status = pRtlGetNativeSystemInformation(SystemCpuInformation, &sci2, sizeof(sci2), &len); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status); - ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); + ok( sizeof(sci2) == len, "Unexpected length %lu.\n", len); if (is_wow64) { ok( sci.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", sci.ProcessorArchitecture ); todo_wine - ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64, "ProcessorArchitecture wrong %x\n", - sci2.ProcessorArchitecture ); + ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 || + sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64, + "ProcessorArchitecture wrong %x\n", sci2.ProcessorArchitecture ); } else ok( sci.ProcessorArchitecture == sci2.ProcessorArchitecture, "ProcessorArchitecture differs %x / %x\n", sci.ProcessorArchitecture, sci2.ProcessorArchitecture ); - ok( sci.ProcessorLevel == sci2.ProcessorLevel, "ProcessorLevel differs %x / %x\n", - sci.ProcessorLevel, sci2.ProcessorLevel ); - ok( sci.ProcessorRevision == sci2.ProcessorRevision, "ProcessorRevision differs %x / %x\n", - sci.ProcessorRevision, sci2.ProcessorRevision ); - ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", - sci.MaximumProcessors, sci2.MaximumProcessors ); - ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", - sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); + if (sci2.ProcessorArchitecture != PROCESSOR_ARCHITECTURE_ARM64) + { + /* Check if we have some return values */ + if (winetest_debug > 1) trace("Processor FeatureSet : %08lx\n", sci.ProcessorFeatureBits); + ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08lx\n", + sci.ProcessorFeatureBits); - memset(&sci2, 0xcc, sizeof(sci2)); - status = pNtQuerySystemInformation(SystemEmulationProcessorInformation, &sci2, sizeof(sci2), &ReturnLength); + ok( sci.ProcessorLevel == sci2.ProcessorLevel, "ProcessorLevel differs %x / %x\n", + sci.ProcessorLevel, sci2.ProcessorLevel ); + ok( sci.ProcessorRevision == sci2.ProcessorRevision, "ProcessorRevision differs %x / %x\n", + sci.ProcessorRevision, sci2.ProcessorRevision ); + ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", + sci.MaximumProcessors, sci2.MaximumProcessors ); + ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", + sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); + } + + memset(&sci3, 0xcc, sizeof(sci3)); + status = pNtQuerySystemInformation(SystemEmulationProcessorInformation, &sci3, sizeof(sci3), &len); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status); - ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); + ok( sizeof(sci3) == len, "Unexpected length %lu.\n", len); #ifdef _WIN64 - ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", - sci2.ProcessorArchitecture ); + if (sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64) + ok( sci3.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM, "ProcessorArchitecture wrong %x\n", + sci3.ProcessorArchitecture ); + else + ok( sci3.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", + sci3.ProcessorArchitecture ); #else - ok( sci.ProcessorArchitecture == sci2.ProcessorArchitecture, + ok( sci.ProcessorArchitecture == sci3.ProcessorArchitecture, "ProcessorArchitecture differs %x / %x\n", - sci.ProcessorArchitecture, sci2.ProcessorArchitecture ); + sci.ProcessorArchitecture, sci3.ProcessorArchitecture ); #endif - ok( sci.ProcessorLevel == sci2.ProcessorLevel, "ProcessorLevel differs %x / %x\n", - sci.ProcessorLevel, sci2.ProcessorLevel ); - ok( sci.ProcessorRevision == sci2.ProcessorRevision, "ProcessorRevision differs %x / %x\n", - sci.ProcessorRevision, sci2.ProcessorRevision ); - ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", - sci.MaximumProcessors, sci2.MaximumProcessors ); - ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", - sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); + ok( sci.ProcessorLevel == sci3.ProcessorLevel, "ProcessorLevel differs %x / %x\n", + sci.ProcessorLevel, sci3.ProcessorLevel ); + ok( sci.ProcessorRevision == sci3.ProcessorRevision, "ProcessorRevision differs %x / %x\n", + sci.ProcessorRevision, sci3.ProcessorRevision ); + ok( sci.MaximumProcessors == sci3.MaximumProcessors, "MaximumProcessors differs %x / %x\n", + sci.MaximumProcessors, sci3.MaximumProcessors ); + ok( sci.ProcessorFeatureBits == sci3.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", + sci.ProcessorFeatureBits, sci3.ProcessorFeatureBits ); } static void test_query_performance(void) @@ -1133,9 +1141,9 @@ static void test_query_logicalproc(void) GetSystemInfo(&si); status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, NULL, 0, &len); - if (status == STATUS_INVALID_INFO_CLASS) /* wow64 win8+ */ + if (status == STATUS_INVALID_INFO_CLASS) /* wow64 win8+, arm64 */ { - win_skip("SystemLogicalProcessorInformation is not supported\n"); + skip("SystemLogicalProcessorInformation is not supported\n"); return; } ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); @@ -3308,19 +3316,29 @@ static void test_thread_start_address(void) static void test_query_data_alignment(void) { - ULONG ReturnLength; + SYSTEM_CPU_INFORMATION sci; + ULONG len; NTSTATUS status; DWORD value; value = 0xdeadbeef; - status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength); + status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &len); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); - ok(sizeof(value) == ReturnLength, "Inconsistent length %lu\n", ReturnLength); -#ifdef __arm__ - ok(value == 32, "Expected 32, got %lu\n", value); -#else - ok(value == 64, "Expected 64, got %lu\n", value); -#endif + ok(sizeof(value) == len, "Inconsistent length %lu\n", len); + + pRtlGetNativeSystemInformation(SystemCpuInformation, &sci, sizeof(sci), &len); + switch (sci.ProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_ARM: + ok(value == 32, "Expected 32, got %lu\n", value); + break; + case PROCESSOR_ARCHITECTURE_ARM64: + ok(value == 128, "Expected 128, got %lu\n", value); + break; + default: + ok(value == 64, "Expected 64, got %lu\n", value); + break; + } } static void test_thread_lookup(void) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 33e93bbdf32..dd652a29f21 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2958,6 +2958,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { #ifdef __arm__ *((DWORD *)info) = 32; +#elif defined __aarch64__ + *((DWORD *)info) = 128; #else *((DWORD *)info) = 64; #endif

1 0

Alexandre Julliard : ntdll: Implement the SystemProcessorBrandString query.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 72422be6d212cccaee7df23d3d4ae1394d1c2c02 URL: https://gitlab.winehq.org/wine/wine/-/commit/72422be6d212cccaee7df23d3d4ae1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 14 17:30:24 2023 +0100 ntdll: Implement the SystemProcessorBrandString query. --- dlls/ntdll/tests/info.c | 27 ++++++++++++++++++++++++++- dlls/ntdll/unix/system.c | 29 +++++++++++++++++++++++++++++ dlls/wow64/system.c | 1 + 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2cd76a8c87e..e7e560a64b8 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -304,7 +304,7 @@ static void test_query_basic(void) static void test_query_cpu(void) { NTSTATUS status; - ULONG len; + ULONG len, buffer[16]; SYSTEM_CPU_INFORMATION sci, sci2, sci3; memset(&sci, 0xcc, sizeof(sci)); @@ -373,6 +373,31 @@ static void test_query_cpu(void) sci.MaximumProcessors, sci3.MaximumProcessors ); ok( sci.ProcessorFeatureBits == sci3.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", sci.ProcessorFeatureBits, sci3.ProcessorFeatureBits ); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemProcessorBrandString, buffer, sizeof(buffer), &len ); + if (status != STATUS_NOT_SUPPORTED) + { + ok( !status, "SystemProcessorBrandString failed %lx\n", status ); + ok( len == 49, "wrong len %lu\n", len ); + trace( "got %s len %u\n", debugstr_a( (char *)buffer ), lstrlenA( (char *)buffer )); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemProcessorBrandString, buffer, 49, &len ); + ok( !status, "SystemProcessorBrandString failed %lx\n", status ); + ok( len == 49, "wrong len %lu\n", len ); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemProcessorBrandString, buffer, 48, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "SystemProcessorBrandString failed %lx\n", status ); + ok( len == 49, "wrong len %lu\n", len ); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemProcessorBrandString, (char *)buffer + 1, 49, &len ); + ok( status == STATUS_DATATYPE_MISALIGNMENT, "SystemProcessorBrandString failed %lx\n", status ); + ok( len == 0xdeadbeef, "wrong len %lu\n", len ); + } + else skip( "SystemProcessorBrandString is not supported\n" ); } static void test_query_performance(void) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index dd652a29f21..cb00336e884 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -229,6 +229,7 @@ struct smbios_chassis_args #define RSMB 0x52534D42 SYSTEM_CPU_INFORMATION cpu_info = { 0 }; +static char cpu_name[49]; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION *logical_proc_info; static unsigned int logical_proc_info_len, logical_proc_info_alloc_len; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *logical_proc_info_ex; @@ -325,6 +326,22 @@ static inline BOOL have_sse_daz_mode(void) #endif } +static void get_cpuid_name( char *buffer ) +{ + unsigned int regs[4]; + + do_cpuid( 0x80000002, 0, regs ); + memcpy( buffer, regs, sizeof(regs) ); + buffer += sizeof(regs); + do_cpuid( 0x80000003, 0, regs ); + memcpy( buffer, regs, sizeof(regs) ); + buffer += sizeof(regs); + do_cpuid( 0x80000004, 0, regs ); + memcpy( buffer, regs, sizeof(regs) ); + buffer += sizeof(regs); + *buffer = 0; +} + static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { unsigned int regs[4], regs2[4], regs3[4]; @@ -399,6 +416,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if (regs2[3] & (1 << 27)) info->ProcessorFeatureBits |= CPU_FEATURE_TSC; if (regs2[3] & (1u << 31)) info->ProcessorFeatureBits |= CPU_FEATURE_3DNOW; } + if (regs[0] >= 0x80000004) get_cpuid_name( cpu_name ); } else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL) { @@ -420,6 +438,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if (regs2[3] & (1 << 20)) info->ProcessorFeatureBits |= CPU_FEATURE_NX; if (regs2[3] & (1 << 27)) info->ProcessorFeatureBits |= CPU_FEATURE_TSC; } + if (regs[0] >= 0x80000004) get_cpuid_name( cpu_name ); } else { @@ -3157,6 +3176,16 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemProcessorBrandString: /* 105 */ + if (!cpu_name[0]) return STATUS_NOT_SUPPORTED; + if ((ULONG_PTR)info & 3) return STATUS_DATATYPE_MISALIGNMENT; + len = sizeof(cpu_name); + if (size >= len) + memcpy( info, cpu_name, len ); + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + case SystemKernelDebuggerInformationEx: /* 149 */ { SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX skdi; diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index c5c1563afc2..28a5a994174 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -330,6 +330,7 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformation( UINT *args ) case SystemCodeIntegrityInformation: /* SYSTEM_CODEINTEGRITY_INFORMATION */ case SystemKernelDebuggerInformationEx: /* SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX */ case SystemCpuSetInformation: /* SYSTEM_CPU_SET_INFORMATION */ + case SystemProcessorBrandString: /* char[] */ case SystemWineVersionInformation: /* char[] */ return NtQuerySystemInformation( class, ptr, len, retlen );

1 0

Henri Verbeet : wined3d: Sort the exports.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 34139937b0453055b54553cbf4eb46887f10da2c URL: https://gitlab.winehq.org/wine/wine/-/commit/34139937b0453055b54553cbf4eb46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 14 11:23:45 2023 +0100 wined3d: Sort the exports. For the most part these were already sorted, but a few exceptions appear to have crept in. --- dlls/wined3d/wined3d.spec | 70 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b22adf07c9c..2980568d94e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -95,11 +95,11 @@ @ cdecl wined3d_device_context_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_context_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_context_copy_uav_counter(ptr ptr long ptr) +@ cdecl wined3d_device_context_dispatch(ptr long long long) +@ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_draw(ptr long long long long) @ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) -@ cdecl wined3d_device_context_dispatch(ptr long long long) -@ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_execute_command_list(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) @@ -133,6 +133,7 @@ @ cdecl wined3d_device_context_set_predication(ptr ptr long) @ cdecl wined3d_device_context_set_primitive_type(ptr long long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) +@ cdecl wined3d_device_context_set_render_targets_and_unordered_access_views(ptr long ptr ptr long ptr ptr) @ cdecl wined3d_device_context_set_rendertarget_views(ptr long long ptr long) @ cdecl wined3d_device_context_set_samplers(ptr long long long ptr) @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @@ -142,7 +143,6 @@ @ cdecl wined3d_device_context_set_stream_outputs(ptr ptr) @ cdecl wined3d_device_context_set_stream_sources(ptr long long ptr) @ cdecl wined3d_device_context_set_unordered_access_views(ptr long long long ptr ptr) -@ cdecl wined3d_device_context_set_render_targets_and_unordered_access_views(ptr long ptr ptr long ptr ptr) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_device_context_unmap(ptr ptr long) @@ -160,10 +160,10 @@ @ cdecl wined3d_output_set_gamma_ramp(ptr ptr) @ cdecl wined3d_output_take_ownership(ptr long) +@ cdecl wined3d_palette_apply_to_dc(ptr ptr) @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) -@ cdecl wined3d_palette_apply_to_dc(ptr ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) @@ -181,15 +181,6 @@ @ cdecl wined3d_rasterizer_state_get_parent(ptr) @ cdecl wined3d_rasterizer_state_incref(ptr) -@ cdecl wined3d_resource_get_desc(ptr ptr) -@ cdecl wined3d_resource_get_parent(ptr) -@ cdecl wined3d_resource_get_priority(ptr) -@ cdecl wined3d_resource_map(ptr long ptr ptr long) -@ cdecl wined3d_resource_preload(ptr) -@ cdecl wined3d_resource_set_parent(ptr ptr) -@ cdecl wined3d_resource_set_priority(ptr long) -@ cdecl wined3d_resource_unmap(ptr long) - @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) @@ -199,6 +190,15 @@ @ cdecl wined3d_rendertarget_view_incref(ptr) @ cdecl wined3d_rendertarget_view_set_parent(ptr ptr) +@ cdecl wined3d_resource_get_desc(ptr ptr) +@ cdecl wined3d_resource_get_parent(ptr) +@ cdecl wined3d_resource_get_priority(ptr) +@ cdecl wined3d_resource_map(ptr long ptr ptr long) +@ cdecl wined3d_resource_preload(ptr) +@ cdecl wined3d_resource_set_parent(ptr ptr) +@ cdecl wined3d_resource_set_priority(ptr long) +@ cdecl wined3d_resource_unmap(ptr long) + @ cdecl wined3d_sampler_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_sampler_decref(ptr) @ cdecl wined3d_sampler_get_parent(ptr) @@ -267,12 +267,12 @@ @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) +@ cdecl wined3d_swapchain_get_desc(ptr ptr) @ cdecl wined3d_swapchain_get_device(ptr) @ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) @ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr long) @ cdecl wined3d_swapchain_get_gamma_ramp(ptr ptr) @ cdecl wined3d_swapchain_get_parent(ptr) -@ cdecl wined3d_swapchain_get_desc(ptr ptr) @ cdecl wined3d_swapchain_get_raster_status(ptr ptr) @ cdecl wined3d_swapchain_get_state(ptr) @ cdecl wined3d_swapchain_incref(ptr) @@ -322,41 +322,41 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl vkd3d_create_instance(ptr ptr) -@ cdecl vkd3d_instance_decref(ptr) -@ cdecl vkd3d_instance_get_vk_instance(ptr) -@ cdecl vkd3d_instance_incref(ptr) +@ cdecl vkd3d_acquire_vk_queue(ptr) @ cdecl vkd3d_create_device(ptr ptr ptr) +@ cdecl vkd3d_create_image_resource(ptr ptr ptr) +@ cdecl vkd3d_create_instance(ptr ptr) +@ cdecl vkd3d_create_root_signature_deserializer(ptr long ptr ptr) +@ cdecl vkd3d_create_versioned_root_signature_deserializer(ptr long ptr ptr) @ cdecl vkd3d_get_device_parent(ptr) +@ cdecl vkd3d_get_dxgi_format(long) @ cdecl vkd3d_get_vk_device(ptr) +@ cdecl vkd3d_get_vk_format(long) @ cdecl vkd3d_get_vk_physical_device(ptr) -@ cdecl vkd3d_instance_from_device(ptr) @ cdecl vkd3d_get_vk_queue_family_index(ptr) -@ cdecl vkd3d_acquire_vk_queue(ptr) +@ cdecl vkd3d_instance_decref(ptr) +@ cdecl vkd3d_instance_from_device(ptr) +@ cdecl vkd3d_instance_get_vk_instance(ptr) +@ cdecl vkd3d_instance_incref(ptr) @ cdecl vkd3d_release_vk_queue(ptr) -@ cdecl vkd3d_create_image_resource(ptr ptr ptr) @ cdecl vkd3d_resource_decref(ptr) @ cdecl vkd3d_resource_incref(ptr) @ cdecl vkd3d_serialize_root_signature(ptr long ptr ptr) -@ cdecl vkd3d_create_root_signature_deserializer(ptr long ptr ptr) -@ cdecl vkd3d_get_vk_format(long) -@ cdecl vkd3d_get_dxgi_format(long) @ cdecl vkd3d_serialize_versioned_root_signature(ptr ptr ptr) -@ cdecl vkd3d_create_versioned_root_signature_deserializer(ptr long ptr ptr) -@ cdecl vkd3d_shader_get_version(ptr ptr) -@ cdecl vkd3d_shader_get_supported_source_types(ptr) -@ cdecl vkd3d_shader_get_supported_target_types(long ptr) @ cdecl vkd3d_shader_compile(ptr ptr ptr) +@ cdecl vkd3d_shader_convert_root_signature(ptr long ptr) +@ cdecl vkd3d_shader_find_signature_element(ptr ptr long long) @ cdecl vkd3d_shader_free_messages(ptr) -@ cdecl vkd3d_shader_free_shader_code(ptr) -@ cdecl vkd3d_shader_parse_root_signature(ptr ptr ptr) @ cdecl vkd3d_shader_free_root_signature(ptr) -@ cdecl vkd3d_shader_serialize_root_signature(ptr ptr ptr) -@ cdecl vkd3d_shader_convert_root_signature(ptr long ptr) -@ cdecl vkd3d_shader_scan(ptr ptr) @ cdecl vkd3d_shader_free_scan_descriptor_info(ptr) -@ cdecl vkd3d_shader_parse_input_signature(ptr ptr ptr) -@ cdecl vkd3d_shader_find_signature_element(ptr ptr long long) +@ cdecl vkd3d_shader_free_shader_code(ptr) @ cdecl vkd3d_shader_free_shader_signature(ptr) +@ cdecl vkd3d_shader_get_supported_source_types(ptr) +@ cdecl vkd3d_shader_get_supported_target_types(long ptr) +@ cdecl vkd3d_shader_get_version(ptr ptr) +@ cdecl vkd3d_shader_parse_input_signature(ptr ptr ptr) +@ cdecl vkd3d_shader_parse_root_signature(ptr ptr ptr) @ cdecl vkd3d_shader_preprocess(ptr ptr ptr) +@ cdecl vkd3d_shader_scan(ptr ptr) +@ cdecl vkd3d_shader_serialize_root_signature(ptr ptr ptr)

1 0