[BOX32][WRAPPER] Added 32bits libXinerama, with new wrapperhelper

7 files changed, 79 insertions, 0 deletions

diff --git a/src/library_list_32.h b/src/library_list_32.h
index f8c1fa2a..0b49488a 100644
--- a/src/library_list_32.h
+++ b/src/library_list_32.h
@@ -37,6 +37,7 @@ GO("libXcursor.so", libxcursor)
 GO("libXrandr.so", libxrandr)
 GO("libxrandr.so", libxrandr)
 GO("libXxf86vm.so", libxxf86vm)
+GO("libXinerama.so", xinerama)
 #else
 GO("libX11.so.6", libx11)
 GO("libXext.so.6", libxext)
@@ -46,6 +47,7 @@ GO("libXcursor.so.1", libxcursor)
 GO("libXrandr.so.2", libxrandr)
 GO("libxrandr.so.2", libxrandr)
 GO("libXxf86vm.so.1", libxxf86vm)
+GO("libXinerama.so.1", xinerama)
 #endif
 GO("libopenal.so.1", openal)
 GO("libopenal.so.0", openal)
diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt
index 23586110..a692acb7 100644
--- a/src/wrapped32/generated/functions_list.txt
+++ b/src/wrapped32/generated/functions_list.txt
@@ -2080,3 +2080,4 @@ wrappedudev0:
 wrappedudev1:
 - vFpp:
   - udev_set_log_fn
+wrappedxinerama:
diff --git a/src/wrapped32/generated/wrappedxineramadefs32.h b/src/wrapped32/generated/wrappedxineramadefs32.h
new file mode 100644
index 00000000..d334187a
--- /dev/null
+++ b/src/wrapped32/generated/wrappedxineramadefs32.h
@@ -0,0 +1,8 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedxineramaDEFS32_H_
+#define __wrappedxineramaDEFS32_H_
+
+
+#endif // __wrappedxineramaDEFS32_H_
diff --git a/src/wrapped32/generated/wrappedxineramatypes32.h b/src/wrapped32/generated/wrappedxineramatypes32.h
new file mode 100644
index 00000000..31abe348
--- /dev/null
+++ b/src/wrapped32/generated/wrappedxineramatypes32.h
@@ -0,0 +1,17 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedxineramaTYPES32_H_
+#define __wrappedxineramaTYPES32_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 // __wrappedxineramaTYPES32_H_
diff --git a/src/wrapped32/generated/wrappedxineramaundefs32.h b/src/wrapped32/generated/wrappedxineramaundefs32.h
new file mode 100644
index 00000000..18d75dea
--- /dev/null
+++ b/src/wrapped32/generated/wrappedxineramaundefs32.h
@@ -0,0 +1,8 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedxineramaUNDEFS32_H_
+#define __wrappedxineramaUNDEFS32_H_
+
+
+#endif // __wrappedxineramaUNDEFS32_H_
diff --git a/src/wrapped32/wrappedxinerama.c b/src/wrapped32/wrappedxinerama.c
new file mode 100644
index 00000000..a75d9c1c
--- /dev/null
+++ b/src/wrapped32/wrappedxinerama.c
@@ -0,0 +1,29 @@
+#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 "box32.h"
+
+#ifdef ANDROID
+    static const char* xineramaName = "libXinerama.so";
+#else
+    static const char* xineramaName = "libXinerama.so.1";
+#endif
+
+#define LIBNAME xinerama
+
+#ifdef ANDROID
+#define NEEDED_LIBS "libX11.so", "libXext.so"
+#else
+#define NEEDED_LIBS "libX11.so.6", "libXext.so.6"
+#endif
+
+#include "wrappedlib_init32.h"
diff --git a/src/wrapped32/wrappedxinerama_private.h b/src/wrapped32/wrappedxinerama_private.h
new file mode 100644
index 00000000..dd337964
--- /dev/null
+++ b/src/wrapped32/wrappedxinerama_private.h
@@ -0,0 +1,14 @@
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error Meh...
+#endif
+
+GO(XineramaIsActive, iFX)
+GO(XineramaQueryExtension, iFXpp)
+GO(XineramaQueryScreens, pFXp)
+GO(XineramaQueryVersion, iFXpp)
+//GO(XPanoramiXAllocInfo, bLiiiiiL_Fv)
+//GO(XPanoramiXGetScreenCount, iFXLbLiiiiiL_)
+//GO(XPanoramiXGetScreenSize, iFXLibLiiiiiL_)
+//GO(XPanoramiXGetState, iFXLbLiiiiiL_)
+GO(XPanoramiXQueryExtension, iFXpp)
+GO(XPanoramiXQueryVersion, iFXpp)