[BOX32][WRAPPER] Added 32bits wrapped libXcomposite (with new wrapperhelper)

8 files changed, 78 insertions, 1 deletions

diff --git a/src/library_list_32.h b/src/library_list_32.h
index 0b49488a..f5ed1784 100644
--- a/src/library_list_32.h
+++ b/src/library_list_32.h
@@ -34,6 +34,7 @@ GO("libXext.so", libxext)
 GO("libXfixes.so", libxfixes)
 GO("libXrender.so", libxrender)
 GO("libXcursor.so", libxcursor)
+GO("libXcomposite.so", libxcomposite)
 GO("libXrandr.so", libxrandr)
 GO("libxrandr.so", libxrandr)
 GO("libXxf86vm.so", libxxf86vm)
@@ -43,6 +44,7 @@ GO("libX11.so.6", libx11)
 GO("libXext.so.6", libxext)
 GO("libXfixes.so.3", libxfixes)
 GO("libXrender.so.1", libxrender)
+GO("libXcomposite.so.1", libxcomposite)
 GO("libXcursor.so.1", libxcursor)
 GO("libXrandr.so.2", libxrandr)
 GO("libxrandr.so.2", libxrandr)
diff --git a/src/wrapped/wrappedlibxcomposite_private.h b/src/wrapped/wrappedlibxcomposite_private.h
index 9c52d04f..c60a4c38 100644
--- a/src/wrapped/wrappedlibxcomposite_private.h
+++ b/src/wrapped/wrappedlibxcomposite_private.h
@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(XCompositeCreateRegionFromBorderClip, LFpL)
diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt
index 4ec5ada9..ad4eae92 100644
--- a/src/wrapped32/generated/functions_list.txt
+++ b/src/wrapped32/generated/functions_list.txt
@@ -1951,6 +1951,7 @@ wrappedlibx11:
   - XGetSubImage
 - LFXLiiuuuiupLp:
   - XCreateWindow
+wrappedlibxcomposite:
 wrappedlibxcursor:
 wrappedlibxext:
 - vFp:
diff --git a/src/wrapped32/generated/wrappedlibxcompositedefs32.h b/src/wrapped32/generated/wrappedlibxcompositedefs32.h
new file mode 100644
index 00000000..599b1179
--- /dev/null
+++ b/src/wrapped32/generated/wrappedlibxcompositedefs32.h
@@ -0,0 +1,8 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedlibxcompositeDEFS32_H_
+#define __wrappedlibxcompositeDEFS32_H_
+
+
+#endif // __wrappedlibxcompositeDEFS32_H_
diff --git a/src/wrapped32/generated/wrappedlibxcompositetypes32.h b/src/wrapped32/generated/wrappedlibxcompositetypes32.h
new file mode 100644
index 00000000..d5d42870
--- /dev/null
+++ b/src/wrapped32/generated/wrappedlibxcompositetypes32.h
@@ -0,0 +1,17 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedlibxcompositeTYPES32_H_
+#define __wrappedlibxcompositeTYPES32_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcompositeTYPES32_H_
diff --git a/src/wrapped32/generated/wrappedlibxcompositeundefs32.h b/src/wrapped32/generated/wrappedlibxcompositeundefs32.h
new file mode 100644
index 00000000..f8fade03
--- /dev/null
+++ b/src/wrapped32/generated/wrappedlibxcompositeundefs32.h
@@ -0,0 +1,8 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedlibxcompositeUNDEFS32_H_
+#define __wrappedlibxcompositeUNDEFS32_H_
+
+
+#endif // __wrappedlibxcompositeUNDEFS32_H_
diff --git a/src/wrapped32/wrappedlibxcomposite.c b/src/wrapped32/wrappedlibxcomposite.c
new file mode 100644
index 00000000..5cb481da
--- /dev/null
+++ b/src/wrapped32/wrappedlibxcomposite.c
@@ -0,0 +1,25 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
+#include <dlfcn.h>
+
+#include "wrappedlibs.h"
+
+#include "wrapper32.h"
+#include "bridge.h"
+#include "librarian/library_private.h"
+#include "x64emu.h"
+#include "debug.h"
+#include "box32.h"
+
+#ifdef ANDROID
+	static const char* libxcompositeName = "libXcomposite.so";
+#else
+	static const char* libxcompositeName = "libXcomposite.so.1";
+#endif
+
+#define LIBNAME libxcomposite
+
+#include "wrappedlib_init32.h"
+
diff --git a/src/wrapped32/wrappedlibxcomposite_private.h b/src/wrapped32/wrappedlibxcomposite_private.h
new file mode 100644
index 00000000..d2a983c0
--- /dev/null
+++ b/src/wrapped32/wrappedlibxcomposite_private.h
@@ -0,0 +1,16 @@
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error Meh...
+#endif
+
+GO(XCompositeCreateRegionFromBorderClip, LFXL)
+//GO(XCompositeFindDisplay, pFX)
+GO(XCompositeGetOverlayWindow, LFXL)
+GO(XCompositeNameWindowPixmap, LFXL)
+GO(XCompositeQueryExtension, iFXpp)
+GO(XCompositeQueryVersion, iFXpp)
+GO(XCompositeRedirectSubwindows, vFXLi)
+GO(XCompositeRedirectWindow, vFXLi)
+GO(XCompositeReleaseOverlayWindow, vFXL)
+GO(XCompositeUnredirectSubwindows, vFXLi)
+GO(XCompositeUnredirectWindow, vFXLi)
+GO(XCompositeVersion, iFv)