wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

uxtheme-GTK_Theming: Update patchset and add export for OpenThemeDataEx.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-01-27 08:24:29 +01:00
parent c344dcf96e
commit 53d43e05b3
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -6354,6 +6354,7 @@ if test "$enable_uxtheme_GTK_Theming" -eq 1; then
patch_apply uxtheme-GTK_Theming/0004-uxthemegtk-Correctly-render-buttons-with-GTK-3.14.0.patch
patch_apply uxtheme-GTK_Theming/0005-uxthemegtk-Print-class-name-before-calling-vtable-fu.patch
patch_apply uxtheme-GTK_Theming/0006-uxthemegtk-Reset-FPU-flags-before-calling-GTK3-funct.patch
patch_apply uxtheme-GTK_Theming/0007-uxthemegtk-Add-export-for-OpenThemeDataEx.patch
(
echo '+ { "Michael Müller", "uxthemegtk: Add configure check and stub dll.", 1 },';
echo '+ { "Ivan Akulinchev", "uxthemegtk: Initial implementation.", 1 },';
@ -6361,6 +6362,7 @@ if test "$enable_uxtheme_GTK_Theming" -eq 1; then
echo '+ { "Sebastian Lackner", "uxthemegtk: Correctly render buttons with GTK >= 3.14.0.", 1 },';
echo '+ { "Michael Müller", "uxthemegtk: Print class name before calling vtable functions.", 1 },';
echo '+ { "Michael Müller", "uxthemegtk: Reset FPU flags before calling GTK3 functions.", 1 },';
echo '+ { "Sebastian Lackner", "uxthemegtk: Add export for OpenThemeDataEx.", 1 },';
) >> "$patchlist"
fi

59
patches/uxtheme-GTK_Theming/0007-uxthemegtk-Add-export-for-OpenThemeDataEx.patch Normal file
View File

@ -0,0 +1,59 @@
From e82e7adedc71f3a2cb3f8a4c7af5ffbfaad48885 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 27 Jan 2016 08:20:28 +0100
Subject: uxthemegtk: Add export for OpenThemeDataEx.
---
dlls/uxtheme-gtk/uxtheme-gtk.spec | 2 +-
dlls/uxtheme-gtk/uxtheme.c | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/uxtheme-gtk/uxtheme-gtk.spec b/dlls/uxtheme-gtk/uxtheme-gtk.spec
index 4acc0fa..c4a619a 100644
--- a/dlls/uxtheme-gtk/uxtheme-gtk.spec
+++ b/dlls/uxtheme-gtk/uxtheme-gtk.spec
@@ -38,7 +38,7 @@
46 stub -noname ClassicAdjustWindowRectEx
48 stub -noname GetThemeParseErrorInfo
60 stub -noname CreateThemeDataFromObjects
-61 stub OpenThemeDataEx
+61 stdcall OpenThemeDataEx(ptr wstr long)
62 stub -noname ServerClearStockObjects
63 stub -noname MarkSelection
diff --git a/dlls/uxtheme-gtk/uxtheme.c b/dlls/uxtheme-gtk/uxtheme.c
index b520f6f..15fc231 100644
--- a/dlls/uxtheme-gtk/uxtheme.c
+++ b/dlls/uxtheme-gtk/uxtheme.c
@@ -501,14 +501,14 @@ BOOL WINAPI IsThemeDialogTextureEnabled(HWND hwnd)
return TRUE; /* Always enabled */
}
-HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR classlist)
+HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR classlist, DWORD flags)
{
WCHAR *start, *tok, buf[CLASSLIST_MAXLEN];
uxgtk_theme_t *theme;
WORD fpu_flags;
int i;
- TRACE("(%p, %s)\n", hwnd, debugstr_w(classlist));
+ TRACE("(%p, %s, %x)\n", hwnd, debugstr_w(classlist), flags);
if (libgtk3 == NULL)
{
@@ -562,6 +562,11 @@ found:
return theme;
}
+HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR classlist)
+{
+ return OpenThemeDataEx(hwnd, classlist, 0);
+}
+
void WINAPI SetThemeAppProperties(DWORD flags)
{
TRACE("(%u)\n", flags);
--
2.6.4