- Wine-Commits - list.winehq.org

Rémi Bernon : widl: Add missing rule end semicolons.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 1ec6ea528ed9d87f9d2ec252d6a1fe841c609806 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ec6ea528ed9d87f9d2ec252d6a1fe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Add missing rule end semicolons. --- tools/widl/parser.y | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 73ff249a993..92de47f106b 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -388,7 +388,9 @@ imp_decl_statements { $$ = append_statement($1, make_statement_reference(type_parameterized_type_specialize_declare($3, $5))); } ; -imp_decl_block: tDECLARE '{' imp_decl_statements '}' { $$ = $3; } +imp_decl_block + : tDECLARE '{' imp_decl_statements '}' { $$ = $3; } + ; gbl_statements : %empty { $$ = NULL; } @@ -585,16 +587,20 @@ contract_ver: | aNUM '.' aNUM { $$ = MAKEVERSION($3, $1); } ; -contract_req: decl_spec ',' contract_ver { if ($1->type->type_type != TYPE_APICONTRACT) +contract_req + : decl_spec ',' contract_ver { if ($1->type->type_type != TYPE_APICONTRACT) error_loc("type %s is not an apicontract\n", $1->type->name); $$ = make_exprl(EXPR_NUM, $3); $$ = make_exprt(EXPR_GTREQL, declare_var(NULL, $1, make_declarator(NULL), 0), $$); } + ; -static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) +static_attr + : decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) error_loc("type %s is not an interface\n", $1->type->name); $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } + ; activatable_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) @@ -1367,8 +1373,8 @@ acf_interface ; acf_attributes - : %empty { $$ = NULL; }; - | '[' acf_attribute_list ']' { $$ = $2; }; + : %empty { $$ = NULL; } + | '[' acf_attribute_list ']' { $$ = $2; } ; acf_attribute_list

1 0

Daniel Tang : wintypes: Stub RoIsApiContractMajorVersionPresent().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 1471924800d05b949b9b078fd605378c3ec32852 URL: https://gitlab.winehq.org/wine/wine/-/commit/1471924800d05b949b9b078fd60537… Author: Daniel Tang <danielzgtg.opensource(a)gmail.com> Date: Sat Mar 11 04:08:10 2023 -0500 wintypes: Stub RoIsApiContractMajorVersionPresent(). --- dlls/wintypes/main.c | 7 +++++++ dlls/wintypes/wintypes.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index 74eda4af5ce..7eb2c0c2cce 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -355,6 +355,13 @@ HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **fac return S_OK; } +HRESULT WINAPI RoIsApiContractMajorVersionPresent(const WCHAR *name, UINT16 major, BOOL *result) +{ + FIXME("name %s, major %u, result %p\n", debugstr_w(name), major, result); + *result = FALSE; + return S_OK; +} + HRESULT WINAPI RoResolveNamespace(HSTRING name, HSTRING windowsMetaDataDir, DWORD packageGraphDirsCount, const HSTRING *packageGraphDirs, DWORD *metaDataFilePathsCount, HSTRING **metaDataFilePaths, diff --git a/dlls/wintypes/wintypes.spec b/dlls/wintypes/wintypes.spec index 305344fef42..086332e0d69 100644 --- a/dlls/wintypes/wintypes.spec +++ b/dlls/wintypes/wintypes.spec @@ -5,7 +5,7 @@ @ stub RoCreatePropertySetSerializer @ stub RoGetBufferMarshaler @ stub RoGetMetaDataFile -@ stub RoIsApiContractMajorVersionPresent +@ stdcall RoIsApiContractMajorVersionPresent(wstr long ptr) @ stub RoIsApiContractPresent @ stub RoParseTypeName @ stdcall RoResolveNamespace(ptr ptr long ptr ptr ptr ptr ptr)

1 0

Daniel Tang : wofutil: Stub WofIsExternalFile().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: ce18bd4d09f68509575a5098ce301950da898c77 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce18bd4d09f68509575a5098ce3019… Author: Daniel Tang <danielzgtg.opensource(a)gmail.com> Date: Sat Mar 11 03:16:00 2023 -0500 wofutil: Stub WofIsExternalFile(). --- dlls/wofutil/main.c | 9 +++++++++ dlls/wofutil/wofutil.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wofutil/main.c b/dlls/wofutil/main.c index 1866aed7c69..d8c891aa30c 100644 --- a/dlls/wofutil/main.c +++ b/dlls/wofutil/main.c @@ -23,6 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(wofutil); +HRESULT WINAPI WofIsExternalFile( const WCHAR *path, BOOL *result, ULONG *provider, void *ptr, ULONG *length ) +{ + FIXME( "%s, %p, %p, %p, %p", debugstr_w(path), result, provider, ptr, length ); + if (result) *result = FALSE; + if (provider) *provider = 0; + if (length) *length = 0; + return S_OK; +} + BOOL WINAPI WofShouldCompressBinaries( const WCHAR *volume, ULONG *alg ) { FIXME( "%s, %p\n", debugstr_w(volume), alg ); diff --git a/dlls/wofutil/wofutil.spec b/dlls/wofutil/wofutil.spec index 73f11c4f885..27a6ebd80eb 100644 --- a/dlls/wofutil/wofutil.spec +++ b/dlls/wofutil/wofutil.spec @@ -1,7 +1,7 @@ @ stub WofEnumEntries @ stub WofFileEnumFiles @ stub WofGetDriverVersion -@ stub WofIsExternalFile +@ stdcall WofIsExternalFile(wstr ptr ptr ptr ptr) @ stub WofSetFileDataLocation @ stdcall WofShouldCompressBinaries(wstr ptr) @ stub WofWimAddEntry

1 0

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