wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Francois Gouget : testbot/Submit: Ensure the staged patch can be cleaned up if submit fails.
by Alexandre Julliard 21 Jan '20

21 Jan '20

Module: tools Branch: master Commit: 189e1b20004e2014c3009638a7f1a199837e7dec URL: https://source.winehq.org/git/tools.git/?a=commit;h=189e1b20004e2014c300963… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 21 12:07:05 2020 +0100 testbot/Submit: Ensure the staged patch can be cleaned up if submit fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- testbot/web/Submit.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index f78c75d..121a3a6 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -271,7 +271,7 @@ if (opendir(my $dh, "$DataDir/staging")) my $Age = int((-M $FileName) + 0.5); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) + if ($Entry =~ /^[0-9a-f]{32}-websubmit2?_/) { # These files always expire after one day $TTL = 1 - $Age; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index bd3dc9f..1943b42 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1292,7 +1292,7 @@ sub OnSubmit($) # Rename the staging file to avoid race conditions if the user clicks on # Submit multiple times my $OldStaging = $self->_GetStagingFilePath(); - my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", $self->{FileName}); + my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", "-websubmit2_$self->{FileName}"); if (!defined $Staging) { $self->{ErrMessage} = "Could not rename '$self->{FileName}': $!";

1 0

Francois Gouget : testbot/UpdateTaskLogs: Delete or recreate files derived from task logs.
by Alexandre Julliard 21 Jan '20

21 Jan '20

Module: tools Branch: master Commit: fbaa67b06992eea45810a2805d271991dd455b72 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fbaa67b06992eea45810a28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 20 16:57:00 2020 +0100 testbot/UpdateTaskLogs: Delete or recreate files derived from task logs. UpdateTaskLogs can rebuild the reference WineTest reports used for the detection of new failures, and the .err files that store extra errors. The reference reports are created from the reports of the WineTest tasks, based on their completion time. Note that it is not possible to recreate reference reports for tasks that are older than the first completed WineTest task. But such issues should go away when these tasks get expired on the next day. This allows fixing up the reference reports after an upgrade or a downgrade. For instance for a downgrade one could run 'UpdateTaskLogs --delete' first to delete files specific to the new code, then downgrade and run 'UpdateTaskLogs' to regenerate the files needed by the old code. Note however that this does not undo any rename operations done when upgrading. Those would need to be reverted by hand. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 468 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=fbaa67b06992eea4581…

1 0

Francois Gouget : testbot/LogUtils: Add _AddLogError() and _AddLogGroup().
by Alexandre Julliard 21 Jan '20

21 Jan '20

Module: tools Branch: master Commit: 15badfe385c6e243751cc22f5d56a4526e0cea8c URL: https://source.winehq.org/git/tools.git/?a=commit;h=15badfe385c6e243751cc22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 20 16:56:32 2020 +0100 testbot/LogUtils: Add _AddLogError() and _AddLogGroup(). This simplifies registering an additional log error. Also rename _AddErrorGroup() to _AddLogGroup() to match. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 815e0d8..c83b63d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -675,7 +675,7 @@ sub _DumpErrors($$) } } -sub _AddErrorGroup($$) +sub _AddLogGroup($$) { my ($LogInfo, $GroupName) = @_; @@ -689,6 +689,14 @@ sub _AddErrorGroup($$) return $LogInfo->{ErrGroups}->{$GroupName}; } +sub _AddLogError($$$) +{ + my ($LogInfo, $ErrGroup, $Line) = @_; + + push @{$ErrGroup->{Errors}}, $Line; + $LogInfo->{ErrCount}++; +} + =pod =over 12 @@ -763,18 +771,16 @@ sub GetLogErrors($) } if (!$CurrentGroup) { - $CurrentGroup = _AddErrorGroup($LogInfo, $CurrentModule); + $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule); } - push @{$CurrentGroup->{Errors}}, $Line; - $LogInfo->{ErrCount}++; + _AddLogError($LogInfo, $CurrentGroup, $Line); } close($LogFile); } elsif (-f $LogFileName) { - my $Group = _AddErrorGroup($LogInfo, "TestBot errors"); - push @{$Group->{Errors}}, "Could not open '". basename($LogFileName) ."' for reading: $!"; - $LogInfo->{ErrCount}++; + my $Group = _AddLogGroup($LogInfo, "TestBot errors"); + _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) ."' for reading: $!"); } if (open(my $LogFile, "<", "$LogFileName.err")) @@ -790,18 +796,16 @@ sub GetLogErrors($) # Note: $GroupName must not depend on the previous content as this # would break diffs. my $GroupName = $IsReport ? "Report errors" : "Task errors"; - $CurrentGroup = _AddErrorGroup($LogInfo, $GroupName); + $CurrentGroup = _AddLogGroup($LogInfo, $GroupName); } - push @{$CurrentGroup->{Errors}}, $Line; - $LogInfo->{ErrCount}++; + _AddLogError($LogInfo, $CurrentGroup, $Line); } close($LogFile); } elsif (-f "$LogFileName.err") { - my $Group = _AddErrorGroup($LogInfo, "TestBot errors"); - push @{$Group->{Errors}}, "Could not open '". basename($LogFileName) .".err' for reading: $!"; - $LogInfo->{ErrCount}++; + my $Group = _AddLogGroup($LogInfo, "TestBot errors"); + _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) .".err' for reading: $!"); } return $LogInfo;

1 0

Alexandre Julliard : Wine release 5.0-rc6
by Alexandre Julliard 17 Jan '20

17 Jan '20

Module: website Branch: master Commit: 0dfa30c27048217cfe5815a4470ec1da911e9b37 URL: https://source.winehq.org/git/website.git/?a=commit;h=0dfa30c27048217cfe581… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 17 23:04:35 2020 +0100 Wine release 5.0-rc6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020011701.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2020011701.xml b/news/en/2020011701.xml new file mode 100644 index 00000000..def74d64 --- /dev/null +++ b/news/en/2020011701.xml @@ -0,0 +1,13 @@ +<news> +<date>January 17, 2020</date> +<title>Wine 5.0-rc6 Released</title> +<body> + The Wine development release 5.0-rc6 is now available. + Barring any last minute issue, this is expected to be the last release candidate before the final 5.0. + <a href="{$root}/announce/5.0-rc6">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0-rc6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-5.0-rc6 : Alexandre Julliard : Release 5.0-rc6
by Alexandre Julliard 17 Jan '20

17 Jan '20

Module: wine Branch: refs/tags/wine-5.0-rc6 Tag: 61806a10221cb1d15bb0690121896f488827fca8 URL: https://source.winehq.org/git/wine.git/?a=tag;h=61806a10221cb1d15bb06901218… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 17 23:02:41 2020 +0100 Release 5.0-rc6

1 0

Alexandre Julliard : Release 5.0-rc6.
by Alexandre Julliard 17 Jan '20

17 Jan '20

Module: wine Branch: master Commit: 02f3a133b64ed1f979309e1399738eaa2e204651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f3a133b64ed1f979309e13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 17 23:02:41 2020 +0100 Release 5.0-rc6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 236 +++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 ++--- 3 files changed, 111 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02f3a133b64ed1f97930…

1 0

Piotr Caban : urlmon: Fix CoInternetParse{Url,IUri} spec entry.
by Alexandre Julliard 17 Jan '20

17 Jan '20

Module: wine Branch: master Commit: 94245fd38e22d35c7646eae5b42ff57635546d97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94245fd38e22d35c7646eae5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 17 14:37:23 2020 +0100 urlmon: Fix CoInternetParse{Url,IUri} spec entry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index d6a6b438cc..0d11ced0d4 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -23,8 +23,8 @@ @ stdcall CoInternetIsFeatureEnabled(long long) @ stdcall CoInternetIsFeatureEnabledForUrl(long long wstr ptr) @ stdcall CoInternetIsFeatureZoneElevationEnabled(wstr wstr ptr long) -@ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) -@ stdcall CoInternetParseIUri(ptr long long wstr long ptr long) +@ stdcall CoInternetParseUrl(wstr long long ptr long ptr long) +@ stdcall CoInternetParseIUri(ptr long long ptr long ptr long) @ stdcall CoInternetQueryInfo(wstr long long ptr long ptr long) @ stdcall CoInternetSetFeatureEnabled(long long long) @ stdcall CompareSecurityIds(ptr long ptr long long)

1 0

Zebediah Figura : urlmon/tests: Make the url tests a bit less verbose by default.
by Alexandre Julliard 17 Jan '20

17 Jan '20

Module: wine Branch: master Commit: df8d43a98d4377846a1d753d74d37bc3ac22f1d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8d43a98d4377846a1d753d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 10:41:37 2020 -0600 urlmon/tests: Make the url tests a bit less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 3a6ad1390f..cfa29248d6 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1626,6 +1626,10 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u { ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); + if (winetest_debug > 1) + trace("IBindStatusCallbackEx::OnProgress(progress %u/%u, code %u, text %s)\n", + ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); + switch(ulStatusCode) { case BINDSTATUS_FINDINGRESOURCE: if(iface == &objbsc) @@ -1785,13 +1789,8 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u ok(szStatusText == NULL, "Expected szStatusText to be NULL\n"); break; case BINDSTATUS_PROXYDETECTING: - trace("BINDSTATUS_PROXYDETECTING\n"); - break; case BINDSTATUS_COOKIE_SENT: - trace("BINDSTATUS_COOKIE_SENT\n"); - break; case BINDSTATUS_DECODING: - trace("BINDSTATUS_DECODING\n"); break; default: ok(0, "unexpected code %d\n", ulStatusCode); @@ -2895,7 +2894,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) prot_state = 0; ResetEvent(complete_event); - trace("URL: %s\n", wine_dbgstr_w(current_url)); + if (winetest_debug > 1) trace("URL: %s\n", wine_dbgstr_w(current_url)); } static void test_BindToStorage(int protocol, DWORD flags, DWORD t)

1 0

Zebediah Figura : urlmon/tests: Avoid testing that only certain interfaces are queried.
by Alexandre Julliard 17 Jan '20

17 Jan '20

Module: wine Branch: master Commit: 278af13334e8e45e1ea9d951e434fe14e83acd97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=278af13334e8e45e1ea9d951… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 10:41:36 2020 -0600 urlmon/tests: Avoid testing that only certain interfaces are queried. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 46 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7c8d1abdb7..3a6ad1390f 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -43,7 +43,6 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); -static const IID IID_undocumentedIE11 = {0xd5ae15f6,0x2032,0x488e,{0x8f,0x96,0xf9,0x24,0x06,0xd8,0xd8,0xb4}}; extern CLSID CLSID_AboutProtocol; #define DEFINE_EXPECT(func) \ @@ -366,7 +365,7 @@ static IInternetPriority InternetPriority = { &InternetPriorityVtbl }; static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { - static const IID IID_undocumentedIE10 = {0x7daf9908,0x8415,0x4005,{0x95,0xae,0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; + if (winetest_debug > 1) trace("IInternetProtocol::QueryInterface(%s)\n", debugstr_guid(riid)); *ppv = NULL; @@ -383,15 +382,6 @@ static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID r return S_OK; } - if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) - return E_NOINTERFACE; /* TODO */ - - if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(%s)\n", wine_dbgstr_guid(riid)); - return E_NOINTERFACE; /* TODO */ - } - - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1403,6 +1393,10 @@ static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { + if (winetest_debug > 1) + trace("IServiceProvider::QueryService(service %s, iid %s)\n", + debugstr_guid(guidService), debugstr_guid(riid)); + if(IsEqualGUID(&IID_IAuthenticate, guidService)) { CHECK_EXPECT(QueryService_IAuthenticate); return E_NOTIMPL; @@ -1430,19 +1424,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return S_OK; } - if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { - trace("QueryService(IID_IGetBindHandle)\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - - if(IsEqualGUID(&IID_undocumentedIE11, guidService)) { - trace("QueryService(IID_undocumentedIE11)\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - - ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); + *ppv = NULL; return E_NOINTERFACE; } @@ -1505,7 +1487,7 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { - static const IID IID_undocumentedIE10 = {0xf286fa56,0xc1fd,0x4270,{0x8e,0x67,0xb3,0xeb,0x79,0x0a,0x81,0xe8}}; + if (winetest_debug > 1) trace("IBindStatusCallback::QueryInterface(%s)\n", debugstr_guid(riid)); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); @@ -1554,20 +1536,6 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF }else if(IsEqualGUID(&IID_IHttpSecurity, riid)) { CHECK_EXPECT2(QueryInterface_IHttpSecurity); return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_IGetBindHandle, riid)) { - trace("QI(IID_IGetBindHandle)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(IID_undocumentedIE10)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_undocumentedIE11, riid)) { - trace("QI(IID_undocumentedIE11)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else { - ok(0, "unexpected interface %s\n", wine_dbgstr_guid(riid)); } return E_NOINTERFACE;

1 0

Zebediah Figura : msi/tests: Fix a crash on Windows 10.
by Alexandre Julliard 17 Jan '20

17 Jan '20

Module: wine Branch: master Commit: 4661c8d45b8f4b4b2adfb157bb16ce3466bc00f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4661c8d45b8f4b4b2adfb157… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 16 10:26:10 2020 -0600 msi/tests: Fix a crash on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/install.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0bd82a621f..f7fd83cfc0 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2744,15 +2744,14 @@ static void test_MsiInstallProduct(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - /* szPackagePath is NULL */ - r = MsiInstallProductA(NULL, "INSTALL=ALL"); - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - - /* both szPackagePath and szCommandLine are NULL */ - r = MsiInstallProductA(NULL, NULL); - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + if (0) /* crashes on Win10 1709 */ + { + r = MsiInstallProductA(NULL, "INSTALL=ALL"); + ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r); + + r = MsiInstallProductA(NULL, NULL); + ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r); + } /* szPackagePath is empty */ r = MsiInstallProductA("", "INSTALL=ALL");

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2020