September 2018 - Wine-Devel

[PATCH 02/10] opcservices/tests: Add some GetRelativeUri() tests.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 a0621760b4..a96a5cf078 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); -- 2.18.0

Sept. 19, 2018

[PATCH 01/10] opcservices/uri: Fix IsEqual() to work with OPC URI objects.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/tests/opcservices.c | 15 ++++++++++++--- dlls/opcservices/uri.c | 16 +++++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 17b7609739..a0621760b4 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -521,7 +521,7 @@ static void test_rel_part_uri(void) IOpcPartUri *rel_uri2; IOpcUri *source_uri2; IUnknown *unk = NULL; - BOOL ret = FALSE; + BOOL ret; BSTR str; hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri); @@ -529,11 +529,20 @@ static void test_rel_part_uri(void) hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri2); ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); ok(source_uri != source_uri2, "Unexpected instance.\n"); + + hr = IOpcUri_IsEqual(source_uri, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + ret = 123; + hr = IOpcUri_IsEqual(source_uri, NULL, &ret); + ok(is_root ? hr == E_POINTER : hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(is_root ? ret == 123 : !ret, "Unexpected result.\n"); + + ret = FALSE; hr = IOpcUri_IsEqual(source_uri, (IUri *)source_uri2, &ret); - todo_wine { ok(SUCCEEDED(hr), "IsEqual failed, hr %#x.\n", hr); ok(ret, "Expected equal uris.\n"); - } + hr = IOpcUri_QueryInterface(source_uri, &IID_IOpcPartUri, (void **)&unk); ok(hr == (is_root ? E_NOINTERFACE : S_OK), "Unexpected hr %#x, %s.\n", hr, rel_part_uri_tests[i].uri); if (unk) diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index ddb2c05daf..fa5ddbcde8 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -312,7 +312,21 @@ static HRESULT WINAPI opc_uri_IsEqual(IOpcPartUri *iface, IUri *comparand, BOOL TRACE("iface %p, comparand %p, is_equal %p.\n", iface, comparand, is_equal); - return IUri_IsEqual(uri->uri, comparand, is_equal); + if (!is_equal) + return E_POINTER; + + if (!comparand) + { + if (uri->is_part_uri) + { + *is_equal = FALSE; + return S_OK; + } + + return E_POINTER; + } + + return IUri_IsEqual(comparand, uri->uri, is_equal); } static HRESULT WINAPI opc_uri_GetRelationshipsPartUri(IOpcPartUri *iface, IOpcPartUri **part_uri) -- 2.18.0

Sept. 19, 2018

Re: [PATCH 2/2] user32/listbox: Optimize SetCount partly

by Huw Davies

On Wed, Sep 19, 2018 at 01:52:37PM +0300, Gabriel Ivăncescu wrote: > On Wed, Sep 19, 2018 at 10:46 AM, Huw Davies <huw(a)codeweavers.com> wrote: > > > > Shouldn't this be if (num == 0) ? That would at least match the comment. > > > > Huw. > > Yeah, you are right. I copied the relevant logic from InsertItem, but > num == 0 definitely makes more sense. I'm also concerned that we won't get WM_MEASUREITEMs in the LBS_OWNERDRAWVARIABLE case. Huw.

Sept. 19, 2018

Re: [PATCH 2/2] user32/listbox: Optimize SetCount partly

by Gabriel Ivăncescu

On Wed, Sep 19, 2018 at 10:46 AM, Huw Davies <huw(a)codeweavers.com> wrote: > > Shouldn't this be if (num == 0) ? That would at least match the comment. > > Huw. Yeah, you are right. I copied the relevant logic from InsertItem, but num == 0 definitely makes more sense.

Sept. 19, 2018

Re: [PATCH 2/2] msi/tests: Add a test for repetitive MsiGetActiveDatabase calls.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42234 Your paranoid android. === w7u (32 bit Windows report) === msi: action: Timeout === w7u (32 bit Windows report) === msi: install: Timeout === wvistau64_zh_CN (32 bit Windows report) === === wvistau64_zh_CN (task log) === Task errors: TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === w864 (64 bit Windows report) === === w864 (task log) === Task errors: TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally

Sept. 19, 2018

Re: [PATCH resend] msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

Sept. 19, 2018

[PATCH] dbghelp: Fix memory leak in SymInitializeW() (Coverity).

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 5685c25cd076..a085cd140ef7 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -298,7 +298,8 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP TRACE("(%p %s %u)\n", hProcess, debugstr_w(UserSearchPath), fInvadeProcess); - if (process_find_by_handle(hProcess)){ + if (process_find_by_handle(hProcess)) + { WARN("the symbols for this process have already been initialized!\n"); /* MSDN says to only call this function once unless SymCleanup() has been called since the last call. @@ -307,15 +308,15 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP return TRUE; } - pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); - if (!pcs) return FALSE; - - pcs->handle = hProcess; - IsWow64Process(GetCurrentProcess(), &wow64); if (!IsWow64Process(hProcess, &child_wow64)) return FALSE; + + pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); + if (!pcs) return FALSE; + + pcs->handle = hProcess; pcs->is_64bit = (sizeof(void *) == 8 || wow64) && !child_wow64; if (UserSearchPath) -- 2.16.4

Sept. 19, 2018

Re: [PATCH] urlmon/tests: Add IsEqual test for custom IUri implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

Sept. 19, 2018

[PATCH 4/4] testbot: Set a flag when all of a module's test units must be rerun.

by Francois Gouget

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> --- 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 476757f38..9e0e68980 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 -- 2.18.0

Sept. 19, 2018

[PATCH 3/4] testbot: Remove the HasConfigure patch impact.

by Francois Gouget

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> --- We could also decide to rerun autoconf even if only configure is updated. This may help detect patches that should have modified configure.ac instead but only if there is code that really needs the new configure (rather than disable some functionality as is usual). It would also defeat testing of configure changes following an autoconf update. So I'm not sure that would be better. 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 2fe7a9778..2e6cc853b 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 4ce5bf40c..476757f38 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; -- 2.18.0

Sept. 19, 2018