[BOX32][WRAPPER] Refined SDL2 display mode wrapping (#1874)

* [BOX32][WRAPPER] Refined SDL2 display mode wrapping

* review

3 files changed, 15 insertions, 3 deletions

diff --git a/src/include/sdl2align32.h b/src/include/sdl2align32.h
index 2920da60..d1131fb2 100644
--- a/src/include/sdl2align32.h
+++ b/src/include/sdl2align32.h
@@ -763,6 +763,7 @@ typedef enum SDL2_EventType {
 
 void inplace_SDL2_DisplayMode_to_64(void* a);
 void inplace_SDL2_DisplayMode_to_32(void* a);
+void convert_SDL2_DisplayMode_to_32(void* dst_, void* src_);
 
 void convert_SDL2_Event_to_32(void* dst_, const void* src_);
 void convert_SDL2_Event_to_64(void* dst_, const void* src_);
diff --git a/src/libtools/sdl2align32.c b/src/libtools/sdl2align32.c
index 83386b9b..dd0b33da 100644
--- a/src/libtools/sdl2align32.c
+++ b/src/libtools/sdl2align32.c
@@ -31,6 +31,17 @@ void inplace_SDL2_DisplayMode_to_32(void* a)
     dst->driverdata = to_ptrv(src->driverdata);
 }
 
+void convert_SDL2_DisplayMode_to_32(void* dst_, void* src_)
+{
+    if (!src_ || !dst_) return;
+    my_SDL2_DisplayMode_t* src = src_;
+    my_SDL2_DisplayMode_32_t* dst = dst_;
+    dst->format = src->format;
+    dst->w = src->w;
+    dst->h = src->h;
+    dst->refresh_rate = src->refresh_rate;
+    dst->driverdata = to_ptrv(src->driverdata);
+}
 
 void convert_SDL2_Event_to_32(void* dst_, const void* src_)
 {
diff --git a/src/wrapped32/wrappedsdl2.c b/src/wrapped32/wrappedsdl2.c
index 7e2e6f26..0914f7d1 100644
--- a/src/wrapped32/wrappedsdl2.c
+++ b/src/wrapped32/wrappedsdl2.c
@@ -96,9 +96,9 @@ static void* find_AudioCallback_Fct(void* fct)
 
 EXPORT int my32_2_SDL_GetDesktopDisplayMode(int displayIndex, void* mode)
 {
-    inplace_SDL2_DisplayMode_to_64(mode);
-    int ret = my->SDL_GetDesktopDisplayMode(displayIndex, mode);
-    inplace_SDL2_DisplayMode_to_32(mode);
+    my_SDL2_DisplayMode_t my_mode = { 0 };
+    int ret = my->SDL_GetDesktopDisplayMode(displayIndex, &my_mode);
+    convert_SDL2_DisplayMode_to_32(mode, &my_mode);
     return ret;
 }