- Wine-Commits - list.winehq.org

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

Francisco Casas : vkd3d-shader/hlsl: Also lower matrix swizzles and index loads in const passes.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: 061dc390367b4c83022d5fe1255f8d38f6b7ce9c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/061dc390367b4c83022d5fe1255f8… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 26 14:46:56 2024 -0400 vkd3d-shader/hlsl: Also lower matrix swizzles and index loads in const passes. --- libs/vkd3d-shader/hlsl_codegen.c | 3 +++ tests/hlsl/array-size-expr.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 51067960..27f16af5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5412,6 +5412,9 @@ void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body) { bool progress; + lower_ir(ctx, lower_matrix_swizzles, body); + lower_ir(ctx, lower_index_loads, body); + lower_ir(ctx, lower_broadcasts, body); while (hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL)); do diff --git a/tests/hlsl/array-size-expr.shader_test b/tests/hlsl/array-size-expr.shader_test index 366e25d5..0c9457ee 100644 --- a/tests/hlsl/array-size-expr.shader_test +++ b/tests/hlsl/array-size-expr.shader_test @@ -53,7 +53,7 @@ todo(glsl) draw quad probe all rgba (2, 3, 6, 1) % Additional level of indirection -[pixel shader todo fail(sm>=6)] +[pixel shader fail(sm>=6)] static const float array[8] = {1, 2, 3, 4, 5, 6, 7, 8}; static const int idx = 2; static const float array2[array[idx]] = {1, 2, 3}; @@ -64,11 +64,11 @@ float4 main() : sv_target } [test] -todo draw quad +todo(glsl) draw quad probe all rgba (2, 3, 6, 1) -[pixel shader fail(sm>=6) todo] +[pixel shader fail(sm>=6)] static const struct { float f; @@ -88,5 +88,5 @@ uniform 4 float 0.0 uniform 8 float 0.0 uniform 12 float 0.0 uniform 16 float 42.0 -todo draw quad +todo(glsl) draw quad probe all rgba (42, 42, 42, 42)

1 0

Francisco Casas : tests: Test complex array size expression.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: dff2f746bc19dc5e783b6d3e1fbdb725a5f9a08c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dff2f746bc19dc5e783b6d3e1fbdb… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 26 20:40:27 2024 -0400 tests: Test complex array size expression. --- tests/hlsl/array-size-expr.shader_test | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/hlsl/array-size-expr.shader_test b/tests/hlsl/array-size-expr.shader_test index a5666fd2..366e25d5 100644 --- a/tests/hlsl/array-size-expr.shader_test +++ b/tests/hlsl/array-size-expr.shader_test @@ -66,3 +66,27 @@ float4 main() : sv_target [test] todo draw quad probe all rgba (2, 3, 6, 1) + + +[pixel shader fail(sm>=6) todo] +static const struct +{ + float f; + float2x3 m[2]; +} a = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1}; + +float arr[a.m[1]._13_22_21.zxy.z]; // Fails on SM6 because size is float. + +float4 main() : sv_target +{ + return arr[4]; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 0.0 +uniform 8 float 0.0 +uniform 12 float 0.0 +uniform 16 float 42.0 +todo draw quad +probe all rgba (42, 42, 42, 42)

1 0

Francisco Casas : vkd3d-shader/hlsl: Run more constant passes on static expressions eval.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: 0d252f894aefb6cf26a590e775a562723112aff9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d252f894aefb6cf26a590e775a56… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 26 12:15:52 2024 -0400 vkd3d-shader/hlsl: Run more constant passes on static expressions eval. --- libs/vkd3d-shader/hlsl.y | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c6b6219e..9c1bdef9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1293,7 +1293,7 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str struct hlsl_ir_node *node; struct hlsl_block expr; unsigned int ret = 0; - bool progress; + struct hlsl_src src; LIST_FOR_EACH_ENTRY(node, &block->instrs, struct hlsl_ir_node, entry) { @@ -1330,13 +1330,12 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str return 0; } - do - { - progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, &expr, NULL); - progress |= hlsl_copy_propagation_execute(ctx, &expr); - } while (progress); + /* Wrap the node into a src to allow the reference to survive the multiple const passes. */ + hlsl_src_from_node(&src, node_from_block(&expr)); + hlsl_run_const_passes(ctx, &expr); + node = src.node; + hlsl_src_remove(&src); - node = node_from_block(&expr); if (node->type == HLSL_IR_CONSTANT) { constant = hlsl_ir_constant(node);

1 0

Francisco Casas : vkd3d-shader/hlsl: Run constant passes in a separate function.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: 4f60c7167e7babb2727e5337a91fdd17d7cfd617 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4f60c7167e7babb2727e5337a91fd… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 26 12:15:52 2024 -0400 vkd3d-shader/hlsl: Run constant passes in a separate function. --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 66 ++++++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 0210cf9d..ca648149 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1250,6 +1250,7 @@ bool hlsl_clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, const void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); +void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body); int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); int hlsl_emit_effect_binary(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 26179042..51067960 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5408,6 +5408,41 @@ static void remove_unreachable_code(struct hlsl_ctx *ctx, struct hlsl_block *bod } } +void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body) +{ + bool progress; + + lower_ir(ctx, lower_broadcasts, body); + while (hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL)); + do + { + progress = hlsl_transform_ir(ctx, split_array_copies, body, NULL); + progress |= hlsl_transform_ir(ctx, split_struct_copies, body, NULL); + } + while (progress); + hlsl_transform_ir(ctx, split_matrix_copies, body, NULL); + + lower_ir(ctx, lower_narrowing_casts, body); + lower_ir(ctx, lower_int_dot, body); + lower_ir(ctx, lower_int_division, body); + lower_ir(ctx, lower_int_modulus, body); + lower_ir(ctx, lower_int_abs, body); + lower_ir(ctx, lower_casts_to_bool, body); + lower_ir(ctx, lower_float_modulus, body); + hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); + + do + { + progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); + progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_identities, body, NULL); + progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_swizzles, body, NULL); + progress |= hlsl_copy_propagation_execute(ctx, body); + progress |= hlsl_transform_ir(ctx, fold_swizzle_chains, body, NULL); + progress |= hlsl_transform_ir(ctx, remove_trivial_swizzles, body, NULL); + progress |= hlsl_transform_ir(ctx, remove_trivial_conditional_branches, body, NULL); + } while (progress); +} + int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { @@ -5416,7 +5451,6 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry struct recursive_call_ctx recursive_call_ctx; struct hlsl_ir_var *var; unsigned int i; - bool progress; list_move_head(&body->instrs, &ctx->static_initializers.instrs); @@ -5494,35 +5528,9 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { hlsl_transform_ir(ctx, lower_discard_neg, body, NULL); } - lower_ir(ctx, lower_broadcasts, body); - while (hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL)); - do - { - progress = hlsl_transform_ir(ctx, split_array_copies, body, NULL); - progress |= hlsl_transform_ir(ctx, split_struct_copies, body, NULL); - } - while (progress); - hlsl_transform_ir(ctx, split_matrix_copies, body, NULL); - lower_ir(ctx, lower_narrowing_casts, body); - lower_ir(ctx, lower_int_dot, body); - lower_ir(ctx, lower_int_division, body); - lower_ir(ctx, lower_int_modulus, body); - lower_ir(ctx, lower_int_abs, body); - lower_ir(ctx, lower_casts_to_bool, body); - lower_ir(ctx, lower_float_modulus, body); - hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); - do - { - progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); - progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_identities, body, NULL); - progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_swizzles, body, NULL); - progress |= hlsl_copy_propagation_execute(ctx, body); - progress |= hlsl_transform_ir(ctx, fold_swizzle_chains, body, NULL); - progress |= hlsl_transform_ir(ctx, remove_trivial_swizzles, body, NULL); - progress |= hlsl_transform_ir(ctx, remove_trivial_conditional_branches, body, NULL); - } - while (progress); + hlsl_run_const_passes(ctx, body); + remove_unreachable_code(ctx, body); hlsl_transform_ir(ctx, normalize_switch_cases, body, NULL);

1 0