January 2019 - Wine-devel - list.winehq.org

[PATCH 3/3] mshtml: Expose IDOMCustomEvent to scripts.
by Jacek Caban 25 Jan '19

25 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 13 +++++++++++++ dlls/mshtml/tests/events.js | 15 +++++++++++++++ 2 files changed, 28 insertions(+)

1 0

[PATCH 2/3] mshtml: Add IDOMCustomEvent::detail property implementation.
by Jacek Caban 25 Jan '19

25 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] mshtml: Add IDOMCustomEvent::initCustomEvent implementation.
by Jacek Caban 25 Jan '19

25 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 3/3] rpcrt4/tests: Add context handle marshaling tests.
by Jacek Caban 25 Jan '19

25 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/server.c | 41 +++++++++++++++++++++++++++++++++++- dlls/rpcrt4/tests/server.idl | 8 +++++++ 2 files changed, 48 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] rpcrt4: Fix context handle return value unmarshaling.
by Jacek Caban 25 Jan '19

25 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/ndr_marshall.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] rpcrt4: Fix context handle return value marshaling.
by Jacek Caban 25 Jan '19

25 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/ndr_stubless.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH] ucrtbase: Add ilogb* functions.
by Nikolay Sivov 25 Jan '19

25 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 3 ++ configure.ac | 3 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 30 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 9 ++++++ 8 files changed, 57 insertions(+), 12 deletions(-) diff --git a/configure b/configure index b3a360e72e..2aa938e81c 100755 --- a/configure +++ b/configure @@ -18605,6 +18605,9 @@ for ac_func in \ exp2f \ expm1 \ expm1f \ + ilogb \ + ilogbf \ + ilogbl \ j0 \ j1 \ jn \ diff --git a/configure.ac b/configure.ac index 119c4cef0e..fc9b0d2346 100644 --- a/configure.ac +++ b/configure.ac @@ -2743,6 +2743,9 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + ilogb \ + ilogbf \ + ilogbl \ j0 \ j1 \ jn \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 0d645e5587..55fa1e594d 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -254,9 +254,9 @@ @ cdecl -arch=arm,x86_64,arm64 fmodf(float float) ucrtbase.fmodf @ cdecl frexp(double ptr) ucrtbase.frexp @ cdecl hypot(double double) ucrtbase.hypot -@ stub ilogb -@ stub ilogbf -@ stub ilogbl +@ cdecl ilogb(double) ucrtbase.ilogb +@ cdecl ilogbf(float) ucrtbase.ilogbf +@ cdecl ilogbl(double) ucrtbase.ilogbl @ cdecl ldexp(double long) ucrtbase.ldexp @ cdecl lgamma(double) ucrtbase.lgamma @ cdecl lgammaf(float) ucrtbase.lgammaf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4e25c6898d..0bfecaffcb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2207,9 +2207,9 @@ @ cdecl gets_s(ptr long) MSVCRT_gets_s @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar -@ stub ilogb -@ stub ilogbf -@ stub ilogbl +@ cdecl ilogb(double) MSVCR120_ilogb +@ cdecl ilogbf(float) MSVCR120_ilogbf +@ cdecl ilogbl(double) MSVCR120_ilogbl @ stub imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0bcf0..4d3d31b9b3 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1871,9 +1871,9 @@ @ cdecl gets_s(ptr long) msvcr120.gets_s @ cdecl getwc(ptr) msvcr120.getwc @ cdecl getwchar() msvcr120.getwchar -@ stub ilogb -@ stub ilogbf -@ stub ilogbl +@ cdecl ilogb(double) msvcr120.ilogb +@ cdecl ilogbf(float) msvcr120.ilogbf +@ cdecl ilogbl(double) msvcr120.ilogbl @ stub imaxabs @ stub imaxdiv @ cdecl isalnum(long) msvcr120.isalnum diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3508..9dd576c05e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3395,4 +3395,34 @@ double CDECL MSVCR120_creal(_Dcomplex z) return z.x; } +int CDECL MSVCR120_ilogb(double x) +{ +#ifdef HAVE_ILOGB + return ilogb(x); +#else + FIXME( "not implemented\n" ); + return 0; +#endif +} + +int CDECL MSVCR120_ilogbf(float x) +{ +#ifdef HAVE_ILOGBF + return ilogbf(x); +#else + FIXME( "not implemented\n" ); + return 0; +#endif +} + +int CDECL MSVCR120_ilogbl(LDOUBLE x) +{ +#ifdef HAVE_ILOGBL + return ilogbl(x); +#else + FIXME( "not implemented\n" ); + return 0; +#endif +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index cb45aa5b87..3cb5e6a58e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2341,9 +2341,9 @@ @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar @ cdecl hypot(double double) _hypot -@ stub ilogb -@ stub ilogbf -@ stub ilogbl +@ cdecl ilogb(double) MSVCR120_ilogb +@ cdecl ilogbf(float) MSVCR120_ilogbf +@ cdecl ilogbl(double) MSVCR120_ilogbl @ stub imaxabs @ stub imaxdiv @ cdecl is_wctype(long long) ntdll.iswctype diff --git a/include/config.h.in b/include/config.h.in index c5a3cb4807..bc87327c0b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -300,6 +300,15 @@ /* Define to 1 if you have the `if_nameindex' function. */ #undef HAVE_IF_NAMEINDEX +/* Define to 1 if you have the `ilogb' function. */ +#undef HAVE_ILOGB + +/* Define to 1 if you have the `ilogbf' function. */ +#undef HAVE_ILOGBF + +/* Define to 1 if you have the `ilogbl' function. */ +#undef HAVE_ILOGBL + /* Define to 1 if you have the `inet_addr' function. */ #undef HAVE_INET_ADDR -- 2.20.1

2 1

Wine staging 4.0 release
by Alistair Leslie-Hughes 25 Jan '19

25 Jan '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0 (837 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 5/5] wbemprox: Create one processor object per package.
by Hans Leidekker 25 Jan '19

25 Jan '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 61 +++++++++++++++++++---------------- dlls/wbemprox/tests/query.c | 63 ++++++++++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 34 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 03f6e62562..d2b7dc116f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1365,38 +1365,47 @@ static UINT get_processor_count(void) return info.NumberOfProcessors; } -static UINT get_logical_processor_count( UINT *num_cores ) +static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages ) { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION *info; - UINT i, j, count = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *buf, *entry; + UINT core_relation_count = 0, package_relation_count = 0; NTSTATUS status; - ULONG len; + ULONG len, offset = 0; + BOOL smt_enabled = FALSE; + DWORD all; - if (num_cores) *num_cores = get_processor_count(); - status = NtQuerySystemInformation( SystemLogicalProcessorInformation, NULL, 0, &len ); + if (num_packages) *num_packages = 1; + status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), NULL, 0, &len ); if (status != STATUS_INFO_LENGTH_MISMATCH) return get_processor_count(); - if (!(info = heap_alloc( len ))) return get_processor_count(); - status = NtQuerySystemInformation( SystemLogicalProcessorInformation, info, len, &len ); + if (!(buf = heap_alloc( len ))) return get_processor_count(); + status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), buf, len, NULL ); if (status != STATUS_SUCCESS) { - heap_free( info ); + heap_free( buf ); return get_processor_count(); } - if (num_cores) *num_cores = 0; - for (i = 0; i < len / sizeof(*info); i++) + + while (offset < len) { - if (info[i].Relationship == RelationProcessorCore) + entry = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((char *)buf + offset); + + if (entry->Relationship == RelationProcessorCore) { - for (j = 0; j < sizeof(ULONG_PTR); j++) if (info[i].ProcessorMask & (1 << j)) count++; + core_relation_count++; + if (entry->u.Processor.Flags & LTP_PC_SMT) smt_enabled = TRUE; } - else if (info[i].Relationship == RelationProcessorPackage && num_cores) + else if (entry->Relationship == RelationProcessorPackage) { - for (j = 0; j < sizeof(ULONG_PTR); j++) if (info[i].ProcessorMask & (1 << j)) (*num_cores)++; + package_relation_count++; } + offset += entry->Size; } - heap_free( info ); - return count; + + heap_free( buf ); + if (num_physical) *num_physical = core_relation_count; + if (num_packages) *num_packages = package_relation_count; + return smt_enabled ? core_relation_count * 2 : core_relation_count; } static UINT64 get_total_physical_memory(void) @@ -1460,8 +1469,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; rec->name = get_computername(); - rec->num_logical_processors = get_logical_processor_count( NULL ); - rec->num_processors = get_processor_count(); + rec->num_logical_processors = get_logical_processor_count( NULL, &rec->num_processors ); rec->total_physical_memory = get_total_physical_memory(); rec->username = get_username(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); @@ -2981,10 +2989,12 @@ static enum fill_status fill_processor( struct table *table, const struct expr * static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR caption[100], 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_cores, num_logical_processors, count = get_processor_count(); + UINT i, offset = 0, num_rows = 0, num_logical, num_physical, num_packages; enum fill_status status = FILL_STATUS_UNFILTERED; - if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; + num_logical = get_logical_processor_count( &num_physical, &num_packages ); + + if (!resize_table( table, num_packages, sizeof(*rec) )) return FILL_STATUS_FAILED; get_processor_caption( caption ); get_processor_id( processor_id ); @@ -2992,10 +3002,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * get_processor_name( name ); get_processor_version( version ); - num_logical_processors = get_logical_processor_count( &num_cores ) / count; - num_cores /= count; - - for (i = 0; i < count; i++) + for (i = 0; i < num_packages; i++) { rec = (struct record_processor *)(table->data + offset); rec->addresswidth = get_osarchitecture() == os_32bitW ? 32 : 64; @@ -3012,8 +3019,8 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->manufacturer = heap_strdupW( manufacturer ); rec->maxclockspeed = get_processor_maxclockspeed( i ); rec->name = heap_strdupW( name ); - rec->num_cores = num_cores; - rec->num_logical_processors = num_logical_processors; + rec->num_cores = num_physical / num_packages; + rec->num_logical_processors = num_logical / num_packages; rec->processor_id = heap_strdupW( processor_id ); rec->processortype = 3; /* central processor */ rec->revision = get_processor_revision(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 82195ebedd..ae0106a341 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -529,12 +529,16 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) static const WCHAR modelW[] = {'M','o','d','e','l',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; static const WCHAR usernameW[] = {'U','s','e','r','N','a','m','e',0}; + static const WCHAR numprocessorsW[] = + {'N','u','m','b','e','r','O','f','P','r','o','c','e','s','s','o','r','s',0}; + static const WCHAR numlogicalprocessorsW[] = + {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; - IWbemClassObject *service; + IWbemClassObject *obj; VARIANT value; CIMTYPE type; HRESULT hr; @@ -565,17 +569,17 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) goto out; } - hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "got %08x\n", hr ); type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( service, memorytypeW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, memorytypeW, 0, &value, &type, NULL ); ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( service, modelW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, modelW, 0, &value, &type, NULL ); ok( hr == S_OK, "failed to get model %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); @@ -584,7 +588,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( service, nameW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, nameW, 0, &value, &type, NULL ); ok( hr == S_OK, "failed to get computer name %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); @@ -593,14 +597,33 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); - hr = IWbemClassObject_Get( service, usernameW, 0, &value, &type, NULL ); + hr = IWbemClassObject_Get( obj, numlogicalprocessorsW, 0, &value, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &value ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "numlogicalprocessors %u\n", V_I4( &value ) ); + } + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, numprocessorsW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "numprocessors %u\n", V_I4( &value ) ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, usernameW, 0, &value, &type, NULL ); ok( hr == S_OK, "failed to get computer name %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); ok( !lstrcmpiW( V_BSTR( &value ), username ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(username) ); VariantClear( &value ); - IWbemClassObject_Release( service ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); out: SysFreeString( query ); @@ -1563,6 +1586,10 @@ static void test_Win32_Processor( IWbemServices *services ) {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR numcoresW[] = + {'N','u','m','b','e','r','O','f','C','o','r','e','s',0}; + static const WCHAR numlogicalprocessorsW[] = + {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR processoridW[] = {'P','r','o','c','e','s','s','o','r','I','d',0}; static const WCHAR revisionW[] = @@ -1665,6 +1692,28 @@ static void test_Win32_Processor( IWbemServices *services ) trace( "version %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, numlogicalprocessorsW, 0, &val, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "numlogicalprocessors %u\n", V_I4( &val ) ); + } + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, numcoresW, 0, &val, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "numcores %u\n", V_I4( &val ) ); + } + IWbemClassObject_Release( obj ); } -- 2.20.1

1 0

[PATCH 4/5] wbemprox: Fix processor caption on AMD 64-bit.
by Hans Leidekker 25 Jan '19

25 Jan '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 62 +++++++++++++++++++++---------------- dlls/wbemprox/tests/query.c | 11 +++++++ 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 620d64e2e6..03f6e62562 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2842,13 +2842,6 @@ void do_cpuid( unsigned int ax, unsigned int *p ) } #endif -static const WCHAR *get_osarchitecture(void) -{ - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; - return os_32bitW; -} static unsigned int get_processor_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) { unsigned int model, family_id = (reg0 & (0x0f << 8)) >> 8; @@ -2863,6 +2856,32 @@ static unsigned int get_processor_model( unsigned int reg0, unsigned int *steppi *stepping = reg0 & 0x0f; return model; } +static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +{ + unsigned int i; + unsigned char *p = (unsigned char *)regs; + + for (i = 0; i < len; i++) { buffer[i] = *p++; } + buffer[i] = 0; +} +static void get_processor_manufacturer( WCHAR *manufacturer ) +{ + unsigned 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, 12, manufacturer ); +} +static const WCHAR *get_osarchitecture(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; + return os_32bitW; +} static void get_processor_caption( WCHAR *caption ) { static const WCHAR fmtW[] = @@ -2870,9 +2889,17 @@ static void get_processor_caption( WCHAR *caption ) 'M','o','d','e','l',' ','%','u',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; - const WCHAR *arch = (get_osarchitecture() == os_32bitW) ? x86W : intel64W; + static const WCHAR amd64W[] = {'A','M','D','6','4',0}; + static const WCHAR authenticamdW[] = {'A','u','t','h','e','n','t','i','c','A','M','D',0}; + const WCHAR *arch; + WCHAR manufacturer[13]; unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; + get_processor_manufacturer( manufacturer ); + if (get_osarchitecture() == os_32bitW) arch = x86W; + else if (!strcmpW( manufacturer, authenticamdW )) arch = amd64W; + else arch = intel64W; + do_cpuid( 1, regs ); model = get_processor_model( regs[0], &stepping, &family ); @@ -2903,25 +2930,6 @@ static void get_processor_id( WCHAR *processor_id ) do_cpuid( 1, regs ); sprintfW( processor_id, fmtW, regs[3], regs[0] ); } -static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) -{ - unsigned int i; - unsigned char *p = (unsigned char *)regs; - - for (i = 0; i < len; i++) { buffer[i] = *p++; } - buffer[i] = 0; -} -static void get_processor_manufacturer( WCHAR *manufacturer ) -{ - unsigned 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, 12, manufacturer ); -} static void get_processor_name( WCHAR *name ) { unsigned int regs[4] = {0, 0, 0, 0}; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0fa6b5e966..82195ebedd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1553,6 +1553,8 @@ static void test_Win32_Processor( IWbemServices *services ) { static const WCHAR architectureW[] = {'A','r','c','h','i','t','e','c','t','u','r','e',0}; + static const WCHAR captionW[] = + {'C','a','p','t','i','o','n',0}; static const WCHAR familyW[] = {'F','a','m','i','l','y',0}; static const WCHAR levelW[] = @@ -1586,6 +1588,15 @@ static void test_Win32_Processor( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "caption %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, architectureW, 0, &val, &type, NULL ); -- 2.20.1

1 0