January 2023 - Wine-commits

Zebediah Figura : ntdll: Manually write byte code for the xsavec instruction.
by Alexandre Julliard 12 Jan '23

12 Jan '23

Module: wine Branch: master Commit: 5250493177f3dcb1ab455e018c1c3046198db746 URL: https://gitlab.winehq.org/wine/wine/-/commit/5250493177f3dcb1ab455e018c1c30… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 11 17:12:05 2023 -0600 ntdll: Manually write byte code for the xsavec instruction. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51268 --- dlls/ntdll/unix/signal_i386.c | 4 +++- dlls/ntdll/unix/signal_x86_64.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index d665e281176..d800885748f 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2601,7 +2601,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %edx,0x274(%ecx)\n\t" "movl %edx,0x278(%ecx)\n\t" "movl %edx,0x27c(%ecx)\n\t" - "xsavec 0x40(%ecx)\n\t" + /* The xsavec instruction is not supported by + * binutils < 2.25. */ + ".byte 0x0f, 0xc7, 0x61, 0x40\n\t" /* xsavec 0x40(%ecx) */ "jmp 4f\n" "1:\txsave 0x40(%ecx)\n\t" "jmp 4f\n" diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6f02f5c6114..94d79b9cdd1 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2693,7 +2693,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq %rdx,0x2e8(%rcx)\n\t" "movq %rdx,0x2f0(%rcx)\n\t" "movq %rdx,0x2f8(%rcx)\n\t" - "xsavec64 0xc0(%rcx)\n\t" + /* The xsavec instruction is not supported by + * binutils < 2.25. */ + ".byte 0x48, 0x0f, 0xc7, 0xa1, 0xc0, 0x00, 0x00, 0x00\n\t" /* xsavec64 0xc0(%rcx) */ "jmp 3f\n" "1:\txsave64 0xc0(%rcx)\n\t" "jmp 3f\n"

1 0

Alexandre Julliard : tools: Create a temporary directory to store temp files.
by Alexandre Julliard 12 Jan '23

12 Jan '23

Module: wine Branch: master Commit: bdc40b4b60d0f8a8532e920547de7c8fa2975474 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc40b4b60d0f8a8532e920547de7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 12 13:00:55 2023 +0100 tools: Create a temporary directory to store temp files. --- tools/tools.h | 46 +++++++++++++++++++++++++++++++++------------- tools/widl/widl.c | 3 +++ tools/winebuild/utils.c | 2 ++ tools/winegcc/winegcc.c | 2 ++ tools/wrc/wrc.c | 2 ++ 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index 1e86e38356d..456633e4277 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -319,33 +319,53 @@ static inline char *replace_extension( const char *name, const char *old_ext, co return strmake( "%.*s%s", name_len, name, new_ext ); } +/* temp files management */ -static inline int make_temp_file( const char *prefix, const char *suffix, char **name ) +extern const char *temp_dir; + +static inline char *make_temp_dir(void) { - static unsigned int value; - int fd, count; + unsigned int value = time(NULL) + getpid(); + int count; + char *name; const char *tmpdir = NULL; - if (!prefix) prefix = "tmp"; - if (!suffix) suffix = ""; - value += time(NULL) + getpid(); - for (count = 0; count < 0x8000; count++) { if (tmpdir) - *name = strmake( "%s/%s-%08x%s", tmpdir, prefix, value, suffix ); + name = strmake( "%s/tmp%08x", tmpdir, value ); else - *name = strmake( "%s-%08x%s", prefix, value, suffix ); - fd = open( *name, O_RDWR | O_CREAT | O_EXCL, 0600 ); - if (fd >= 0) return fd; + name = strmake( "tmp%08x", value ); + if (!mkdir( name, 0700 )) return name; value += 7777; - if (errno == EACCES && !tmpdir && !strchr( prefix, '/' )) + if (errno == EACCES && !tmpdir) { if (!(tmpdir = getenv("TMPDIR"))) tmpdir = "/tmp"; } + free( name ); + } + fprintf( stderr, "failed to create directory for temp files\n" ); + exit(1); +} + +static inline int make_temp_file( const char *prefix, const char *suffix, char **name ) +{ + static unsigned int value; + int fd, count; + + if (!temp_dir) temp_dir = make_temp_dir(); + if (!suffix) suffix = ""; + if (!prefix) prefix = "tmp"; + else prefix = get_basename_noext( prefix ); + + for (count = 0; count < 0x8000; count++) + { + *name = strmake( "%s/%s-%08x%s", temp_dir, prefix, value++, suffix ); + fd = open( *name, O_RDWR | O_CREAT | O_EXCL, 0600 ); + if (fd >= 0) return fd; free( *name ); } - fprintf( stderr, "failed to create temp file for %s%s\n", prefix, suffix ); + fprintf( stderr, "failed to create temp file for %s%s in %s\n", prefix, suffix, temp_dir ); exit(1); } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 4b26e3a0991..79d895b52bf 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -135,6 +135,7 @@ char *regscript_name; char *regscript_token; static char *idfile_name; char *temp_name; +const char *temp_dir = NULL; const char *prefix_client = ""; const char *prefix_server = ""; static const char *includedir; @@ -931,4 +932,6 @@ static void rm_tempfile(void) unlink(proxy_name); if (do_typelib) unlink(typelib_name); + if (temp_dir) + rmdir(temp_dir); } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 21de209f65c..22eb60236b0 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -29,6 +29,7 @@ #include "build.h" +const char *temp_dir = NULL; static struct strarray tmp_files; static const char *output_file_source_name; @@ -37,6 +38,7 @@ void cleanup_tmp_files(void) { unsigned int i; for (i = 0; i < tmp_files.count; i++) if (tmp_files.str[i]) unlink( tmp_files.str[i] ); + if (temp_dir) rmdir( temp_dir ); } diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 142ab81de12..2e656f7ea83 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -147,6 +147,7 @@ static const char *output_file_name; static const char *output_debug_file; static const char *output_implib; static int keep_generated = 0; +const char *temp_dir = NULL; static struct strarray tmp_files; #ifdef HAVE_SIGSET_T static sigset_t signal_mask; @@ -222,6 +223,7 @@ static void clean_temp_files(void) for (i = 0; i < tmp_files.count; i++) unlink(tmp_files.str[i]); + if (temp_dir) rmdir( temp_dir ); } /* clean things up when aborting on a signal */ diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 2448fff11eb..a1e59c3d2b3 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -135,6 +135,7 @@ static char *output_name; /* The name given by the -o option */ const char *input_name = NULL; /* The name given on the command-line */ static char *temp_name = NULL; /* Temporary file for preprocess pipe */ static struct strarray input_files; +const char *temp_dir = NULL; static int stdinc = 1; static int po_mode; @@ -519,4 +520,5 @@ static void cleanup_files(void) { if (output_name) unlink(output_name); if (temp_name) unlink(temp_name); + if (temp_dir) rmdir(temp_dir); }

1 0

Hans Leidekker : ntdll: Fix a test failure on Windows 11.
by Alexandre Julliard 12 Jan '23

12 Jan '23

Module: wine Branch: master Commit: 1318f8aa0ae53abc3047d3beb448b1bd822e5860 URL: https://gitlab.winehq.org/wine/wine/-/commit/1318f8aa0ae53abc3047d3beb448b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 12 15:38:02 2023 +0100 ntdll: Fix a test failure on Windows 11. --- dlls/ntdll/tests/info.c | 43 ++++++++++++++++++++++++++++++++++++------- include/winnt.h | 3 +++ 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f583f0d0a76..192f6be7ce9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1167,9 +1167,12 @@ static void test_query_logicalproc(void) static void test_query_logicalprocex(void) { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *infoex, *infoex_public, *infoex_core, *infoex_numa, - *infoex_cache, *infoex_package, *infoex_group, *ex; - DWORD relationship, len, len_public, len_core, len_numa, len_cache, len_package, len_group, len_union, ret_len; + static const char * const names[] = { "Core", "NumaNode", "Cache", "Package", "Group", "Die", "NumaNodeEx", "Module" }; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *infoex, *infoex_public, *infoex_core, *infoex_numa, *infoex_cache, + *infoex_package, *infoex_group, *infoex_die, *infoex_numa_ex, + *infoex_module, *ex; + DWORD relationship, len, len_public, len_core, len_numa, len_cache, len_package, len_group, len_die, len_numa_ex, + len_module, len_union, ret_len; unsigned int i, j; NTSTATUS status; BOOL ret; @@ -1213,6 +1216,23 @@ static void test_query_logicalprocex(void) ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status); ok(len_group > 0, "got %lu\n", len_group); + relationship = RelationProcessorDie; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_die); + todo_wine ok(status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_UNSUCCESSFUL || broken(status == STATUS_SUCCESS), + "got 0x%08lx\n", status); + + len_numa_ex = 0; + relationship = RelationNumaNodeEx; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_numa_ex); + todo_wine ok(status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_UNSUCCESSFUL || broken(status == STATUS_SUCCESS), + "got 0x%08lx\n", status); + + len_module = 0; + relationship = RelationProcessorModule; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_module); + todo_wine ok(status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_UNSUCCESSFUL || broken(status == STATUS_SUCCESS), + "got 0x%08lx\n", status); + len_public = 0; ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len_public); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %ld\n", ret, GetLastError()); @@ -1225,6 +1245,9 @@ static void test_query_logicalprocex(void) infoex_cache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_cache); infoex_package = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_package); infoex_group = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_group); + infoex_die = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_die); + infoex_numa_ex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_numa_ex); + infoex_module = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_module); relationship = RelationAll; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &ret_len); @@ -1252,7 +1275,9 @@ static void test_query_logicalprocex(void) { case RelationProcessorCore: case RelationProcessorPackage: - trace("infoex[%u].Relationship: 0x%x (%s)\n", i, ex->Relationship, ex->Relationship == RelationProcessorCore ? "Core" : "Package"); + case RelationProcessorDie: + case RelationProcessorModule: + trace("infoex[%u].Relationship: 0x%x (%s)\n", i, ex->Relationship, names[ex->Relationship]); trace("infoex[%u].Processor.Flags: 0x%x\n", i, ex->Processor.Flags); trace("infoex[%u].Processor.EfficiencyClass: 0x%x\n", i, ex->Processor.EfficiencyClass); trace("infoex[%u].Processor.GroupCount: 0x%x\n", i, ex->Processor.GroupCount); @@ -1263,7 +1288,8 @@ static void test_query_logicalprocex(void) } break; case RelationNumaNode: - trace("infoex[%u].Relationship: 0x%x (NumaNode)\n", i, ex->Relationship); + case RelationNumaNodeEx: + trace("infoex[%u].Relationship: 0x%x (%s)\n", i, ex->Relationship, names[ex->Relationship]); trace("infoex[%u].NumaNode.NodeNumber: 0x%lx\n", i, ex->NumaNode.NodeNumber); trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%Ix\n", i, ex->NumaNode.GroupMask.Mask); trace("infoex[%u].NumaNode.GroupMask.Group: 0x%x\n", i, ex->NumaNode.GroupMask.Group); @@ -1359,8 +1385,8 @@ static void test_query_logicalprocex(void) i += ex->Size; } - len_union = len_core + len_numa + len_cache + len_package + len_group; - ok(len == len_union, "Expected 0x%lx, got 0x%0lx\n", len, len_union); + len_union = len_core + len_numa + len_cache + len_package + len_group + len_module; + ok(len == len_union, "Expected %lu, got %lu\n", len, len_union); HeapFree(GetProcessHeap(), 0, infoex); HeapFree(GetProcessHeap(), 0, infoex_public); @@ -1369,6 +1395,9 @@ static void test_query_logicalprocex(void) HeapFree(GetProcessHeap(), 0, infoex_cache); HeapFree(GetProcessHeap(), 0, infoex_package); HeapFree(GetProcessHeap(), 0, infoex_group); + HeapFree(GetProcessHeap(), 0, infoex_die); + HeapFree(GetProcessHeap(), 0, infoex_numa_ex); + HeapFree(GetProcessHeap(), 0, infoex_module); } static void test_query_cpusetinfo(void) diff --git a/include/winnt.h b/include/winnt.h index 14cfe64af74..f40136a2003 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6075,6 +6075,9 @@ typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP RelationCache = 2, RelationProcessorPackage = 3, RelationGroup = 4, + RelationProcessorDie = 5, + RelationNumaNodeEx = 6, + RelationProcessorModule = 7, RelationAll = 0xffff } LOGICAL_PROCESSOR_RELATIONSHIP;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 12 Jan '23

12 Jan '23

Module: wine Branch: master Commit: 047118247ce489a7138428c8b2cd5692ed04337e URL: https://gitlab.winehq.org/wine/wine/-/commit/047118247ce489a7138428c8b2cd56… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jan 12 16:46:58 2023 +0100 po: Update German translation. --- po/de.po | 60 +++++++++++++++++++++++++++--------------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/po/de.po b/po/de.po index 3a3b03db896..235569a0fab 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-09-05 10:50+0200\n" +"PO-Revision-Date: 2023-01-12 16:46+0100\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3740,7 +3740,7 @@ msgstr "Verbunden" #: dlls/joy.cpl/joy.rc:46 msgid "Connected (xinput device)" -msgstr "Verbunden (xinput-Geräte)" +msgstr "Verbunden (XInput-Geräte)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3756,25 +3756,23 @@ msgstr "" #: dlls/joy.cpl/joy.rc:55 msgid "DInput" -msgstr "" +msgstr "DInput" #: dlls/joy.cpl/joy.rc:59 msgid "Axes" -msgstr "" +msgstr "Achsen" #: dlls/joy.cpl/joy.rc:60 msgid "POVs" -msgstr "" +msgstr "POVs" #: dlls/joy.cpl/joy.rc:61 msgid "Buttons" msgstr "Tasten" #: dlls/joy.cpl/joy.rc:62 -#, fuzzy -#| msgid "Test Force Feedback" msgid "Force Feedback Effect" -msgstr "Force Feedback testen" +msgstr "Force-Feedback-Effekt" #: dlls/joy.cpl/joy.rc:64 msgid "" @@ -3787,60 +3785,60 @@ msgstr "" #: dlls/joy.cpl/joy.rc:70 msgid "XInput" -msgstr "" +msgstr "XInput" #: dlls/joy.cpl/joy.rc:73 -#, fuzzy -#| msgid "User" msgid "User #0" -msgstr "Benutzername" +msgstr "Benutzer #0" #: dlls/joy.cpl/joy.rc:74 -#, fuzzy -#| msgid "User" msgid "User #1" -msgstr "Benutzername" +msgstr "Benutzer #1" #: dlls/joy.cpl/joy.rc:75 -#, fuzzy -#| msgid "User" msgid "User #2" -msgstr "Benutzername" +msgstr "Benutzer #2" #: dlls/joy.cpl/joy.rc:76 -#, fuzzy -#| msgid "User" msgid "User #3" -msgstr "Benutzername" +msgstr "Benutzer #3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"Kein Gerät auf Platz #0 erkannt, stellen Sie sicher, dass Ihr Gamepad " +"eingesteckt ist und nicht im Joysticks-Tab für DInput überschrieben wurde." #: dlls/joy.cpl/joy.rc:82 msgid "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"Kein Gerät auf Platz #1 erkannt, stellen Sie sicher, dass Ihr Gamepad " +"eingesteckt ist und nicht im Joysticks-Tab für DInput überschrieben wurde." #: dlls/joy.cpl/joy.rc:86 msgid "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"Kein Gerät auf Platz #2 erkannt, stellen Sie sicher, dass Ihr Gamepad " +"eingesteckt ist und nicht im Joysticks-Tab für DInput überschrieben wurde." #: dlls/joy.cpl/joy.rc:90 msgid "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " "overridden for DInput in the Joysticks tab." msgstr "" +"Kein Gerät auf Platz #3 erkannt, stellen Sie sicher, dass Ihr Gamepad " +"eingesteckt ist und nicht im Joysticks-Tab für DInput überschrieben wurde." #: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 #: dlls/joy.cpl/joy.rc:98 msgid "Rumble" -msgstr "" +msgstr "Rumble" #: dlls/joy.cpl/joy.rc:31 msgid "Game Controllers" @@ -15198,7 +15196,7 @@ msgstr "&Zeilenumbruch" #: programs/notepad/notepad.rc:56 msgid "&Search...\tCtrl+F" -msgstr "Suchen...\tStrg+F" +msgstr "&Suchen...\tStrg+F" #: programs/notepad/notepad.rc:57 msgid "&Search next\tF3" @@ -15209,10 +15207,8 @@ msgid "&Replace...\tCtrl+H" msgstr "Erset&zen...\tStrg+H" #: programs/notepad/notepad.rc:59 -#, fuzzy -#| msgid "&New...\tCtrl+N" msgid "&Go To...\tCtrl+G" -msgstr "&Neu...\tStrg+N" +msgstr "Zu &Zeile...\tStrg+G" #: programs/notepad/notepad.rc:63 programs/oleview/oleview.rc:68 #: programs/oleview/oleview.rc:90 programs/winefile/winefile.rc:67 @@ -15255,17 +15251,15 @@ msgstr "&Oben:" #: programs/notepad/notepad.rc:132 msgid "Go To Line" -msgstr "" +msgstr "Zu Zeile springen" #: programs/notepad/notepad.rc:134 -#, fuzzy -#| msgid "CRL Number" msgid "&Line Number:" -msgstr "CRL-Nummer" +msgstr "&Zeilennummer:" #: programs/notepad/notepad.rc:137 msgid "Go To" -msgstr "" +msgstr "Springen" #: programs/notepad/notepad.rc:145 msgid "Encoding:" @@ -15331,7 +15325,7 @@ msgstr "Z" #: programs/notepad/notepad.rc:162 msgctxt "accelerator GoTo" msgid "G" -msgstr "" +msgstr "G" #: programs/notepad/notepad.rc:74 msgid "Page &p" @@ -15408,7 +15402,7 @@ msgstr "" #: programs/notepad/notepad.rc:90 msgid "Ln %ld, Col %ld" -msgstr "" +msgstr "Z. %ld, Sp. %ld" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..."

1 0

Zebediah Figura : ntdll: Check for AT_HWCAP2 definition before using it.
by Alexandre Julliard 12 Jan '23

12 Jan '23

Module: wine Branch: master Commit: 95fe8e5d152338c17152fc06024c081f7f4181b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/95fe8e5d152338c17152fc06024c08… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 11 16:42:25 2023 -0600 ntdll: Check for AT_HWCAP2 definition before using it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54210 --- dlls/ntdll/unix/signal_x86_64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 15d1a3539a1..6f02f5c6114 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2429,7 +2429,9 @@ void signal_init_process(void) { amd64_thread_data()->fs = fs32_sel = (sel << 3) | 3; syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; +#ifdef AT_HWCAP2 if (getauxval( AT_HWCAP2 ) & 2) syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; +#endif } else ERR_(seh)( "failed to allocate %%fs selector\n" ); }

1 0

Fabian Maurer : vkd3d-shader/hlsl: Fix typo (Coverity).
by Alexandre Julliard 11 Jan '23

11 Jan '23

Module: vkd3d Branch: master Commit: 9519fcb56206511aa1a369936681c50e434afda7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9519fcb56206511aa1a369936681c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 19:53:24 2022 +0100 vkd3d-shader/hlsl: Fix typo (Coverity). I assume this is a typo, right now it doesn't make sense. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f67b5118..bd26228f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3140,7 +3140,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl if (!strcmp(name, "Gather") || !offset_dim) { - if (params->args_count < 2 && params->args_count > 3 + !!offset_dim) + if (params->args_count < 2 || params->args_count > 3 + !!offset_dim) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Wrong number of arguments to method '%s': expected from 2 to %u, but got %u.",

1 0

Francisco Casas : vkd3d-shader/hlsl: Rename HLSL_STORAGE_VOLATILE to HLSL_MODIFIER_VOLATILE.
by Alexandre Julliard 11 Jan '23

11 Jan '23

Module: vkd3d Branch: master Commit: 23bd2d9ad8f296ab6002117ec5ac836a47775983 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23bd2d9ad8f296ab6002117ec5ac8… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Dec 12 20:17:53 2022 -0300 vkd3d-shader/hlsl: Rename HLSL_STORAGE_VOLATILE to HLSL_MODIFIER_VOLATILE. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8aa289ac..b6773876 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1491,7 +1491,7 @@ struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsig vkd3d_string_buffer_printf(string, "static "); if (modifiers & HLSL_STORAGE_UNIFORM) vkd3d_string_buffer_printf(string, "uniform "); - if (modifiers & HLSL_STORAGE_VOLATILE) + if (modifiers & HLSL_MODIFIER_VOLATILE) vkd3d_string_buffer_printf(string, "volatile "); if (modifiers & HLSL_MODIFIER_CONST) vkd3d_string_buffer_printf(string, "const "); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b6a593ca..cab3d6e5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -228,14 +228,14 @@ struct hlsl_attribute #define HLSL_STORAGE_GROUPSHARED 0x00000010 #define HLSL_STORAGE_STATIC 0x00000020 #define HLSL_STORAGE_UNIFORM 0x00000040 -#define HLSL_STORAGE_VOLATILE 0x00000080 +#define HLSL_MODIFIER_VOLATILE 0x00000080 #define HLSL_MODIFIER_CONST 0x00000100 #define HLSL_MODIFIER_ROW_MAJOR 0x00000200 #define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 #define HLSL_STORAGE_IN 0x00000800 #define HLSL_STORAGE_OUT 0x00001000 -#define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \ +#define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ HLSL_MODIFIER_COLUMN_MAJOR) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bd26228f..dfa90297 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4353,7 +4353,7 @@ var_modifiers: } | KW_VOLATILE var_modifiers { - $$ = add_modifiers(ctx, $2, HLSL_STORAGE_VOLATILE, @1); + $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_VOLATILE, @1); } | KW_CONST var_modifiers {

1 0

Francisco Casas : vkd3d-shader/hlsl: Rename hlsl_ir_var.modifiers to "storage_modifiers".
by Alexandre Julliard 11 Jan '23

11 Jan '23

Module: vkd3d Branch: master Commit: 4dbbb8beb4d071bf31339fe00b182a5c3f8d8f1c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4dbbb8beb4d071bf31339fe00b182… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Nov 29 16:10:40 2022 -0300 vkd3d-shader/hlsl: Rename hlsl_ir_var.modifiers to "storage_modifiers". --- libs/vkd3d-shader/hlsl.c | 6 +++--- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 6 +++--- libs/vkd3d-shader/hlsl_codegen.c | 14 +++++++------- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b6773876..b4f705da 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -778,7 +778,7 @@ struct hlsl_ir_var *hlsl_new_var(struct hlsl_ctx *ctx, const char *name, struct var->loc = loc; if (semantic) var->semantic = *semantic; - var->modifiers = modifiers; + var->storage_modifiers = modifiers; if (reg_reservation) var->reg_reservation = *reg_reservation; return var; @@ -1556,11 +1556,11 @@ static void dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl_src * static void dump_ir_var(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, const struct hlsl_ir_var *var) { - if (var->modifiers) + if (var->storage_modifiers) { struct vkd3d_string_buffer *string; - if ((string = hlsl_modifiers_to_string(ctx, var->modifiers))) + if ((string = hlsl_modifiers_to_string(ctx, var->storage_modifiers))) vkd3d_string_buffer_printf(buffer, "%s ", string->buffer); hlsl_release_string_buffer(ctx, string); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index cab3d6e5..74f62ad5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -256,7 +256,7 @@ struct hlsl_ir_var const char *name; struct hlsl_semantic semantic; struct hlsl_buffer *buffer; - unsigned int modifiers; + unsigned int storage_modifiers; struct hlsl_reg_reservation reg_reservation; struct list scope_entry, param_entry, extern_entry; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index dfa90297..d457ab97 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2060,9 +2060,9 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t * variables also get put in the global scope, but shouldn't be * considered uniforms, and we have no way of telling otherwise. */ if (!(modifiers & HLSL_STORAGE_STATIC)) - var->modifiers |= HLSL_STORAGE_UNIFORM; + var->storage_modifiers |= HLSL_STORAGE_UNIFORM; - if (ctx->profile->major_version < 5 && (var->modifiers & HLSL_STORAGE_UNIFORM) && + if (ctx->profile->major_version < 5 && (var->storage_modifiers & HLSL_STORAGE_UNIFORM) && type_has_object_components(var->data_type, true)) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, @@ -2096,7 +2096,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Semantics are not allowed on local variables."); } - if ((var->modifiers & HLSL_STORAGE_STATIC) && type_has_numeric_components(var->data_type) + if ((var->storage_modifiers & HLSL_STORAGE_STATIC) && type_has_numeric_components(var->data_type) && type_has_object_components(var->data_type, false)) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6e4168fc..45b6e1d0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -184,7 +184,7 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru * can write the uniform name into the shader reflection data. */ if (!(uniform = hlsl_new_var(ctx, temp->name, temp->data_type, - temp->loc, NULL, temp->modifiers, &temp->reg_reservation))) + temp->loc, NULL, temp->storage_modifiers, &temp->reg_reservation))) return; list_add_before(&temp->scope_entry, &uniform->scope_entry); list_add_tail(&ctx->extern_vars, &uniform->extern_entry); @@ -334,7 +334,7 @@ static void prepend_input_var_copy(struct hlsl_ctx *ctx, struct list *instrs, st if (var->data_type->type == HLSL_CLASS_STRUCT) prepend_input_struct_copy(ctx, instrs, load); else if (var->semantic.name) - prepend_input_copy(ctx, instrs, load, var->modifiers, &var->semantic); + prepend_input_copy(ctx, instrs, load, var->storage_modifiers, &var->semantic); } static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_load *rhs, @@ -430,7 +430,7 @@ static void append_output_var_copy(struct hlsl_ctx *ctx, struct list *instrs, st if (var->data_type->type == HLSL_CLASS_STRUCT) append_output_struct_copy(ctx, instrs, load); else if (var->semantic.name) - append_output_copy(ctx, instrs, load, var->modifiers, &var->semantic); + append_output_copy(ctx, instrs, load, var->storage_modifiers, &var->semantic); } static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), @@ -2610,13 +2610,13 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { - if (var->modifiers & HLSL_STORAGE_UNIFORM) + if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) prepend_uniform_copy(ctx, &body->instrs, var); } LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { - if (var->data_type->type == HLSL_CLASS_OBJECT || (var->modifiers & HLSL_STORAGE_UNIFORM)) + if (var->data_type->type == HLSL_CLASS_OBJECT || (var->storage_modifiers & HLSL_STORAGE_UNIFORM)) { prepend_uniform_copy(ctx, &body->instrs, var); } @@ -2626,9 +2626,9 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, "Parameter \"%s\" is missing a semantic.", var->name); - if (var->modifiers & HLSL_STORAGE_IN) + if (var->storage_modifiers & HLSL_STORAGE_IN) prepend_input_var_copy(ctx, &body->instrs, var); - if (var->modifiers & HLSL_STORAGE_OUT) + if (var->storage_modifiers & HLSL_STORAGE_OUT) append_output_var_copy(ctx, &body->instrs, var); } } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index ae5bb1ac..d9d05e04 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1232,7 +1232,7 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b { enum vkd3d_shader_interpolation_mode mode = VKD3DSIM_LINEAR; - if ((var->modifiers & HLSL_STORAGE_NOINTERPOLATION) || type_is_integer(var->data_type)) + if ((var->storage_modifiers & HLSL_STORAGE_NOINTERPOLATION) || type_is_integer(var->data_type)) mode = VKD3DSIM_CONSTANT; instr.opcode |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT;

1 0

Francisco Casas : vkd3d-shader/hlsl: Rename hlsl_struct_field.modifiers to "storage_modifiers".
by Alexandre Julliard 11 Jan '23

11 Jan '23

Module: vkd3d Branch: master Commit: cc811dc3c210f5830cc928c9cd9444741c245e43 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cc811dc3c210f5830cc928c9cd944… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Nov 29 16:31:54 2022 -0300 vkd3d-shader/hlsl: Rename hlsl_struct_field.modifiers to "storage_modifiers". --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 74f62ad5..e80e315a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -156,7 +156,7 @@ struct hlsl_struct_field struct hlsl_type *type; const char *name; struct hlsl_semantic semantic; - unsigned int modifiers; + unsigned int storage_modifiers; unsigned int reg_offset; size_t name_bytecode_offset; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d457ab97..eee487ef 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -983,7 +983,7 @@ static bool gen_struct_fields(struct hlsl_ctx *ctx, struct parse_fields *fields, field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; - field->modifiers = modifiers; + field->storage_modifiers = modifiers; if (v->initializer.args_count) { hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field."); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 45b6e1d0..d21e31be 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -313,7 +313,7 @@ static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, if (field->type->type == HLSL_CLASS_STRUCT) prepend_input_struct_copy(ctx, instrs, field_load); else if (field->semantic.name) - prepend_input_copy(ctx, instrs, field_load, field->modifiers, &field->semantic); + prepend_input_copy(ctx, instrs, field_load, field->storage_modifiers, &field->semantic); else hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, "Field '%s' is missing a semantic.", field->name); @@ -408,7 +408,7 @@ static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, if (field->type->type == HLSL_CLASS_STRUCT) append_output_struct_copy(ctx, instrs, field_load); else if (field->semantic.name) - append_output_copy(ctx, instrs, field_load, field->modifiers, &field->semantic); + append_output_copy(ctx, instrs, field_load, field->storage_modifiers, &field->semantic); else hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, "Field '%s' is missing a semantic.", field->name);

1 0

Francisco Casas : vkd3d-shader/hlsl: Add field-level documentation to struct hlsl_type.
by Alexandre Julliard 11 Jan '23

11 Jan '23

Module: vkd3d Branch: master Commit: 3a53da7f5bdfe02cbda47fb07306160e085ad291 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3a53da7f5bdfe02cbda47fb073061… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Nov 14 13:48:55 2022 -0300 vkd3d-shader/hlsl: Add field-level documentation to struct hlsl_type. --- libs/vkd3d-shader/hlsl.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e80e315a..d672de0b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -114,33 +114,74 @@ enum hlsl_matrix_majority HLSL_ROW_MAJOR }; +/* An HLSL source-level data type, including anonymous structs and typedefs. */ struct hlsl_type { + /* Item entry in hlsl_ctx->types. */ struct list entry; + /* Item entry in hlsl_scope->types. hlsl_type->name is used as key (if not NULL). */ struct rb_entry scope_entry; + enum hlsl_type_class type; + /* If type is <= HLSL_CLASS_LAST_NUMERIC, then base_type is <= HLSL_TYPE_LAST_SCALAR. + * If type is HLSL_CLASS_OBJECT, then base_type is > HLSL_TYPE_LAST_SCALAR. + * Otherwise, base_type is not used. */ enum hlsl_base_type base_type; + + /* If base_type is HLSL_TYPE_SAMPLER, then sampler_dim is <= HLSL_SAMPLER_DIM_LAST_SAMPLER. + * If base_type is HLSL_TYPE_TEXTURE, then sampler_dim can have any value of the enum. + * If base_type is HLSL_TYPE_UAV, them sampler_dim must be one of HLSL_SAMPLER_DIM_1D, + * HLSL_SAMPLER_DIM_2D, HLSL_SAMPLER_DIM_3D, HLSL_SAMPLER_DIM_1DARRAY, or HLSL_SAMPLER_DIM_2DARRAY. + * Otherwise, sampler_dim is not used */ enum hlsl_sampler_dim sampler_dim; + /* Name, in case the type is a named struct or a typedef. */ const char *name; + /* Bitfield for storing type modifiers, subset of HLSL_TYPE_MODIFIERS_MASK. + * Modifiers that don't fall inside this mask are to be stored in the variable in + * hlsl_ir_var.modifiers, or in the struct field in hlsl_ir_field.modifiers. */ unsigned int modifiers; + /* Size of the type values on each dimension. For non-numeric types, they are set for the + * convenience of the sm1/sm4 backends. + * If type is HLSL_CLASS_SCALAR, then both dimx = 1 and dimy = 1. + * If type is HLSL_CLASS_VECTOR, then dimx is the size of the vector, and dimy = 1. + * If type is HLSL_CLASS_MATRIX, then dimx is the number of columns, and dimy the number of rows. + * If type is HLSL_CLASS_ARRAY, then dimx and dimy have the same value as in the type of the array elements. + * If type is HLSL_CLASS_STRUCT, then dimx is the sum of (dimx * dimy) of every component, and dimy = 1. + * If type is HLSL_CLASS_OBJECT, dimx and dimy depend on the base_type: + * If base_type is HLSL_TYPE_SAMPLER, then both dimx = 1 and dimy = 1. + * If base_type is HLSL_TYPE_TEXTURE, then dimx = 4 and dimy = 1. + * If base_type is HLSL_TYPE_UAV, then dimx is the dimx of e.resource_format, and dimy = 1. + * Otherwise both dimx = 1 and dimy = 1. */ unsigned int dimx; unsigned int dimy; + union { + /* Additional information if type is HLSL_CLASS_STRUCT. */ struct { struct hlsl_struct_field *fields; size_t field_count; } record; + /* Additional information if type is HLSL_CLASS_ARRAY. */ struct { struct hlsl_type *type; + /* Array lenght, or HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT if it is unknown yet while parsing. */ unsigned int elements_count; } array; + /* Format of the data contained within the type if the base_type is HLSL_TYPE_TEXTURE or + * HLSL_TYPE_UAV. */ struct hlsl_type *resource_format; } e; + /* Number of numeric register components used by one value of this type (4 components make 1 + * register). + * If type is HLSL_CLASS_STRUCT or HLSL_CLASS_ARRAY, this value includes the reg_size of + * their elements and padding (which varies according to the backend). + * This value is 0 for types without numeric components, like objects. */ unsigned int reg_size; + /* Offset where the type's description starts in the output bytecode, in bytes. */ size_t bytecode_offset; };

1 0