From 53d43e05b3df30c9475eec78b5ad6f298c871d35 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 27 Jan 2016 08:24:29 +0100 Subject: [PATCH] uxtheme-GTK_Theming: Update patchset and add export for OpenThemeDataEx. --- patches/patchinstall.sh | 2 + ...megtk-Add-export-for-OpenThemeDataEx.patch | 59 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 patches/uxtheme-GTK_Theming/0007-uxthemegtk-Add-export-for-OpenThemeDataEx.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d112a9b5..65c97e5c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -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 diff --git a/patches/uxtheme-GTK_Theming/0007-uxthemegtk-Add-export-for-OpenThemeDataEx.patch b/patches/uxtheme-GTK_Theming/0007-uxthemegtk-Add-export-for-OpenThemeDataEx.patch new file mode 100644 index 00000000..b8f1a4df --- /dev/null +++ b/patches/uxtheme-GTK_Theming/0007-uxthemegtk-Add-export-for-OpenThemeDataEx.patch @@ -0,0 +1,59 @@ +From e82e7adedc71f3a2cb3f8a4c7af5ffbfaad48885 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +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 +