February 2020 - Wine-commits

Francois Gouget : testbot/UpdateTaskLogs: Simplify logging and deleting files.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: tools Branch: master Commit: 86a73ca90badf726ba72fe2791f1c9a77a4d6067 URL: https://source.winehq.org/git/tools.git/?a=commit;h=86a73ca90badf726ba72fe2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 31 13:15:31 2020 +0100 testbot/UpdateTaskLogs: Simplify logging and deleting files. The files may be in a Step directory so add support for those in Path2TaskKey(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 55 +++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index d9369d8..bbcab7d 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -180,10 +180,25 @@ sub Path2TaskKey($) return "latest" if (!defined $Path); return "latest" if ($Path =~ m~/latest(?:/|$)~); - $Path =~ s~^.*/jobs/(\d+/\d+/\d+)(/.*)?$~$1~; + $Path =~ s~^.*/jobs/(\d+/\d+(?:/\d+)?)(/.*)?$~$1~; return $Path; } +sub Delete($;$) +{ + my ($Path, $Label) = @_; + + return 0 if (!-f $Path); + + my $Name = basename($Path); + $Label = defined $Label ? " $Label" : ""; + Debug(Path2TaskKey($Path) .": Deleting$Label $Name\n"); + return 0 if (unlink $Path); + + Error "Could not delete $Path: $!\n"; + return 1; +} + sub BuildErrFile($$$$) { my ($Dir, $ReportName, $IsWineTest, $TaskTimedOut) = @_; @@ -286,25 +301,10 @@ sub ProcessTaskLogs($$$) # Save this report to latest/ in case it's not already present there # (this would be the case for the oldest tasks with --rebuild) $Rc += DoUpdateLatestReport($Task, $ReportName, $RefReportPath); - - Debug(TaskKeyStr($Task) .": Deleting ../$RefReportName\n"); - } - foreach my $Suffix ("", ".err") - { - if (!unlink "$RefReportPath$Suffix" and -e "$RefReportPath$Suffix") - { - Error "Could not delete '$RefReportPath$Suffix': $!\n"; - $Rc = 1; - } - } - - next if (!-f "$TaskDir/$ReportName.err"); - Debug(TaskKeyStr($Task) .": Deleting $ReportName.err\n"); - if (!unlink "$TaskDir/$ReportName.err") - { - Error "Could not delete '$ReportName.err': $!\n"; - $Rc = 1; } + $Rc += Delete($RefReportPath); + $Rc += Delete("$RefReportPath.err"); + $Rc += Delete("$TaskDir/$ReportName.err"); } } @@ -402,23 +402,12 @@ sub ProcessLatestReports() if ($OptDelete or $OptRebuild) { # Delete the reports that should be deleted / rebuilt - foreach my $Suffix ("", ".err") - { - next if (!-f "$LatestReportPath$Suffix"); - Debug("latest: Deleting $RefReportName$Suffix\n"); - next if (unlink "$LatestReportPath$Suffix"); - Error "Could not delete '$LatestReportPath$Suffix': $!\n"; - $Rc = 1; - } + $Rc += Delete($LatestReportPath); + $Rc += Delete("$LatestReportPath.err"); } elsif (!-f "$LatestReportPath") { - Debug("latest: Deleting orphaned $RefReportName.err\n"); - if (!unlink "$LatestReportPath.err") - { - Error "Could not delete orphaned '$LatestReportPath.err': $!\n"; - $Rc = 1; - } + $Rc += Delete("$LatestReportPath.err", "orphaned"); } elsif (!$OptDelete and !-f "$LatestReportPath.err") {

1 0

Francois Gouget : testbot/UpdateTaskLogs: Remove a redundant check in ProcessLatestReports().
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: tools Branch: master Commit: 02ac922aed634af3fb675260bac1182f2a6fc90c URL: https://source.winehq.org/git/tools.git/?a=commit;h=02ac922aed634af3fb67526… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 31 13:15:22 2020 +0100 testbot/UpdateTaskLogs: Remove a redundant check in ProcessLatestReports(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index bbcab7d..887061d 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -405,11 +405,11 @@ sub ProcessLatestReports() $Rc += Delete($LatestReportPath); $Rc += Delete("$LatestReportPath.err"); } - elsif (!-f "$LatestReportPath") + elsif (!-f $LatestReportPath) { $Rc += Delete("$LatestReportPath.err", "orphaned"); } - elsif (!$OptDelete and !-f "$LatestReportPath.err") + elsif (!-f "$LatestReportPath.err") { # Build the missing .err file my $ErrMessage = BuildErrFile("$DataDir/latest", $RefReportName, 1, 0);

1 0

Alexandre Julliard : Wine release 5.1
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: website Branch: master Commit: 102b0853cf657bcce7c178425bc1706f4c5a36d7 URL: https://source.winehq.org/git/website.git/?a=commit;h=102b0853cf657bcce7c17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 2 19:57:07 2020 +0100 Wine release 5.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020020201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020020201.xml b/news/en/2020020201.xml new file mode 100644 index 00000000..7b9e5d2c --- /dev/null +++ b/news/en/2020020201.xml @@ -0,0 +1,17 @@ +<news> +<date>February 2, 2020</date> +<title>Wine 5.1 Released</title> +<body> + The Wine development release 5.1 is now available. + <a href="{$root}/announce/5.1">What's new</a> in this release: +<ul> + <li>Support for using LLVM-MinGW as PE cross-compiler.</li> + <li>Better reporting of error location in JScript and VBScript.</li> + <li>Support for relocatable installation of the Winelib tools.</li> + <li>Ellipse drawing in Direct2D.</li> + <li>OLE monikers improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.1.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

Nikolay Sivov : ole32: Respond to CLSID in pointer moniker interface query.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: a7ca351859d401e710ff5177bd803aee4b68e484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ca351859d401e710ff5177… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 31 13:37:35 2020 +0300 ole32: Respond to CLSID in pointer moniker interface query. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/pointermoniker.c | 3 ++- dlls/ole32/tests/moniker.c | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 2ece11f53b..34692c4965 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -74,7 +74,8 @@ static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker *iface, REFIID if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid)) + IsEqualIID(&IID_IMoniker, riid) || + IsEqualGUID(&CLSID_PointerMoniker, riid)) { *ppvObject = iface; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 3dd7048ef4..0e6eaff57b 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2886,13 +2886,8 @@ static void test_pointer_moniker(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown); -todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); - IUnknown_Release(unknown); - } + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); hr = IMoniker_QueryInterface(moniker, &IID_IMarshal, (void **)&marshal); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr);

1 0

Nikolay Sivov : ole32: Respond to CLSID in class moniker interface query.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 3d2c8ef48119f6ac8beeec5eab25ff65980d10d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d2c8ef48119f6ac8beeec5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 31 13:37:36 2020 +0300 ole32: Respond to CLSID in class moniker interface query. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 12 ++++-------- dlls/ole32/tests/moniker.c | 8 ++------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 07d55e2f94..86d954a9c9 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -60,24 +60,22 @@ static inline ClassMoniker *impl_from_IROTData(IROTData *iface) /******************************************************************************* * ClassMoniker_QueryInterface *******************************************************************************/ -static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker *iface, REFIID riid, void **ppvObject) { ClassMoniker *This = impl_from_IMoniker(iface); - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppvObject); - /* Perform a sanity check on the parameters.*/ if (!ppvObject) return E_POINTER; - /* Initialize the return parameter */ *ppvObject = 0; - /* Compare the riid with the interface IDs implemented by this object.*/ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid)) + IsEqualIID(&IID_IMoniker, riid) || + IsEqualGUID(&CLSID_ClassMoniker, riid)) { *ppvObject = iface; } @@ -93,11 +91,9 @@ static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker* iface,REFIID riid,vo return IUnknown_QueryInterface(This->pMarshal, riid, ppvObject); } - /* Check that we obtained an interface.*/ if (!*ppvObject) return E_NOINTERFACE; - /* Query Interface always increases the reference count by one when it is successful */ IMoniker_AddRef(iface); return S_OK; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 0e6eaff57b..e0a87e0701 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1773,13 +1773,9 @@ static void test_class_moniker(void) ok_ole_success(hr, CreateClassMoniker); hr = IMoniker_QueryInterface(moniker, &CLSID_ClassMoniker, (void **)&unknown); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); - IUnknown_Release(unknown); - } + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); test_moniker("class moniker", moniker, expected_class_moniker_marshal_data, sizeof(expected_class_moniker_marshal_data),

1 0

Nikolay Sivov : ole32: Respond to CLSID in file moniker interface query.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: b06281c25bde9f71ce03f47e633113c729a86687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b06281c25bde9f71ce03f47e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 31 13:37:37 2020 +0300 ole32: Respond to CLSID in file moniker interface query. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 21 ++++++++------------- dlls/ole32/tests/moniker.c | 8 ++------ 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 6310a5acd5..e5978169ca 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -64,28 +64,25 @@ static HRESULT FileMonikerImpl_Destroy(FileMonikerImpl* iface); /******************************************************************************* * FileMoniker_QueryInterface */ -static HRESULT WINAPI -FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +static HRESULT WINAPI FileMonikerImpl_QueryInterface(IMoniker *iface, REFIID riid, void **ppvObject) { FileMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppvObject); - /* Perform a sanity check on the parameters.*/ - if ( ppvObject==0 ) + if (!ppvObject) return E_INVALIDARG; - /* Initialize the return parameter */ *ppvObject = 0; - /* Compare the riid with the interface IDs implemented by this object.*/ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream,riid) || - IsEqualIID(&IID_IMoniker, riid) - ) + IsEqualIID(&IID_IMoniker, riid) || + IsEqualGUID(&CLSID_FileMoniker, riid)) + { *ppvObject = iface; - + } else if (IsEqualIID(&IID_IROTData, riid)) *ppvObject = &This->IROTData_iface; else if (IsEqualIID(&IID_IMarshal, riid)) @@ -98,11 +95,9 @@ FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) return IUnknown_QueryInterface(This->pMarshal, riid, ppvObject); } - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) + if (!*ppvObject) return E_NOINTERFACE; - /* Query Interface always increases the reference count by one when it is successful */ IMoniker_AddRef(iface); return S_OK; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e0a87e0701..b22cf84946 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1877,13 +1877,9 @@ static void test_file_moniker(WCHAR* path) ok_ole_success(hr, CreateFileMoniker); hr = IMoniker_QueryInterface(moniker1, &CLSID_FileMoniker, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(unk == (IUnknown *)moniker1, "Unexpected interface.\n"); - IUnknown_Release(unk); - } + ok(unk == (IUnknown *)moniker1, "Unexpected interface.\n"); + IUnknown_Release(unk); hr = IMoniker_Inverse(moniker1, &inverse); ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr);

1 0

Nikolay Sivov : ole32: Respond to CLSID in item moniker interface query.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 9d2d367f3d01140cbe510ee7e3f7e1c7219a22f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d2d367f3d01140cbe510ee7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 31 13:37:38 2020 +0300 ole32: Respond to CLSID in item moniker interface query. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 10 ++++++---- dlls/ole32/tests/moniker.c | 8 ++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 78b23ae633..dee4fc0bf2 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -140,21 +140,23 @@ static HRESULT set_container_lock(IOleItemContainer *container, IBindCtx *pbc) /******************************************************************************* * ItemMoniker_QueryInterface *******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +static HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker *iface, REFIID riid, void **ppvObject) { ItemMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppvObject); if (!ppvObject) return E_INVALIDARG; - /* Compare the riid with the interface IDs implemented by this object.*/ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid)) + IsEqualIID(&IID_IMoniker, riid) || + IsEqualGUID(&CLSID_ItemMoniker, riid)) + { *ppvObject = iface; + } else if (IsEqualIID(&IID_IROTData, riid)) *ppvObject = &This->IROTData_iface; else if (IsEqualIID(&IID_IMarshal, riid)) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b22cf84946..d485360215 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2087,13 +2087,9 @@ static void test_item_moniker(void) ok(hr == S_OK, "Failed to create item moniker, hr %#x.\n", hr); hr = IMoniker_QueryInterface(moniker, &CLSID_ItemMoniker, (void **)&unknown); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); - IUnknown_Release(unknown); - } + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); test_moniker("item moniker 2", moniker, expected_item_moniker_marshal_data2, sizeof(expected_item_moniker_marshal_data2),

1 0

Alexandre Julliard : Release 5.1.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: bdf8d94e2a40f82c618ba5587cc82382c5230ac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf8d94e2a40f82c618ba558… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 2 19:55:00 2020 +0100 Release 5.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 879 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 488 insertions(+), 412 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdf8d94e2a40f82c618b…

1 0

Tag wine-5.1 : Alexandre Julliard : Release 5.1
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: refs/tags/wine-5.1 Tag: edc5b70593a55fa4bc160cbf0301d51716c89fda URL: https://source.winehq.org/git/wine.git/?a=tag;h=edc5b70593a55fa4bc160cbf030… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 2 19:55:00 2020 +0100 Release 5.1

1 0

Dmitry Timoshkov : gdiplus: Create FontFamily objects only once for the FontCollection.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: b9307cfa61e9884b01d34c2310ec1ffbb1868728 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9307cfa61e9884b01d34c23… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 16:47:24 2020 +0800 gdiplus: Create FontFamily objects only once for the FontCollection. .Net 4.7+ depends on this behaviour and expects to be able to do pointer equality tests for FontFamily objects. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 208 ++++++++++++++++++++-------------------------- dlls/gdiplus/tests/font.c | 6 -- 2 files changed, 89 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9307cfa61e9884b01d3…

1 0