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

Alexandre Julliard : ntdll: Add default values for cache parameters.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: e4db1b39ea28d0cc1b20ef4eacbb237c2f6cb68b URL: https://gitlab.winehq.org/wine/wine/-/commit/e4db1b39ea28d0cc1b20ef4eacbb23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 19:01:09 2024 +0200 ntdll: Add default values for cache parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56653 --- dlls/ntdll/unix/system.c | 60 ++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index fc9dfa90355..b7c424b6548 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1030,7 +1030,7 @@ static NTSTATUS create_logical_proc_info(void) for (j = 0; j < 4; j++) { - CACHE_DESCRIPTOR cache; + CACHE_DESCRIPTOR cache = { .Associativity = 8, .LineSize = 64, .Type = CacheUnified, .Size = 64 * 1024 }; ULONG_PTR mask = 0; snprintf(name, sizeof(name), cache_info, i, j, "shared_cpu_map"); @@ -1044,39 +1044,43 @@ static NTSTATUS create_logical_proc_info(void) cache.Level = r; snprintf(name, sizeof(name), cache_info, i, j, "ways_of_associativity"); - f = fopen(name, "r"); - if(!f) continue; - fscanf(f, "%u", &r); - fclose(f); - cache.Associativity = r; + if ((f = fopen(name, "r"))) + { + fscanf(f, "%u", &r); + fclose(f); + cache.Associativity = r; + } snprintf(name, sizeof(name), cache_info, i, j, "coherency_line_size"); - f = fopen(name, "r"); - if(!f) continue; - fscanf(f, "%u", &r); - fclose(f); - cache.LineSize = r; + if ((f = fopen(name, "r"))) + { + fscanf(f, "%u", &r); + fclose(f); + cache.LineSize = r; + } snprintf(name, sizeof(name), cache_info, i, j, "size"); - f = fopen(name, "r"); - if(!f) continue; - fscanf(f, "%u%c", &r, &op); - fclose(f); - if(op != 'K') - WARN("unknown cache size %u%c\n", r, op); - cache.Size = (op=='K' ? r*1024 : r); + if ((f = fopen(name, "r"))) + { + fscanf(f, "%u%c", &r, &op); + fclose(f); + if(op != 'K') + WARN("unknown cache size %u%c\n", r, op); + cache.Size = (op=='K' ? r*1024 : r); + } snprintf(name, sizeof(name), cache_info, i, j, "type"); - f = fopen(name, "r"); - if(!f) continue; - fscanf(f, "%s", name); - fclose(f); - if (!memcmp(name, "Data", 5)) - cache.Type = CacheData; - else if(!memcmp(name, "Instruction", 11)) - cache.Type = CacheInstruction; - else - cache.Type = CacheUnified; + if ((f = fopen(name, "r"))) + { + fscanf(f, "%s", name); + fclose(f); + if (!memcmp(name, "Data", 5)) + cache.Type = CacheData; + else if(!memcmp(name, "Instruction", 11)) + cache.Type = CacheInstruction; + else + cache.Type = CacheUnified; + } if (!logical_proc_info_add_cache( mask, &cache )) {

1 0

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

15 May '24

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: Get the processor count from the SMBIOS table.
by Alexandre Julliard 15 May '24

15 May '24

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 the processor id from the SMBIOS table.
by Alexandre Julliard 15 May '24

15 May '24

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 a few more processor details from the SMBIOS table.
by Alexandre Julliard 15 May '24

15 May '24

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 15 May '24

15 May '24

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: Use RtlGetNativeSystemInformation directly to get the correct info on ARM platforms.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 80c9034976dee54a549b789e50cae071a0c1b7e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/80c9034976dee54a549b789e50cae0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:48:43 2024 +0200 wbemprox: Use RtlGetNativeSystemInformation directly to get the correct info on ARM platforms. --- dlls/wbemprox/builtin.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 72ee294dd08..80434e5f19f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1725,10 +1725,16 @@ static WCHAR *get_computername(void) static const WCHAR *get_systemtype(void) { - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"x64 based PC"; - return L"x86 based PC"; + SYSTEM_CPU_INFORMATION info; + + RtlGetNativeSystemInformation( SystemCpuInformation, &info, sizeof(info), NULL ); + switch (info.ProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_ARM: return L"ARM-based PC"; + case PROCESSOR_ARCHITECTURE_ARM64: return L"ARM64-based PC"; + case PROCESSOR_ARCHITECTURE_AMD64: return L"x64-based PC"; + default: return L"x86-based PC"; + } } static WCHAR *get_username(void) @@ -3416,10 +3422,17 @@ static WCHAR *get_processor_manufacturer( UINT index, const char *buf, UINT len } static const WCHAR *get_osarchitecture(void) { - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"64-bit"; - return L"32-bit"; + SYSTEM_CPU_INFORMATION info; + + RtlGetNativeSystemInformation( SystemCpuInformation, &info, sizeof(info), NULL ); + switch (info.ProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + case PROCESSOR_ARCHITECTURE_ARM: + return L"32-bit"; + default: + return L"64-bit"; + } } static WCHAR *get_processor_caption( UINT index ) {

1 0

Elizabeth Figura : wined3d: Remove no longer used support for emulated non-power-of-two textures.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 62523c78992f19ef397f8a8a79b2bab25e231573 URL: https://gitlab.winehq.org/wine/wine/-/commit/62523c78992f19ef397f8a8a79b2ba… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 15:31:26 2024 -0500 wined3d: Remove no longer used support for emulated non-power-of-two textures. --- dlls/wined3d/texture.c | 124 +---------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 123 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a4eee054528..d1b24b4dc2e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -58,8 +58,7 @@ bool wined3d_texture_validate_sub_resource_idx(const struct wined3d_texture *tex BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) { - if (!d3d_info->pbo || texture->resource.format->conv_byte_count || texture->resource.pin_sysmem - || (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)) + if (!d3d_info->pbo || texture->resource.format->conv_byte_count || texture->resource.pin_sysmem) return FALSE; return TRUE; @@ -2643,10 +2642,6 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl return; } - /* NP2 emulation is not allowed on array textures. */ - if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - ERR("Array texture %p uses NP2 emulation.\n", texture_gl); - WARN_(d3d_perf)("Downloading all miplevel layers to get the data for a single sub-resource.\n"); if (!(temporary_mem = calloc(texture_gl->t.layer_count, sub_resource->size))) @@ -2656,31 +2651,6 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl } } - if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - if (format_gl->f.download) - { - FIXME("Reading back converted texture %p with NP2 emulation is not supported.\n", texture_gl); - return; - } - - wined3d_texture_get_pitch(&texture_gl->t, level, &dst_row_pitch, &dst_slice_pitch); - wined3d_format_calculate_pitch(&format_gl->f, texture_gl->t.resource.device->surface_alignment, - wined3d_texture_get_level_pow2_width(&texture_gl->t, level), - wined3d_texture_get_level_pow2_height(&texture_gl->t, level), - &src_row_pitch, &src_slice_pitch); - if (!(temporary_mem = malloc(src_slice_pitch))) - { - ERR("Out of memory.\n"); - return; - } - - if (bo) - ERR("NP2 emulated texture uses PBO unexpectedly.\n"); - if (texture_gl->t.resource.format_attrs & WINED3D_FORMAT_ATTR_COMPRESSED) - ERR("Unexpected compressed format for NP2 emulated texture.\n"); - } - if (format_gl->f.download) { struct wined3d_format f; @@ -2748,71 +2718,6 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl wined3d_texture_get_level_width(&texture_gl->t, level), wined3d_texture_get_level_height(&texture_gl->t, level), 1); } - else if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - const BYTE *src_data; - unsigned int h, y; - BYTE *dst_data; - /* Some games (e.g. Warhammer 40,000) don't properly handle texture - * pitches, preventing us from using the texture pitch to box NPOT - * textures. Instead, we repack the texture's CPU copy so that its - * pitch equals bpp * width instead of bpp * pow2width. - * - * Instead of boxing the texture: - * - * │<── texture width ──>│ pow2 width ──>│ - * ├─────────────────────┼───────────────┼─ - * │111111111111111111111│ │ʌ - * │222222222222222222222│ ││ - * │333333333333333333333│ padding │texture height - * │444444444444444444444│ ││ - * │555555555555555555555│ │v - * ├─────────────────────┘ ├─ - * │ │pow2 height - * │ padding padding ││ - * │ │v - * └─────────────────────────────────────┴─ - * - * we're repacking the data to the expected texture width - * - * │<── texture width ──>│ pow2 width ──>│ - * ├─────────────────────┴───────────────┼─ - * │1111111111111111111112222222222222222│ʌ - * │2222233333333333333333333344444444444││ - * │4444444444555555555555555555555 │texture height - * │ ││ - * │ padding padding │v - * │ ├─ - * │ │pow2 height - * │ padding padding ││ - * │ │v - * └─────────────────────────────────────┴─ - * - * == is the same as - * - * │<── texture width ──>│ - * ├─────────────────────┼─ - * │111111111111111111111│ʌ - * │222222222222222222222││ - * │333333333333333333333│texture height - * │444444444444444444444││ - * │555555555555555555555│v - * └─────────────────────┴─ - * - * This also means that any references to surface memory should work - * with the data as if it were a standard texture with a NPOT width - * instead of a texture boxed up to be a power-of-two texture. */ - src_data = mem; - dst_data = data->addr; - TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); - h = wined3d_texture_get_level_height(&texture_gl->t, level); - for (y = 0; y < h; ++y) - { - memcpy(dst_data, src_data, dst_row_pitch); - src_data += src_row_pitch; - dst_data += dst_row_pitch; - } - } else if (temporary_mem) { unsigned int layer = sub_resource_idx / texture_gl->t.level_count; @@ -2914,7 +2819,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, if ((src_texture->resource.type == WINED3D_RTYPE_TEXTURE_2D && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count - || src_texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_COND_NP2_EMULATED))) + || (src_texture->flags & WINED3D_TEXTURE_CONVERTED))) || target == GL_TEXTURE_1D_ARRAY) { wined3d_texture_gl_download_data_slow_path(src_texture_gl, src_sub_resource_idx, context_gl, dst_bo_addr); @@ -3838,25 +3743,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc WARN("Creating a scratch mipmapped/cube/array NPOT texture despite lack of HW support.\n"); } texture->flags |= WINED3D_TEXTURE_COND_NP2; - - if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !d3d_info->texture_npot_conditional) - { - /* TODO: Add support for non-power-of-two compressed textures. */ - if (format->attrs & (WINED3D_FORMAT_ATTR_COMPRESSED | WINED3D_FORMAT_ATTR_HEIGHT_SCALE)) - { - FIXME("Compressed or height scaled non-power-of-two (%ux%u) textures are not supported.\n", - desc->width, desc->height); - return WINED3DERR_NOTAVAILABLE; - } - - /* Find the nearest pow2 match. */ - pow2_width = pow2_height = 1; - while (pow2_width < desc->width) - pow2_width <<= 1; - while (pow2_height < desc->height) - pow2_height <<= 1; - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - } } texture->pow2_width = pow2_width; texture->pow2_height = pow2_height; @@ -3976,12 +3862,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->pow2_matrix[5] = (float)desc->height; texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } - else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); - texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; - } else { texture->pow2_matrix[0] = 1.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dc802bdd5d5..de4b2108365 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3301,7 +3301,6 @@ struct wined3d_texture_ops }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -#define WINED3D_TEXTURE_COND_NP2_EMULATED 0x00000002 #define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000004 #define WINED3D_TEXTURE_IS_SRGB 0x00000008 #define WINED3D_TEXTURE_RGB_ALLOCATED 0x00000010

1 0

Elizabeth Figura : wined3d: Remove no longer used support for rectangle textures.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 1fc3522163bbd02f0409c39815b6959c9c769af9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1fc3522163bbd02f0409c39815b695… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 15:37:21 2024 -0500 wined3d: Remove no longer used support for rectangle textures. --- dlls/wined3d/glsl_shader.c | 7 ------- dlls/wined3d/resource.c | 1 - dlls/wined3d/texture.c | 17 ++--------------- dlls/wined3d/utils.c | 9 --------- dlls/wined3d/wined3d_private.h | 7 +++---- 5 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d249f14bc8a..f3ac9e1095c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9841,9 +9841,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * case WINED3D_GL_RES_TYPE_TEX_CUBE: sampler_type = "Cube"; break; - case WINED3D_GL_RES_TYPE_TEX_RECT: - sampler_type = "2DRect"; - break; default: FIXME("Unhandled sampler type %#x.\n", settings->op[stage].tex_type); sampler_type = NULL; @@ -9984,10 +9981,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * texture_function = "textureCube"; coord_mask = "xyz"; break; - case WINED3D_GL_RES_TYPE_TEX_RECT: - texture_function = "texture2DRect"; - coord_mask = "xy"; - break; default: FIXME("Unhandled texture type %#x.\n", settings->op[stage].tex_type); texture_function = ""; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e336e0048e0..b0537ffd305 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -75,7 +75,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, {WINED3D_RTYPE_TEXTURE_1D, 0, WINED3D_GL_RES_TYPE_TEX_1D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_LEGACY_CUBEMAP, WINED3D_GL_RES_TYPE_TEX_CUBE}, {WINED3D_RTYPE_TEXTURE_3D, 0, WINED3D_GL_RES_TYPE_TEX_3D}, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d1b24b4dc2e..bbf8a8bc249 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3855,18 +3855,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc wined3d_texture_dirty_region_add(texture, i, NULL); } - /* Precalculated scaling for 'faked' non power of two texture coords. */ - if (texture->resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) - { - texture->pow2_matrix[0] = (float)desc->width; - texture->pow2_matrix[5] = (float)desc->height; - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; - } - else - { - texture->pow2_matrix[0] = 1.0f; - texture->pow2_matrix[5] = 1.0f; - } + texture->pow2_matrix[0] = 1.0f; + texture->pow2_matrix[5] = 1.0f; texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; TRACE("x scale %.8e, y scale %.8e.\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); @@ -4233,9 +4223,6 @@ HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wi flags, device, parent, parent_ops, &texture_gl[1], &texture_gl_ops))) return hr; - if (texture_gl->t.resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) - texture_gl->target = GL_TEXTURE_RECTANGLE_ARB; - if (texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY || texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE) texture_gl->t.flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c0695762795..25cb992d021 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2235,8 +2235,6 @@ static GLenum wined3d_gl_type_to_enum(enum wined3d_gl_resource_type type) return GL_TEXTURE_3D; case WINED3D_GL_RES_TYPE_TEX_CUBE: return GL_TEXTURE_CUBE_MAP_ARB; - case WINED3D_GL_RES_TYPE_TEX_RECT: - return GL_TEXTURE_RECTANGLE_ARB; case WINED3D_GL_RES_TYPE_BUFFER: return GL_TEXTURE_2D; /* TODO: GL_TEXTURE_BUFFER. */ case WINED3D_GL_RES_TYPE_RB: @@ -2255,7 +2253,6 @@ static void delete_fbo_attachment(const struct wined3d_gl_info *gl_info, { case WINED3D_GL_RES_TYPE_TEX_1D: case WINED3D_GL_RES_TYPE_TEX_2D: - case WINED3D_GL_RES_TYPE_TEX_RECT: case WINED3D_GL_RES_TYPE_TEX_3D: case WINED3D_GL_RES_TYPE_TEX_CUBE: gl_info->gl_ops.gl.p_glDeleteTextures(1, &object); @@ -2296,7 +2293,6 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info break; case WINED3D_GL_RES_TYPE_TEX_2D: - case WINED3D_GL_RES_TYPE_TEX_RECT: gl_info->gl_ops.gl.p_glGenTextures(1, object); gl_info->gl_ops.gl.p_glBindTexture(wined3d_gl_type_to_enum(d3d_type), *object); gl_info->gl_ops.gl.p_glTexImage2D(wined3d_gl_type_to_enum(d3d_type), 0, internal, 16, 16, 0, @@ -2658,7 +2654,6 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for case WINED3D_GL_RES_TYPE_TEX_2D: case WINED3D_GL_RES_TYPE_TEX_3D: - case WINED3D_GL_RES_TYPE_TEX_RECT: /* Rebinding texture to workaround a fglrx bug. */ gl_info->gl_ops.gl.p_glBindTexture(wined3d_gl_type_to_enum(type), object); gl_info->gl_ops.gl.p_glGetTexImage(wined3d_gl_type_to_enum(type), 0, GL_BGRA, @@ -3132,7 +3127,6 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3D_FORMAT_CAP_TEXTURE; format->f.caps[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3D_FORMAT_CAP_TEXTURE; format->f.caps[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3D_FORMAT_CAP_TEXTURE; - format->f.caps[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3D_FORMAT_CAP_TEXTURE; } query_view_class(format); @@ -3223,9 +3217,6 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) format->f.caps[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].caps | WINED3D_FORMAT_CAP_BLIT; - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - format->f.caps[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].caps | WINED3D_FORMAT_CAP_BLIT; - format->f.caps[WINED3D_GL_RES_TYPE_RB] |= format_texture_info[i].caps | WINED3D_FORMAT_CAP_BLIT; format->f.caps[WINED3D_GL_RES_TYPE_RB] &= ~WINED3D_FORMAT_CAP_TEXTURE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de4b2108365..431ccff6316 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1437,10 +1437,9 @@ enum wined3d_gl_resource_type WINED3D_GL_RES_TYPE_TEX_2D = 1, WINED3D_GL_RES_TYPE_TEX_3D = 2, WINED3D_GL_RES_TYPE_TEX_CUBE = 3, - WINED3D_GL_RES_TYPE_TEX_RECT = 4, - WINED3D_GL_RES_TYPE_BUFFER = 5, - WINED3D_GL_RES_TYPE_RB = 6, - WINED3D_GL_RES_TYPE_COUNT = 7, + WINED3D_GL_RES_TYPE_BUFFER = 4, + WINED3D_GL_RES_TYPE_RB = 5, + WINED3D_GL_RES_TYPE_COUNT = 6, }; enum wined3d_vertex_processing_mode

1 0

Elizabeth Figura : wined3d: Remove texture non-power-of-two fixup.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: d257c47f072a789db9a3f61f73164b97cc01c586 URL: https://gitlab.winehq.org/wine/wine/-/commit/d257c47f072a789db9a3f61f73164b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 15:49:17 2024 -0500 wined3d: Remove texture non-power-of-two fixup. --- dlls/wined3d/context_gl.c | 2 - dlls/wined3d/glsl_shader.c | 201 ++--------------------------------------- dlls/wined3d/resource.c | 18 +--- dlls/wined3d/shader.c | 5 - dlls/wined3d/texture.c | 8 +- dlls/wined3d/utils.c | 14 --- dlls/wined3d/view.c | 4 - dlls/wined3d/wined3d_private.h | 31 +------ 8 files changed, 11 insertions(+), 272 deletions(-)

1 0