1 files changed, 130 insertions, 5 deletions

diff --git a/src/wrapped32/wrappedsdl2.c b/src/wrapped32/wrappedsdl2.c
index 0914f7d1..bf444cff 100644
--- a/src/wrapped32/wrappedsdl2.c
+++ b/src/wrapped32/wrappedsdl2.c
@@ -17,6 +17,9 @@
 #include "librarian.h"
 #include "box32context.h"
 #include "emu/x64emu_private.h"
+#include "myalign32.h"
+#include "gltools.h"
+#include "sdl2rwops.h"
 
 #include "x64trace.h"
 #include "threads.h"
@@ -38,7 +41,7 @@ typedef struct {
     void* userdata;
 } SDL2_AudioSpec;
 
-typedef struct {
+typedef struct __attribute__((packed)) {
     int32_t freq;
     uint16_t format;
     uint8_t channels;
@@ -50,7 +53,11 @@ typedef struct {
     ptr_t userdata; // void *userdata;
 } SDL2_AudioSpec32;
 
-#define ADDED_FUNCTIONS()
+typedef void (*vFiupV_t)(int, uint32_t, void*, va_list);
+#define ADDED_FUNCTIONS()         \
+    GO(SDL_LogMessageV, vFiupV_t) \
+    GO(SDL_AllocRW, sdl2_allocrw) \
+    GO(SDL_FreeRW, sdl2_freerw)
 
 #define ADDED_FINI()
 
@@ -117,10 +124,10 @@ EXPORT int my32_2_SDL_OpenAudio(x64emu_t* emu, void* d, void* o)
     desired.userdata = from_ptrv(d_->userdata);
     desired.callback = find_AudioCallback_Fct(from_ptrv(d_->callback));
     int ret = my->SDL_OpenAudio(&desired, &output);
-    if (ret != 0) {
+    if (ret <= 0) {
         return ret;
     }
-    // put back stuff in place?
+
     if (o) {
         SDL2_AudioSpec32* o_ = o;
         o_->channels = output.channels;
@@ -130,11 +137,44 @@ EXPORT int my32_2_SDL_OpenAudio(x64emu_t* emu, void* d, void* o)
         o_->padding = output.padding;
         o_->silence = output.silence;
         o_->size = output.size;
-        o_->userdata = o_->callback = 0;
+        o_->userdata = to_ptrv(output.userdata);
+        o_->callback = to_ptrv(output.callback);
     }
     return ret;
 }
 
+EXPORT uint32_t my32_2_SDL_OpenAudioDevice(x64emu_t* emu, void* device, int iscapture, void* d, void* o, int allowed)
+{
+    SDL2_AudioSpec desired = { 0 };
+    SDL2_AudioSpec output = { 0 };
+    SDL2_AudioSpec32* d_ = d;
+    desired.channels = d_->channels;
+    desired.format = d_->format;
+    desired.freq = d_->freq;
+    desired.samples = d_->samples;
+    desired.padding = d_->padding;
+    desired.silence = d_->silence;
+    desired.size = d_->size;
+    desired.userdata = from_ptrv(d_->userdata);
+    desired.callback = find_AudioCallback_Fct(from_ptrv(d_->callback));
+    uint32_t ret = my->SDL_OpenAudioDevice(device, iscapture, &desired, &output, allowed);
+
+    if (o) {
+        SDL2_AudioSpec32* o_ = o;
+        o_->channels = output.channels;
+        o_->format = output.format;
+        o_->freq = output.freq;
+        o_->samples = output.samples;
+        o_->padding = output.padding;
+        o_->silence = output.silence;
+        o_->size = output.size;
+        o_->userdata = to_ptrv(output.userdata);
+        o_->callback = to_ptrv(output.callback);
+    }
+    return ret;
+}
+
+
 EXPORT int my32_2_SDL_PollEvent(my_SDL2_Event_32_t* evt)
 {
     my_SDL2_Event_t event;
@@ -145,6 +185,91 @@ EXPORT int my32_2_SDL_PollEvent(my_SDL2_Event_32_t* evt)
     return ret;
 }
 
+EXPORT char* my32_2_SDL_GetBasePath(x64emu_t* emu)
+{
+    char* p = strdup(emu->context->fullpath);
+    char* b = strrchr(p, '/');
+    if (b) *(b + 1) = '\0';
+    return p;
+}
+
+EXPORT void my32_2_SDL_Log(x64emu_t* emu, void* fmt, void* b)
+{
+    myStackAlign32((const char*)fmt, (uint32_t*)b, emu->scratch);
+    PREPARE_VALIST_32;
+    my->SDL_LogMessageV(0, 3, fmt, VARARGS_32);
+}
+
+EXPORT int my32_2_SDL_vsnprintf(x64emu_t* emu, void* buff, size_t s, void* fmt, void* b)
+{
+    myStackAlign32((const char*)fmt, (uint32_t*)b, emu->scratch);
+    PREPARE_VALIST_32;
+    int r = vsnprintf(buff, s, fmt, VARARGS_32);
+    return r;
+}
+
+EXPORT int my32_2_SDL_snprintf(x64emu_t* emu, void* buff, size_t s, void* fmt, uint64_t* b)
+{
+    (void)emu;
+    myStackAlign32((const char*)fmt, (uint32_t*)b, emu->scratch);
+    PREPARE_VALIST_32;
+    return vsnprintf(buff, s, fmt, VARARGS_32);
+}
+
+EXPORT void* my32_2_SDL_GL_GetProcAddress(x64emu_t* emu, void* name)
+{
+    khint_t k;
+    const char* rname = (const char*)name;
+    return getGLProcAddress32(emu, (glprocaddress_t)my->SDL_GL_GetProcAddress, rname);
+}
+
+EXPORT void* my32_2_SDL_CreateRGBSurfaceWithFormatFrom(x64emu_t* emu, void* pixels, int width, int height, int depth, int pitch, uint32_t format)
+{
+    void* p = my->SDL_CreateRGBSurfaceWithFormatFrom(pixels, width, height, depth, pitch, format);
+    inplace_SDL2_Surface_to_32(p);
+    return p;
+}
+
+EXPORT void my32_2_SDL_SetWindowIcon(x64emu_t* emu, void* window, void* icon)
+{
+    inplace_SDL2_Surface_to_64(icon);
+    my->SDL_SetWindowIcon(window, icon);
+    inplace_SDL2_Surface_to_32(icon);
+}
+
+EXPORT void my32_2_SDL_FreeSurface(x64emu_t* emu, void* surface)
+{
+    inplace_SDL2_Surface_to_64(surface);
+    my->SDL_FreeSurface(surface);
+}
+
+void* my32_prepare_thread(x64emu_t* emu, void* f, void* arg, int ssize, void** pet);
+EXPORT void* my32_2_SDL_CreateThread(x64emu_t* emu, void* f, void* n, void* p)
+{
+    void* et = NULL;
+    void* fnc = my32_prepare_thread(emu, f, p, 0, &et);
+    return my->SDL_CreateThread(fnc, n, et);
+}
+
+EXPORT void* my32_2_SDL_RWFromFile(x64emu_t* emu, void* a, void* b)
+{
+    SDL2_RWops_t* r = (SDL2_RWops_t*)my->SDL_RWFromFile(a, b);
+    void* ret = AddNativeRW2(emu, r);
+    inplace_SDL2_RWops_to_32(ret);
+    return ret;
+}
+
 #define ALTMY my32_2_
 
+#define CUSTOM_INIT                       \
+    box64->sdl2allocrw = my->SDL_AllocRW; \
+    box64->sdl2freerw = my->SDL_FreeRW;
+
+#define NEEDED_LIBS "libdl.so.2", "libm.so.6", "librt.so.1", "libpthread.so.0"
+
+#define CUSTOM_FINI                 \
+    my_context->sdl2allocrw = NULL; \
+    my_context->sdl2freerw = NULL;
+
+
 #include "wrappedlib_init32.h"
\ No newline at end of file