[PATCH 0/2] MR2058: winex11: Make some definitions hidden.

[Zebediah Figura (＠zfigura)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2058

[PATCH 1/2] winex11: Make client_foreign_window_proc hidden.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

---
 dlls/winex11.drv/x11drv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 4997367ce9a..f4f6ba07e07 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -453,7 +453,7 @@ extern int alloc_system_colors DECLSPEC_HIDDEN;
 extern int xrender_error_base DECLSPEC_HIDDEN;
 extern char *process_name DECLSPEC_HIDDEN;
 extern Display *clipboard_display DECLSPEC_HIDDEN;
-extern WNDPROC client_foreign_window_proc;
+extern WNDPROC client_foreign_window_proc DECLSPEC_HIDDEN;
 
 /* atoms */
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2058

[PATCH 2/2] winex11: Include x11drv.h in xrandr.c even if compiling without xrandr.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

Make sure we pull in the definition of X11DRV_XRandR_Init(), in particular because it has DECLSPEC_HIDDEN.
---
 dlls/winex11.drv/xrandr.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index dbd8a721074..2b0ee253cea 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -28,7 +28,11 @@
 
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
-
+#include <assert.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>
+#include <dlfcn.h>
+#include "x11drv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(xrandr);
@@ -38,12 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
 #ifdef SONAME_LIBXRANDR
 
-#include <assert.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>
-#include <dlfcn.h>
-#include "x11drv.h"
-
 #define VK_NO_PROTOTYPES
 #define WINE_VK_HOST
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2058