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

8 files changed, 75 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b90b4b0..4e976076 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -806,6 +806,7 @@ if(BOX32)
         "${BOX64_ROOT}/src/wrapped32/wrappedexpat.c"
         "${BOX64_ROOT}/src/wrapped32/wrappedudev0.c"
         "${BOX64_ROOT}/src/wrapped32/wrappedudev1.c"
+        "${BOX64_ROOT}/src/wrapped32/wrappedlibuuid.c"
         "${BOX64_ROOT}/src/wrapped32/wrappedtcmallocminimal.c"
     )
     endif()
diff --git a/src/library_list_32.h b/src/library_list_32.h
index f5ed1784..c12061d5 100644
--- a/src/library_list_32.h
+++ b/src/library_list_32.h
@@ -62,6 +62,7 @@ GO("libexpat.so", expat)
 GO("libudev.so.0", udev0)
 GO("libudev.so.1", udev1)
 GO("libudev.so", udev1)
+GO("libuuid.so.1", libuuid)
 
 GO("crashhandler.so", crashhandler)
 GO("libtcmalloc_minimal.so.0", tcmallocminimal)
diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt
index ad4eae92..da1ae2a5 100644
--- a/src/wrapped32/generated/functions_list.txt
+++ b/src/wrapped32/generated/functions_list.txt
@@ -1846,6 +1846,7 @@ wrappedlibpthread:
 - iFBh_ppp:
   - pthread_create
 wrappedlibrt:
+wrappedlibuuid:
 wrappedlibx11:
 - vFp:
   - XFreeStringList
diff --git a/src/wrapped32/generated/wrappedlibuuiddefs32.h b/src/wrapped32/generated/wrappedlibuuiddefs32.h
new file mode 100644
index 00000000..d9650816
--- /dev/null
+++ b/src/wrapped32/generated/wrappedlibuuiddefs32.h
@@ -0,0 +1,8 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedlibuuidDEFS32_H_
+#define __wrappedlibuuidDEFS32_H_
+
+
+#endif // __wrappedlibuuidDEFS32_H_
diff --git a/src/wrapped32/generated/wrappedlibuuidtypes32.h b/src/wrapped32/generated/wrappedlibuuidtypes32.h
new file mode 100644
index 00000000..10e237dd
--- /dev/null
+++ b/src/wrapped32/generated/wrappedlibuuidtypes32.h
@@ -0,0 +1,17 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedlibuuidTYPES32_H_
+#define __wrappedlibuuidTYPES32_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 // __wrappedlibuuidTYPES32_H_
diff --git a/src/wrapped32/generated/wrappedlibuuidundefs32.h b/src/wrapped32/generated/wrappedlibuuidundefs32.h
new file mode 100644
index 00000000..dd05c734
--- /dev/null
+++ b/src/wrapped32/generated/wrappedlibuuidundefs32.h
@@ -0,0 +1,8 @@
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
+#ifndef __wrappedlibuuidUNDEFS32_H_
+#define __wrappedlibuuidUNDEFS32_H_
+
+
+#endif // __wrappedlibuuidUNDEFS32_H_
diff --git a/src/wrapped32/wrappedlibuuid.c b/src/wrapped32/wrappedlibuuid.c
new file mode 100644
index 00000000..23d02fca
--- /dev/null
+++ b/src/wrapped32/wrappedlibuuid.c
@@ -0,0 +1,18 @@
+#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"
+
+static const char* libuuidName = "libuuid.so.1";
+#define LIBNAME libuuid
+
+#include "wrappedlib_init32.h"
diff --git a/src/wrapped32/wrappedlibuuid_private.h b/src/wrapped32/wrappedlibuuid_private.h
new file mode 100644
index 00000000..e6281141
--- /dev/null
+++ b/src/wrapped32/wrappedlibuuid_private.h
@@ -0,0 +1,21 @@
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error Meh...
+#endif
+
+GO(uuid_clear, vFp)
+GO(uuid_compare, iFpp)
+GO(uuid_copy, vFpp)
+GO(uuid_generate, vFp)
+//GO(uuid__generate_random, vFpp)
+GO(uuid_generate_random, vFp)
+//GO(uuid__generate_time, vFpp)
+GO(uuid_generate_time, vFp)
+GO(uuid_generate_time_safe, iFp)
+GO(uuid_is_null, iFp)
+GO(uuid_parse, iFpp)
+//GO(uuid_time, uFpp)
+GO(uuid_type, iFp)
+GO(uuid_unparse, vFpp)
+GO(uuid_unparse_lower, vFpp)
+GO(uuid_unparse_upper, vFpp)
+GO(uuid_variant, iFp)