[WRAPPER] Added wrapped libXaw with new wrapperhelper (for #1990)

ptitSeb · Nov 9, 2024 · b46925e · b46925e
1 parent e676756
commit b46925e
Show file tree

Hide file tree

Showing 10 changed files with 331 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -602,6 +602,7 @@ set(WRAPPEDS
     "${BOX64_ROOT}/src/wrapped/wrappedlibx11.c"
     "${BOX64_ROOT}/src/wrapped/wrappedlibx11xcb.c"
     "${BOX64_ROOT}/src/wrapped/wrappedlibxau.c"
+    "${BOX64_ROOT}/src/wrapped/wrappedlibxaw.c"
     "${BOX64_ROOT}/src/wrapped/wrappedlibxcb.c"
     "${BOX64_ROOT}/src/wrapped/wrappedlibxcbcursor.c"
     "${BOX64_ROOT}/src/wrapped/wrappedlibxcbdri2.c"

diff --git a/src/library_list.h b/src/library_list.h
@@ -81,6 +81,7 @@ GO("libxcb-xkb.so.1", libxcbxkb)
 //GO("libxcb-present.so.0", libxcbpresent)
 GO("libXtst.so.6", libxtst)
 GO("libXt.so.6", libxt)
+GO("libXaw.so.7", libxaw)
 GO("libXcomposite.so.1", libxcomposite)
 GO("libXdamage.so.1", libxdamage)
 GO("libXpresent.so.1", libxpresent)
@@ -323,6 +324,7 @@ GO("libxcb-xinerama.so", libxcbxinerama)
 GO("libxcb-xkb.so", libxcbxkb)
 GO("libXtst.so", libxtst)
 GO("libXt.so", libxt)
+GO("libXaw.so", libxaw)
 GO("libXcomposite.so", libxcomposite)
 GO("libXdamage.so", libxdamage)
 GO("libXpresent.so", libxpresent)

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
@@ -437,6 +437,7 @@
 #() vFLup
 #() vFLpL
 #() vFLpp
+#() vFpww
 #() vFpic
 #() vFpii
 #() vFpiI
@@ -682,6 +683,7 @@
 #() lFipi
 #() lFipL
 #() lFlll
+#() lFpup
 #() lFpli
 #() lFpLu
 #() lFpLd
@@ -915,6 +917,7 @@
 #() vFllii
 #() vFLuui
 #() vFLppi
+#() vFpwwu
 #() vFpiii
 #() vFpiiu
 #() vFpiid
@@ -950,6 +953,7 @@
 #() vFpddu
 #() vFpddd
 #() vFplll
+#() vFpllL
 #() vFplpp
 #() vFpLii
 #() vFpLuu
@@ -1114,6 +1118,7 @@
 #() iFpdip
 #() iFplii
 #() iFplip
+#() iFpllp
 #() iFplpi
 #() iFplpp
 #() iFpLii
@@ -1237,6 +1242,8 @@
 #() lFpilp
 #() lFpuip
 #() lFplip
+#() lFplup
+#() lFplpi
 #() lFplpp
 #() lFpLpp
 #() lFppii
@@ -1501,6 +1508,7 @@
 #() vFluipp
 #() vFLpppi
 #() vFLpppp
+#() vFpwwWW
 #() vFpiiii
 #() vFpiiiI
 #() vFpiiiu
@@ -1540,6 +1548,7 @@
 #() vFpddii
 #() vFpdddd
 #() vFpddpp
+#() vFpliip
 #() vFpluul
 #() vFplppp
 #() vFpLiii
@@ -1548,6 +1557,7 @@
 #() vFpLLpp
 #() vFpLpiL
 #() vFpLppi
+#() vFppiic
 #() vFppiii
 #() vFppiiu
 #() vFppiiL
@@ -2011,9 +2021,11 @@
 #() vFffffff
 #() vFdddddd
 #() vFdddppp
+#() vFpwwllc
 #() vFpiiiii
 #() vFpiiipp
 #() vFpiiuuu
+#() vFpiilli
 #() vFpiippi
 #() vFpiippp
 #() vFpiUuup
@@ -2283,6 +2295,7 @@
 #() lFipLpLL
 #() lFpipill
 #() lFpuuLLp
+#() lFpluuic
 #() lFppLipp
 #() lFpppLpp
 #() LFEuuppp
@@ -2462,6 +2475,7 @@
 #() vFpfffppp
 #() vFpddiidd
 #() vFpdddddd
+#() vFplilppp
 #() vFpLiiiLi
 #() vFpLiiipi
 #() vFpLiiuui
@@ -2501,6 +2515,7 @@
 #() vFpppppip
 #() vFppppppu
 #() vFppppppp
+#() cFppppppp
 #() iFElppppp
 #() iFEpupppp
 #() iFEpUuppp
@@ -2637,6 +2652,7 @@
 #() pFpiiippp
 #() pFpiiUdii
 #() pFpiipipp
+#() pFpiiplui
 #() pFpiipppp
 #() pFpipiupp
 #() pFpipippp
@@ -2745,6 +2761,7 @@
 #() vFpuppLLLL
 #() vFpUiUiupi
 #() vFpUuuUUUu
+#() vFpliicppp
 #() vFpLiiiLii
 #() vFpLLLiipi
 #() vFpLpLpLpp
@@ -5211,6 +5228,7 @@ wrappedlibx11xcb:
 - pFp:
   - XGetXCBConnection
 wrappedlibxau:
+wrappedlibxaw:
 wrappedlibxcb:
 - vFp:
   - xcb_disconnect

diff --git a/src/wrapped/generated/wrappedlibxawdefs.h b/src/wrapped/generated/wrappedlibxawdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.5.0.24) *
+ *******************************************************************/
+#ifndef __wrappedlibxawDEFS_H_
+#define __wrappedlibxawDEFS_H_
+
+
+#endif // __wrappedlibxawDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxawtypes.h b/src/wrapped/generated/wrappedlibxawtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.5.0.24) *
+ *******************************************************************/
+#ifndef __wrappedlibxawTYPES_H_
+#define __wrappedlibxawTYPES_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 // __wrappedlibxawTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxawundefs.h b/src/wrapped/generated/wrappedlibxawundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.5.0.24) *
+ *******************************************************************/
+#ifndef __wrappedlibxawUNDEFS_H_
+#define __wrappedlibxawUNDEFS_H_
+
+
+#endif // __wrappedlibxawUNDEFS_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
@@ -474,6 +474,7 @@ void vFlpp(x64emu_t *emu, uintptr_t fnc);
 void vFLup(x64emu_t *emu, uintptr_t fnc);
 void vFLpL(x64emu_t *emu, uintptr_t fnc);
 void vFLpp(x64emu_t *emu, uintptr_t fnc);
+void vFpww(x64emu_t *emu, uintptr_t fnc);
 void vFpic(x64emu_t *emu, uintptr_t fnc);
 void vFpii(x64emu_t *emu, uintptr_t fnc);
 void vFpiI(x64emu_t *emu, uintptr_t fnc);
@@ -719,6 +720,7 @@ void lFili(x64emu_t *emu, uintptr_t fnc);
 void lFipi(x64emu_t *emu, uintptr_t fnc);
 void lFipL(x64emu_t *emu, uintptr_t fnc);
 void lFlll(x64emu_t *emu, uintptr_t fnc);
+void lFpup(x64emu_t *emu, uintptr_t fnc);
 void lFpli(x64emu_t *emu, uintptr_t fnc);
 void lFpLu(x64emu_t *emu, uintptr_t fnc);
 void lFpLd(x64emu_t *emu, uintptr_t fnc);
@@ -952,6 +954,7 @@ void vFdddd(x64emu_t *emu, uintptr_t fnc);
 void vFllii(x64emu_t *emu, uintptr_t fnc);
 void vFLuui(x64emu_t *emu, uintptr_t fnc);
 void vFLppi(x64emu_t *emu, uintptr_t fnc);
+void vFpwwu(x64emu_t *emu, uintptr_t fnc);
 void vFpiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpiid(x64emu_t *emu, uintptr_t fnc);
@@ -987,6 +990,7 @@ void vFpdup(x64emu_t *emu, uintptr_t fnc);
 void vFpddu(x64emu_t *emu, uintptr_t fnc);
 void vFpddd(x64emu_t *emu, uintptr_t fnc);
 void vFplll(x64emu_t *emu, uintptr_t fnc);
+void vFpllL(x64emu_t *emu, uintptr_t fnc);
 void vFplpp(x64emu_t *emu, uintptr_t fnc);
 void vFpLii(x64emu_t *emu, uintptr_t fnc);
 void vFpLuu(x64emu_t *emu, uintptr_t fnc);
@@ -1151,6 +1155,7 @@ void iFpUpp(x64emu_t *emu, uintptr_t fnc);
 void iFpdip(x64emu_t *emu, uintptr_t fnc);
 void iFplii(x64emu_t *emu, uintptr_t fnc);
 void iFplip(x64emu_t *emu, uintptr_t fnc);
+void iFpllp(x64emu_t *emu, uintptr_t fnc);
 void iFplpi(x64emu_t *emu, uintptr_t fnc);
 void iFplpp(x64emu_t *emu, uintptr_t fnc);
 void iFpLii(x64emu_t *emu, uintptr_t fnc);
@@ -1274,6 +1279,8 @@ void lFpili(x64emu_t *emu, uintptr_t fnc);
 void lFpilp(x64emu_t *emu, uintptr_t fnc);
 void lFpuip(x64emu_t *emu, uintptr_t fnc);
 void lFplip(x64emu_t *emu, uintptr_t fnc);
+void lFplup(x64emu_t *emu, uintptr_t fnc);
+void lFplpi(x64emu_t *emu, uintptr_t fnc);
 void lFplpp(x64emu_t *emu, uintptr_t fnc);
 void lFpLpp(x64emu_t *emu, uintptr_t fnc);
 void lFppii(x64emu_t *emu, uintptr_t fnc);
@@ -1538,6 +1545,7 @@ void vFddddp(x64emu_t *emu, uintptr_t fnc);
 void vFluipp(x64emu_t *emu, uintptr_t fnc);
 void vFLpppi(x64emu_t *emu, uintptr_t fnc);
 void vFLpppp(x64emu_t *emu, uintptr_t fnc);
+void vFpwwWW(x64emu_t *emu, uintptr_t fnc);
 void vFpiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiI(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiu(x64emu_t *emu, uintptr_t fnc);
@@ -1577,6 +1585,7 @@ void vFpdiII(x64emu_t *emu, uintptr_t fnc);
 void vFpddii(x64emu_t *emu, uintptr_t fnc);
 void vFpdddd(x64emu_t *emu, uintptr_t fnc);
 void vFpddpp(x64emu_t *emu, uintptr_t fnc);
+void vFpliip(x64emu_t *emu, uintptr_t fnc);
 void vFpluul(x64emu_t *emu, uintptr_t fnc);
 void vFplppp(x64emu_t *emu, uintptr_t fnc);
 void vFpLiii(x64emu_t *emu, uintptr_t fnc);
@@ -1585,6 +1594,7 @@ void vFpLLLL(x64emu_t *emu, uintptr_t fnc);
 void vFpLLpp(x64emu_t *emu, uintptr_t fnc);
 void vFpLpiL(x64emu_t *emu, uintptr_t fnc);
 void vFpLppi(x64emu_t *emu, uintptr_t fnc);
+void vFppiic(x64emu_t *emu, uintptr_t fnc);
 void vFppiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiu(x64emu_t *emu, uintptr_t fnc);
 void vFppiiL(x64emu_t *emu, uintptr_t fnc);
@@ -2048,9 +2058,11 @@ void vFUUpppp(x64emu_t *emu, uintptr_t fnc);
 void vFffffff(x64emu_t *emu, uintptr_t fnc);
 void vFdddddd(x64emu_t *emu, uintptr_t fnc);
 void vFdddppp(x64emu_t *emu, uintptr_t fnc);
+void vFpwwllc(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiuuu(x64emu_t *emu, uintptr_t fnc);
+void vFpiilli(x64emu_t *emu, uintptr_t fnc);
 void vFpiippi(x64emu_t *emu, uintptr_t fnc);
 void vFpiippp(x64emu_t *emu, uintptr_t fnc);
 void vFpiUuup(x64emu_t *emu, uintptr_t fnc);
@@ -2320,6 +2332,7 @@ void lFipLipp(x64emu_t *emu, uintptr_t fnc);
 void lFipLpLL(x64emu_t *emu, uintptr_t fnc);
 void lFpipill(x64emu_t *emu, uintptr_t fnc);
 void lFpuuLLp(x64emu_t *emu, uintptr_t fnc);
+void lFpluuic(x64emu_t *emu, uintptr_t fnc);
 void lFppLipp(x64emu_t *emu, uintptr_t fnc);
 void lFpppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFEuuppp(x64emu_t *emu, uintptr_t fnc);
@@ -2499,6 +2512,7 @@ void vFpUUUUuu(x64emu_t *emu, uintptr_t fnc);
 void vFpfffppp(x64emu_t *emu, uintptr_t fnc);
 void vFpddiidd(x64emu_t *emu, uintptr_t fnc);
 void vFpdddddd(x64emu_t *emu, uintptr_t fnc);
+void vFplilppp(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiiLi(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiipi(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiuui(x64emu_t *emu, uintptr_t fnc);
@@ -2538,6 +2552,7 @@ void vFppppiui(x64emu_t *emu, uintptr_t fnc);
 void vFpppppip(x64emu_t *emu, uintptr_t fnc);
 void vFppppppu(x64emu_t *emu, uintptr_t fnc);
 void vFppppppp(x64emu_t *emu, uintptr_t fnc);
+void cFppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFElppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpupppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpUuppp(x64emu_t *emu, uintptr_t fnc);
@@ -2674,6 +2689,7 @@ void pFpiiiiid(x64emu_t *emu, uintptr_t fnc);
 void pFpiiippp(x64emu_t *emu, uintptr_t fnc);
 void pFpiiUdii(x64emu_t *emu, uintptr_t fnc);
 void pFpiipipp(x64emu_t *emu, uintptr_t fnc);
+void pFpiiplui(x64emu_t *emu, uintptr_t fnc);
 void pFpiipppp(x64emu_t *emu, uintptr_t fnc);
 void pFpipiupp(x64emu_t *emu, uintptr_t fnc);
 void pFpipippp(x64emu_t *emu, uintptr_t fnc);
@@ -2782,6 +2798,7 @@ void vFpuppippp(x64emu_t *emu, uintptr_t fnc);
 void vFpuppLLLL(x64emu_t *emu, uintptr_t fnc);
 void vFpUiUiupi(x64emu_t *emu, uintptr_t fnc);
 void vFpUuuUUUu(x64emu_t *emu, uintptr_t fnc);
+void vFpliicppp(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiiLii(x64emu_t *emu, uintptr_t fnc);
 void vFpLLLiipi(x64emu_t *emu, uintptr_t fnc);
 void vFpLpLpLpp(x64emu_t *emu, uintptr_t fnc);

diff --git a/src/wrapped/wrappedlibxaw.c b/src/wrapped/wrappedlibxaw.c
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
+#include <dlfcn.h>
+
+#include "wrappedlibs.h"
+
+#include "wrapper.h"
+#include "bridge.h"
+#include "librarian/library_private.h"
+#include "x64emu.h"
+
+const char* libxawName = "libXaw.so.7";
+#define ALTNAME "libXaw.so"
+
+#define LIBNAME libxaw
+
+#define NEEDED_LIBS "libX11.so.6", "libXext.so.6", "libXmu.so.6", "libXt.so.6"
+
+#include "wrappedlib_init.h"