January 2021 - Wine-Commits

Matteo Bruni : vkd3d: Fix typo in WARN() message.
by Alexandre Julliard Jan. 27, 2021

Jan. 27, 2021

Module: vkd3d Branch: master Commit: f26eed586da97de0c71b9934a5f35f33317005ce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f26eed586da97de0c71b993… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 20:26:32 2021 +0100 vkd3d: Fix typo in WARN() message. 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/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e5c6791..8b84451 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -195,7 +195,7 @@ static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *que { unsigned int i; - WARN("Ressetting sequence number for queue %p.\n", queue); + WARN("Resetting sequence number for queue %p.\n", queue); queue->completed_sequence_number = 0; queue->submitted_sequence_number = 1;

1 0

Matteo Bruni : vkd3d-compiler: Require a profile specification when compiling HLSL sources.
by Alexandre Julliard Jan. 27, 2021

Jan. 27, 2021

Module: vkd3d Branch: master Commit: 9d6be9530b95f7774657915b5c46dc390a736362 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9d6be9530b95f7774657915… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 20:26:36 2021 +0100 vkd3d-compiler: Require a profile specification when compiling HLSL sources. 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> --- programs/vkd3d-compiler/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index f1e597a..94cce20 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -496,6 +496,12 @@ static bool parse_command_line(int argc, char **argv, struct options *options) return false; } + if (!options->preprocess_only && options->source_type == VKD3D_SHADER_SOURCE_HLSL && !options->profile) + { + fprintf(stderr, "You need to specify a profile when compiling from HLSL source.\n"); + return false; + } + if (optind < argc) options->filename = argv[argc - 1];

1 0

Matteo Bruni : vkd3d-shader: Cleanup predefined macro body on allocation failure.
by Alexandre Julliard Jan. 27, 2021

Jan. 27, 2021

Module: vkd3d Branch: master Commit: 1e01656def355b589f0602b51b67e3aa34df10c6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e01656def355b589f0602b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 20:26:33 2021 +0100 vkd3d-shader: Cleanup predefined macro body on allocation failure. 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 82b6492..bf4d669 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -743,10 +743,14 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, vkd3d_string_buffer_init(&body); vkd3d_string_buffer_printf(&body, "%s", ctx.preprocess_info->macros[i].value); if (!(name = vkd3d_strdup(ctx.preprocess_info->macros[i].name))) + { + vkd3d_string_buffer_cleanup(&body); goto fail; + } if (!preproc_add_macro(&ctx, &loc, name, NULL, 0, &loc, &body)) { vkd3d_free(name); + vkd3d_string_buffer_cleanup(&body); goto fail; } }

1 0

Francois Gouget : testbot/PatchUtils: Run make_requests when it is modified.
by Alexandre Julliard Jan. 27, 2021

Jan. 27, 2021

Module: tools Branch: master Commit: 23fed17b68e5c7b8adfa603b74e0ee387004b87e URL: https://source.winehq.org/git/tools.git/?a=commit;h=23fed17b68e5c7b8adfa603… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 03:59:18 2021 +0100 testbot/PatchUtils: Run make_requests when it is modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 5588df2..b2749c4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -324,7 +324,7 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(server/protocol\.def)$=) + elsif ($Line =~ m=^--- \w+/(tools/make_requests|server/protocol\.def)$=) { $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1;

1 0

Francois Gouget : testbot/web: The ISO 8601 date format uses dashes rather than slashes.
by Alexandre Julliard Jan. 27, 2021

Jan. 27, 2021

Module: tools Branch: master Commit: d1a934f039057c826b9e19e4d9f67f0d1edeef7c URL: https://source.winehq.org/git/tools.git/?a=commit;h=d1a934f039057c826b9e19e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 04:04:34 2021 +0100 testbot/web: The ISO 8601 date format uses dashes rather than slashes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 6 +++--- testbot/web/JobDetails.pl | 2 +- testbot/web/index.pl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index f9e590c..b523d14 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -85,7 +85,7 @@ function Pad2(n) function ShowDateTime(Sec1970, Id, Attr) { var Dt = new Date(Sec1970 * 1000); - var Pretty = Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + + var Pretty = Dt.getFullYear() + '-' + Pad2(Dt.getMonth() + 1) + '-' + Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) if (Id != null) @@ -461,7 +461,7 @@ sub GetDisplayValue($$$) { $Value = "<noscript><div>" . - strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . "<script type='text/javascript'></script>\n"; @@ -487,7 +487,7 @@ sub GetEscapedDisplayValue($$$) $Value = "<script type='text/javascript'></script><noscript><div>" . - strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n"; } } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 5a484da..7a4f4fc 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -696,7 +696,7 @@ sub GenerateDataCell($$$$$) my $Duration = $StepTask->Ended - $StepTask->Started; my $TagId = "E". $StepTask->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y/%m/%d %H:%M:%S", localtime($StepTask->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($StepTask->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'><!--\n"; print " ShowDateTime(", $StepTask->Ended, ",'$TagId');\n"; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 39fea3e..088aea1 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -163,7 +163,7 @@ sub GenerateDataCell($$$$) my $Duration = $Item->Ended - $Item->Submitted; my $TagId = "E". $Item->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($Item->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'><!--\n"; print " ShowDateTime(", $Item->Ended, ",'$TagId');\n";

1 0

Francois Gouget : testbot/LogUtils: Ignore empty report lines.
by Alexandre Julliard Jan. 27, 2021

Jan. 27, 2021

Module: tools Branch: master Commit: 153a206d85287602ec1900aee3e620a89adbde6f URL: https://source.winehq.org/git/tools.git/?a=commit;h=153a206d85287602ec1900a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 04:03:36 2021 +0100 testbot/LogUtils: Ignore empty report lines. They have no impact on the ParseWineTestReport() result. Also this matches the winetest parser behavior. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 7786494..d537af2 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -531,6 +531,7 @@ sub ParseWineTestReport($$$) { $LineNo++; $Cur->{UnitSize} += length($Line); + next if ($Line =~ /^\s*$/); # empty lines have no impact chomp $Line; $Line =~ s/\r+$//;

1 0

Francois Gouget : testbot/TestWTBS: Allow checking emails that don't contain a patch.
by Alexandre Julliard Jan. 27, 2021

Jan. 27, 2021

Module: tools Branch: master Commit: c6f00ecf6767781726a5d0d79ca1765e38105ad3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6f00ecf6767781726a5d0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 03:57:27 2021 +0100 testbot/TestWTBS: Allow checking emails that don't contain a patch. When an email contains no patch it is not saved in the patches folder, which also makes putting TestWTBS directives in the email body pointless. This patch allows telling TestWTBS this is expected by adding 'WTBS' and 'NoPatch' anywhere in the subject line. Conversely, if the subject contains 'WTBS' but not 'NoPatch', TestWTBS expects to find a file in the patches folder. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index d0e7cab..67b1c8f 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1152,9 +1152,19 @@ sub CheckPatches() foreach my $Patch (sort { $b->Id <=> $a->Id } @{$Patches->GetItems()}) { my $PatchFileName = "$DataDir/patches/". $Patch->Id; - next if (!-f $PatchFileName); - my $TestInfo = LoadTestInfo($PatchFileName); - CheckPatch($Jobs, $Patch, $TestInfo) if ($TestInfo); + if (-f $PatchFileName) + { + ok($Patch->Subject !~ /NoPatch/, "Found a file for patch ". $Patch->Id .": ". $Patch->Subject) + or diag("Disposition=". $Patch->Disposition); + my $TestInfo = LoadTestInfo($PatchFileName); + CheckPatch($Jobs, $Patch, $TestInfo) if ($TestInfo); + } + elsif ($Patch->Subject =~ /\bWTBS\b/) + { + ok(($Patch->Subject =~ /NoPatch/ or $Patch->Disposition eq "Reply to a patch series"), + "Found no file for patch ". $Patch->Id .": ". $Patch->Subject) + or diag("Disposition=". $Patch->Disposition); + } } }

1 0

Zhiyi Zhang : wined3d: Support multiple outputs.
by Alexandre Julliard Jan. 26, 2021

Jan. 26, 2021

Module: wine Branch: master Commit: 98f490bdfcfaa4624ea56aaa6fb23c9143a32880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98f490bdfcfaa4624ea56aaa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jan 25 22:22:19 2021 +0800 wined3d: Support multiple outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 5 ++-- dlls/d3d9/tests/device.c | 5 ++-- dlls/dxgi/device.c | 16 +---------- dlls/dxgi/swapchain.c | 20 +------------ dlls/dxgi/tests/dxgi.c | 26 ++--------------- dlls/wined3d/directx.c | 65 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_main.c | 4 +-- dlls/wined3d/wined3d_private.h | 2 -- 8 files changed, 60 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98f490bdfcfaa4624ea5…

1 0

Rémi Bernon : widl: Support WinRT mta threading attribute parsing.
by Alexandre Julliard Jan. 26, 2021

Jan. 26, 2021

Module: wine Branch: master Commit: 1abdd8c89a97f15ffee87526c67ef898f1c2b3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1abdd8c89a97f15ffee87526… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 15:36:29 2021 +0100 widl: Support WinRT mta threading attribute parsing. As an alias to free-threaded model. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 01c6f800a08..2f5f55905c5 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -385,6 +385,7 @@ static const struct keyword attr_keywords[] = {"marshaling_behavior", tMARSHALINGBEHAVIOR, 1}, {"maybe", tMAYBE, 0}, {"message", tMESSAGE, 0}, + {"mta" , tMTA, 0}, {"neutral", tNEUTRAL, 0}, {"nocode", tNOCODE, 0}, {"nonbrowsable", tNONBROWSABLE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 48f180cdb49..4ce84cc2440 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -222,6 +222,7 @@ static typelib_t *current_typelib; %token tMAYBE tMESSAGE %token tMETHODS %token tMODULE +%token tMTA %token tNAMESPACE %token tNOCODE tNONBROWSABLE %token tNONCREATABLE @@ -1154,6 +1155,7 @@ threading_type: | tSINGLE { $$ = THREADING_SINGLE; } | tFREE { $$ = THREADING_FREE; } | tBOTH { $$ = THREADING_BOTH; } + | tMTA { $$ = THREADING_FREE; } ; pointer_type:

1 0

Georg Lehmann : winevulkan: Fix surface functions if they aren't called by winevulkan.
by Alexandre Julliard Jan. 26, 2021

Jan. 26, 2021

Module: wine Branch: master Commit: c1824d578ac514d29e79a5a00d6759f11dbe4813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1824d578ac514d29e79a5a0… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jan 26 13:32:24 2021 +0100 winevulkan: Fix surface functions if they aren't called by winevulkan. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50549 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 15 ++++++++-- dlls/winevulkan/make_vulkan | 60 ++++++++++++++-------------------------- dlls/winevulkan/vulkan.c | 45 +++++++++++++++++++++++++----- dlls/winevulkan/vulkan_private.h | 3 +- dlls/winevulkan/vulkan_thunks.c | 24 ++++++---------- dlls/winevulkan/vulkan_thunks.h | 4 +++ dlls/winex11.drv/vulkan.c | 15 ++++++++-- include/wine/vulkan_driver.h | 31 +++------------------ 8 files changed, 103 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1824d578ac514d29e79…

1 0