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

Elizabeth Figura : wined3d: Collapse together NPOT d3d_info flags.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: dcb0136cc064af3f0d09862da42707bf09031d3c URL: https://gitlab.winehq.org/wine/wine/-/commit/dcb0136cc064af3f0d09862da42707… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 16:00:47 2024 -0500 wined3d: Collapse together NPOT d3d_info flags. --- dlls/wined3d/adapter_gl.c | 8 +++----- dlls/wined3d/adapter_vk.c | 4 +--- dlls/wined3d/directx.c | 10 +++------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2ff75eb0788..59c85df5a9a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4298,7 +4298,7 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s { caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | WINED3DPTEXTURECAPS_MIPVOLUMEMAP; - if (!d3d_info->texture_npot) + if (!d3d_info->unconditional_npot) caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; caps->VolumeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR @@ -4338,7 +4338,7 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s { caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | WINED3DPTEXTURECAPS_MIPCUBEMAP; - if (!d3d_info->texture_npot) + if (!d3d_info->unconditional_npot) caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR @@ -5045,9 +5045,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; d3d_info->stencil_export = !!gl_info->supported[ARB_SHADER_STENCIL_EXPORT]; - d3d_info->texture_npot = !!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]; - d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]; - d3d_info->normalized_texrect = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]; + d3d_info->unconditional_npot = !!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]; d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 39b263872ed..10c62c3b7ca 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2356,9 +2356,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = false; /* VK_EXT_shader_viewport_index_layer */ d3d_info->stencil_export = vk_info->supported[WINED3D_VK_EXT_SHADER_STENCIL_EXPORT]; - d3d_info->texture_npot = true; - d3d_info->texture_npot_conditional = true; - d3d_info->normalized_texrect = false; + d3d_info->unconditional_npot = true; d3d_info->draw_base_vertex_offset = true; d3d_info->vertex_bgra = true; d3d_info->texture_swizzle = true; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97e1880f3f1..b11d284c10b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2437,12 +2437,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, WINED3DPTEXTURECAPS_PROJECTED | WINED3DPTEXTURECAPS_PERSPECTIVE; - if (!d3d_info->texture_npot) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2; - if (d3d_info->texture_npot_conditional) - caps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; - } + if (!d3d_info->unconditional_npot) + caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2 | WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; caps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | WINED3DPTFILTERCAPS_MAGFPOINT | @@ -3323,7 +3319,7 @@ static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->texture_npot = TRUE; + d3d_info->unconditional_npot = true; d3d_info->feature_level = WINED3D_FEATURE_LEVEL_5; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1dcc3e3be49..ad5753e5d99 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -2667,7 +2667,7 @@ static void sampler_desc_from_sampler_states(struct wined3d_sampler_desc *desc, if (texture->flags & WINED3D_TEXTURE_COND_NP2) { desc->mip_filter = WINED3D_TEXF_NONE; - if (d3d_info->normalized_texrect) + if (!d3d_info->unconditional_npot) desc->min_filter = WINED3D_TEXF_POINT; } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b3defb1f2fe..94429628035 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3713,7 +3713,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc pow2_width = desc->width; pow2_height = desc->height; if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1)) || (desc->depth & (desc->depth - 1))) - && !d3d_info->texture_npot) + && !d3d_info->unconditional_npot) { /* level_count == 0 returns an error as well. */ if (level_count != 1 || layer_count != 1 || desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb97a2587ba..8ecac000379 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -232,9 +232,9 @@ struct wined3d_d3d_info uint32_t shader_output_interpolation : 1; uint32_t viewport_array_index_any_shader : 1; uint32_t stencil_export : 1; - uint32_t texture_npot : 1; - uint32_t texture_npot_conditional : 1; - uint32_t normalized_texrect : 1; + /* If zero, only conditional NPOT textures are supported, via + * WINED3D_GL_NORMALIZED_TEXRECT. */ + uint32_t unconditional_npot : 1; uint32_t draw_base_vertex_offset : 1; uint32_t vertex_bgra : 1; uint32_t texture_swizzle : 1;

1 0

Alexandre Julliard : wbemprox: Get the processor id from the SMBIOS table.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 865522533dc15727e5dae4692d4b64cf9a1b8dde URL: https://gitlab.winehq.org/wine/wine/-/commit/865522533dc15727e5dae4692d4b64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:44:34 2024 +0200 wbemprox: Get the processor id from the SMBIOS table. --- dlls/wbemprox/builtin.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d1eaeef9e50..c371537c66d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3468,13 +3468,6 @@ static UINT16 get_processor_revision(void) do_cpuid( 1, regs ); return regs[0]; } -static void get_processor_id( WCHAR *processor_id, UINT len ) -{ - int regs[4] = {0, 0, 0, 0}; - - do_cpuid( 1, regs ); - swprintf( processor_id, len, L"%08X%08X", regs[3], regs[0] ); -} static WCHAR *get_processor_name( UINT index, const char *buf, UINT len ) { WCHAR *ret = get_smbios_string( SMBIOS_TYPE_PROCESSOR, index, offsetof(struct smbios_processor, version), buf, len ); @@ -3532,7 +3525,6 @@ static enum fill_status fill_processor( struct table *table, const struct expr * return FILL_STATUS_FAILED; } - get_processor_id( processor_id, ARRAY_SIZE( processor_id ) ); get_processor_version( version, ARRAY_SIZE( version ) ); for (i = 0; i < num_packages; i++) @@ -3558,6 +3550,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->name = get_processor_name( i, buf, len ); rec->num_cores = proc->core_count2; rec->num_logical_processors = proc->thread_count2; + swprintf( processor_id, ARRAY_SIZE( processor_id ), L"%016I64X", proc->id ); rec->processor_id = wcsdup( processor_id ); rec->processortype = 3; /* central processor */ rec->revision = get_processor_revision();

1 0

Alexandre Julliard : wbemprox: Get the processor count from the SMBIOS table.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 29ce1e685db0d4f331383e1520617b2f55caf6d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/29ce1e685db0d4f331383e1520617b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:43:15 2024 +0200 wbemprox: Get the processor count from the SMBIOS table. --- dlls/wbemprox/builtin.c | 63 +++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 42 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 099b4481bfd..d1eaeef9e50 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1663,47 +1663,20 @@ static UINT get_processor_count(void) return info.NumberOfProcessors; } -static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages ) +static UINT get_physical_processor_count( const char *buf, UINT len, UINT *num_logical ) { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *buf, *entry; - UINT core_relation_count = 0, package_relation_count = 0; - NTSTATUS status; - ULONG len, offset = 0; - BOOL smt_enabled = FALSE; - DWORD all = RelationAll; - - 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(); + const struct smbios_header *hdr; + const struct smbios_processor *proc; + UINT thread_count = 0, package_count = 0; - if (!(buf = malloc( len ))) return get_processor_count(); - status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), buf, len, &len ); - if (status != STATUS_SUCCESS) + while ((hdr = find_smbios_entry( SMBIOS_TYPE_PROCESSOR, package_count, buf, len ))) { - free( buf ); - return get_processor_count(); + proc = (const struct smbios_processor *)hdr; + thread_count += proc->thread_count2; + package_count++; } - - while (offset < len) - { - entry = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((char *)buf + offset); - - if (entry->Relationship == RelationProcessorCore) - { - core_relation_count++; - if (entry->Processor.Flags & LTP_PC_SMT) smt_enabled = TRUE; - } - else if (entry->Relationship == RelationProcessorPackage) - { - package_relation_count++; - } - offset += entry->Size; - } - - 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; + if (num_logical) *num_logical = thread_count; + return package_count; } static UINT64 get_total_physical_memory(void) @@ -1811,7 +1784,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec->manufacturer = get_compsysproduct_vendor( buf, len ); rec->model = get_compsysproduct_name( buf, len ); rec->name = get_computername(); - rec->num_logical_processors = get_logical_processor_count( NULL, &rec->num_processors ); + rec->num_processors = get_physical_processor_count( buf, len, &rec->num_logical_processors ); rec->systemtype = get_systemtype(); rec->total_physical_memory = get_total_physical_memory(); rec->username = get_username(); @@ -3540,8 +3513,10 @@ 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], version[50]; + const struct smbios_header *hdr; + const struct smbios_processor *proc; struct record_processor *rec; - UINT i, len, offset = 0, num_rows = 0, num_logical, num_physical, num_packages; + UINT i, len, offset = 0, num_rows = 0, num_packages; enum fill_status status = FILL_STATUS_UNFILTERED; char *buf; @@ -3549,7 +3524,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * if (!(buf = malloc( len ))) return FILL_STATUS_FAILED; GetSystemFirmwareTable( RSMB, 0, buf, len ); - num_logical = get_logical_processor_count( &num_physical, &num_packages ); + num_packages = get_physical_processor_count( buf, len, NULL ); if (!resize_table( table, num_packages, sizeof(*rec) )) { @@ -3562,6 +3537,10 @@ static enum fill_status fill_processor( struct table *table, const struct expr * for (i = 0; i < num_packages; i++) { + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_PROCESSOR, i, buf, len )) || hdr->length < sizeof(*proc)) + continue; + proc = (const struct smbios_processor *)hdr; + 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; @@ -3577,8 +3556,8 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->manufacturer = get_processor_manufacturer( i, buf, len ); rec->maxclockspeed = get_processor_maxclockspeed( i ); rec->name = get_processor_name( i, buf, len ); - rec->num_cores = num_physical / num_packages; - rec->num_logical_processors = num_logical / num_packages; + rec->num_cores = proc->core_count2; + rec->num_logical_processors = proc->thread_count2; rec->processor_id = wcsdup( processor_id ); rec->processortype = 3; /* central processor */ rec->revision = get_processor_revision();

1 0

Alexandre Julliard : wbemprox: Get a few more processor details from the SMBIOS table.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 76d9721ebb860885709505ab476f12ca615ea394 URL: https://gitlab.winehq.org/wine/wine/-/commit/76d9721ebb860885709505ab476f12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:45:34 2024 +0200 wbemprox: Get a few more processor details from the SMBIOS table. --- dlls/wbemprox/builtin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c371537c66d..18a7f5a5168 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3534,16 +3534,16 @@ static enum fill_status fill_processor( struct table *table, const struct expr * proc = (const struct smbios_processor *)hdr; rec = (struct record_processor *)(table->data + offset); - rec->addresswidth = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 32 : 64; + rec->addresswidth = (proc->characteristics & 4) ? 64 : 32; rec->architecture = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 0 : 9; rec->caption = get_processor_caption( i ); - rec->cpu_status = 1; /* CPU Enabled */ + rec->cpu_status = proc->status; rec->currentclockspeed = get_processor_currentclockspeed( i ); - rec->datawidth = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 32 : 64; + rec->datawidth = rec->addresswidth; 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 */ + rec->family = proc->family; rec->level = 15; rec->manufacturer = get_processor_manufacturer( i, buf, len ); rec->maxclockspeed = get_processor_maxclockspeed( i ); @@ -3552,7 +3552,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->num_logical_processors = proc->thread_count2; swprintf( processor_id, ARRAY_SIZE( processor_id ), L"%016I64X", proc->id ); rec->processor_id = wcsdup( processor_id ); - rec->processortype = 3; /* central processor */ + rec->processortype = proc->type; rec->revision = get_processor_revision(); rec->version = wcsdup( version ); if (!match_row( table, i, cond, &status ))

1 0

Alexandre Julliard : wbemprox: Get the processor type and model with SystemCpuInformation.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 372bae07731bc43865922687e966b29adfc31a60 URL: https://gitlab.winehq.org/wine/wine/-/commit/372bae07731bc43865922687e966b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:47:15 2024 +0200 wbemprox: Get the processor type and model with SystemCpuInformation. --- dlls/wbemprox/builtin.c | 52 +++++++------------------------------------------ 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 18a7f5a5168..72ee294dd08 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -19,7 +19,6 @@ #define COBJMACROS #include <stdarg.h> -#include <intrin.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -44,7 +43,6 @@ #include "setupapi.h" #include "ntddstor.h" -#include "wine/asm.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -3410,29 +3408,6 @@ done: return status; } -void do_cpuid( unsigned int ax, int *p ) -{ -#if defined(__i386__) || defined(__x86_64__) - __cpuid( p, ax ); -#else - FIXME("\n"); -#endif -} - -static unsigned int get_processor_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) -{ - unsigned int model, family_id = (reg0 & (0x0f << 8)) >> 8; - - model = (reg0 & (0x0f << 4)) >> 4; - if (family_id == 6 || family_id == 15) model |= (reg0 & (0x0f << 16)) >> 12; - if (family) - { - *family = family_id; - if (family_id == 15) *family += (reg0 & (0xff << 20)) >> 20; - } - *stepping = reg0 & 0x0f; - return model; -} static WCHAR *get_processor_manufacturer( UINT index, const char *buf, UINT len ) { WCHAR *ret = get_smbios_string( SMBIOS_TYPE_PROCESSOR, index, offsetof(struct smbios_processor, vendor), buf, len ); @@ -3452,22 +3427,6 @@ static WCHAR *get_processor_caption( UINT index ) 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 ) -{ - int regs[4] = {0, 0, 0, 0}; - unsigned int model, stepping; - - do_cpuid( 1, regs ); - - model = get_processor_model( regs[0], &stepping, NULL ); - swprintf( version, len, L"Model %u Stepping %u", model, stepping ); -} -static UINT16 get_processor_revision(void) -{ - int regs[4] = {0, 0, 0, 0}; - do_cpuid( 1, regs ); - return regs[0]; -} static WCHAR *get_processor_name( UINT index, const char *buf, UINT len ) { WCHAR *ret = get_smbios_string( SMBIOS_TYPE_PROCESSOR, index, offsetof(struct smbios_processor, version), buf, len ); @@ -3511,6 +3470,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * struct record_processor *rec; UINT i, len, offset = 0, num_rows = 0, num_packages; enum fill_status status = FILL_STATUS_UNFILTERED; + SYSTEM_CPU_INFORMATION info; char *buf; len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); @@ -3525,7 +3485,9 @@ static enum fill_status fill_processor( struct table *table, const struct expr * return FILL_STATUS_FAILED; } - get_processor_version( version, ARRAY_SIZE( version ) ); + RtlGetNativeSystemInformation( SystemCpuInformation, &info, sizeof(info), NULL ); + swprintf( version, sizeof(version), L"Model %u, Stepping %u", + HIBYTE(info.ProcessorRevision), LOBYTE(info.ProcessorRevision) ); for (i = 0; i < num_packages; i++) { @@ -3535,7 +3497,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec = (struct record_processor *)(table->data + offset); rec->addresswidth = (proc->characteristics & 4) ? 64 : 32; - rec->architecture = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 0 : 9; + rec->architecture = info.ProcessorArchitecture; rec->caption = get_processor_caption( i ); rec->cpu_status = proc->status; rec->currentclockspeed = get_processor_currentclockspeed( i ); @@ -3544,7 +3506,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * swprintf( device_id, ARRAY_SIZE( device_id ), L"CPU%u", i ); rec->device_id = wcsdup( device_id ); rec->family = proc->family; - rec->level = 15; + rec->level = info.ProcessorLevel; rec->manufacturer = get_processor_manufacturer( i, buf, len ); rec->maxclockspeed = get_processor_maxclockspeed( i ); rec->name = get_processor_name( i, buf, len ); @@ -3553,7 +3515,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * swprintf( processor_id, ARRAY_SIZE( processor_id ), L"%016I64X", proc->id ); rec->processor_id = wcsdup( processor_id ); rec->processortype = proc->type; - rec->revision = get_processor_revision(); + rec->revision = info.ProcessorRevision; rec->version = wcsdup( version ); if (!match_row( table, i, cond, &status )) {

1 0

Alexandre Julliard : wbemprox: Get the processor name from the SMBIOS table.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: a36cf20d708a7e71ab3ea44847687165331e8e91 URL: https://gitlab.winehq.org/wine/wine/-/commit/a36cf20d708a7e71ab3ea448476871… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:42:03 2024 +0200 wbemprox: Get the processor name from the SMBIOS table. --- dlls/wbemprox/builtin.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ff6e35c5e24..099b4481bfd 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3460,14 +3460,6 @@ static unsigned int get_processor_model( unsigned int reg0, unsigned int *steppi *stepping = reg0 & 0x0f; return model; } -static void regs_to_str( 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 WCHAR *get_processor_manufacturer( UINT index, const char *buf, UINT len ) { WCHAR *ret = get_smbios_string( SMBIOS_TYPE_PROCESSOR, index, offsetof(struct smbios_processor, vendor), buf, len ); @@ -3510,22 +3502,11 @@ static void get_processor_id( WCHAR *processor_id, UINT len ) do_cpuid( 1, regs ); swprintf( processor_id, len, L"%08X%08X", regs[3], regs[0] ); } -static void get_processor_name( WCHAR *name ) +static WCHAR *get_processor_name( UINT index, const char *buf, UINT len ) { - int regs[4] = {0, 0, 0, 0}; - int i; - - do_cpuid( 0x80000000, regs ); - if (regs[0] >= 0x80000004) - { - do_cpuid( 0x80000002, regs ); - regs_to_str( regs, 16, name ); - do_cpuid( 0x80000003, regs ); - regs_to_str( regs, 16, name + 16 ); - do_cpuid( 0x80000004, regs ); - regs_to_str( regs, 16, name + 32 ); - } - for (i = lstrlenW(name) - 1; i >= 0 && name[i] == ' '; i--) name[i] = 0; + WCHAR *ret = get_smbios_string( SMBIOS_TYPE_PROCESSOR, index, offsetof(struct smbios_processor, version), buf, len ); + if (!ret) ret = wcsdup( L"Unknown CPU" ); + return ret; } static UINT get_processor_currentclockspeed( UINT index ) { @@ -3558,7 +3539,7 @@ 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], name[49] = {0}, version[50]; + WCHAR device_id[14], processor_id[17], version[50]; struct record_processor *rec; UINT i, len, offset = 0, num_rows = 0, num_logical, num_physical, num_packages; enum fill_status status = FILL_STATUS_UNFILTERED; @@ -3577,7 +3558,6 @@ static enum fill_status fill_processor( struct table *table, const struct expr * } get_processor_id( processor_id, ARRAY_SIZE( processor_id ) ); - get_processor_name( name ); get_processor_version( version, ARRAY_SIZE( version ) ); for (i = 0; i < num_packages; i++) @@ -3596,7 +3576,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->level = 15; rec->manufacturer = get_processor_manufacturer( i, buf, len ); rec->maxclockspeed = get_processor_maxclockspeed( i ); - rec->name = wcsdup( name ); + rec->name = get_processor_name( i, buf, len ); rec->num_cores = num_physical / num_packages; rec->num_logical_processors = num_logical / num_packages; rec->processor_id = wcsdup( processor_id );

1 0

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

May 15, 2024

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 May 15, 2024

May 15, 2024

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

Alexandre Julliard : wbemprox: Get the processor caption from the registry.
by Alexandre Julliard May 15, 2024

May 15, 2024

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

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

May 15, 2024

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