September 2018 - Wine-Commits

Gabriel Ivăncescu : shell32/autocomplete: Don' t auto-append on control characters.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 964420554055059c4157b732a70181a766c0dec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964420554055059c4157b732… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 18 23:59:52 2018 +0300 shell32/autocomplete: Don't auto-append on control characters. We must not auto-append on control characters, most notably Backspace, but also ^X (cut) and so on. 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 183b37b..b0c92c3 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -343,7 +343,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_CHAR: case WM_UNICHAR: ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) + autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) && wParam >= ' ' ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_DESTROY:

1 0

Dmitry Timoshkov : msi: Move parameter checks to a common helper in MsiSummaryInfoSetProperty.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 7929c31ea7b9f47f68cd434393f1212e448a9cf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7929c31ea7b9f47f68cd4343… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 19 13:28:34 2018 +0800 msi: Move parameter checks to a common helper in MsiSummaryInfoSetProperty. Currently MsiSummaryInfoSetProperty tests don't have a chance to execute under Wine because the tests crash earlier, and the crashes are hidden by a custom action exception handler. This patch simplifies the next one. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/suminfo.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 37c49d7..af3458a 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -877,26 +877,32 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type, return ERROR_SUCCESS; } -UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, - INT iValue, FILETIME *pftValue, LPCWSTR szValue ) +static UINT msi_set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT uiDataType, + INT iValue, FILETIME *pftValue, awcstring *str ) { - awcstring str; - MSISUMMARYINFO *si; - UINT type, ret; - - TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, - debugstr_w(szValue) ); - - type = get_type( uiProperty ); + UINT type = get_type( uiProperty ); if( type == VT_EMPTY || type != uiDataType ) return ERROR_DATATYPE_MISMATCH; - if( uiDataType == VT_LPSTR && !szValue ) + if( uiDataType == VT_LPSTR && !str->str.a ) return ERROR_INVALID_PARAMETER; if( uiDataType == VT_FILETIME && !pftValue ) return ERROR_INVALID_PARAMETER; + return set_prop( si, uiProperty, type, iValue, pftValue, str ); +} + +UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, + INT iValue, FILETIME *pftValue, LPCWSTR szValue ) +{ + awcstring str; + MSISUMMARYINFO *si; + UINT ret; + + TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, + debugstr_w(szValue) ); + if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) { MSIHANDLE remote; @@ -913,7 +919,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT str.unicode = TRUE; str.str.w = szValue; - ret = set_prop( si, uiProperty, type, iValue, pftValue, &str ); + ret = msi_set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str ); msiobj_release( &si->hdr ); return ret; } @@ -923,21 +929,11 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT { awcstring str; MSISUMMARYINFO *si; - UINT type, ret; + UINT ret; TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, debugstr_a(szValue) ); - type = get_type( uiProperty ); - if( type == VT_EMPTY || type != uiDataType ) - return ERROR_DATATYPE_MISMATCH; - - if( uiDataType == VT_LPSTR && !szValue ) - return ERROR_INVALID_PARAMETER; - - if( uiDataType == VT_FILETIME && !pftValue ) - return ERROR_INVALID_PARAMETER; - if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) { MSIHANDLE remote; @@ -954,7 +950,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT str.unicode = FALSE; str.str.a = szValue; - ret = set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str ); + ret = msi_set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str ); msiobj_release( &si->hdr ); return ret; }

1 0

Dmitry Timoshkov : msi/tests: Also test full range of properties for MsiSummaryInfoSetPropertyW.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: ff0129370869ed4ffb4acd69d7123f3d5ca294c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0129370869ed4ffb4acd69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 19 16:37:12 2018 +0800 msi/tests: Also test full range of properties for MsiSummaryInfoSetPropertyW. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index f06aee0..c9ec82f 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -510,12 +510,14 @@ static void test_db(MSIHANDLE hinst) for (i = 0; i < 20; i++) { + WCHAR emptyW[1] = { 0 }; + r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - } - r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW); + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); + } r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r);

1 0

Nikolay Sivov : opcservices/tests: Add some GetRelativeUri() tests.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 5f1f28c1cbad35c420f73d97569dc74496027d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f1f28c1cbad35c420f73d97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:30 2018 +0300 opcservices/tests: Add some GetRelativeUri() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 81 ++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index a062176..a96a5cf 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -923,6 +923,86 @@ static void test_rels_enumerator(void) IOpcPackage_Release(package); IOpcFactory_Release(factory); } + +static void test_relative_uri(void) +{ + static const struct + { + const char *part; + const char *combined; + const char *relative; + const char *relative_broken; + } + relative_uri_tests[] = + { + { "/", "/path/path2", "path/path2", "/path/path2" }, + { "/", "/path", "path", "/path" }, + { "/path/path2", "/path/path2/path3", "path2/path3" }, + { "/path/path2", "/path3", "../path3" }, + { "/path", "/path", "" }, + { "/path", "../path", "" }, + { "/path2", "/path", "path" }, + { "../path", "/path", "" }, + { "../../path", "/path", "" }, + }; + IOpcFactory *factory; + unsigned int i; + + factory = create_factory(); + + for (i = 0; i < ARRAY_SIZE(relative_uri_tests); ++i) + { + WCHAR *uriW, *combinedW, *relativeW, *relative_broken_W; + IOpcPartUri *combined_uri; + IUri *relative_uri; + IOpcUri *part_uri; + IUnknown *unk; + HRESULT hr; + BSTR str; + + uriW = strdupAtoW(relative_uri_tests[i].part); + combinedW = strdupAtoW(relative_uri_tests[i].combined); + relativeW = strdupAtoW(relative_uri_tests[i].relative); + relative_broken_W = strdupAtoW(relative_uri_tests[i].relative_broken); + + if (!strcmp(relative_uri_tests[i].part, "/")) + hr = IOpcFactory_CreatePackageRootUri(factory, &part_uri); + else + hr = IOpcFactory_CreatePartUri(factory, uriW, (IOpcPartUri **)&part_uri); + ok(SUCCEEDED(hr), "%u: failed to create part uri, hr %#x.\n", i, hr); + + hr = IOpcFactory_CreatePartUri(factory, combinedW, &combined_uri); + ok(SUCCEEDED(hr), "%u: failed to create part uri, hr %#x.\n", i, hr); + + hr = IOpcUri_GetRelativeUri(part_uri, combined_uri, &relative_uri); + todo_wine + ok(SUCCEEDED(hr), "%u: failed t oget relative uri, hr %#x.\n", i, hr); + + if (SUCCEEDED(hr)) + { + hr = IUri_QueryInterface(relative_uri, &IID_IOpcUri, (void **)&unk); + ok(hr == E_NOINTERFACE, "%u: unexpected hr %#x.\n", i, hr); + + hr = IUri_GetRawUri(relative_uri, &str); + ok(SUCCEEDED(hr), "%u: failed to get raw uri, hr %#x.\n", i, hr); + ok(!lstrcmpW(str, relativeW) || broken(relative_broken_W && !lstrcmpW(str, relative_broken_W)), + "%u: unexpected relative uri %s.\n", i, wine_dbgstr_w(str)); + SysFreeString(str); + + IUri_Release(relative_uri); + } + IOpcUri_Release(part_uri); + IOpcPartUri_Release(combined_uri); + + heap_free(uriW); + heap_free(combinedW); + heap_free(relativeW); + heap_free(relative_broken_W); + } + + IOpcFactory_Release(factory); +} + START_TEST(opcservices) { IOpcFactory *factory; @@ -943,6 +1023,7 @@ START_TEST(opcservices) test_rel_part_uri(); test_part_enumerator(); test_rels_enumerator(); + test_relative_uri(); IOpcFactory_Release(factory);

1 0

Francois Gouget : testbot: Set a flag when all of a module' s test units must be rerun.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: tools Branch: master Commit: 84ae9f5f5448d38a29f307b9c381cfc3fd8a5793 URL: https://source.winehq.org/git/tools.git/?a=commit;h=84ae9f5f5448d38a29f307b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 19 12:09:45 2018 +0200 testbot: Set a flag when all of a module's test units must be rerun. This will let GetPatchImpacts() callers make optimisations like passing the module name to WineTest instead of the full test unit list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 476757f..9e0e689 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -353,7 +353,6 @@ sub GetPatchImpacts($;$) foreach my $TestInfo (values %{$Impacts->{Tests}}) { # For each module, identify modifications to non-C files and helper dlls - my $AllUnits; foreach my $File (keys %{$TestInfo->{Files}}) { # Skip unmodified files @@ -363,7 +362,7 @@ sub GetPatchImpacts($;$) if ($Base !~ s/(?:\.c|\.spec)$//) { # Any change to a non-C non-Spec file can potentially impact all tests - $AllUnits = 1; + $TestInfo->{All} = 1; last; } if (exists $TestInfo->{Files}->{"$Base.spec"} and @@ -371,7 +370,7 @@ sub GetPatchImpacts($;$) $TestInfo->{Files}->{"$Base.spec"})) { # Any change to a helper dll can potentially impact all tests - $AllUnits = 1; + $TestInfo->{All} = 1; last; } } @@ -380,7 +379,7 @@ sub GetPatchImpacts($;$) foreach my $File (keys %{$TestInfo->{Files}}) { # Skip unmodified files - next if (!$AllUnits and !$TestInfo->{Files}->{$File}); + next if (!$TestInfo->{All} and !$TestInfo->{Files}->{$File}); my $Base = $File; # Non-C files are not test units @@ -388,7 +387,7 @@ sub GetPatchImpacts($;$) # Helper dlls are not test units next if (exists $TestInfo->{Files}->{"$Base.spec"}); - if (($AllUnits or $TestInfo->{Files}->{$File}) and + if (($TestInfo->{All} or $TestInfo->{Files}->{$File}) and $TestInfo->{Files}->{$File} ne "rm") { # Only new/modified test units are impacted

1 0

Francois Gouget : testbot: Remove the $NoUnits GetPatchImpacts() parameter.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: tools Branch: master Commit: 73d3e48acd0e037bae0c58da5f355bf8061c3259 URL: https://source.winehq.org/git/tools.git/?a=commit;h=73d3e48acd0e037bae0c58d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 19 12:09:38 2018 +0200 testbot: Remove the $NoUnits GetPatchImpacts() parameter. The goal was to be able to use it on systems that don't have the winefiles.txt file. However nowadays all systems have access to it. Furthermore the amount of work saved is not really significant so there is no reason for the extra complexity. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 9 +++++---- testbot/lib/WineTestBot/Patches.pm | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index d9bedb5..ec36b62 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -446,7 +446,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # -my $Impacts = GetPatchImpacts($FileName, "nounit"); +my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 38a8012..2fe7a97 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -113,7 +113,7 @@ sub ApplyPatch($$) return undef; } - my $Impacts = GetPatchImpacts($PatchFile, "nounits"); + my $Impacts = GetPatchImpacts($PatchFile); if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 4a1761a..4ce5bf4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -193,7 +193,6 @@ sub _HandleFile($$$) } return; } - return if ($Impacts->{NoUnits}); if (!$Tests->{$Module}->{Files}) { @@ -258,15 +257,17 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpacts($;$$) +sub GetPatchImpacts($;$) { - my ($PatchFileName, $NoUnits, $PastImpacts) = @_; + my ($PatchFileName, $PastImpacts) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); my $Impacts = { - NoUnits => $NoUnits, + # Number of test units impacted either directly, or indirectly by a module + # patch. + ModuleUnitCount => 0, # Number of patched test units. UnitCount => 0, # The modules that need a rebuild, even if only for the tests. diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a052c5a..5024ed4 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -134,7 +134,7 @@ sub Submit($$$) my $PastImpacts; $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, undef, $PastImpacts); + my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, $PastImpacts); if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and !$Impacts->{TestBuild})

1 0

Francois Gouget : testbot: Rename the patch analyzer to GetPatchImpacts().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: tools Branch: master Commit: 46de79b0bf47d1989a263e2fb80feb5cf974aa1e URL: https://source.winehq.org/git/tools.git/?a=commit;h=46de79b0bf47d1989a263e2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 19 12:09:35 2018 +0200 testbot: Rename the patch analyzer to GetPatchImpacts(). The returned structure is called $Impacts everywhere so this makes the naming more consistent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 6 +++--- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/web/Submit.pl | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 11b41c6..d9bedb5 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -446,7 +446,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # -my $Impacts = GetPatchImpact($FileName, "nounit"); +my $Impacts = GetPatchImpacts($FileName, "nounit"); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index fd1b846..38a8012 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -113,7 +113,7 @@ sub ApplyPatch($$) return undef; } - my $Impacts = GetPatchImpact($PatchFile, "nounits"); + my $Impacts = GetPatchImpacts($PatchFile, "nounits"); if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7049694..4a1761a 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,7 +31,7 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpact UpdateWineData GetBuildTimeout); +our @EXPORT = qw(GetPatchImpacts UpdateWineData GetBuildTimeout); use List::Util qw(min max); @@ -249,7 +249,7 @@ sub _HandleFile($$$) =pod =over 12 -=item C<GetPatchImpact()> +=item C<GetPatchImpacts()> Analyzes a patch and returns a hashtable describing the impact it has on the Wine build: whether it requires updating the makefiles, re-running autoconf or @@ -258,7 +258,7 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($;$$) +sub GetPatchImpacts($;$$) { my ($PatchFileName, $NoUnits, $PastImpacts) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 390b161..a052c5a 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -133,8 +133,8 @@ sub Submit($$$) my ($self, $PatchFileName, $IsSet) = @_; my $PastImpacts; - $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); + $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); + my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and !$Impacts->{TestBuild}) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 621b017..fe10104 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -597,7 +597,7 @@ sub DetermineFileType($$) my ($ErrMessage, $ExeBase, $TestUnit); if ($FileType eq "unknown") { - my $Impacts = GetPatchImpact($FileName); + my $Impacts = GetPatchImpacts($FileName); if ($Impacts->{UnitCount} == 0) { $ErrMessage = "Patch doesn't affect tests"; @@ -781,7 +781,7 @@ sub OnSubmit($) if ($FileType eq "patch") { my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - $Impacts = GetPatchImpact($TmpStagingFullPath); + $Impacts = GetPatchImpacts($TmpStagingFullPath); } my $BuildStep;

1 0

Francois Gouget : testbot: Remove the HasConfigure patch impact.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: tools Branch: master Commit: 5141879b5e9bd6423322eb21c57e5e34f5f53e73 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5141879b5e9bd6423322eb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 19 12:09:42 2018 +0200 testbot: Remove the HasConfigure patch impact. Even if the patch provides an updated configure file the TestBot needs to be able to recreate it in case another patch does not provide it. Furthermore skipping the autoconf steps correctly is complex when a patchset changes configure.ac in part 1 and provides configure in part 2, or provides both in part 1 and only some other configure.ac change in part 2, etc. So it's better to just run autoconf whenever configure.ac is patched. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 2fe7a97..2e6cc85 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -125,7 +125,7 @@ sub ApplyPatch($$) } } - if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) + if ($Impacts->{Autoconf}) { InfoMsg "\nRunning autoconf\n"; system("cd '$DataDir/$Dir' && set -x && autoconf"); diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 4ce5bf4..476757f 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -317,10 +317,6 @@ sub GetPatchImpacts($;$) { $Impacts->{WineBuild} = $Impacts->{Autoconf} = 1; } - elsif ($Line =~ m=^--- \w+/configure$=) - { - $Impacts->{WineBuild} = $Impacts->{HasConfigure} = 1; - } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Redesign the window proc to trigger on key presses instead of key release.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: a118459adf218617337c5ea737033fc3bfd9b01c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a118459adf218617337c5ea7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 17 22:23:10 2018 +0300 shell32/autocomplete: Redesign the window proc to trigger on key presses instead of key release. AutoComplete currently shows up when the user releases a key, which is wrong. Windows does it when the user presses a key, so use both WM_KEYDOWN and WM_CHAR and redesign it so that it 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 | 115 +++++++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 50 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 874d831..183b37b 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -79,6 +79,13 @@ typedef struct AUTOCOMPLETEOPTIONS options; } IAutoCompleteImpl; +enum autoappend_flag +{ + autoappend_flag_yes, + autoappend_flag_no, + autoappend_flag_displayempty +}; + static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', 'c','o','m','p','l','e','t','e',' ', 'c','o','n','t','r','o','l',0}; @@ -119,10 +126,25 @@ static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *st return dst - base; } -static void autocomplete_text(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND hwnd, BOOL displayall) +static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) { HRESULT hr; - UINT cpt; + WCHAR *text; + UINT cpt, size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + + if (flag != autoappend_flag_displayempty && len == 0) + { + if (ac->options & ACO_AUTOSUGGEST) + ShowWindow(ac->hwndListBox, SW_HIDE); + return; + } + + size = len + 1; + if (!(text = heap_alloc(size * sizeof(WCHAR)))) + return; + len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)text); + if (len + 1 != size) + text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); @@ -130,9 +152,6 @@ static void autocomplete_text(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND heap_free(ac->txtbackup); ac->txtbackup = text; - if (!displayall && !len) - return; - IEnumString_Reset(ac->enumstr); for (cpt = 0;;) { @@ -145,7 +164,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND if (!strncmpiW(text, strs, len)) { - if (cpt == 0 && (ac->options & ACO_AUTOAPPEND)) + if (cpt == 0 && flag == autoappend_flag_yes) { WCHAR buffW[255]; @@ -200,27 +219,23 @@ static void destroy_autocomplete_object(IAutoCompleteImpl *ac) /* Helper for ACEditSubclassProc */ -static LRESULT ACEditSubclassProc_KeyUp(IAutoCompleteImpl *ac, HWND hwnd, UINT uMsg, - WPARAM wParam, LPARAM lParam) +static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT uMsg, + WPARAM wParam, LPARAM lParam) { - WCHAR *text; - UINT len, size; - BOOL displayall = FALSE; - - len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); - size = len + 1; - if (!(text = heap_alloc(size * sizeof(WCHAR)))) - return 0; - len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)text); - switch (wParam) { case VK_RETURN: /* If quickComplete is set and control is pressed, replace the string */ if (ac->quickComplete && (GetKeyState(VK_CONTROL) & 0x8000)) { - WCHAR *buf; - size_t sz = strlenW(ac->quickComplete) + 1 + len; + WCHAR *text, *buf; + size_t sz; + UINT len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + if (!(text = heap_alloc((len + 1) * sizeof(WCHAR)))) + return 0; + len = SendMessageW(hwnd, WM_GETTEXT, len + 1, (LPARAM)text); + sz = strlenW(ac->quickComplete) + 1 + len; + if ((buf = heap_alloc(sz * sizeof(WCHAR)))) { len = format_quick_complete(buf, ac->quickComplete, text, len); @@ -228,16 +243,16 @@ static LRESULT ACEditSubclassProc_KeyUp(IAutoCompleteImpl *ac, HWND hwnd, UINT u SendMessageW(hwnd, EM_SETSEL, 0, len); heap_free(buf); } + + if (ac->options & ACO_AUTOSUGGEST) + ShowWindow(ac->hwndListBox, SW_HIDE); + heap_free(text); + return 0; } if (ac->options & ACO_AUTOSUGGEST) ShowWindow(ac->hwndListBox, SW_HIDE); - heap_free(text); - return 0; - case VK_LEFT: - case VK_RIGHT: - heap_free(text); - return 0; + break; case VK_UP: case VK_DOWN: /* Two cases here: @@ -245,19 +260,20 @@ static LRESULT ACEditSubclassProc_KeyUp(IAutoCompleteImpl *ac, HWND hwnd, UINT u set, display it with all the entries, without selecting any - if the listbox is visible, change the selection */ - if ( (ac->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) - && (!IsWindowVisible(ac->hwndListBox) && (! *text)) ) + if (!(ac->options & ACO_AUTOSUGGEST)) + break; + + if (!IsWindowVisible(ac->hwndListBox)) { - /* We must display all the entries */ - displayall = TRUE; + if (ac->options & ACO_UPDOWNKEYDROPSLIST) + { + autocomplete_text(ac, hwnd, autoappend_flag_displayempty); + return 0; + } } else { INT count, sel; - heap_free(text); - if (!IsWindowVisible(ac->hwndListBox)) - return 0; - count = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0); /* Change the selection */ @@ -290,22 +306,14 @@ static LRESULT ACEditSubclassProc_KeyUp(IAutoCompleteImpl *ac, HWND hwnd, UINT u return 0; } break; - case VK_BACK: case VK_DELETE: - if ((! *text) && (ac->options & ACO_AUTOSUGGEST)) - { - heap_free(text); - ShowWindow(ac->hwndListBox, SW_HIDE); - return CallWindowProcW(ac->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - } - break; + { + LRESULT ret = CallWindowProcW(ac->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + autocomplete_text(ac, hwnd, autoappend_flag_no); + return ret; + } } - - if (len + 1 != size) - text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); - - autocomplete_text(ac, text, len, hwnd, displayall); - return 0; + return CallWindowProcW(ac->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } /* @@ -314,6 +322,7 @@ static LRESULT ACEditSubclassProc_KeyUp(IAutoCompleteImpl *ac, HWND hwnd, UINT u static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); + LRESULT ret; if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); @@ -329,8 +338,14 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ShowWindow(This->hwndListBox, SW_HIDE); } return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - case WM_KEYUP: - return ACEditSubclassProc_KeyUp(This, hwnd, uMsg, wParam, lParam); + case WM_KEYDOWN: + return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); + case WM_CHAR: + case WM_UNICHAR: + ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) + ? autoappend_flag_yes : autoappend_flag_no); + return ret; case WM_DESTROY: { WNDPROC proc = This->wpOrigEditProc;

1 0

Zebediah Figura : quartz/filtergraph: Use a linked list to store filters.
by Alexandre Julliard Sept. 18, 2018

Sept. 18, 2018

Module: wine Branch: master Commit: 2230834022869a32794f3de05ee1ac0e439cd354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2230834022869a32794f3de0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 09:40:45 2018 -0500 quartz/filtergraph: Use a linked list to store filters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 211 +++++++++++++++++++--------------------- dlls/quartz/tests/filtergraph.c | 7 -- 2 files changed, 98 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2230834022869a32794f…

1 0