November 2021 - Wine-Devel - list.winehq.org

[PATCH v4 1/9] win32u: Implement NtUserGetDisplayConfigBufferSizes.
by Jacek Caban Nov. 30, 2021

Nov. 30, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/Makefile.in | 1 + dlls/win32u/font.c | 4 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 467 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 2 + 8 files changed, 484 insertions(+), 3 deletions(-) create mode 100644 dlls/win32u/sysparams.c

2 1

[PATCH] winemac: Remove unused variable.
by Huw Davies Nov. 30, 2021

Nov. 30, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index fe48437849d..ffafb0bd1d2 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -429,7 +429,7 @@ static struct display_mode_descriptor* create_original_display_mode_descriptor(C HKEY hkey; DWORD type, size; DWORD refresh100; - WCHAR* pixel_encoding = NULL, *end; + WCHAR* pixel_encoding = NULL; init_original_display_mode(); -- 2.23.0

1 0

[PATCH v3 1/2] include: Define ISpeechSynthesizer interface.
by Paul Gofman Nov. 30, 2021

Nov. 30, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - remove unused 'apicontract MediaControlContract'; - add 'requires' to ISpeechSynthesisStream. include/Makefile.in | 1 + include/windows.foundation.idl | 9 ++++ include/windows.media.idl | 43 ++++++++++++++++ include/windows.media.speechsynthesis.idl | 63 +++++++++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 include/windows.media.idl diff --git a/include/Makefile.in b/include/Makefile.in index acb55b37f6c..b230804974c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -776,6 +776,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.idl \ windows.media.devices.idl \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index fe09dc66edd..292522f2c49 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -119,6 +119,15 @@ namespace Windows { { HRESULT ToString([out, retval] HSTRING *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) + ] + interface IClosable : IInspectable + { + HRESULT Close(); + } } } diff --git a/include/windows.media.idl b/include/windows.media.idl new file mode 100644 index 00000000000..fe81c768361 --- /dev/null +++ b/include/windows.media.idl @@ -0,0 +1,43 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + interface IMediaControl; + } +} + +namespace Windows { + namespace Media { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] + interface IMediaMarker : IInspectable + { + [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); + [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); + [propget] HRESULT Text([out] [retval] HSTRING* value); + } + } +} diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index af4466681dc..29dca510dee 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -22,6 +22,7 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; namespace Windows { namespace Foundation { @@ -35,10 +36,27 @@ namespace Windows { interface ISpeechSynthesizer; interface ISpeechSynthesizer2; interface IVoiceInformation; + interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesisStream; } } + namespace Storage { + namespace Streams { + interface IRandomAccessStreamWithContentType; + interface IRandomAccessStream; + interface IInputStream; + interface IOutputStream; + interface IContentTypeProvider; + } + } +} + +namespace Windows { + namespace Media { + interface IMediaMarker; + } } namespace Windows { @@ -48,6 +66,9 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; } } } @@ -63,6 +84,34 @@ namespace Windows { Female = 1 }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] + [uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)] + interface ISpeechSynthesisStream : IInspectable + requires + Windows.Storage.Streams.IRandomAccessStreamWithContentType, + Windows.Storage.Streams.IRandomAccessStream, + Windows.Foundation.IClosable, + Windows.Storage.Streams.IInputStream, + Windows.Storage.Streams.IOutputStream, + Windows.Storage.Streams.IContentTypeProvider + { + [propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6) + ] + interface ISpeechSynthesizer : IInspectable + { + HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + [propput] HRESULT Voice([in] VoiceInformation *value); + [propget] HRESULT Voice([out] [retval] VoiceInformation **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -97,6 +146,20 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [marshaling_behavior(agile)] + runtimeclass SpeechSynthesisStream + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream; + interface Windows.Storage.Streams.IRandomAccessStreamWithContentType; + interface Windows.Storage.Streams.IContentTypeProvider; + interface Windows.Storage.Streams.IRandomAccessStream; + interface Windows.Storage.Streams.IOutputStream; + interface Windows.Foundation.IClosable; + interface Windows.Storage.Streams.IInputStream; + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), -- 2.33.1

2 3

[PATCH v2 1/2] include: Define ISpeechSynthesizer interface.
by Paul Gofman Nov. 30, 2021

Nov. 30, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - split off .idl modifications into a separate patch. include/Makefile.in | 1 + include/windows.foundation.idl | 9 +++++ include/windows.media.idl | 48 +++++++++++++++++++++++ include/windows.media.speechsynthesis.idl | 41 +++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 include/windows.media.idl diff --git a/include/Makefile.in b/include/Makefile.in index 756e25dcc82..530c5b73f19 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -775,6 +775,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.idl \ windows.media.devices.idl \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index fe09dc66edd..292522f2c49 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -119,6 +119,15 @@ namespace Windows { { HRESULT ToString([out, retval] HSTRING *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) + ] + interface IClosable : IInspectable + { + HRESULT Close(); + } } } diff --git a/include/windows.media.idl b/include/windows.media.idl new file mode 100644 index 00000000000..94a9a516245 --- /dev/null +++ b/include/windows.media.idl @@ -0,0 +1,48 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + apicontract MediaControlContract; + interface IMediaControl; + } +} + +namespace Windows { + namespace Media { + [contractversion(1.0)] + apicontract MediaControlContract { + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] + interface IMediaMarker : IInspectable + { + [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); + [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); + [propget] HRESULT Text([out] [retval] HSTRING* value); + } + } +} diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index af4466681dc..431fa9243be 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -22,6 +22,7 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; namespace Windows { namespace Foundation { @@ -35,12 +36,20 @@ namespace Windows { interface ISpeechSynthesizer; interface ISpeechSynthesizer2; interface IVoiceInformation; + interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesisStream; } } } +namespace Windows { + namespace Media { + interface IMediaMarker; + } +} + namespace Windows { namespace Media { namespace SpeechSynthesis { @@ -48,6 +57,9 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; } } } @@ -63,6 +75,27 @@ namespace Windows { Female = 1 }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] + [uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)] + interface ISpeechSynthesisStream : IInspectable + { + [propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6) + ] + interface ISpeechSynthesizer : IInspectable + { + HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + [propput] HRESULT Voice([in] VoiceInformation *value); + [propget] HRESULT Voice([out] [retval] VoiceInformation **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -97,6 +130,14 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [marshaling_behavior(agile)] + runtimeclass SpeechSynthesisStream + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream; + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), -- 2.33.1

2 4

[PATCH v3 9/9] winex11: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban Nov. 30, 2021

Nov. 30, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 537 ++------------------------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 +- 5 files changed, 32 insertions(+), 512 deletions(-)

3 3

[PATCH 1/5] configure: Fix the makefile path for libxml2 and libxslt.
by Zebediah Figura Nov. 30, 2021

Nov. 30, 2021

They were not correctly being disabled if an external library was specified, which was causing msxml3 to link to the bundled version. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 72f580cbf0f..163d06fc327 100644 --- a/configure.ac +++ b/configure.ac @@ -1041,8 +1041,8 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") -WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") +WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") +WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread **** -- 2.34.0

2 5

[PATCH 4/4] uxtheme: Reference count theme classes.
by Zhiyi Zhang Nov. 30, 2021

Nov. 30, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29974 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 9 ++++++++- dlls/uxtheme/msstyles.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index d834c9604b9..8377ca9ebce 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -446,6 +446,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST cur = heap_alloc(sizeof(*cur)); cur->signature = THEME_CLASS_SIGNATURE; + cur->refcount = 0; cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -1030,6 +1031,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); cls->tf = tfActiveTheme; cls->tf->dwRefCount++; + InterlockedIncrement(&cls->refcount); cls->dpi = dpi; } return cls; @@ -1049,6 +1051,8 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + LONG refcount; + __TRY { if (tc->signature != THEME_CLASS_SIGNATURE) @@ -1066,7 +1070,10 @@ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) return E_HANDLE; } - MSSTYLES_CloseThemeFile (tc->tf); + refcount = InterlockedDecrement(&tc->refcount); + /* Some buggy apps may double free HTHEME handles */ + if (refcount >= 0) + MSSTYLES_CloseThemeFile(tc->tf); return S_OK; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 89937227ee2..8db0aa4c03c 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -50,6 +50,7 @@ struct _THEME_FILE; typedef struct _THEME_CLASS { DWORD signature; + LONG refcount; HMODULE hTheme; struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; -- 2.32.0

1 0

[PATCH 3/4] uxtheme: Protect CloseThemeData() from invalid input.
by Zhiyi Zhang Nov. 30, 2021

Nov. 30, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> With test case by Michael Müller <michael(a)fds-team.de>. Some applications closes the same HTHEME more than once, causing use-after-free. HTHEME is a handle rather than a pointer. Some testing shows that it's a handle starting from 0x10000 or 0x20000. Each new handle increments from the first handle and closing handles decrements it. I prefer not to implement this handle to data map for now because it will likely hurt performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29974 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 22 ++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/tests/system.c | 2 ++ 3 files changed, 25 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index c0f626d54aa..d834c9604b9 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -32,6 +32,7 @@ #include "msstyles.h" +#include "wine/exception.h" #include "wine/debug.h" #include "wine/heap.h" @@ -48,6 +49,8 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPC #define MSSTYLES_VERSION 0x0003 +#define THEME_CLASS_SIGNATURE 0x12bc6d83 + static PTHEME_FILE tfActiveTheme; /***********************************************************************/ @@ -203,6 +206,7 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) pcls->partstate = ps->next; heap_free(ps); } + pcls->signature = 0; heap_free(pcls); } } @@ -441,6 +445,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST if(cur) return cur; cur = heap_alloc(sizeof(*cur)); + cur->signature = THEME_CLASS_SIGNATURE; cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -1044,6 +1049,23 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + __TRY + { + if (tc->signature != THEME_CLASS_SIGNATURE) + tc = NULL; + } + __EXCEPT_PAGE_FAULT + { + tc = NULL; + } + __ENDTRY + + if (!tc) + { + WARN("Invalid theme class handle\n"); + return E_HANDLE; + } + MSSTYLES_CloseThemeFile (tc->tf); return S_OK; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..89937227ee2 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -49,6 +49,7 @@ typedef struct _THEME_PARTSTATE { struct _THEME_FILE; typedef struct _THEME_CLASS { + DWORD signature; HMODULE hTheme; struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 10857115061..ebf66f6b5af 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -768,6 +768,8 @@ static void test_CloseThemeData(void) ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); hRes = CloseThemeData(INVALID_HANDLE_VALUE); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + hRes = CloseThemeData((HTHEME)0xdeadbeef); + ok(hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } static void test_buffer_dc_props(HDC hdc, const RECT *rect) -- 2.32.0

1 0

[PATCH 2/4] uxtheme: Call DefDlgProc() if drawing tab body in a dialog fails.
by Zhiyi Zhang Nov. 30, 2021

Nov. 30, 2021

Some third party themes have tab body part defined but with its ImageSelectType set to IST_NONE. In this case, DrawThemeBackground() will fail to draw the background. Fix track bar black background in winecfg when using VLT theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index a949bfc6579..d0055e013a0 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -38,8 +38,9 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa static const WCHAR themeClass[] = L"Window"; BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); BOOL doTheming = themingActive && (theme != NULL); + HRESULT hr = E_FAIL; LRESULT result; - + switch (msg) { case WM_CREATE: @@ -78,13 +79,11 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa NULL); #endif return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - else - /* We might have gotten a TAB theme class, so check if we can - * draw as a tab page. */ - if (IsThemePartDefined (theme, TABP_BODY, 0)) - DrawThemeBackground (theme, (HDC)wParam, TABP_BODY, 0, &rc, - NULL); - else + /* We might have gotten a TAB theme class, so check if we can draw as a tab page */ + else if (IsThemePartDefined(theme, TABP_BODY, 0)) + hr = DrawThemeBackground(theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); + + if (FAILED(hr)) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); } return 1; -- 2.32.0

1 0

[PATCH 1/4] uxtheme: Use StretchBlt() when resizing a source image for tiling.
by Zhiyi Zhang Nov. 30, 2021

Nov. 30, 2021

For example, when a theme part has a source image with 0xff00ff as transparent pixels and the sizing margin is larger than the destination, the source image is first resized to fit the destination, during which, StretchBlt() should be used instead of TransparentBlt() because the image should not be blended with the temporary memory device context. Fix group box background may be drawn in black. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index bf294ed3cc8..04ea1e79df9 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -779,8 +779,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); SelectObject(hdcSrc, bmpSrcResized); + /* Use ALPHABLEND_NONE because the image is getting resized, rather than blended with the target */ UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, ALPHABLEND_NONE, 0); rcSrc.left = 0; rcSrc.top = 0; -- 2.32.0

1 0