From 0821e6acc230b4cc9806ce29f4def74c76465394 Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Fri, 18 Oct 2024 18:59:15 +0200
Subject: [PATCH] [BOX32][WRAPPER] Added a few symbols to libSDL2

---
 src/wrapped32/generated/functions_list.txt |  1 +
 src/wrapped32/generated/wrapper32.c        |  2 ++
 src/wrapped32/generated/wrapper32.h        |  1 +
 src/wrapped32/wrappedsdl2_private.h        | 15 ++++++++-------
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt
index 74d64986..00a1b693 100644
--- a/src/wrapped32/generated/functions_list.txt
+++ b/src/wrapped32/generated/functions_list.txt
@@ -43,6 +43,7 @@
 #() WFi -> WFi
 #() WFW -> WFW
 #() WFu -> WFu
+#() WFp -> WFp
 #() uFv -> uFv
 #() uFi -> uFi
 #() uFu -> uFu
diff --git a/src/wrapped32/generated/wrapper32.c b/src/wrapped32/generated/wrapper32.c
index 57cc0741..818aec2e 100644
--- a/src/wrapped32/generated/wrapper32.c
+++ b/src/wrapped32/generated/wrapper32.c
@@ -133,6 +133,7 @@ typedef uint8_t (*CFp_t)(void*);
 typedef uint16_t (*WFi_t)(int32_t);
 typedef uint16_t (*WFW_t)(uint16_t);
 typedef uint16_t (*WFu_t)(uint32_t);
+typedef uint16_t (*WFp_t)(void*);
 typedef uint32_t (*uFv_t)(void);
 typedef uint32_t (*uFi_t)(int32_t);
 typedef uint32_t (*uFu_t)(uint32_t);
@@ -1634,6 +1635,7 @@ void CFp_32(x64emu_t *emu, uintptr_t fcn) { CFp_t fn = (CFp_t)fcn; R_EAX = (unsi
 void WFi_32(x64emu_t *emu, uintptr_t fcn) { WFi_t fn = (WFi_t)fcn; R_EAX = (unsigned short)fn(from_ptri(int32_t, R_ESP + 4)); }
 void WFW_32(x64emu_t *emu, uintptr_t fcn) { WFW_t fn = (WFW_t)fcn; R_EAX = (unsigned short)fn(from_ptri(uint16_t, R_ESP + 4)); }
 void WFu_32(x64emu_t *emu, uintptr_t fcn) { WFu_t fn = (WFu_t)fcn; R_EAX = (unsigned short)fn(from_ptri(uint32_t, R_ESP + 4)); }
+void WFp_32(x64emu_t *emu, uintptr_t fcn) { WFp_t fn = (WFp_t)fcn; R_EAX = (unsigned short)fn(from_ptriv(R_ESP + 4)); }
 void uFv_32(x64emu_t *emu, uintptr_t fcn) { uFv_t fn = (uFv_t)fcn; R_EAX = (uint32_t)fn(); }
 void uFi_32(x64emu_t *emu, uintptr_t fcn) { uFi_t fn = (uFi_t)fcn; R_EAX = (uint32_t)fn(from_ptri(int32_t, R_ESP + 4)); }
 void uFu_32(x64emu_t *emu, uintptr_t fcn) { uFu_t fn = (uFu_t)fcn; R_EAX = (uint32_t)fn(from_ptri(uint32_t, R_ESP + 4)); }
diff --git a/src/wrapped32/generated/wrapper32.h b/src/wrapped32/generated/wrapper32.h
index 9922919d..49e9c30b 100644
--- a/src/wrapped32/generated/wrapper32.h
+++ b/src/wrapped32/generated/wrapper32.h
@@ -84,6 +84,7 @@ void CFp_32(x64emu_t *emu, uintptr_t fnc);
 void WFi_32(x64emu_t *emu, uintptr_t fnc);
 void WFW_32(x64emu_t *emu, uintptr_t fnc);
 void WFu_32(x64emu_t *emu, uintptr_t fnc);
+void WFp_32(x64emu_t *emu, uintptr_t fnc);
 void uFv_32(x64emu_t *emu, uintptr_t fnc);
 void uFi_32(x64emu_t *emu, uintptr_t fnc);
 void uFu_32(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped32/wrappedsdl2_private.h b/src/wrapped32/wrappedsdl2_private.h
index 9dc5b16e..d80d1b72 100644
--- a/src/wrapped32/wrappedsdl2_private.h
+++ b/src/wrapped32/wrappedsdl2_private.h
@@ -151,13 +151,14 @@ GO(SDL_GameControllerGetJoystick, pFp)
 //GO(SDL_GameControllerGetStringForAxis, pFi)
 //GO(SDL_GameControllerGetStringForButton, pFi)
 //GO(SDL_GameControllerGetTouchpadFinger, iFpiipppp)
-//GO(SDL_GameControllerGetType, uFp)
-//GO(SDL_GameControllerGetVendor, WFp)
-//GO(SDL_GameControllerHasButton, uFpi)
-//GO(SDL_GameControllerHasLED, iFp)
-//GO(SDL_GameControllerHasRumble, iFp)
-//GO(SDL_GameControllerHasSensor, iFpi)
-//GO(SDL_GameControllerIsSensorEnabled, uFpi)
+GO(SDL_GameControllerGetType, uFp)
+GO(SDL_GameControllerGetVendor, WFp)
+GO(SDL_GameControllerHasAxis, iFpu)
+GO(SDL_GameControllerHasButton, uFpi)
+GO(SDL_GameControllerHasLED, iFp)
+GO(SDL_GameControllerHasRumble, iFp)
+GO(SDL_GameControllerHasSensor, iFpi)
+GO(SDL_GameControllerIsSensorEnabled, uFpi)
 GO(SDL_GameControllerMapping, pFp)
 GO(SDL_GameControllerMappingForDeviceIndex, pFi)
 //GO(SDL_GameControllerMappingForGUID, pFpp)