May 2024 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL for HTMLEventObj object implementation.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 14e4316fbae9c414c333d841c6cdbd6df3f09e94 URL: https://gitlab.winehq.org/wine/wine/-/commit/14e4316fbae9c414c333d841c6cdbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:12:16 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL for HTMLEventObj object implementation. --- dlls/mshtml/htmlevent.c | 274 ++---------------------------------------------- 1 file changed, 6 insertions(+), 268 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlevent.c.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: cd7b9a6f9c75969e5e88b98d70291f52743cd3ac URL: https://gitlab.winehq.org/wine/wine/-/commit/cd7b9a6f9c75969e5e88b98d70291f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:20:57 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlevent.c. --- dlls/mshtml/htmlevent.c | 482 ++---------------------------------------------- 1 file changed, 12 insertions(+), 470 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlform.c.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: ef066c3017c4a79a39a8219646c0b3a86f55e122 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef066c3017c4a79a39a8219646c0b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:22:34 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlform.c. --- dlls/mshtml/htmlform.c | 55 ++------------------------------------------------ 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 648e1efa6b5..7be9c1c95d7 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -251,59 +251,8 @@ static inline HTMLFormElement *impl_from_IHTMLFormElement(IHTMLFormElement *ifac return CONTAINING_RECORD(iface, HTMLFormElement, IHTMLFormElement_iface); } -static HRESULT WINAPI HTMLFormElement_QueryInterface(IHTMLFormElement *iface, - REFIID riid, void **ppv) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLFormElement_AddRef(IHTMLFormElement *iface) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLFormElement_Release(IHTMLFormElement *iface) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLFormElement_GetTypeInfoCount(IHTMLFormElement *iface, UINT *pctinfo) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLFormElement_GetTypeInfo(IHTMLFormElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLFormElement_GetIDsOfNames(IHTMLFormElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLFormElement_Invoke(IHTMLFormElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLFormElement, IHTMLFormElement, + impl_from_IHTMLFormElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLFormElement_put_action(IHTMLFormElement *iface, BSTR v) {

1 0

Tim Clem : Revert "winemac.drv: Hide app's dock icon when it wouldn't have a taskbar item on Windows.".
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: d042b3b138a44683e7dd524c1bcfe7de23f875fd URL: https://gitlab.winehq.org/wine/wine/-/commit/d042b3b138a44683e7dd524c1bcfe7… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed May 15 08:36:56 2024 -0700 Revert "winemac.drv: Hide app's dock icon when it wouldn't have a taskbar item on Windows.". This hits some intractable OS-level bugs, and it seems best to just revert it for now. This reverts commit f0efb2e46a7fb2a00f85196a4a06bd50eda560b2. --- dlls/winemac.drv/cocoa_app.h | 1 - dlls/winemac.drv/cocoa_app.m | 74 ----------------------------------------- dlls/winemac.drv/cocoa_window.h | 2 -- dlls/winemac.drv/cocoa_window.m | 23 ++----------- dlls/winemac.drv/macdrv_cocoa.h | 2 -- dlls/winemac.drv/macdrv_main.c | 4 --- dlls/winemac.drv/window.c | 8 ----- 7 files changed, 2 insertions(+), 112 deletions(-)

1 0

Elizabeth Figura : wined3d: Fix inversion in shader_get_position_fixup().
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 5fa3e9b8298f89e636e1d167bae54aee6f7e0872 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fa3e9b8298f89e636e1d167bae54a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue May 14 23:08:02 2024 -0500 wined3d: Fix inversion in shader_get_position_fixup(). Spotted by Matteo Bruni. Fixes: ba2f78922f84f0576694fef17be7bec2cc9da19b --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 510bc057d9f..757c6638645 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4340,7 +4340,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte for (i = 0; i < fixup_count; ++i) { position_fixup[4 * i ] = 1.0f; - position_fixup[4 * i + 1] = 1.0f; + position_fixup[4 * i + 1] = -1.0f; if (!context->d3d_info->subpixel_viewport) { double dummy; @@ -4348,7 +4348,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte y = modf(state->viewports[i].y, &dummy) * 2.0f; } position_fixup[4 * i + 2] = (center_offset + x) / state->viewports[i].width; - position_fixup[4 * i + 3] = -(center_offset + y) / state->viewports[i].height; + position_fixup[4 * i + 3] = (center_offset + y) / state->viewports[i].height; } }

1 0

Alistair Leslie-Hughes : include: Add some D3D12_FEATURE_DATA_D3D12_OPTIONS* types.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 849baece66e326bce255dfea0d6fb10df888bc55 URL: https://gitlab.winehq.org/wine/wine/-/commit/849baece66e326bce255dfea0d6fb1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 15 20:52:06 2024 +1000 include: Add some D3D12_FEATURE_DATA_D3D12_OPTIONS* types. --- include/d3d12.idl | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 593a40a02a7..d7b283a2e02 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2446,6 +2446,36 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS13 BOOL AlphaBlendFactorSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS13; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS14 +{ + BOOL AdvancedTextureOpsSupported; + BOOL WriteableMSAATexturesSupported; + BOOL IndependentFrontAndBackStencilRefMaskSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS14; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS15 +{ + BOOL TriangleFanSupported; + BOOL DynamicIndexBufferStripCutSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS15; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS16 +{ + BOOL DynamicDepthBiasSupported; + BOOL GPUUploadHeapSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS16; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS17 +{ + BOOL NonNormalizedCoordinateSamplersSupported; + BOOL ManualWriteTrackingResourceSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS17; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS18 +{ + BOOL RenderPassesValid; +} D3D12_FEATURE_DATA_D3D12_OPTIONS18; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2481,6 +2511,11 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS11 = 40, D3D12_FEATURE_D3D12_OPTIONS12 = 41, D3D12_FEATURE_D3D12_OPTIONS13 = 42, + D3D12_FEATURE_D3D12_OPTIONS14 = 43, + D3D12_FEATURE_D3D12_OPTIONS15 = 44, + D3D12_FEATURE_D3D12_OPTIONS16 = 45, + D3D12_FEATURE_D3D12_OPTIONS17 = 46, + D3D12_FEATURE_D3D12_OPTIONS18 = 47, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST

1 0

Piotr Caban : msvcrt/tests: Don't link to _wcsicmp_l and _create_locale.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: d2043a73a6594cd11a0a93655007ebf45be6e7c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2043a73a6594cd11a0a93655007eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 15 13:45:53 2024 +0200 msvcrt/tests: Don't link to _wcsicmp_l and _create_locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56682 --- dlls/msvcrt/tests/locale.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 38dc62eb416..cb56fe39754 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -27,6 +27,9 @@ static BOOL (__cdecl *p__crtGetStringTypeW)(DWORD, DWORD, const wchar_t*, int, W static int (__cdecl *pmemcpy_s)(void *, size_t, void*, size_t); static int (__cdecl *p___mb_cur_max_func)(void); static int *(__cdecl *p__p___mb_cur_max)(void); +static _locale_t(__cdecl *p_create_locale)(int, const char*); +static void(__cdecl *p_free_locale)(_locale_t); +static int (__cdecl *p_wcsicmp_l)(const wchar_t*, const wchar_t*, _locale_t); void* __cdecl _Gettnames(void); static void init(void) @@ -37,6 +40,9 @@ static void init(void) pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); p___mb_cur_max_func = (void*)GetProcAddress(hmod, "___mb_cur_max_func"); p__p___mb_cur_max = (void*)GetProcAddress(hmod, "__p___mb_cur_max"); + p_create_locale = (void*)GetProcAddress(hmod, "_create_locale"); + p_free_locale = (void*)GetProcAddress(hmod, "_free_locale"); + p_wcsicmp_l = (void*)GetProcAddress(hmod, "_wcsicmp_l"); } static void test_setlocale(void) @@ -815,20 +821,27 @@ static void test__wcsicmp_l(void) }; int ret, i; + if (!p_wcsicmp_l || !p_create_locale) + { + win_skip("_wcsicmp_l or _create_locale not available\n"); + return; + } + ok(!!p_free_locale, "_free_locale not available\n"); + for(i=0; i<ARRAY_SIZE(tests); i++) { _locale_t loc = NULL; - if(tests[i].loc && !(loc = _create_locale(LC_ALL, tests[i].loc))) { + if(tests[i].loc && !(loc = p_create_locale(LC_ALL, tests[i].loc))) { win_skip("locale %s not available. skipping\n", tests[i].loc); continue; } - ret = _wcsicmp_l(tests[i].str1, tests[i].str2, loc); + ret = p_wcsicmp_l(tests[i].str1, tests[i].str2, loc); ok(ret == tests[i].exp, "_wcsicmp_l = %d, expected %d for test %d '%ls' vs '%ls' using %s locale\n", ret, tests[i].exp, i, tests[i].str1, tests[i].str2, loc ? tests[i].loc : "current"); if(loc) - _free_locale(loc); + p_free_locale(loc); } }

1 0

Alexandre Julliard : wbemprox: Get the processor caption from the registry.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 7a054a4a8f477142d88c5ec07e0ba32ab52875c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a054a4a8f477142d88c5ec07e0ba3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:39:21 2024 +0200 wbemprox: Get the processor caption from the registry. --- dlls/wbemprox/builtin.c | 68 ++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fa4c6ee6351..ebfd8e5fc9d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1351,6 +1351,27 @@ static WCHAR *get_smbios_string( enum smbios_type type, size_t field_offset, con return get_smbios_string_by_id( ((const BYTE *)hdr)[field_offset], buf, offset, len ); } +static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) +{ + HKEY hkey = 0; + DWORD size, type; + WCHAR *ret = NULL; + + if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && + (ret = malloc( size + sizeof(WCHAR) ))) + { + size += sizeof(WCHAR); + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) + { + free( ret ); + ret = NULL; + } + } + if (hkey) RegCloseKey( hkey ); + return ret; +} + static WCHAR *get_baseboard_manufacturer( const char *buf, UINT len ) { WCHAR *ret = get_smbios_string( SMBIOS_TYPE_BASEBOARD, offsetof(struct smbios_baseboard, vendor), buf, len ); @@ -3434,22 +3455,11 @@ static const WCHAR *get_osarchitecture(void) if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"64-bit"; return L"32-bit"; } -static void get_processor_caption( WCHAR *caption, UINT len ) +static WCHAR *get_processor_caption( UINT index ) { - const WCHAR *arch; - WCHAR manufacturer[13]; - int regs[4] = {0, 0, 0, 0}; - unsigned int family, model, stepping; - - get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); - if (!wcscmp( get_osarchitecture(), L"32-bit" )) arch = L"x86"; - else if (!wcscmp( manufacturer, L"AuthenticAMD" )) arch = L"AMD64"; - else arch = L"Intel64"; - - do_cpuid( 1, regs ); - - model = get_processor_model( regs[0], &stepping, &family ); - swprintf( caption, len, L"%s Family %u Model %u Stepping %u", arch, family, model, stepping ); + WCHAR name[64]; + swprintf( name, ARRAY_SIZE(name), L"Hardware\\Description\\System\\CentralProcessor\\%u", index ); + return get_reg_str( HKEY_LOCAL_MACHINE, name, L"Identifier" ); } static void get_processor_version( WCHAR *version, UINT len ) { @@ -3522,7 +3532,7 @@ static UINT get_processor_maxclockspeed( UINT index ) static enum fill_status fill_processor( struct table *table, const struct expr *cond ) { - WCHAR caption[100], device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; + WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; struct record_processor *rec; UINT i, offset = 0, num_rows = 0, num_logical, num_physical, num_packages; enum fill_status status = FILL_STATUS_UNFILTERED; @@ -3531,7 +3541,6 @@ static enum fill_status fill_processor( struct table *table, const struct expr * if (!resize_table( table, num_packages, sizeof(*rec) )) return FILL_STATUS_FAILED; - get_processor_caption( caption, ARRAY_SIZE( caption ) ); get_processor_id( processor_id, ARRAY_SIZE( processor_id ) ); get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); get_processor_name( name ); @@ -3542,11 +3551,11 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec = (struct record_processor *)(table->data + offset); rec->addresswidth = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 32 : 64; rec->architecture = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 0 : 9; - rec->caption = wcsdup( caption ); + rec->caption = get_processor_caption( i ); rec->cpu_status = 1; /* CPU Enabled */ rec->currentclockspeed = get_processor_currentclockspeed( i ); rec->datawidth = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 32 : 64; - rec->description = wcsdup( caption ); + rec->description = get_processor_caption( i ); swprintf( device_id, ARRAY_SIZE( device_id ), L"CPU%u", i ); rec->device_id = wcsdup( device_id ); rec->family = 2; /* Unknown */ @@ -3657,27 +3666,6 @@ static WCHAR *get_locale(void) return ret; } -static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) -{ - HKEY hkey = 0; - DWORD size, type; - WCHAR *ret = NULL; - - if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && - !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && - (ret = malloc( size + sizeof(WCHAR) ))) - { - size += sizeof(WCHAR); - if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) - { - free( ret ); - ret = NULL; - } - } - if (hkey) RegCloseKey( hkey ); - return ret; -} - static WCHAR *get_organization(void) { return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion",

1 0

Alexandre Julliard : wbemprox: Support multiple SMBIOS entries of the same type.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: a5e707f7a1ed7f65ef6484ffcdbf2ee597bad030 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5e707f7a1ed7f65ef6484ffcdbf2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:40:49 2024 +0200 wbemprox: Support multiple SMBIOS entries of the same type. --- dlls/wbemprox/builtin.c | 61 +++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 32 deletions(-)

1 0

Alexandre Julliard : wbemprox: Get the processor manufacturer from the SMBIOS table.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 63cd5d18f6f7d0fe182dc354c741248ca5d82b13 URL: https://gitlab.winehq.org/wine/wine/-/commit/63cd5d18f6f7d0fe182dc354c74124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:41:23 2024 +0200 wbemprox: Get the processor manufacturer from the SMBIOS table. --- dlls/wbemprox/builtin.c | 75 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e362fec02a5..ff6e35c5e24 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1221,10 +1221,13 @@ struct smbios_prologue enum smbios_type { - SMBIOS_TYPE_BIOS, - SMBIOS_TYPE_SYSTEM, - SMBIOS_TYPE_BASEBOARD, - SMBIOS_TYPE_CHASSIS, + SMBIOS_TYPE_BIOS = 0, + SMBIOS_TYPE_SYSTEM = 1, + SMBIOS_TYPE_BASEBOARD = 2, + SMBIOS_TYPE_CHASSIS = 3, + SMBIOS_TYPE_PROCESSOR = 4, + SMBIOS_TYPE_BOOTINFO = 32, + SMBIOS_TYPE_END = 127 }; struct smbios_header @@ -1278,6 +1281,37 @@ struct smbios_system BYTE serial; BYTE uuid[16]; }; + +struct smbios_processor +{ + struct smbios_header hdr; + BYTE socket; + BYTE type; + BYTE family; + BYTE vendor; + ULONGLONG id; + BYTE version; + BYTE voltage; + WORD clock; + WORD max_speed; + WORD cur_speed; + BYTE status; + BYTE upgrade; + WORD l1cache; + WORD l2cache; + WORD l3cache; + BYTE serial; + BYTE asset_tag; + BYTE part_number; + BYTE core_count; + BYTE core_enabled; + BYTE thread_count; + WORD characteristics; + WORD family2; + WORD core_count2; + WORD core_enabled2; + WORD thread_count2; +}; #include "poppack.h" #define RSMB (('R' << 24) | ('S' << 16) | ('M' << 8) | 'B') @@ -3434,16 +3468,11 @@ static void regs_to_str( int *regs, unsigned int len, WCHAR *buffer ) for (i = 0; i < len; i++) { buffer[i] = *p++; } buffer[i] = 0; } -static void get_processor_manufacturer( WCHAR *manufacturer, UINT len ) +static WCHAR *get_processor_manufacturer( UINT index, const char *buf, UINT len ) { - int tmp, regs[4] = {0, 0, 0, 0}; - - do_cpuid( 0, regs ); - tmp = regs[2]; /* swap edx and ecx */ - regs[2] = regs[3]; - regs[3] = tmp; - - regs_to_str( regs + 1, min( 12, len ), manufacturer ); + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_PROCESSOR, index, offsetof(struct smbios_processor, vendor), buf, len ); + if (!ret) ret = wcsdup( L"Unknown" ); + return ret; } static const WCHAR *get_osarchitecture(void) { @@ -3529,17 +3558,25 @@ static UINT get_processor_maxclockspeed( UINT index ) static enum fill_status fill_processor( struct table *table, const struct expr *cond ) { - WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; + WCHAR device_id[14], processor_id[17], name[49] = {0}, version[50]; struct record_processor *rec; - UINT i, offset = 0, num_rows = 0, num_logical, num_physical, num_packages; + UINT i, len, offset = 0, num_rows = 0, num_logical, num_physical, num_packages; enum fill_status status = FILL_STATUS_UNFILTERED; + char *buf; + + len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); + if (!(buf = malloc( len ))) return FILL_STATUS_FAILED; + GetSystemFirmwareTable( RSMB, 0, buf, len ); num_logical = get_logical_processor_count( &num_physical, &num_packages ); - if (!resize_table( table, num_packages, sizeof(*rec) )) return FILL_STATUS_FAILED; + if (!resize_table( table, num_packages, sizeof(*rec) )) + { + free( buf ); + return FILL_STATUS_FAILED; + } get_processor_id( processor_id, ARRAY_SIZE( processor_id ) ); - get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); get_processor_name( name ); get_processor_version( version, ARRAY_SIZE( version ) ); @@ -3557,7 +3594,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->device_id = wcsdup( device_id ); rec->family = 2; /* Unknown */ rec->level = 15; - rec->manufacturer = wcsdup( manufacturer ); + rec->manufacturer = get_processor_manufacturer( i, buf, len ); rec->maxclockspeed = get_processor_maxclockspeed( i ); rec->name = wcsdup( name ); rec->num_cores = num_physical / num_packages; @@ -3575,6 +3612,8 @@ static enum fill_status fill_processor( struct table *table, const struct expr * num_rows++; } + free( buf ); + TRACE("created %u rows\n", num_rows); table->num_rows = num_rows; return status;

1 0