February 2021 - Wine-commits

Hugh McMaster : reg/tests: Replace RegCloseKey() with the helper function close_key().
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 93fbe09ed098f6356485c6390a533e04f6ff3959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93fbe09ed098f6356485c639… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:30:02 2021 +1100 reg/tests: Replace RegCloseKey() with the helper function close_key(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 92 ++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93fbe09ed098f6356485…

1 0

Hugh McMaster : reg/tests: Add additional tests with embedded NUL characters.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 6c62ffeca7f381199bef1969452fcef46b979f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c62ffeca7f381199bef1969… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:30:03 2021 +1100 reg/tests: Add additional tests with embedded NUL characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 471c6ad8d46..db02fc770e2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2360,7 +2360,7 @@ static void test_import(void) "\"Wine69c\"=\"Value1\\0\n" "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value4\n\n", &r); + "\"Wine69f\"=\"\\0Value5\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "Wine69a"); verify_reg_nonexist(hkey, "Wine69b"); @@ -2369,6 +2369,22 @@ static void test_import(void) verify_reg_nonexist(hkey, "Wine69e"); verify_reg_nonexist(hkey, "Wine69f"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine70a\"=\"\\0\"\n" + "\"Wine70b\"=\"\\0\\0\"\n" + "\"Wine70c\"=\"Value1\\0\"\n" + "\"Wine70d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine70e\"=\"Value3\\0Value4\"\n" + "\"Wine70f\"=\"\\0Value5\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine70a"); + todo_wine verify_reg_nonexist(hkey, "Wine70b"); + todo_wine verify_reg_nonexist(hkey, "Wine70c"); + todo_wine verify_reg_nonexist(hkey, "Wine70d"); + todo_wine verify_reg_nonexist(hkey, "Wine70e"); + todo_wine verify_reg_nonexist(hkey, "Wine70f"); + close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -3882,7 +3898,7 @@ static void test_unicode_import(void) "\"Wine69c\"=\"Value1\\0\n" "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value4\n\n", &r); + "\"Wine69f\"=\"\\0Value5\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "Wine69a"); verify_reg_nonexist(hkey, "Wine69b"); @@ -3891,6 +3907,22 @@ static void test_unicode_import(void) verify_reg_nonexist(hkey, "Wine69e"); verify_reg_nonexist(hkey, "Wine69f"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine70a\"=\"\\0\"\n" + "\"Wine70b\"=\"\\0\\0\"\n" + "\"Wine70c\"=\"Value1\\0\"\n" + "\"Wine70d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine70e\"=\"Value3\\0Value4\"\n" + "\"Wine70f\"=\"\\0Value5\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine70a"); + todo_wine verify_reg_nonexist(hkey, "Wine70b"); + todo_wine verify_reg_nonexist(hkey, "Wine70c"); + todo_wine verify_reg_nonexist(hkey, "Wine70d"); + todo_wine verify_reg_nonexist(hkey, "Wine70e"); + todo_wine verify_reg_nonexist(hkey, "Wine70f"); + close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE);

1 0

Andrey Gusev : vkd3d-shader: Add a fall-through to default case in shader_sm4_read_param().
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: vkd3d Branch: master Commit: 24537d369372252ca5da4fb066433e1d1ff6d824 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=24537d369372252ca5da4fb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Feb 20 16:41:16 2021 +0200 vkd3d-shader: Add a fall-through to default case in shader_sm4_read_param(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index bfc3cce..d2cf87e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1551,6 +1551,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr default: FIXME("Skipping modifier 0x%08x.\n", m); + /* fall-through */ case VKD3D_SM4_REGISTER_MODIFIER_NONE: *modifier = VKD3DSPSM_NONE; break;

1 0

Floris Renaud : website: Update Dutch translation.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: website Branch: master Commit: 9f3acf7b917c30a4e778ccc26f490f2172fb17ee URL: https://source.winehq.org/git/website.git/?a=commit;h=9f3acf7b917c30a4e778c… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 20 00:03:17 2021 +0100 website: Update Dutch translation. Point the links to the Dutch wiki. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/nl/documentation.template | 2 +- templates/nl/forums.template | 2 +- templates/nl/getinvolved.template | 2 +- templates/nl/help.template | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/nl/documentation.template b/templates/nl/documentation.template index f379c9ca..4ef1989e 100644 --- a/templates/nl/documentation.template +++ b/templates/nl/documentation.template @@ -6,7 +6,7 @@ <h2>Handleidingen</h2> <ul> <li> - <a href="https://wiki.winehq.org/Wine User's Guide">Gebruikershandleiding van Wine</a><br> + <a href="https://wiki.winehq.org/Gebruikershandleiding">Gebruikershandleiding van Wine</a><br> Wine gebruiken en aanpassen om Windows programma's uit te voeren.<br> </li><br> diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 8ac7740b..f4bb72c1 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -103,7 +103,7 @@ Anders behandeld de software van de mailinglijsten uw bericht als spam.</p> [<a href="//www.winehq.org/pipermail/wine-bugs/">Archief 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archief 2</a>]<br> Een drukke lijst (100/dag) die alle activiteit op de - <a href="//bugs.winehq.org/">Bug Tracking Database</a>laat zien. + <a href="//bugs.winehq.org/">Bug Tracking Database</a> laat zien. </li> </ul> diff --git a/templates/nl/getinvolved.template b/templates/nl/getinvolved.template index 6ce0ac3f..cb07e0fa 100644 --- a/templates/nl/getinvolved.template +++ b/templates/nl/getinvolved.template @@ -14,7 +14,7 @@ Op deze pagina staat hoe u betrokken raakt bij Wine.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Main_Page#Contribute">Bijdragen aan Wine</a> + <a href="https://wiki.winehq.org/Startpagina#Meedoen">Bijdragen aan Wine</a> </div> <div class="col-xs-9 col-md-10"> Een lijst met manieren om aan Wine bij te dragen. diff --git a/templates/nl/help.template b/templates/nl/help.template index 80e44789..656c06c0 100644 --- a/templates/nl/help.template +++ b/templates/nl/help.template @@ -22,11 +22,11 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/FAQ"><i class="fas fa-info-circle fa-2x"></i><br>FAQ</a> + <a href="https://wiki.winehq.org/FAQ_nl"><i class="fas fa-info-circle fa-2x"></i><br>FAQ</a> </div> <div class="col-xs-10 col-md-11"> Veel vragen worden snel beantwoord op onze - <a href="https://wiki.winehq.org/FAQ">Veel Gestelde Vragen</a> pagina. + <a href="https://wiki.winehq.org/FAQ_nl">Veel Gestelde Vragen</a> pagina. Bekijk deze pagina eerst om te zien of de vraag al beantwoord is. </div> </div> @@ -44,10 +44,10 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/"><i class="fas fa-book fa-2x"></i><br>Wiki</a> + <a href="https://wiki.winehq.org/Startpagina"><i class="fas fa-book fa-2x"></i><br>Wiki</a> </div> <div class="col-xs-10 col-md-11"> - Doorzoek ook de <a href="https://wiki.winehq.org/">Wiki</a> om een + Doorzoek ook de <a href="https://wiki.winehq.org/Startpagina">Wiki</a> om een antwoord te vinden. </div> </div>

1 0

Francois Gouget : testbot: Deduplicate matching errors in ParseWineTestReport().
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: tools Branch: master Commit: c101616e143d09309e3343694e9660de3fb433ec URL: https://source.winehq.org/git/tools.git/?a=commit;h=c101616e143d09309e33436… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 22 06:26:28 2021 +0100 testbot: Deduplicate matching errors in ParseWineTestReport(). Let ParseWineTestReport() populate the list of errors, and only use GetReportLineCategory() as a fallback. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 59 +++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index dae8292..267dcd9 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -368,6 +368,8 @@ sub _NewCurrentUnit($$) IsBroken => 0, Rc => undef, Pids => {}, + Group => undef, + GroupLineNo => 0, }; } @@ -462,6 +464,25 @@ sub _CloseTestUnit($$$) $LogInfo->{Failures} += $Cur->{LineFailures}; } +sub _AddReportError($$$$) +{ + my ($LogInfo, $Cur, $LineNo, $Line) = @_; + + # Make the timeout messages more user-friendly + my $ErrLine = $Line; + if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + { + my $Unit = $1; + $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + + if (!$Cur->{Group}) + { + $Cur->{Group} = _AddLogGroup($LogInfo, $Cur->{Dll}, $Cur->{GroupLineNo} || $LineNo); + } + _AddLogError($LogInfo, $Cur->{Group}, $ErrLine, $LineNo); +} + =pod =over 12 @@ -522,8 +543,6 @@ sub ParseWineTestReport($$$) } my $LineNo = 0; - my $CurGroupName = ""; - my ($CurGroup, $CurGroupLineNo); my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -533,23 +552,6 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if (GetReportLineCategory($Line) eq "error") - { - # Make the timeout messages more user-friendly - my $ErrLine = $Line; - if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) - { - my $Unit = $1; - $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - - if (!$CurGroup) - { - $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); - } - _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); - } - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); @@ -563,9 +565,8 @@ sub ParseWineTestReport($$$) $Cur->{Rc} = 0 if ($Type eq "skipped"); # The next error will be in a new error group - $CurGroupName = $Dll; - $CurGroupLineNo = $LineNo; - $CurGroup = undef; + $Cur->{GroupLineNo} = $LineNo; + $Cur->{Group} = undef; } elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) { @@ -586,6 +587,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -614,6 +616,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; $LogInfo->{IsWineTest} = 1; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -629,6 +632,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; } _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif ($Line =~ /Unhandled exception: .* in .* code /) @@ -636,6 +640,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -650,6 +655,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; } _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -704,6 +710,7 @@ sub ParseWineTestReport($$$) $LogInfo->{Failures}++; $Cur->{IsBroken} = 1; $LogInfo->{TimeoutCount}++; + _AddReportError($LogInfo, $Cur, $LineNo, $&); } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -729,6 +736,14 @@ sub ParseWineTestReport($$$) } $Cur->{Rc} = $Rc; } + elsif (GetReportLineCategory($Line) eq "error") + { + # This should only happen on very garbled lines, or if there is an + # inconsistency between GetReportLineCategory() and + # ParseWineTestReport(). + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + } + } $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); _CloseTestUnit($LogInfo, $Cur, 1);

1 0

Francois Gouget : testbot/TestWTBS: Check that no extra test units have been run.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: tools Branch: master Commit: d03ed1fe17bf4a73232a51bdff6080f5cc92f53d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d03ed1fe17bf4a73232a51b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 22 06:26:12 2021 +0100 testbot/TestWTBS: Check that no extra test units have been run. TestUnits is now an exhaustive list of test units that are expected to be run. Any extra test unit is reported as a failure. To compensate one can now add a module name to accept any test unit from that module. This allows dealing with the test=module configurations. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 8a77b00..1467c4b 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1038,11 +1038,15 @@ p win.HasTask 0 =item <tests.TestUnits> -Checks that the TestBot ran at least the test units mentioned in this -space-separated list on the VMs matching the specified category. +Checks that the TestBot ran the test units mentioned in this space-separated +list on the VMs matching the specified category. Each entry is either of the +form module:unit, or just module in which case it matches any test unit of the +specified module. Each entry in the list must match at least one test unit. +Two entries can match the same test unit(s). +This is useful when test=module, in which case the TestBot may run many tests. For instance: -p win.TestUnits cabinet:extract cabinet:fdi +p win.TestUnits cabinet:newunit cabinet =item <patch.Grep> =item <patch.GrepV> @@ -1168,11 +1172,31 @@ sub CheckJobTree($;$) my $MissionInfo = $TestInfo->{$MissionType}; next if (!CheckValue($MissionInfo->{TestUnits})); - foreach my $TestUnit (split / +/, $MissionInfo->{TestUnits}) + foreach my $TestGrep (split / +/, $MissionInfo->{TestUnits}) { - ok($TestUnits->{$MissionType}->{$TestUnit}, "Check that $TestUnit was tested by $MissionType VMs for job $JobId") + if ($TestGrep =~ /:/) + { + if (exists $TestUnits->{$MissionType}->{$TestGrep}) + { + $TestUnits->{$MissionType}->{$TestGrep} = 0; + next; + } + fail("Check that $MissionType VMs ran $TestGrep for job $JobId") + or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); + } + my $Matched; + foreach my $TestUnit (keys %{$TestUnits->{$MissionType}}) + { + next if ($TestUnit !~/^\Q$TestGrep:\E/); + $TestUnits->{$MissionType}->{$TestUnit} = 0; + $Matched = 1; + } + ok($Matched, "Check that $MissionType VMs ran $TestGrep for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); } + my @ExtraUnits = grep { $TestUnits->{$MissionType}->{$_} } keys %{$TestUnits->{$MissionType}}; + ok(!@ExtraUnits, "Check that $MissionType VMs ran no extra test units") + or diag("Extraneous test runs=". join(" ", sort @ExtraUnits)); } }

1 0

Steve Lhomme : widl: Never use the namespace ABI prefix for global types.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: a78053743dab9c116d20b0d0ecc48c9e08aa9b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a78053743dab9c116d20b0d0… Author: Steve Lhomme <robux4(a)ycbcr.xyz> Date: Fri Feb 19 12:03:57 2021 +0100 widl: Never use the namespace ABI prefix for global types. Otherwise we end up with types like ABI::IInspectable. 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/typetree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 9d0b5576d45..40d987b7a28 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -105,9 +105,10 @@ static size_t append_namespace(char **buf, size_t *len, size_t pos, struct names static size_t append_namespaces(char **buf, size_t *len, size_t pos, struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, const char *abi_prefix) { + int nested = namespace && !is_global_namespace(namespace); size_t n = 0; n += strappend(buf, len, pos + n, "%s", prefix); - n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix); + if (nested) n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix); n += strappend(buf, len, pos + n, "%s", suffix); return n; }

1 0

Steve Lhomme : widl: Precompute qualified type names, and use them for C++ interfaces.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: fc533ddf32a8408db3f204dcb449f795bdbd3ce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc533ddf32a8408db3f204dc… Author: Steve Lhomme <robux4(a)ycbcr.xyz> Date: Fri Feb 19 12:03:58 2021 +0100 widl: Precompute qualified type names, and use them for C++ interfaces. This is what MIDL does and avoid mismatching and even fixes some compiling issues. 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/header.c | 4 ++-- tools/widl/parser.y | 6 ++++++ tools/widl/typetree.c | 15 +++++++++++++++ tools/widl/typetree.h | 1 + tools/widl/widltypes.h | 1 + 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 3c8ad09bd63..5ab8a3cc26f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -465,13 +465,13 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i case TYPE_INTERFACE: case TYPE_MODULE: case TYPE_COCLASS: - fprintf(h, "%s", name); + fprintf(h, "%s", type_get_qualified_name(t, name_type)); break; case TYPE_RUNTIMECLASS: fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t), name_type)); break; case TYPE_DELEGATE: - fprintf(h, "%s", type_get_name(type_delegate_get_iface(t), name_type)); + fprintf(h, "%s", type_get_qualified_name(type_delegate_get_iface(t), name_type)); break; case TYPE_VOID: fprintf(h, "void"); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4c115adf4ab..eb8035c39bc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2073,9 +2073,15 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in nt = xmalloc(sizeof(struct rtype)); nt->name = name; if (is_global_namespace(namespace)) + { type->c_name = name; + type->qualified_name = name; + } else + { type->c_name = format_namespace(namespace, "__x_", "_C", name, use_abi_namespace ? "ABI" : NULL); + type->qualified_name = format_namespace(namespace, "", "::", name, use_abi_namespace ? "ABI" : NULL); + } nt->type = type; nt->t = t; nt->next = namespace->type_hash[hash]; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 40d987b7a28..319dd4ae65a 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -51,6 +51,7 @@ type_t *make_type(enum type_type type) t->attrs = NULL; t->c_name = NULL; t->signature = NULL; + t->qualified_name = NULL; memset(&t->details, 0, sizeof(t->details)); t->typestring_offset = 0; t->ptrdesc = 0; @@ -91,6 +92,19 @@ const char *type_get_name(const type_t *type, enum name_type name_type) return NULL; } +const char *type_get_qualified_name(const type_t *type, enum name_type name_type) +{ + switch(name_type) { + case NAME_DEFAULT: + return type->qualified_name; + case NAME_C: + return type->c_name; + } + + assert(0); + return NULL; +} + static size_t append_namespace(char **buf, size_t *len, size_t pos, struct namespace *namespace, const char *separator, const char *abi_prefix) { int nested = namespace && !is_global_namespace(namespace); @@ -820,6 +834,7 @@ static void compute_delegate_iface_names(type_t *delegate, type_t *type, typeref iface->name = strmake("I%s", delegate->name); if (type) iface->c_name = format_parameterized_type_c_name(type, params, "I"); else iface->c_name = format_namespace(delegate->namespace, "__x_", "_C", iface->name, use_abi_namespace ? "ABI" : NULL); + iface->qualified_name = format_namespace(delegate->namespace, "", "::", iface->name, use_abi_namespace ? "ABI" : NULL); } type_t *type_delegate_declare(char *name, struct namespace *namespace) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index c8bccc2fec9..805e96a9305 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -75,6 +75,7 @@ type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t type_t *type_parameterized_type_specialize_define(type_t *type); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); +const char *type_get_qualified_name(const type_t *type, enum name_type name_type); char *gen_name(void); extern int is_attr(const attr_list_t *list, enum attr_type t); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index e01bd122b45..81646cae1d1 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -503,6 +503,7 @@ struct _type_t { } details; const char *c_name; const char *signature; + const char *qualified_name; unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx;

1 0

Steve Lhomme : widl: Define the C type name as an alias for the C++ qualified name.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 18f04f569bbd85734a1cabd32ed250720d15fadf URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f04f569bbd85734a1cabd3… Author: Steve Lhomme <robux4(a)ycbcr.xyz> Date: Fri Feb 19 12:03:59 2021 +0100 widl: Define the C type name as an alias for the C++ qualified name. 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/header.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index 5ab8a3cc26f..e1dcab9b75b 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1482,6 +1482,8 @@ static void write_forward(FILE *header, type_t *iface) fprintf(header, "#define __%s_FWD_DEFINED__\n", iface->c_name); fprintf(header, "typedef interface %s %s;\n", iface->c_name, iface->c_name); fprintf(header, "#ifdef __cplusplus\n"); + if (iface->namespace && !is_global_namespace(iface->namespace)) + fprintf(header, "#define %s %s\n", iface->c_name, iface->qualified_name); write_namespace_start(header, iface->namespace); if (strchr(iface->name, '<')) write_line(header, 0, "template<> struct %s;", iface->name); else write_line(header, 0, "interface %s;", iface->name);

1 0

Steve Lhomme : widl: Use C name when writing UUID declarations.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 49a1cc10d2db6ed7257b2e3a70d41d09dbff5ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49a1cc10d2db6ed7257b2e3a… Author: Steve Lhomme <robux4(a)ycbcr.xyz> Date: Fri Feb 19 12:04:00 2021 +0100 widl: Use C name when writing UUID declarations. 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/header.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index e1dcab9b75b..82aad0f11ca 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -135,15 +135,13 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const static void write_uuid_decl(FILE *f, type_t *type, const UUID *uuid) { - char *name = format_namespace(type->namespace, "", "::", type->name, use_abi_namespace ? "ABI" : NULL); fprintf(f, "#ifdef __CRT_UUID_DECL\n"); fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n", - name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1], + type->c_name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], uuid->Data4[1], uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], uuid->Data4[7]); fprintf(f, "#endif\n"); - free(name); } static const char *uuid_string(const UUID *uuid)

1 0