wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Alexandre Julliard : packaging: Update .deb package names for new OBS scheme.
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: tools Branch: master Commit: d0538f3bad27a742ca19b37fae1ecdef16098399 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d0538f3bad27a742ca19b37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 21:19:06 2021 +0100 packaging: Update .deb package names for new OBS scheme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 6ddbc48..29960d3 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -71,14 +71,14 @@ add_deb () test -d $dstdir || mkdir -p $dstdir for arch in $deb_archs do - rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}_$arch.deb $dstdir/binary-$arch/ + rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-1_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-1_$arch.deb $dstdir/binary-$arch/ done - dscverify -u $obsdir/$source_pkg\~$2.dsc - if test -f $obsdir/$source_pkg\~$2.diff.gz + dscverify -u $obsdir/$source_pkg\~$2-1.dsc + if test -f $obsdir/$source_pkg\~$2-1.diff.gz then - rsync -aq $obsdir/$source_pkg\~$2.dsc $obsdir/$source_pkg\~$2.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ else - rsync -aq $obsdir/$source_pkg\~$2.dsc $obsdir/$source_pkg\~$2.tar.xz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ fi if test -n "$4"

1 0

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

14 Jan '21

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: Update the build timeout calculations.
by Alexandre Julliard 14 Jan '21

14 Jan '21

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

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

14 Jan '21

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/Patches: The Patches::NewPatch()'s WebPatchId argument is optional.
by Alexandre Julliard 14 Jan '21

14 Jan '21

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/TestLauncher: Remove the unused bindir variable.
by Alexandre Julliard 14 Jan '21

14 Jan '21

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

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

14 Jan '21

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

Zebediah Figura : vkd3d-shader: Implement stringification.
by Alexandre Julliard 14 Jan '21

14 Jan '21

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: Implement concatenation.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: 33df515f103205c78a2e669ab8a8723c4c86ea90 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33df515f103205c78a2e669… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:20 2021 -0600 vkd3d-shader: Implement concatenation. 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 | 22 ++++++++++++++++++++++ libs/vkd3d-shader/preproc.y | 6 ++++++ tests/hlsl_d3d12.c | 7 ++----- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 9043ade..18a59b7 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -83,6 +83,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} <INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL>## {return T_CONCAT;} + <INITIAL>"&&" {return T_TEXT;} <INITIAL>"||" {return T_TEXT;} <INITIAL>"++" {return T_TEXT;} @@ -189,6 +191,18 @@ static struct preproc_macro *preproc_get_top_macro(struct preproc_ctx *ctx) return ctx->expansion_stack[ctx->expansion_count - 1].macro; } +/* Concatenation is not done for object-like macros, but is done for both + * function-like macro bodies and their arguments. */ +static bool should_concat(struct preproc_ctx *ctx) +{ + struct preproc_macro *macro; + + if (!ctx->expansion_count) + return false; + macro = ctx->expansion_stack[ctx->expansion_count - 1].macro; + return !macro || macro->arg_count; +} + static void preproc_pop_buffer(struct preproc_ctx *ctx) { if (ctx->expansion_count) @@ -375,6 +389,14 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (func_state->state) { case STATE_NONE: + if (token == T_CONCAT && should_concat(ctx)) + { + while (ctx->buffer.content_size + && strchr(" \t\r\n", ctx->buffer.buffer[ctx->buffer.content_size - 1])) + --ctx->buffer.content_size; + break; + } + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { const struct preproc_text *expansion; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 4173af0..45577f2 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -327,6 +327,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_INCLUDE "#include" %token T_UNDEF "#undef" +%token T_CONCAT "##" + %type <integer> expr %type <string> body_token %type <const_string> body_token_const @@ -419,6 +421,10 @@ body_token_const { $$ = ","; } + | T_CONCAT + { + $$ = "##"; + } directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 6980b99..e726798 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,10 +349,8 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 10 || i == 11) - continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || (i >= 9 && i <= 14)) + todo_if (i <= 4 || i == 9 || (i >= 12 && i <= 14)) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); @@ -407,8 +405,7 @@ static void test_preprocess(void) ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); /* Macro invocation spread across multiple files. */ - if (0) - todo check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); + check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); blob = errors = (ID3D10Blob *)0xdeadbeef; hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors);

1 0

Zebediah Figura : vkd3d-shader: Implement function-like macro expansion.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: e1a956f8f2f96f89baf8d723a3fa94a2071c2429 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e1a956f8f2f96f89baf8d72… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:19 2021 -0600 vkd3d-shader: Implement function-like macro expansion. 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> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.h | 35 ++++ libs/vkd3d-shader/preproc.l | 329 ++++++++++++++++++++++++------- libs/vkd3d-shader/preproc.y | 46 ++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/hlsl_d3d12.c | 2 +- 6 files changed, 338 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e1a956f8f2f96f89baf…

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021