wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 8827eb6a83348057293f89be535ccb74607db608.

Browse Source
This commit is contained in:
Zebediah Figura
2020-09-08 19:35:45 -05:00
parent 480bf20bec
commit ad66963dff
12 changed files with 140 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
patches/uxtheme-GTK_Theming/0001-uxtheme-Initial-implementation-of-GTK-backend.patch
View File

@@ -1,7 +1,7 @@
From 661d9d1f1f04ae904f4420f4a067fc23dae45c6f Mon Sep 17 00:00:00 2001
From 6c7e1cd9d421fef33c4e89e17c4e269af4a53f8a Mon Sep 17 00:00:00 2001
From: Ivan Akulinchev <ivan.akulinchev@gmail.com>
Date: Sat, 9 Feb 2019 15:18:54 -0600
Subject: [PATCH 1/2] uxtheme: Initial implementation of GTK backend.
Subject: [PATCH] uxtheme: Initial implementation of GTK backend.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -35,13 +35,13 @@ Additional changes by Sebastian Lackner <sebastian@fds-team.de>:
dlls/uxtheme/gtk-toolbar.c | 171 +++++++
dlls/uxtheme/gtk-trackbar.c | 188 +++++++
dlls/uxtheme/gtk-window.c | 172 +++++++
dlls/uxtheme/gtk.c | 962 ++++++++++++++++++++++++++++++++++++
dlls/uxtheme/gtk.c | 961 ++++++++++++++++++++++++++++++++++++
dlls/uxtheme/metric.c | 24 +
dlls/uxtheme/property.c | 40 ++
dlls/uxtheme/system.c | 34 +-
dlls/uxtheme/uxthemedll.h | 72 +++
dlls/uxtheme/uxthemegtk.h | 129 +++++
22 files changed, 3761 insertions(+), 1 deletion(-)
22 files changed, 3760 insertions(+), 1 deletion(-)
create mode 100644 dlls/uxtheme/gtk-button.c
create mode 100644 dlls/uxtheme/gtk-combobox.c
create mode 100644 dlls/uxtheme/gtk-edit.c
@@ -59,10 +59,10 @@ Additional changes by Sebastian Lackner <sebastian@fds-team.de>:
create mode 100644 dlls/uxtheme/uxthemegtk.h
diff --git a/configure.ac b/configure.ac
index 1c912a30a..c4373aeb2 100644
index 006087e05ec..cf5a6fa1b44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06
@@ -57,6 +57,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06
[if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
AC_ARG_WITH(gssapi, AS_HELP_STRING([--without-gssapi],[do not use GSSAPI (Kerberos SSP support)]))
AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)]))
@@ -70,7 +70,7 @@ index 1c912a30a..c4373aeb2 100644
AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
AC_ARG_WITH(inotify, AS_HELP_STRING([--without-inotify],[do not use inotify (filesystem change notifications)]))
AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]))
@@ -1539,6 +1540,21 @@ fi
@@ -1606,6 +1607,21 @@ fi
WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"],
[liblcms2 ${notice_platform}development files not found, Color Management won't be supported.])
@@ -93,7 +93,7 @@ index 1c912a30a..c4373aeb2 100644
if test "x$with_freetype" != "xno"
then
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index c3fff30ba..e09f891ee 100644
index c3fff30ba90..e09f891ee48 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -2,10 +2,25 @@ MODULE = uxtheme.dll
@@ -123,7 +123,7 @@ index c3fff30ba..e09f891ee 100644
metric.c \
msstyles.c \
diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 69c53b9eb..dbcbaab79 100644
index 69c53b9ebc3..dbcbaab79b1 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -55,6 +55,10 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags)
@@ -221,7 +221,7 @@ index 69c53b9eb..dbcbaab79 100644
if (bgtype != BT_IMAGEFILE) return FALSE;
diff --git a/dlls/uxtheme/gtk-button.c b/dlls/uxtheme/gtk-button.c
new file mode 100644
index 000000000..1e8581c77
index 00000000000..1e8581c77eb
--- /dev/null
+++ b/dlls/uxtheme/gtk-button.c
@@ -0,0 +1,516 @@
@@ -743,7 +743,7 @@ index 000000000..1e8581c77
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-combobox.c b/dlls/uxtheme/gtk-combobox.c
new file mode 100644
index 000000000..f6cc04055
index 00000000000..f6cc0405587
--- /dev/null
+++ b/dlls/uxtheme/gtk-combobox.c
@@ -0,0 +1,242 @@
@@ -991,7 +991,7 @@ index 000000000..f6cc04055
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-edit.c b/dlls/uxtheme/gtk-edit.c
new file mode 100644
index 000000000..834a3889c
index 00000000000..834a3889c5c
--- /dev/null
+++ b/dlls/uxtheme/gtk-edit.c
@@ -0,0 +1,211 @@
@@ -1208,7 +1208,7 @@ index 000000000..834a3889c
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-header.c b/dlls/uxtheme/gtk-header.c
new file mode 100644
index 000000000..c95918db2
index 00000000000..c95918db2ef
--- /dev/null
+++ b/dlls/uxtheme/gtk-header.c
@@ -0,0 +1,128 @@
@@ -1342,7 +1342,7 @@ index 000000000..c95918db2
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-listbox.c b/dlls/uxtheme/gtk-listbox.c
new file mode 100644
index 000000000..89b281ded
index 00000000000..89b281ded41
--- /dev/null
+++ b/dlls/uxtheme/gtk-listbox.c
@@ -0,0 +1,119 @@
@@ -1467,7 +1467,7 @@ index 000000000..89b281ded
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-listview.c b/dlls/uxtheme/gtk-listview.c
new file mode 100644
index 000000000..fbc85fdcc
index 00000000000..fbc85fdccce
--- /dev/null
+++ b/dlls/uxtheme/gtk-listview.c
@@ -0,0 +1,38 @@
@@ -1511,7 +1511,7 @@ index 000000000..fbc85fdcc
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-menu.c b/dlls/uxtheme/gtk-menu.c
new file mode 100644
index 000000000..30357bc85
index 00000000000..30357bc85f4
--- /dev/null
+++ b/dlls/uxtheme/gtk-menu.c
@@ -0,0 +1,189 @@
@@ -1706,7 +1706,7 @@ index 000000000..30357bc85
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-rebar.c b/dlls/uxtheme/gtk-rebar.c
new file mode 100644
index 000000000..493b05b6f
index 00000000000..493b05b6ff1
--- /dev/null
+++ b/dlls/uxtheme/gtk-rebar.c
@@ -0,0 +1,102 @@
@@ -1814,7 +1814,7 @@ index 000000000..493b05b6f
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-status.c b/dlls/uxtheme/gtk-status.c
new file mode 100644
index 000000000..558a8227c
index 00000000000..558a8227c42
--- /dev/null
+++ b/dlls/uxtheme/gtk-status.c
@@ -0,0 +1,157 @@
@@ -1977,7 +1977,7 @@ index 000000000..558a8227c
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-tab.c b/dlls/uxtheme/gtk-tab.c
new file mode 100644
index 000000000..845dbec1a
index 00000000000..845dbec1a65
--- /dev/null
+++ b/dlls/uxtheme/gtk-tab.c
@@ -0,0 +1,207 @@
@@ -2190,7 +2190,7 @@ index 000000000..845dbec1a
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-toolbar.c b/dlls/uxtheme/gtk-toolbar.c
new file mode 100644
index 000000000..231fffe73
index 00000000000..231fffe7335
--- /dev/null
+++ b/dlls/uxtheme/gtk-toolbar.c
@@ -0,0 +1,171 @@
@@ -2367,7 +2367,7 @@ index 000000000..231fffe73
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-trackbar.c b/dlls/uxtheme/gtk-trackbar.c
new file mode 100644
index 000000000..0bd4c2d1d
index 00000000000..0bd4c2d1dd2
--- /dev/null
+++ b/dlls/uxtheme/gtk-trackbar.c
@@ -0,0 +1,188 @@
@@ -2561,7 +2561,7 @@ index 000000000..0bd4c2d1d
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk-window.c b/dlls/uxtheme/gtk-window.c
new file mode 100644
index 000000000..2c4b40074
index 00000000000..2c4b4007402
--- /dev/null
+++ b/dlls/uxtheme/gtk-window.c
@@ -0,0 +1,172 @@
@@ -2739,10 +2739,10 @@ index 000000000..2c4b40074
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/gtk.c b/dlls/uxtheme/gtk.c
new file mode 100644
index 000000000..ddaa96496
index 00000000000..17cee005d5a
--- /dev/null
+++ b/dlls/uxtheme/gtk.c
@@ -0,0 +1,962 @@
@@ -0,0 +1,961 @@
+/*
+ * GTK uxtheme implementation
+ *
@@ -2780,7 +2780,6 @@ index 000000000..ddaa96496
+#include "vssym32.h"
+
+#include "wine/debug.h"
+#include "wine/library.h"
+
+#include "uxthemedll.h"
+
@@ -3706,7 +3705,7 @@ index 000000000..ddaa96496
+
+#endif /* HAVE_GTK_GTK_H */
diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c
index 073422f1c..244187d19 100644
index 073422f1cda..244187d1963 100644
--- a/dlls/uxtheme/metric.c
+++ b/dlls/uxtheme/metric.c
@@ -31,6 +31,7 @@
@@ -3783,7 +3782,7 @@ index 073422f1c..244187d19 100644
WARN("Unknown StringID: %d\n", iStringID);
return STG_E_INVALIDPARAMETER;
diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c
index 0e077aeec..ada482879 100644
index 0e077aeec46..ada48287952 100644
--- a/dlls/uxtheme/property.c
+++ b/dlls/uxtheme/property.c
@@ -31,6 +31,7 @@
@@ -3925,7 +3924,7 @@ index 0e077aeec..ada482879 100644
*pOrigin = PO_NOTFOUND;
return S_OK;
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index c898ad32e..2f7d40fc0 100644
index c898ad32e2f..2f7d40fc011 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -558,6 +558,10 @@ BOOL WINAPI IsAppThemed(void)
@@ -4033,7 +4032,7 @@ index c898ad32e..2f7d40fc0 100644
return TRUE;
return FALSE;
diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h
index fee152c9c..cdc5958d7 100644
index fee152c9c34..cdc5958d7c7 100644
--- a/dlls/uxtheme/uxthemedll.h
+++ b/dlls/uxtheme/uxthemedll.h
@@ -21,6 +21,14 @@
@@ -4124,7 +4123,7 @@ index fee152c9c..cdc5958d7 100644
/* "Cheap" binary alpha blending - but possibly faster */
diff --git a/dlls/uxtheme/uxthemegtk.h b/dlls/uxtheme/uxthemegtk.h
new file mode 100644
index 000000000..87cd0456f
index 00000000000..87cd0456f8d
--- /dev/null
+++ b/dlls/uxtheme/uxthemegtk.h
@@ -0,0 +1,129 @@
@@ -4258,5 +4257,5 @@ index 000000000..87cd0456f
+
+#endif /* UXTHEMEGTK_H */
--
2.23.0
2.28.0