January 2021 - Wine-Commits

Francois Gouget : testbot: Take into account configure for the build timeout.
by Alexandre Julliard Jan. 15, 2021

Jan. 15, 2021

Module: tools Branch: master Commit: e9d470d7e63724d8f989603b47830ece7fc1b1d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e9d470d7e63724d8f989603… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 15 16:09:19 2021 +0100 testbot: Take into account configure for the build timeout. It is likely that configure will need to be rerun after a make_makefiles, even outside of full rebuilds. In particular this is the case when adding a new dll, program or test directory. So take the configure time out of the full-rebuild timeouts and into its own $ReconfigBuildTimeout setting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 11 +++++++---- testbot/lib/WineTestBot/PatchUtils.pm | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 68709e5..2f01e95 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc - $ExeBuildTimeout $ExeModuleTimeout + $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList $LDAPServer @@ -48,7 +48,7 @@ require Exporter; $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $ExeBuildTimeout $ExeModuleTimeout + $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList @@ -109,15 +109,18 @@ $MaxVMErrors = 3; # How many times to run a test that fails before giving up. $MaxTaskTries = 3; +# Build configure timeout (in seconds) +$ReconfigBuildTimeout = 60; + # Exe build timeouts (in seconds) # - For a full build -$ExeBuildTimeout = 7 * 60; +$ExeBuildTimeout = 6 * 60; # - For a single module $ExeModuleTimeout = 30; # Wine build timeouts (in seconds) # - For a full build -$WineBuildTimeout = 25 * 60; +$WineBuildTimeout = 24 * 60; # - For a single module $WineModuleTimeout = 60; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 26c16c4..974ff8e 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -521,19 +521,22 @@ sub GetBuildTimeout($$) # Set $ModuleCount to 0 if a full rebuild is needed my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); + my $Reconfig = (!$Impacts or $Impacts->{Autoconf} or $Impacts->{MakeMakefiles}); my ($ExeTimeout, $WineTimeout) = (0, 0); if ($ExeCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout : $ExeBuildTimeout; - $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild); + $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild) + + ($Reconfig ? $ExeCount * $ReconfigBuildTimeout : 0); } if ($WineCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $WineModuleTimeout : $WineBuildTimeout; - $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild); + $WineTimeout = $WineCount * min($WineBuildTimeout, $OneBuild) + + ($Reconfig ? $WineCount * $ReconfigBuildTimeout : 0); } return $ExeTimeout + $WineTimeout;

1 0

Alexandre Julliard : update-winehq: Fix formatting of news item for major release.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: tools Branch: master Commit: bfaa1e39cbbeceeb03e0f556ae018c4e3d427abe URL: https://source.winehq.org/git/tools.git/?a=commit;h=bfaa1e39cbbeceeb03e0f55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 17:08:48 2021 +0100 update-winehq: Fix formatting of news item for major release. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- update-winehq | 71 +++++++++++++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 44 deletions(-) diff --git a/update-winehq b/update-winehq index 4ba11d4..9ea758d 100755 --- a/update-winehq +++ b/update-winehq @@ -33,9 +33,7 @@ system("git", "pull") == 0 or die "git pull failed"; # Parse the ANNOUNCE file open ANNOUNCE, $ARGV[1] || "ANNOUNCE" or die "cannot open ANNOUNCE"; -my $whats_new = 0; -my $release_notes = 0; -my $first = 1; +my $ul = 0; my $url; push @text, "<body>\n"; @@ -43,52 +41,37 @@ push @text, "<body>\n"; while (<ANNOUNCE>) { chomp; - if (!$whats_new && !$release_notes) + if (/^What's new in this release/) { - if (/^What's new in this release/) - { - $whats_new = 1; - push @text, " <a href=\"{\$root}/announce/$rel\">What's new</a> in this release:"; - next; - } - elsif (/See the release notes/) - { - $release_notes = 1; - xml_escape($_); - s/See the release notes/See the <a href=\"{\$root}\/announce\/$rel\">release notes<\/a>/; - push @text, " " . $_; - next; - } - if (/^\s*$/) - { - push @text, "\n"; - next; - } - last if (/^The source is available/); - last if (/^--------------------/); - push @text, " " . xml_escape($_); + push @text, " <a href=\"{\$root}/announce/$rel\">What's new</a> in this release:"; + next; } - else + elsif (/the release notes/) { - if (/^ *- (.*)$/) - { - push @text, ($first ? "\n<ul>\n <li>" : "</li>\n <li>") . xml_escape($1); - $first = 0; - next; - } - if (/^\s*$/) + xml_escape($_); + s/the release notes/the <a href=\"{\$root}\/announce\/$rel\">release notes<\/a>/; + push @text, " " . $_; + next; + } + if (/^\s*$/) + { + if ($ul) { - if ($release_notes) { - push @text, "\n"; - } else { - push @text, "</li>\n</ul>\n"; - } - $whats_new = 0; - $release_notes = 0; - next; + push @text, "</li>\n</ul>\n"; + $ul = 0; } - push @text, " " . xml_escape($_); + push @text, "\n"; + next; + } + if (/^ *- (.*)$/) + { + push @text, (!$ul ? "\n<ul>\n <li>" : "</li>\n <li>") . xml_escape($1); + $ul = 1; + next; } + last if (/^The source is available/); + last if (/^--------------------/); + push @text, " " . xml_escape($_); } while (<ANNOUNCE>) @@ -101,7 +84,7 @@ while (<ANNOUNCE>) } die "Download URL not found" unless $url; -push @text, "The source is <a href=\"$url\">available now</a>.\n"; +push @text, "The source is <a href=\"$url\">available now</a>.\n"; push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"{\$root}/download\">download locations</a>.\n"; push @text, "</body></news>\n"; close ANNOUNCE;

1 0

Francois Gouget : testbot/Engine: Fix attachment support in HandleWinePatchMLSubmission().
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: tools Branch: master Commit: 82e6398fe915ce4a4ef0c86c43c4b9bf8788b8fb URL: https://source.winehq.org/git/tools.git/?a=commit;h=82e6398fe915ce4a4ef0c86… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:15:03 2021 +0100 testbot/Engine: Fix attachment support in HandleWinePatchMLSubmission(). By default MIME:Parser::Filer uses the attachement's recommended filename to save it to disk. However that name is tainted which causes Perl to throw an exception. Since we don't actually care about the filename (all mailing list patches are called 'patch.diff'), simply tell the filer to generate its own filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 48bb797..db9d82d 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -428,6 +428,7 @@ sub HandleWinePatchMLSubmission() # Process the email my $Parser = new MIME::Parser; $Parser->output_dir($WorkDir); + $Parser->filer->ignore_filename(1); my $Entity = $Parser->parse_open($FullMessageFileName); my $ErrMessage = CreatePatches()->NewPatch($Entity); if (defined $ErrMessage)

1 0

Francois Gouget : testbot/TestLauncher: Remove the unused bindir variable.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: tools Branch: master Commit: 4aa44795dec4a7eae8e13927d8c4339e79b544f8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4aa44795dec4a7eae8e1392… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:11:58 2021 +0100 testbot/TestLauncher: Remove the unused bindir variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index b040353..7c9a351 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -1,5 +1,3 @@ -bindir = ../../bin/windows - CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc

1 0

Francois Gouget : testbot/PatchUtils: Propagate all build flags.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: tools Branch: master Commit: b093534160268a0ab11b5bc4ef50454cc6bb8d51 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b093534160268a0ab11b5bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:18:37 2021 +0100 testbot/PatchUtils: Propagate all build flags. MakeErrors, MakeFir, MakeOpenGL and MakeUnicode must be propagated to the last patchset part too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index ffe0ec4..26c16c4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -396,9 +396,10 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests", - "MakeVulkan", "PatchedRoot", "PatchedModules", - "PatchedTests") + foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", + "MakeOpenGL", "MakeRequests", "MakeUnicode", + "MakeVulkan", + "PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -490,10 +491,12 @@ sub GetPatchImpacts($) # ... even if the patch was in previous parts if ($PastImpacts) { - $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; - $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; - $Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests}; - $Impacts->{MakeVulkan} ||= $PastImpacts->{MakeVulkan}; + foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", + "MakeOpenGL", "MakeRequests", "MakeUnicode", + "MakeVulkan") + { + $Impacts->{$Field} ||= $PastImpacts->{$Field}; + } $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};

1 0

Francois Gouget : testbot/Patches: The Patches::NewPatch()'s WebPatchId argument is optional.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: tools Branch: master Commit: 57d774ffe3b35e94e2be47b8cbce4cdc709f945d URL: https://source.winehq.org/git/tools.git/?a=commit;h=57d774ffe3b35e94e2be47b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:12:10 2021 +0100 testbot/Patches: The Patches::NewPatch()'s WebPatchId argument is optional. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 54b6c5e..cb8c78c 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -516,7 +516,7 @@ others, then C<WineTestBot::Patch::Submit()> is called right away. =back =cut -sub NewPatch($$$) +sub NewPatch($$;$) { my ($self, $MsgEntity, $WebPatchId) = @_;

1 0

Francois Gouget : testbot: Update the build timeout calculations.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: tools Branch: master Commit: 70f1d2799e3a094cea3ff31d82dfd97d58f7d9ea URL: https://source.winehq.org/git/tools.git/?a=commit;h=70f1d2799e3a094cea3ff31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 12 18:15:33 2021 +0100 testbot: Update the build timeout calculations. Ever since the Wine build has been simplified there is no separate 'native' Wine build. So there is no need for the $ExeBuildNativeTimeout constant anymore. This allows renaming $ExeBuildTestTimeout to $ExeBuildTimeout, so it follows the same naming scheme as $WineBuildTimeout. Also notice that the 'exe*' and 'win*' timeout calculations have the same structure which makes sense since BuildWine() handles both. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47849 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 7 +++---- testbot/lib/WineTestBot/PatchUtils.pm | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index ca3e983..68709e5 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc - $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout + $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList $LDAPServer @@ -48,7 +48,7 @@ require Exporter; $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout + $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin $SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize $TagPrefix $ProjectName $PatchesMailingList @@ -111,8 +111,7 @@ $MaxTaskTries = 3; # Exe build timeouts (in seconds) # - For a full build -$ExeBuildNativeTimeout = 2 * 60; -$ExeBuildTestTimeout = 7 * 60; +$ExeBuildTimeout = 7 * 60; # - For a single module $ExeModuleTimeout = 30; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index dbd14f2..ffe0ec4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -523,9 +523,8 @@ sub GetBuildTimeout($$) if ($ExeCount) { my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout : - $ExeBuildTestTimeout; - $ExeTimeout = ($ModuleCount ? 0 : $ExeBuildNativeTimeout) + - $ExeCount * min($ExeBuildTestTimeout, $OneBuild); + $ExeBuildTimeout; + $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild); } if ($WineCount) {

1 0

Zebediah Figura : vkd3d-shader: Implement macro body expansion.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: vkd3d Branch: master Commit: 668820f069f3b757ba51499c83f8fadd9eb627ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=668820f069f3b757ba51499… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:17 2021 -0600 vkd3d-shader: Implement macro body expansion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.h | 18 ++++++++++ libs/vkd3d-shader/preproc.l | 83 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d-shader/preproc.y | 24 +++++++++++-- tests/hlsl_d3d12.c | 9 +++-- 5 files changed, 113 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=668820f069f3b757ba5…

1 0

Zebediah Figura : vkd3d-shader: Implement stringification.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: vkd3d Branch: master Commit: d33a8964031274576dc7b713a8dd5d6355f9d587 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d33a8964031274576dc7b71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:21 2021 -0600 vkd3d-shader: Implement stringification. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 41 ++++++++++++++++++++++++++++++++++++++++- libs/vkd3d-shader/preproc.y | 4 +++- tests/hlsl_d3d12.c | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 18a59b7..388b77f 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -104,7 +104,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* const char *p; if (!ctx->last_was_newline) - return T_TEXT; + return T_HASHSTRING; for (p = yytext + 1; strchr(" \t", *p); ++p) ; @@ -247,6 +247,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) { switch (token) { + case T_HASHSTRING: case T_IDENTIFIER: case T_IDENTIFIER_PAREN: case T_INTEGER: @@ -389,6 +390,9 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (func_state->state) { case STATE_NONE: + { + struct preproc_macro *macro; + if (token == T_CONCAT && should_concat(ctx)) { while (ctx->buffer.content_size @@ -397,6 +401,40 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) break; } + /* Stringification, however, is only done for function-like + * macro bodies. */ + if (token == T_HASHSTRING && (macro = preproc_get_top_macro(ctx)) && macro->arg_count) + { + const struct preproc_text *expansion; + const char *p = text + 1; + unsigned int i; + + if (ctx->current_directive) + return return_token(token, lval, text); + + while (*p == ' ' || *p == '\t') + ++p; + + vkd3d_string_buffer_printf(&ctx->buffer, "\""); + if ((expansion = find_arg_expansion(ctx, p))) + { + for (i = 0; i < expansion->text.content_size; ++i) + { + char c = expansion->text.buffer[i]; + + if (c == '\\' || c == '"') + vkd3d_string_buffer_printf(&ctx->buffer, "\\"); + vkd3d_string_buffer_printf(&ctx->buffer, "%c", c); + } + } + else + { + vkd3d_string_buffer_printf(&ctx->buffer, "%s", p); + } + vkd3d_string_buffer_printf(&ctx->buffer, "\""); + break; + } + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { const struct preproc_text *expansion; @@ -440,6 +478,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); break; + } case STATE_IDENTIFIER: if (token == '(') diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 45577f2..72d6486 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -309,6 +309,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) struct parse_arg_names arg_names; } +%token <string> T_HASHSTRING %token <string> T_IDENTIFIER %token <string> T_IDENTIFIER_PAREN %token <string> T_INTEGER @@ -387,7 +388,8 @@ body_text } body_token - : T_IDENTIFIER + : T_HASHSTRING + | T_IDENTIFIER | T_IDENTIFIER_PAREN | T_INTEGER | T_TEXT diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index e726798..9d8d16d 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -350,7 +350,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || i == 9 || (i >= 12 && i <= 14)) + todo_if (i == 9 || (i >= 12 && i <= 14)) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL);

1 0

Zebediah Figura : vkd3d-shader: Parse function-like macro definitions.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: vkd3d Branch: master Commit: 0f80ac09759936a8074ca691ecd8e5034bfaccf1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f80ac09759936a8074ca69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:18 2021 -0600 vkd3d-shader: Parse function-like macro definitions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 5 +++- libs/vkd3d-shader/preproc.y | 72 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 86ca473..77f4f0dc 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -70,6 +70,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} +<INITIAL>{IDENTIFIER}/\( {return T_IDENTIFIER_PAREN;} <INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -141,6 +142,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} +<INITIAL>[(),] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% @@ -221,6 +223,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) switch (token) { case T_IDENTIFIER: + case T_IDENTIFIER_PAREN: case T_INTEGER: case T_STRING: case T_TEXT: @@ -321,7 +324,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) continue; } - if (token == T_IDENTIFIER) + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { struct preproc_macro *macro; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 17bc649..3cb7de6 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -28,6 +28,12 @@ #define PREPROC_YYLTYPE struct vkd3d_shader_location +struct parse_arg_names +{ + char **args; + size_t count; +}; + } %code provides @@ -254,6 +260,15 @@ static const void *get_parent_data(struct preproc_ctx *ctx) return preproc_get_top_file(ctx)->code.code; } +static void free_parse_arg_names(struct parse_arg_names *args) +{ + unsigned int i; + + for (i = 0; i < args->count; ++i) + vkd3d_free(args->args[i]); + vkd3d_free(args->args); +} + } %define api.prefix {preproc_yy} @@ -268,11 +283,14 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %union { char *string; + const char *const_string; uint32_t integer; struct vkd3d_string_buffer string_buffer; + struct parse_arg_names arg_names; } %token <string> T_IDENTIFIER +%token <string> T_IDENTIFIER_PAREN %token <string> T_INTEGER %token <string> T_STRING %token <string> T_TEXT @@ -291,7 +309,9 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %type <integer> expr %type <string> body_token +%type <const_string> body_token_const %type <string_buffer> body_text +%type <arg_names> identifier_list %% @@ -302,6 +322,28 @@ shader_text vkd3d_string_buffer_printf(&ctx->buffer, "\n"); } +identifier_list + : T_IDENTIFIER + { + if (!($$.args = vkd3d_malloc(sizeof(*$$.args)))) + YYABORT; + $$.args[0] = $1; + $$.count = 1; + } + | identifier_list ',' T_IDENTIFIER + { + char **new_array; + + if (!(new_array = vkd3d_realloc($1.args, ($1.count + 1) * sizeof(*$$.args)))) + { + free_parse_arg_names(&$1); + YYABORT; + } + $$.args = new_array; + $$.count = $1.count + 1; + $$.args[$1.count] = $3; + } + body_text : %empty { @@ -316,12 +358,32 @@ body_text } vkd3d_free($2); } + | body_text body_token_const + { + if (vkd3d_string_buffer_printf(&$$, "%s ", $2) < 0) + YYABORT; + } body_token : T_IDENTIFIER + | T_IDENTIFIER_PAREN | T_INTEGER | T_TEXT +body_token_const + : '(' + { + $$ = "("; + } + | ')' + { + $$ = ")"; + } + | ',' + { + $$ = ","; + } + directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE { @@ -332,6 +394,16 @@ directive YYABORT; } } + | T_DEFINE T_IDENTIFIER_PAREN '(' identifier_list ')' body_text T_NEWLINE + { + free_parse_arg_names(&$4); + if (!preproc_add_macro(ctx, &@6, $2, &@6, &$6)) + { + vkd3d_free($2); + vkd3d_string_buffer_cleanup(&$6); + YYABORT; + } + } | T_UNDEF T_IDENTIFIER T_NEWLINE { struct preproc_macro *macro;

1 0