November 2020 - Wine-commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 71bf73795d02f624e6758491a26e243123244e31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71bf73795d02f624e6758491… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Nov 9 23:19:04 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index 11c21bda7c8..cc929c91eb3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-11-04 09:28+0200\n" +"PO-Revision-Date: 2020-11-09 23:18+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9954,16 +9954,12 @@ msgid "Central Asia Daylight Time" msgstr "Vidurio Azijos vasaros laikas" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Korėjos juostinis laikas" +msgstr "Lordo Hau juostinis laikas" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Korėjos vasaros laikas" +msgstr "Lordo Hau vasaros laikas" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10386,16 +10382,12 @@ msgid "Russian Daylight Time" msgstr "Rusijos vasaros laikas" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "AUS Centrinis juostinis laikas" +msgstr "AUS Centrinis v. juostinis laikas" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "AUS Centrinis vasaros laikas" +msgstr "AUS Centrinis v. vasaros laikas" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time"

1 0

Nikolay Sivov : user32: Remove usp10 from delayed imports.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: df0c5d23ef15d31a84daf78a8ab19406c1876894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0c5d23ef15d31a84daf78a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 12:34:12 2020 +0300 user32: Remove usp10 from delayed imports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index c371e1fc28e..49a52eeff32 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -3,7 +3,7 @@ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = setupapi gdi32 version sechost advapi32 kernelbase EXTRAINCL = $(PNG_CFLAGS) -DELAYIMPORTS = hid imm32 usp10 +DELAYIMPORTS = hid imm32 EXTRADLLFLAGS = -mno-cygwin

1 0

Alexandre Julliard : wineboot: Fall back to initial hostname if the name lookup fails.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 5ac2f4b55338a27c5d8c7e891bc29198dee7ea50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ac2f4b55338a27c5d8c7e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:22:19 2020 +0100 wineboot: Fall back to initial hostname if the name lookup fails. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50084 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index fa1c459035f..05a5ee6aa62 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -820,18 +820,18 @@ static void create_environment_registry_keys( void ) static void create_computer_name_keys(void) { struct addrinfo hints = {0}, *res; - char *dot, buffer[256]; + char *dot, buffer[256], *name = buffer; HKEY key, subkey; if (gethostname( buffer, sizeof(buffer) )) return; hints.ai_flags = AI_CANONNAME; - if (getaddrinfo( buffer, NULL, &hints, &res )) return; - dot = strchr( res->ai_canonname, '.' ); + if (!getaddrinfo( buffer, NULL, &hints, &res )) name = res->ai_canonname; + dot = strchr( name, '.' ); if (dot) *dot++ = 0; - else dot = res->ai_canonname + strlen(res->ai_canonname); + else dot = name + strlen(name); SetComputerNameExA( ComputerNamePhysicalDnsDomain, dot ); - SetComputerNameExA( ComputerNamePhysicalDnsHostname, res->ai_canonname ); - freeaddrinfo( res ); + SetComputerNameExA( ComputerNamePhysicalDnsHostname, name ); + if (name != buffer) freeaddrinfo( res ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\ComputerName", &key )) return;

1 0

Alistair Leslie-Hughes : include: Add ICommandStream interface.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 951793c71ec5626d8fed155ce05f0145a941ea92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=951793c71ec5626d8fed155c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:56 2020 +1100 include: Add ICommandStream interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cmdstrm.idl | 35 +++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 37 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index ea021a4b80a..1db3765f68b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -63,6 +63,7 @@ SOURCES = \ cierror.h \ clusapi.h \ cmdbas.idl \ + cmdstrm.idl \ cmdtxt.idl \ cmnquery.idl \ codecapi.h \ diff --git a/include/cmdstrm.idl b/include/cmdstrm.idl new file mode 100644 index 00000000000..caadf046f1b --- /dev/null +++ b/include/cmdstrm.idl @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733abf-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandStream : IUnknown +{ + [local] + HRESULT GetCommandStream([out] IID *iid, [in,out] GUID *dialect, [out, iid_is(*iid)] IUnknown **commandstream); + + [local] + HRESULT SetCommandStream([in] REFIID riid, [in] REFGUID dialect, [in, iid_is(riid)] IUnknown *commandstream); +} diff --git a/include/oledb.idl b/include/oledb.idl index 1ffbefa9ffd..87d148f67b4 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -70,6 +70,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "crtrow.idl" #include "errrec.idl" #include "getdts.idl" +#include "cmdstrm.idl" cpp_quote("#include <accctrl.h>")

1 0

Alistair Leslie-Hughes : include: Add ICommandProperties interface.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: e9d6612a0157eae10682b7a5346eb325ca55308b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9d6612a0157eae10682b7a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:57 2020 +1100 include: Add ICommandProperties interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 27 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/cmdprp.idl | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 73 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 2fe4e60b68b..9eb14147690 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1589,3 +1589,30 @@ HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFII FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), datasource, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandProperties_GetProperties_Proxy(ICommandProperties* This, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) +{ + FIXME("(%p)->(%d %p %p %p): stub\n", This, count, propertyidsets, sets_cnt, propertyset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandProperties_GetProperties_Stub(ICommandProperties* This, const ULONG count, + const DBPROPIDSET *propertyidsets, ULONG *sets_cnt, DBPROPSET **propertyset, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %p %p %p): stub\n", This, count, propertyidsets, sets_cnt, propertyset, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandProperties_SetProperties_Proxy(ICommandProperties* This, ULONG count, DBPROPSET propertyset[]) +{ + FIXME("(%p)->(%d %p): stub\n", This, count, propertyset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandProperties_SetProperties_Stub(ICommandProperties* This, ULONG count, + DBPROPSET *propertyset, ULONG total, DBPROPSTATUS *propstatus, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %d %p %p): stub\n", This, count, propertyset, total, propstatus, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 1db3765f68b..c9c8ebe8bb5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -63,6 +63,7 @@ SOURCES = \ cierror.h \ clusapi.h \ cmdbas.idl \ + cmdprp.idl \ cmdstrm.idl \ cmdtxt.idl \ cmnquery.idl \ diff --git a/include/cmdprp.idl b/include/cmdprp.idl new file mode 100644 index 00000000000..ce9e7075523 --- /dev/null +++ b/include/cmdprp.idl @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a79-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandProperties : IUnknown +{ + [local] + HRESULT GetProperties([in] ULONG count, [in, size_is(count)] const DBPROPIDSET propertyidsets[], + [in, out] ULONG *sets_cnt, [out, size_is(,*sets_cnt)] DBPROPSET **propertyset); + + [call_as(GetProperties)] + HRESULT RemoteGetProperties([in] ULONG count, [in, unique, size_is(count)] const DBPROPIDSET *propertyidsets, + [in, out] ULONG *sets_cnt, [out, size_is(,*sets_cnt)] DBPROPSET **propertyset, [out] IErrorInfo **error); + + [local] + HRESULT SetProperties([in] ULONG count, [in, out, unique, size_is(count)] DBPROPSET propertyset[]); + + [call_as(SetProperties)] + HRESULT RemoteSetProperties([in] ULONG count, [in, unique, size_is(count)] DBPROPSET *propertyset, + [in] ULONG total, [out, size_is(total)] DBPROPSTATUS *propstatus, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 87d148f67b4..4370c7f6bcc 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -71,6 +71,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "errrec.idl" #include "getdts.idl" #include "cmdstrm.idl" +#include "cmdprp.idl" cpp_quote("#include <accctrl.h>")

1 0

Alexandre Julliard : Wine release 5.0.3
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: website Branch: master Commit: c33582c58245762f665ca078f7b8c87430b4bd4c URL: https://source.winehq.org/git/website.git/?a=commit;h=c33582c58245762f665ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 20:46:35 2020 +0100 Wine release 5.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020111001.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020111001.xml b/news/en/2020111001.xml new file mode 100644 index 00000000..b9bccbe6 --- /dev/null +++ b/news/en/2020111001.xml @@ -0,0 +1,12 @@ +<news> +<date>November 10, 2020</date> +<title>Wine 5.0.3 Released</title> +<body> + The Wine maintenance release 5.0.3 is now available. + <a href="{$root}/announce/5.0.3">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.3.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

Anton Baskanov : amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 59adc57590b50df0eaf09d73bb5d8facc9b30a40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59adc57590b50df0eaf09d73… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 25 14:17:33 2020 -0500 amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4300981d6b997c0b4c70c3415d4bbcd694d1a7f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/audiostream.c | 14 +++++++------- dlls/amstream/ddrawstream.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 911cbd4d19f..17723db6c21 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -259,18 +259,18 @@ static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; } diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 48ccc52d47c..671585f5d63 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -127,18 +127,18 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; }

1 0

Gijs Vermeulen : amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw().
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 286946a5333ae299fc89949e4211357a3c13c10e URL: https://source.winehq.org/git/wine.git/?a=commit;h=286946a5333ae299fc89949e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jun 19 16:10:30 2020 +0200 amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1e81d551903d548d42d04d5076181741309d23c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/ddrawstream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 671585f5d63..ff7cf1ab3f5 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -393,6 +393,9 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi TRACE("(%p)->(%p)\n", iface, ddraw); + if (!ddraw) + return E_POINTER; + *ddraw = NULL; if (!This->ddraw) {

1 0

Paul Gofman : shell32: Only consider copy operation multidest if the number of dst files is greater than one.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: cbfb70ba0a5fc2aadb9cd8f0df98aea732336435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbfb70ba0a5fc2aadb9cd8f0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 15:09:01 2020 +0300 shell32: Only consider copy operation multidest if the number of dst files is greater than one. Fixes crash on start in Worms World Party Remastered. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2f456cfe57de42259cca8155a56854a0f170844) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db39144..38c582be091 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl fileDest = &flTo->feFiles[0]; } - if (op->req->fFlags & FOF_MULTIDESTFILES) + if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1) { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c72440425..36602f335d6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1816,6 +1816,15 @@ static void test_copy(void) CreateDirectoryA("one", NULL); CreateDirectoryA("two", NULL); + /* Test with FOF_MULTIDESTFILES with a wildcard in pFrom and single output directory. */ + shfo.pFrom = "a*.txt\0"; + shfo.pTo = "one\0"; + shfo.fFlags |= FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n"); + /* pFrom has a glob, pTo has more than one dest */ shfo.pFrom = "a*.txt\0"; shfo.pTo = "one\0two\0";

1 0

Jiajin Cui : gdiplus: Fix crash if failed to create bitmap.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 25137e1cc16da13656a3c1f1fa6163062a3459c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25137e1cc16da13656a3c1f1… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Fri Jul 17 17:34:09 2020 +0800 gdiplus: Fix crash if failed to create bitmap. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f992bc77c87889c37cbd80aced707e6d1a537c8c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2d7f4bdb80f..fa46e7cc4ce 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -432,6 +432,9 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); + if(!hbitmap || !temp_bits) + goto done; + if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) @@ -443,9 +446,12 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ SelectObject(hdc, hbitmap); gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, hdc, 0, 0, src_width, src_height); - DeleteDC(hdc); + DeleteObject(hbitmap); +done: + DeleteDC(hdc); + return Ok; }

1 0