September 2018 - Wine-Commits

Nikolay Sivov : opcservices: Update content stream position on Read().
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: wine Branch: master Commit: 55af98d1a3158b7a8b061d2162050902b80782a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55af98d1a3158b7a8b061d21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 21 09:23:30 2018 +0300 opcservices: Update content stream position on Read(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 2 ++ dlls/opcservices/tests/opcservices.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index fb07d4d..5534fe6 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -560,6 +560,8 @@ static HRESULT WINAPI opc_content_stream_Read(IStream *iface, void *buff, ULONG if (*num_read) memcpy(buff, stream->content->data + stream->pos.QuadPart, *num_read); + stream->pos.QuadPart += *num_read; + return S_OK; } diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 2ef5677..6bb0c54 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -159,6 +159,11 @@ static void test_package(void) ok(hr == S_OK, "Failed to read content, hr %#x.\n", hr); ok(!memcmp(buff, "abc", 3), "Unexpected content.\n"); + move.QuadPart = 0; + hr = IStream_Seek(stream2, move, STREAM_SEEK_CUR, &pos); + ok(SUCCEEDED(hr), "Seek failed, hr %#x.\n", hr); + ok(pos.QuadPart == 3, "Unexpected position.\n"); + IStream_Release(stream); IStream_Release(stream2);

1 0

Zhiyi Zhang : comctl32/pager: Support tooltip notification conversion.
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: wine Branch: master Commit: d7dcfe032f0d5213284a27145c127f8973446477 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7dcfe032f0d5213284a2714… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 17 23:26:48 2018 +0800 comctl32/pager: Support tooltip notification conversion. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 72 ++++++++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7dcfe032f0d5213284a…

1 0

Gabriel Ivăncescu : shell32/autocomplete: Fix going up through the suggestion listbox.
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: wine Branch: master Commit: cb8bd825b99478393efad5907236f1bcd9dc799e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8bd825b99478393efad590… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 20 14:55:34 2018 +0300 shell32/autocomplete: Fix going up through the suggestion listbox. When going up past the topmost item in the listbox, go through txtbackup first before wrapping around, just like when going down. This matches Windows behavior. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index e3fe1fd..0471146 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -296,7 +296,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT /* Change the selection */ sel = SendMessageW(ac->hwndListBox, LB_GETCURSEL, 0, 0); if (wParam == VK_UP) - sel = ((sel - 1) < 0) ? count - 1 : sel - 1; + sel = ((sel - 1) < -1) ? count - 1 : sel - 1; else sel = ((sel + 1) >= count) ? -1 : sel + 1; SendMessageW(ac->hwndListBox, LB_SETCURSEL, sel, 0);

1 0

Alex Henrie : gdi32: Avoid using GCC's typeof extension.
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: wine Branch: master Commit: 47ab4904276be87297a851a8468ff3966afc8584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ab4904276be87297a851a8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 19 22:44:15 2018 -0600 gdi32: Avoid using GCC's typeof extension. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index ce60d11..8920b73 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -61,9 +61,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static typeof(GetDesktopWindow) *pGetDesktopWindow; -static typeof(GetSystemMetrics) *pGetSystemMetrics; -static typeof(SetThreadDpiAwarenessContext) *pSetThreadDpiAwarenessContext; +static HWND (WINAPI *pGetDesktopWindow)(void); +static INT (WINAPI *pGetSystemMetrics)(INT); +static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** * create_driver

1 0

Nikolay Sivov : opcservices: Add content type entry for relationship parts.
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: wine Branch: master Commit: 9c6d6899a7cca342dc9320207481b8c009fae76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c6d6899a7cca342dc932020… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 21 09:23:28 2018 +0300 opcservices: Add content type entry for relationship parts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 70 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index d7467a5..a6f3b90 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1535,6 +1535,7 @@ HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) struct content_types { struct list types; + BOOL has_rels_part; }; enum content_type_element @@ -1653,9 +1654,26 @@ static HRESULT opc_package_add_content_type(struct content_types *types, IOpcPar return hr; } +static BOOL opc_package_has_rels_part(IOpcRelationshipSet *rel_set) +{ + IOpcRelationshipEnumerator *enumerator; + BOOL has_next; + HRESULT hr; + + if (FAILED(hr = IOpcRelationshipSet_GetEnumerator(rel_set, &enumerator))) + return FALSE; + + has_next = FALSE; + IOpcRelationshipEnumerator_MoveNext(enumerator, &has_next); + IOpcRelationshipEnumerator_Release(enumerator); + + return has_next; +} + static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct content_types *types) { IOpcPartEnumerator *enumerator; + IOpcRelationshipSet *rel_set; IOpcPartSet *parts; BOOL has_next; HRESULT hr; @@ -1663,6 +1681,13 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co if (FAILED(hr = IOpcPackage_GetPartSet(package, &parts))) return hr; + hr = IOpcPackage_GetRelationshipSet(package, &rel_set); + if (SUCCEEDED(hr)) + { + types->has_rels_part |= opc_package_has_rels_part(rel_set); + IOpcRelationshipSet_Release(rel_set); + } + hr = IOpcPartSet_GetEnumerator(parts, &enumerator); IOpcPartSet_Release(parts); if (FAILED(hr)) @@ -1681,6 +1706,16 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co if (FAILED(hr = IOpcPartEnumerator_GetCurrent(enumerator, &part))) break; + if (!types->has_rels_part) + { + hr = IOpcPart_GetRelationshipSet(part, &rel_set); + if (SUCCEEDED(hr)) + { + types->has_rels_part |= opc_package_has_rels_part(rel_set); + IOpcRelationshipSet_Release(rel_set); + } + } + hr = opc_package_add_content_type(types, part); IOpcPart_Release(part); if (FAILED(hr)) @@ -1694,23 +1729,40 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co return hr; } +static HRESULT opc_package_write_default_type(const WCHAR *ext, const WCHAR *type, IXmlWriter *writer) +{ + static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; + static const WCHAR extensionW[] = {'E','x','t','e','n','s','i','o','n',0}; + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; + HRESULT hr; + + hr = IXmlWriter_WriteStartElement(writer, NULL, defaultW, NULL); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteAttributeString(writer, NULL, extensionW, NULL, ext); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, type); + return hr; +} + static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_archive *archive, IXmlWriter *writer) { static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', 'p','a','c','k','a','g','e','/','2','0','0','6','/','c','o','n','t','e','n','t','-','t','y','p','e','s',0}; + static const WCHAR relstypeW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','v','n','d','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','-', + 'p','a','c','k','a','g','e','.','r','e','l','a','t','i','o','n','s','h','i','p','s','+','x','m','l',0}; static const WCHAR contenttypesW[] = {'[','C','o','n','t','e','n','t','_','T','y','p','e','s',']','.','x','m','l',0}; static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; - static const WCHAR extensionW[] = {'E','x','t','e','n','s','i','o','n',0}; static const WCHAR overrideW[] = {'O','v','e','r','r','i','d','e',0}; static const WCHAR partnameW[] = {'P','a','r','t','N','a','m','e',0}; - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR typesW[] = {'T','y','p','e','s',0}; + static const WCHAR relsW[] = {'r','e','l','s',0}; struct content_type *content_type, *content_type2; struct content_types types; IStream *content = NULL; HRESULT hr; list_init(&types.types); + types.has_rels_part = FALSE; hr = CreateStreamOnHGlobal(NULL, TRUE, &content); if (SUCCEEDED(hr)) @@ -1722,16 +1774,18 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a if (SUCCEEDED(hr)) hr = IXmlWriter_WriteStartElement(writer, NULL, typesW, uriW); + if (SUCCEEDED(hr) && types.has_rels_part) + { + hr = opc_package_write_default_type(relsW, relstypeW, writer); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteEndElement(writer); + } + LIST_FOR_EACH_ENTRY_SAFE(content_type, content_type2, &types.types, struct content_type, entry) { if (content_type->element == CONTENT_TYPE_DEFAULT) { - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, defaultW, NULL); - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, extensionW, NULL, content_type->u.def.ext + 1); - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, content_type->u.def.type); + hr = opc_package_write_default_type(content_type->u.def.ext + 1, content_type->u.def.type, writer); CoTaskMemFree(content_type->u.def.ext); CoTaskMemFree(content_type->u.def.type);

1 0

Francois Gouget : testbot: Rename some GetPatchImpacts() fields.
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: tools Branch: master Commit: f4c3c990f09bd918e2c193d4bf46dd5b49d96cf5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f4c3c990f09bd918e2c193d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 21 10:35:34 2018 +0200 testbot: Rename some GetPatchImpacts() fields. The new names are less ambiguous and less Wine-specific. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 25 ++++++++++++------------- testbot/lib/WineTestBot/Patches.pm | 6 +++--- testbot/web/Submit.pl | 4 ++-- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7a268db..1287f6d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -222,7 +222,7 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - ($Impacts->{WineBuild} and !BuildNative()) or + ($Impacts->{PatchedRoot} and !BuildNative()) or !BuildTestExecutables($Targets, $Impacts, "exe32") or !BuildTestExecutables($Targets, $Impacts, "exe64")) { diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 04aea18..2bac7be 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -195,7 +195,7 @@ sub _HandleFile($$$) my ($Root, $Dir, $File) = ($1, $2, $3); my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{TestBuild} = 1; + $Impacts->{PatchedTests} = 1; $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; if ($File eq "Makefile.in" and $Change ne "modify") @@ -209,7 +209,7 @@ sub _HandleFile($$$) my ($Root, $Dir, $File) = ($1, $2, $3); my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{ModuleBuild} = 1; + $Impacts->{PatchedModules} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -227,12 +227,11 @@ sub _HandleFile($$$) $Impacts->{IsWinePatch} = 1; } # Else this file exists in Wine but has a very common name so it may just - # as well belong to another repository. Still update WineBuild in case - # this patch really is for Wine. + # as well belong to another repository. if ($FilePath !~ /^(?:$IgnoredPathsRe)/) { - $Impacts->{WineBuild} = 1; + $Impacts->{PatchedRoot} = 1; if ($FilePath =~ m~/Makefile.in$~ and $Change ne "modify") { # This adds / removes a directory @@ -245,7 +244,7 @@ sub _HandleFile($$$) { # This may or may not be a Wine patch but the new Makefile.in will be # added to the build by make_makefiles. - $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } } } @@ -274,7 +273,7 @@ sub GetPatchImpacts($;$) # patch. ModuleUnitCount => 0, # Number of patched test units. - UnitCount => 0, + TestUnitCount => 0, # The modules that need a rebuild, even if only for the tests. BuildModules => {}, # Information about 'tests' directories. @@ -284,8 +283,8 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{WineBuild} or $PastImpacts->{ModuleBuild} or - $PastImpacts->{TestBuild}) + if ($PastImpacts->{PatchedRoot} or $PastImpacts->{PatchedModules} or + $PastImpacts->{PatchedTests}) { # Update the list of Wine files so we correctly recognize patchset parts # that modify new Wine files. @@ -318,11 +317,11 @@ sub GetPatchImpacts($;$) { if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) { - $Impacts->{WineBuild} = $Impacts->{Autoconf} = 1; + $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=) @@ -401,7 +400,7 @@ sub GetPatchImpacts($;$) } $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{Units}}); - $Impacts->{UnitCount} += $TestInfo->{UnitCount}; + $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; } return $Impacts; @@ -420,7 +419,7 @@ sub GetBuildTimeout($$) map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %$Builds; # Set $ModuleCount to 0 if a full rebuild is needed - my $ModuleCount = (!$Impacts or $Impacts->{WineBuild}) ? 0 : + my $ModuleCount = (!$Impacts or $Impacts->{PatchedRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); my ($ExeTimeout, $WineTimeout) = (0, 0); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 5024ed4..0387543 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -136,8 +136,8 @@ sub Submit($$$) $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, $PastImpacts); - if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and - !$Impacts->{TestBuild}) + if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and + !$Impacts->{PatchedTests}) { if ($Impacts->{IsWinePatch}) { @@ -176,7 +176,7 @@ sub Submit($$$) my $BuildVMs = CreateVMs(); $BuildVMs->AddFilter("Type", ["build"]); $BuildVMs->AddFilter("Role", ["base"]); - if ($Impacts->{UnitCount} and !$BuildVMs->IsEmpty()) + if ($Impacts->{TestUnitCount} and !$BuildVMs->IsEmpty()) { # Create the Build Step my $BuildStep = $NewJob->Steps->Add(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index fe10104..ae4aca3 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -598,11 +598,11 @@ sub DetermineFileType($$) if ($FileType eq "unknown") { my $Impacts = GetPatchImpacts($FileName); - if ($Impacts->{UnitCount} == 0) + if ($Impacts->{TestUnitCount} == 0) { $ErrMessage = "Patch doesn't affect tests"; } - elsif ($Impacts->{UnitCount} > 1) + elsif ($Impacts->{TestUnitCount} > 1) { $ErrMessage = "Patch contains changes to multiple tests"; }

1 0

Francois Gouget : testbot: Add a ModuleBuild check in GetPatchImpacts().
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: tools Branch: master Commit: fa8080c7e9f3013d26ab6f1c26f7fe03488df840 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fa8080c7e9f3013d26ab6f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 21 10:35:22 2018 +0200 testbot: Add a ModuleBuild check in GetPatchImpacts(). Patches that impact a single module can impact the Wine files list too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 9e0e689..602c80b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -279,7 +279,8 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{WineBuild} or $PastImpacts->{TestBuild}) + if ($PastImpacts->{WineBuild} or $PastImpacts->{ModuleBuild} or + $PastImpacts->{TestBuild}) { # Update the list of Wine files so we correctly recognize patchset parts # that modify new Wine files.

1 0

Francois Gouget : testbot: Add _CreateTestInfo() to reduce code duplication in PatchUtils.
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: tools Branch: master Commit: b44393b440c7a15b7b1cfd0631e15434429ecfe9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b44393b440c7a15b7b1cfd0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 21 10:35:30 2018 +0200 testbot: Add _CreateTestInfo() to reduce code duplication in PatchUtils. _CreateTestInfo() creates the initial $Impacts->{Tests} structure for GetPachImpacts(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 64 ++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7c57b2c..04aea18 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -150,6 +150,31 @@ my $IgnoredPathsRe = join('|', 'tools/winemaker/', ); +sub _CreateTestInfo($$$) +{ + my ($Impacts, $Root, $Dir) = @_; + + my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + $Impacts->{BuildModules}->{$Module} = 1; + $Impacts->{IsWinePatch} = 1; + + my $Tests = $Impacts->{Tests}; + if (!$Tests->{$Module}) + { + $Tests->{$Module} = { + "Module" => $Module, + "Path" => "$Root/$Dir/tests", + "ExeBase" => "${Module}_test", + }; + foreach my $File (keys %{$_TestList->{$Module}}) + { + $Tests->{$Module}->{Files}->{$File} = 0; # not modified + } + } + + return $Module; +} + sub _HandleFile($$$) { my ($Impacts, $FilePath, $Change) = @_; @@ -168,43 +193,23 @@ sub _HandleFile($$$) if ($FilePath =~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; - $Impacts->{BuildModules}->{$Module} = 1; - $Impacts->{TestBuild} = 1; - $Impacts->{IsWinePatch} = 1; - my $Tests = $Impacts->{Tests}; - if (!$Tests->{$Module}) - { - $Tests->{$Module} = { - "Module" => $Module, - "Path" => "$Root/$Dir/tests", - "ExeBase" => "${Module}_test", - }; - } + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + $Impacts->{TestBuild} = 1; + $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; if ($File eq "Makefile.in" and $Change ne "modify") { # This adds / removes a directory $Impacts->{MakeMakefiles} = 1; } - - if (!$Tests->{$Module}->{Files}) - { - foreach my $File (keys %{$_TestList->{$Module}}) - { - $Tests->{$Module}->{Files}->{$File} = 0; # not modified - } - } - $Tests->{$Module}->{Files}->{$File} = $Change; } elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; - $Impacts->{BuildModules}->{$Module} = 1; + + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); $Impacts->{ModuleBuild} = 1; - $Impacts->{IsWinePatch} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -300,13 +305,10 @@ sub GetPatchImpacts($;$) foreach my $PastInfo (values %{$PastImpacts->{Tests}}) { - if ($PastInfo->{Files}) + foreach my $File (keys %{$PastInfo->{Files}}) { - foreach my $File (keys %{$PastInfo->{Files}}) - { - _HandleFile($Impacts, "$PastInfo->{Path}/$File", - $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); - } + _HandleFile($Impacts, "$PastInfo->{Path}/$File", + $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); } } }

1 0

Francois Gouget : testbot: Fix Makefile.in additions / removals in GetPatchImpacts().
by Alexandre Julliard Sept. 21, 2018

Sept. 21, 2018

Module: tools Branch: master Commit: 0eef5517017e63a53ad7f0c3a6402723dced096c URL: https://source.winehq.org/git/tools.git/?a=commit;h=0eef5517017e63a53ad7f0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 21 10:35:27 2018 +0200 testbot: Fix Makefile.in additions / removals in GetPatchImpacts(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 602c80b..7c57b2c 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -183,15 +183,10 @@ sub _HandleFile($$$) }; } - # Assume makefile modifications may break the build but not the tests - if ($File eq "Makefile.in") + if ($File eq "Makefile.in" and $Change ne "modify") { - if ($Change eq "new" or $Change eq "rm") - { - # This adds / removes a directory - $Impacts->{MakeMakefiles} = 1; - } - return; + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; } if (!$Tests->{$Module}->{Files}) @@ -233,6 +228,11 @@ sub _HandleFile($$$) if ($FilePath !~ /^(?:$IgnoredPathsRe)/) { $Impacts->{WineBuild} = 1; + if ($FilePath =~ m~/Makefile.in$~ and $Change ne "modify") + { + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; + } } # Else patches to this file don't impact the Wine build. } @@ -358,6 +358,8 @@ sub GetPatchImpacts($;$) { # Skip unmodified files next if (!$TestInfo->{Files}->{$File}); + # Assume makefile modifications may break the build but not the tests + next if ($File eq "Makefile.in"); my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//)

1 0

Zebediah Figura : quartz/filtergraph: Try filters in the graph first in FilterGraph2_Connect().
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: a638c327533fb4b0a2e0120e97062d2f1ef00040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a638c327533fb4b0a2e0120e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 10:36:19 2018 -0500 quartz/filtergraph: Try filters in the graph first in FilterGraph2_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 35 ++++++++++++++++++++++++++++++++--- dlls/quartz/tests/filtergraph.c | 11 +---------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8d5c5dc..4eaed31 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1089,7 +1089,9 @@ static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IPin *ppinIn) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + struct filter *filter; HRESULT hr; + IPin *pin; AM_MEDIA_TYPE* mt = NULL; IEnumMediaTypes* penummt = NULL; ULONG nbmt; @@ -1097,7 +1099,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IEnumMoniker* pEnumMoniker; GUID tab[2]; IMoniker* pMoniker; - ULONG pin; PIN_INFO PinInfo; CLSID FilterCLSID; PIN_DIRECTION dir; @@ -1160,6 +1161,34 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, TRACE("Direct connection failed, trying to render using extra filters\n"); + LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry) + { + hr = IBaseFilter_EnumPins(filter->filter, &penumpins); + if (FAILED(hr)) + goto out; + + while (IEnumPins_Next(penumpins, 1, &pin, NULL) == S_OK) + { + IPin_QueryDirection(pin, &dir); + if (dir == PINDIR_INPUT && SUCCEEDED(IFilterGraph2_ConnectDirect(iface, + ppinOut, pin, NULL))) + { + if (SUCCEEDED(hr = connect_output_pin(This, filter->filter, ppinIn))) + { + IPin_Release(pin); + IEnumPins_Release(penumpins); + goto out; + } + + IFilterGraph2_Disconnect(iface, pin); + IFilterGraph2_Disconnect(iface, ppinOut); + } + IPin_Release(pin); + } + + IEnumPins_Release(penumpins); + } + hr = IPin_QueryPinInfo(ppinIn, &PinInfo); if (FAILED(hr)) goto out; @@ -1290,14 +1319,14 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); + hr = IEnumPins_Next(penumpins, 1, &ppinfilter, NULL); IEnumPins_Release(penumpins); if (FAILED(hr)) { WARN("Obtaining next pin: (%x)\n", hr); goto error; } - if (pin == 0) { + if (hr == S_FALSE) { WARN("Cannot use this filter: no pins\n"); goto error; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c9083f9..64705d2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1701,11 +1701,9 @@ todo_wine sink_pin.accept_mt = &sink_type; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -1715,11 +1713,9 @@ todo_wine { IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, NULL); hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -1729,12 +1725,10 @@ todo_wine { IFilterGraph2_AddFilter(graph, &parser3.IBaseFilter_iface, NULL); hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser3_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(parser3_pins[1].peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", parser3_pins[1].peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, parser3_pins[0].peer); @@ -1753,11 +1747,10 @@ todo_wine { IFilterGraph2_AddFilter(graph, &sink2.IBaseFilter_iface, NULL); hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { +todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} ok(!parser1_pins[2].peer, "Got peer %p.\n", parser1_pins[2].peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); @@ -1769,11 +1762,9 @@ todo_wine { parser1_pins[1].QueryInternalConnections_hr = S_OK; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer);

1 0