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 38e95ed2227dd3f0fc3d1394c884265d43e3b283

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-04-08 09:15:39 +10:00
parent 160a5024b4
commit bf3fbb7bdf
18 changed files with 109 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2864,14 +2864,14 @@ index 000000000..ddaa96496
+
+static void free_gtk3_libs(void)
+{
+ if (libgtk3) wine_dlclose(libgtk3, NULL, 0);
+ if (libcairo) wine_dlclose(libcairo, NULL, 0);
+ if (libgobject2) wine_dlclose(libgobject2, NULL, 0);
+ if (libgtk3) dlclose(libgtk3);
+ if (libcairo) dlclose(libcairo);
+ if (libgobject2) dlclose(libgobject2);
+ libgtk3 = libcairo = libgobject2 = NULL;
+}
+
+#define LOAD_FUNCPTR(lib, f) \
+ if(!(p##f = wine_dlsym(lib, #f, NULL, 0))) \
+ if(!(p##f = dlsym(lib, #f))) \
+ { \
+ WARN("Can't find symbol %s.\n", #f); \
+ goto error; \
@@ -2882,7 +2882,7 @@ index 000000000..ddaa96496
+ if (libgtk3 && libcairo && libgobject2)
+ return TRUE;
+
+ libgtk3 = wine_dlopen(SONAME_LIBGTK_3, RTLD_NOW, NULL, 0);
+ libgtk3 = dlopen(SONAME_LIBGTK_3, RTLD_NOW);
+ if (!libgtk3)
+ {
+ FIXME("Wine cannot find the %s library.\n", SONAME_LIBGTK_3);
@@ -2940,7 +2940,7 @@ index 000000000..ddaa96496
+ LOAD_FUNCPTR(libgtk3, gtk_widget_style_get)
+ LOAD_FUNCPTR(libgtk3, gtk_window_new)
+
+ libcairo = wine_dlopen(SONAME_LIBCAIRO, RTLD_NOW, NULL, 0);
+ libcairo = dlopen(SONAME_LIBCAIRO, RTLD_NOW);
+ if (!libcairo)
+ {
+ FIXME("Wine cannot find the %s library.\n", SONAME_LIBCAIRO);
@@ -2955,7 +2955,7 @@ index 000000000..ddaa96496
+ LOAD_FUNCPTR(libcairo, cairo_surface_destroy)
+ LOAD_FUNCPTR(libcairo, cairo_surface_flush)
+
+ libgobject2 = wine_dlopen(SONAME_LIBGOBJECT_2_0, RTLD_NOW, NULL, 0);
+ libgobject2 = dlopen(SONAME_LIBGOBJECT_2_0, RTLD_NOW);
+ if (!libgobject2)
+ {
+ FIXME("Wine cannot find the %s library.\n", SONAME_LIBGOBJECT_2_0);

2
patches/uxtheme-GTK_Theming/0004-uxtheme-Reset-FPU-flags-before-calling-GTK3-function.patch
View File

@@ -38,7 +38,7 @@ index bbee8e87..86ea4d1b 100644
+
static void free_gtk3_libs(void)
{
if (libgtk3) wine_dlclose(libgtk3, NULL, 0);
if (libgtk3) dlclose(libgtk3);
@@ -319,11 +340,15 @@ BOOL uxtheme_gtk_enabled(void)
HRESULT uxtheme_gtk_CloseThemeData(HTHEME htheme)
{