diff options
Diffstat (limited to 'patches/sdl2')
| -rw-r--r-- | patches/sdl2/alignment.patch | 18 | ||||
| -rw-r--r-- | patches/sdl2/dynapi.patch | 85 | ||||
| -rw-r--r-- | patches/sdl2/iconv.patch | 10 | ||||
| -rw-r--r-- | patches/sdl2/u16.patch | 112 | ||||
| -rw-r--r-- | patches/sdl2/wchar.patch | 40 | ||||
| -rw-r--r-- | patches/sdl2/win32.patch | 15 |
6 files changed, 182 insertions, 98 deletions
diff --git a/patches/sdl2/alignment.patch b/patches/sdl2/alignment.patch new file mode 100644 index 00000000..091928d1 --- /dev/null +++ b/patches/sdl2/alignment.patch @@ -0,0 +1,18 @@ +diff -ru SDL2-2.0.12.orig/src/video/windows/SDL_windowstaskdialog.h SDL2-2.0.12/src/video/windows/SDL_windowstaskdialog.h +--- SDL2-2.0.12.orig/src/video/windows/SDL_windowstaskdialog.h 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12/src/video/windows/SDL_windowstaskdialog.h 2020-10-07 13:45:15.231259024 +0200 +@@ -18,7 +18,7 @@ + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + */ +-#include <pshpack1.h> ++#pragma pack(push,1) + + typedef HRESULT(CALLBACK *PFTASKDIALOGCALLBACK)(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LONG_PTR lpRefData); + +@@ -153,4 +153,4 @@ + UINT cxWidth; // width of the Task Dialog's client area in DLU's. If 0, Task Dialog will calculate the ideal width. + } TASKDIALOGCONFIG; + +-#include <poppack.h> ++#pragma pack(pop) diff --git a/patches/sdl2/dynapi.patch b/patches/sdl2/dynapi.patch new file mode 100644 index 00000000..b2f175b8 --- /dev/null +++ b/patches/sdl2/dynapi.patch @@ -0,0 +1,85 @@ +diff -ru SDL2-2.0.12.orig/include/SDL_stdinc.h SDL2-2.0.12/include/SDL_stdinc.h +--- SDL2-2.0.12.orig/include/SDL_stdinc.h 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12/include/SDL_stdinc.h 2020-10-07 12:59:08.970629028 +0200 +@@ -455,6 +455,16 @@ + extern DECLSPEC void *SDLCALL SDL_memmove(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len); + extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); + ++#ifdef __midipix__ ++extern DECLSPEC size_t SDLCALL SDL_wcslen(const uint16_t *wstr); ++extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) uint16_t *dst, const uint16_t *src, size_t maxlen); ++extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) uint16_t *dst, const uint16_t *src, size_t maxlen); ++extern DECLSPEC uint16_t *SDLCALL SDL_wcsdup(const uint16_t *wstr); ++extern DECLSPEC uint16_t *SDLCALL SDL_wcsstr(const uint16_t *haystack, const uint16_t *needle); ++ ++extern DECLSPEC int SDLCALL SDL_wcscmp(const uint16_t *str1, const uint16_t *str2); ++extern DECLSPEC int SDLCALL SDL_wcsncmp(const uint16_t *str1, const uint16_t *str2, size_t maxlen); ++#else + extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); + extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); + extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); +@@ -463,6 +473,7 @@ + + extern DECLSPEC int SDLCALL SDL_wcscmp(const wchar_t *str1, const wchar_t *str2); + extern DECLSPEC int SDLCALL SDL_wcsncmp(const wchar_t *str1, const wchar_t *str2, size_t maxlen); ++#endif + + extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); + extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen); +diff -ru SDL2-2.0.12.orig/src/dynapi/SDL_dynapi_procs.h SDL2-2.0.12/src/dynapi/SDL_dynapi_procs.h +--- SDL2-2.0.12.orig/src/dynapi/SDL_dynapi_procs.h 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12/src/dynapi/SDL_dynapi_procs.h 2020-10-07 13:19:40.863706330 +0200 +@@ -418,9 +418,15 @@ + SDL_DYNAPI_PROC(void*,SDL_memcpy,(SDL_OUT_BYTECAP(c) void *a, SDL_IN_BYTECAP(c) const void *b, size_t c),(a,b,c),return) + SDL_DYNAPI_PROC(void*,SDL_memmove,(SDL_OUT_BYTECAP(c) void *a, SDL_IN_BYTECAP(c) const void *b, size_t c),(a,b,c),return) + SDL_DYNAPI_PROC(int,SDL_memcmp,(const void *a, const void *b, size_t c),(a,b,c),return) ++#ifdef __midipix__ ++SDL_DYNAPI_PROC(size_t,SDL_wcslen,(const uint16_t *a),(a),return) ++SDL_DYNAPI_PROC(size_t,SDL_wcslcpy,(SDL_OUT_Z_CAP(c) uint16_t *a, const uint16_t *b, size_t c),(a,b,c),return) ++SDL_DYNAPI_PROC(size_t,SDL_wcslcat,(SDL_INOUT_Z_CAP(c) uint16_t *a, const uint16_t *b, size_t c),(a,b,c),return) ++#else + SDL_DYNAPI_PROC(size_t,SDL_wcslen,(const wchar_t *a),(a),return) + SDL_DYNAPI_PROC(size_t,SDL_wcslcpy,(SDL_OUT_Z_CAP(c) wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return) + SDL_DYNAPI_PROC(size_t,SDL_wcslcat,(SDL_INOUT_Z_CAP(c) wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return) ++#endif + SDL_DYNAPI_PROC(size_t,SDL_strlen,(const char *a),(a),return) + SDL_DYNAPI_PROC(size_t,SDL_strlcpy,(SDL_OUT_Z_CAP(c) char *a, const char *b, size_t c),(a,b,c),return) + SDL_DYNAPI_PROC(size_t,SDL_utf8strlcpy,(SDL_OUT_Z_CAP(c) char *a, const char *b, size_t c),(a,b,c),return) +@@ -660,7 +666,11 @@ + SDL_DYNAPI_PROC(SDL_JoystickID,SDL_JoystickGetDeviceInstanceID,(int a),(a),return) + SDL_DYNAPI_PROC(size_t,SDL_utf8strlen,(const char *a),(a),return) + SDL_DYNAPI_PROC(void*,SDL_LoadFile_RW,(SDL_RWops *a, size_t *b, int c),(a,b,c),return) ++#ifdef __midipix__ ++SDL_DYNAPI_PROC(int,SDL_wcscmp,(const uint16_t *a, const uint16_t *b),(a,b),return) ++#else + SDL_DYNAPI_PROC(int,SDL_wcscmp,(const wchar_t *a, const wchar_t *b),(a,b),return) ++#endif + SDL_DYNAPI_PROC(SDL_BlendMode,SDL_ComposeCustomBlendMode,(SDL_BlendFactor a, SDL_BlendFactor b, SDL_BlendOperation c, SDL_BlendFactor d, SDL_BlendFactor e, SDL_BlendOperation f),(a,b,c,d,e,f),return) + SDL_DYNAPI_PROC(SDL_Surface*,SDL_DuplicateSurface,(SDL_Surface *a),(a),return) + SDL_DYNAPI_PROC(int,SDL_Vulkan_LoadLibrary,(const char *a),(a),return) +@@ -719,7 +729,11 @@ + #endif + SDL_DYNAPI_PROC(double,SDL_exp,(double a),(a),return) + SDL_DYNAPI_PROC(float,SDL_expf,(float a),(a),return) ++#ifdef __midipix__ ++SDL_DYNAPI_PROC(uint16_t*,SDL_wcsdup,(const uint16_t *a),(a),return) ++#else + SDL_DYNAPI_PROC(wchar_t*,SDL_wcsdup,(const wchar_t *a),(a),return) ++#endif + SDL_DYNAPI_PROC(int,SDL_GameControllerRumble,(SDL_GameController *a, Uint16 b, Uint16 c, Uint32 d),(a,b,c,d),return) + SDL_DYNAPI_PROC(int,SDL_JoystickRumble,(SDL_Joystick *a, Uint16 b, Uint16 c, Uint32 d),(a,b,c,d),return) + SDL_DYNAPI_PROC(int,SDL_NumSensors,(void),(),return) +@@ -785,8 +799,13 @@ + SDL_DYNAPI_PROC(int,SDL_LockTextureToSurface,(SDL_Texture *a, const SDL_Rect *b, SDL_Surface **c),(a,b,c),return) + SDL_DYNAPI_PROC(SDL_bool,SDL_HasARMSIMD,(void),(),return) + SDL_DYNAPI_PROC(char*,SDL_strtokr,(char *a, const char *b, char **c),(a,b,c),return) ++#ifdef __midipix__ ++SDL_DYNAPI_PROC(uint16_t*,SDL_wcsstr,(const uint16_t *a, const uint16_t *b),(a,b),return) ++SDL_DYNAPI_PROC(int,SDL_wcsncmp,(const uint16_t *a, const uint16_t *b, size_t c),(a,b,c),return) ++#else + SDL_DYNAPI_PROC(wchar_t*,SDL_wcsstr,(const wchar_t *a, const wchar_t *b),(a,b),return) + SDL_DYNAPI_PROC(int,SDL_wcsncmp,(const wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return) ++#endif + SDL_DYNAPI_PROC(SDL_GameControllerType,SDL_GameControllerTypeForIndex,(int a),(a),return) + SDL_DYNAPI_PROC(SDL_GameControllerType,SDL_GameControllerGetType,(SDL_GameController *a),(a),return) + SDL_DYNAPI_PROC(SDL_GameController*,SDL_GameControllerFromPlayerIndex,(int a),(a),return) diff --git a/patches/sdl2/iconv.patch b/patches/sdl2/iconv.patch index 64008c8a..3163ed38 100644 --- a/patches/sdl2/iconv.patch +++ b/patches/sdl2/iconv.patch @@ -1,12 +1,12 @@ -diff -ru SDL2-2.0.8.orig/src/stdlib/SDL_iconv.c SDL2-2.0.8/src/stdlib/SDL_iconv.c ---- SDL2-2.0.8.orig/src/stdlib/SDL_iconv.c 2018-03-01 17:34:42.000000000 +0100 -+++ SDL2-2.0.8/src/stdlib/SDL_iconv.c 2020-10-05 12:56:24.565427760 +0200 +diff -ru SDL2-2.0.12.orig/src/stdlib/SDL_iconv.c SDL2-2.0.12/src/stdlib/SDL_iconv.c +--- SDL2-2.0.12.orig/src/stdlib/SDL_iconv.c 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12/src/stdlib/SDL_iconv.c 2020-10-07 12:52:35.217963940 +0200 @@ -37,7 +37,7 @@ iconv() may or may not use const char ** for the inbuf param. If we get this wrong, it's just a warning, so no big deal. */ --#if defined(_XGP6) || defined(__APPLE__) || \ -+#if defined(_XGP6) || defined(__APPLE__) || defined(__midipix__) || \ +-#if defined(_XGP6) || defined(__APPLE__) || defined(__RISCOS__) || \ ++#if defined(_XGP6) || defined(__APPLE__) || defined(__RISCOS__) || defined(__midipix__) || \ defined(__EMSCRIPTEN__) || \ (defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) || \ (defined(_NEWLIB_VERSION))) diff --git a/patches/sdl2/u16.patch b/patches/sdl2/u16.patch index d282e5e7..0a8966b4 100644 --- a/patches/sdl2/u16.patch +++ b/patches/sdl2/u16.patch @@ -1,59 +1,23 @@ -diff -ru SDL2-2.0.8.orig/include/SDL_stdinc.h SDL2-2.0.8/include/SDL_stdinc.h ---- SDL2-2.0.8.orig/include/SDL_stdinc.h 2018-03-01 17:34:41.000000000 +0100 -+++ SDL2-2.0.8/include/SDL_stdinc.h 2020-10-05 12:29:51.927442178 +0200 -@@ -451,10 +451,17 @@ - extern DECLSPEC void *SDLCALL SDL_memmove(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len); - extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); - -+#ifdef __midipix__ -+extern DECLSPEC size_t SDLCALL SDL_wcslen(const uint16_t *wstr); -+extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) uint16_t *dst, const uint16_t *src, size_t maxlen); -+extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) uint16_t *dst, const uint16_t *src, size_t maxlen); -+extern DECLSPEC int SDLCALL SDL_wcscmp(const uint16_t *str, const uint16_t *str2); -+#else - extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); - extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); - extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); - extern DECLSPEC int SDLCALL SDL_wcscmp(const wchar_t *str1, const wchar_t *str2); -+#endif /* !__midipix__ */ - - extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); - extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen); -diff -ru SDL2-2.0.8.orig/src/dynapi/SDL_dynapi_procs.h SDL2-2.0.8/src/dynapi/SDL_dynapi_procs.h ---- SDL2-2.0.8.orig/src/dynapi/SDL_dynapi_procs.h 2018-03-01 17:34:42.000000000 +0100 -+++ SDL2-2.0.8/src/dynapi/SDL_dynapi_procs.h 2020-10-05 12:41:07.154180772 +0200 -@@ -418,9 +418,15 @@ - SDL_DYNAPI_PROC(void*,SDL_memcpy,(SDL_OUT_BYTECAP(c) void *a, SDL_IN_BYTECAP(c) const void *b, size_t c),(a,b,c),return) - SDL_DYNAPI_PROC(void*,SDL_memmove,(SDL_OUT_BYTECAP(c) void *a, SDL_IN_BYTECAP(c) const void *b, size_t c),(a,b,c),return) - SDL_DYNAPI_PROC(int,SDL_memcmp,(const void *a, const void *b, size_t c),(a,b,c),return) -+#ifdef __midipix__ -+SDL_DYNAPI_PROC(size_t,SDL_wcslen,(const uint16_t *a),(a),return) -+SDL_DYNAPI_PROC(size_t,SDL_wcslcpy,(SDL_OUT_Z_CAP(c) uint16_t *a, const uint16_t *b, size_t c),(a,b,c),return) -+SDL_DYNAPI_PROC(size_t,SDL_wcslcat,(SDL_INOUT_Z_CAP(c) uint16_t *a, const uint16_t *b, size_t c),(a,b,c),return) -+#else - SDL_DYNAPI_PROC(size_t,SDL_wcslen,(const wchar_t *a),(a),return) - SDL_DYNAPI_PROC(size_t,SDL_wcslcpy,(SDL_OUT_Z_CAP(c) wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return) - SDL_DYNAPI_PROC(size_t,SDL_wcslcat,(SDL_INOUT_Z_CAP(c) wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return) -+#endif - SDL_DYNAPI_PROC(size_t,SDL_strlen,(const char *a),(a),return) - SDL_DYNAPI_PROC(size_t,SDL_strlcpy,(SDL_OUT_Z_CAP(c) char *a, const char *b, size_t c),(a,b,c),return) - SDL_DYNAPI_PROC(size_t,SDL_utf8strlcpy,(SDL_OUT_Z_CAP(c) char *a, const char *b, size_t c),(a,b,c),return) -@@ -660,7 +666,11 @@ - SDL_DYNAPI_PROC(SDL_JoystickID,SDL_JoystickGetDeviceInstanceID,(int a),(a),return) - SDL_DYNAPI_PROC(size_t,SDL_utf8strlen,(const char *a),(a),return) - SDL_DYNAPI_PROC(void*,SDL_LoadFile_RW,(SDL_RWops *a, size_t *b, int c),(a,b,c),return) +diff -ru SDL2-2.0.8.orig/src/video/windows/SDL_windowsmessagebox.c SDL2-2.0.8/src/video/windows/SDL_windowsmessagebox.c +--- SDL2-2.0.8.orig/src/video/windows/SDL_windowsmessagebox.c 2018-03-01 17:34:42.000000000 +0100 ++++ SDL2-2.0.8/src/video/windows/SDL_windowsmessagebox.c 2020-10-05 12:51:31.389436939 +0200 +@@ -350,7 +350,11 @@ + HFONT DialogFont; + SIZE Size; + RECT TextSize; +#ifdef __midipix__ -+SDL_DYNAPI_PROC(int,SDL_wcscmp,(const uint16_t *a, const uint16_t *b),(a,b),return) ++ uint16_t *wmessage; +#else - SDL_DYNAPI_PROC(int,SDL_wcscmp,(const wchar_t *a, const wchar_t *b),(a,b),return) + wchar_t* wmessage; +#endif - SDL_DYNAPI_PROC(SDL_BlendMode,SDL_ComposeCustomBlendMode,(SDL_BlendFactor a, SDL_BlendFactor b, SDL_BlendOperation c, SDL_BlendFactor d, SDL_BlendFactor e, SDL_BlendOperation f),(a,b,c,d,e,f),return) - SDL_DYNAPI_PROC(SDL_Surface*,SDL_DuplicateSurface,(SDL_Surface *a),(a),return) - SDL_DYNAPI_PROC(int,SDL_Vulkan_LoadLibrary,(const char *a),(a),return) -diff -ru SDL2-2.0.8.orig/src/stdlib/SDL_string.c SDL2-2.0.8/src/stdlib/SDL_string.c ---- SDL2-2.0.8.orig/src/stdlib/SDL_string.c 2018-03-01 17:34:42.000000000 +0100 -+++ SDL2-2.0.8/src/stdlib/SDL_string.c 2020-10-05 12:29:39.691442561 +0200 -@@ -416,6 +416,44 @@ + TEXTMETRIC TM; + + HWND ParentWindow = NULL; + +diff -ru SDL2-2.0.12.orig/src/stdlib/SDL_string.c SDL2-2.0.12/src/stdlib/SDL_string.c +--- SDL2-2.0.12.orig/src/stdlib/SDL_string.c 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12/src/stdlib/SDL_string.c 2020-10-07 13:40:28.237747292 +0200 +@@ -421,6 +421,63 @@ #endif /* HAVE_STRLEN */ } @@ -89,35 +53,39 @@ diff -ru SDL2-2.0.8.orig/src/stdlib/SDL_string.c SDL2-2.0.8/src/stdlib/SDL_strin + return dstlen + srclen; +} + ++uint16_t * ++SDL_wcsdup(const uint16_t *string) ++{ ++ return u16_wcsdup(string); ++} ++ ++uint16_t * ++SDL_wcsstr(const uint16_t *haystack, const uint16_t *needle) ++{ ++ return SDL_const_cast(uint16_t*,u16_wcsstr(haystack, needle)); ++} ++ +int +SDL_wcscmp(const uint16_t *str1, const uint16_t *str2) +{ + return u16_wcscmp(str1, str2); +} -+#else ++ ++int ++SDL_wcsncmp(const uint16_t *str1, const uint16_t *str2, size_t maxlen) ++{ ++ return u16_wcsncmp(str1, str2, maxlen); ++} ++ ++#else /* !__MIDIPIX__ */ size_t SDL_wcslen(const wchar_t * string) { -@@ -476,6 +514,7 @@ +@@ -525,6 +582,7 @@ return (int)(*str1 - *str2); - #endif /* HAVE_WCSCMP */ + #endif /* HAVE_WCSNCMP */ } -+#endif /* !__midipix__ */ ++#endif /* !__MIDIPIX__ */ size_t SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen) -diff -ru SDL2-2.0.8.orig/src/video/windows/SDL_windowsmessagebox.c SDL2-2.0.8/src/video/windows/SDL_windowsmessagebox.c ---- SDL2-2.0.8.orig/src/video/windows/SDL_windowsmessagebox.c 2018-03-01 17:34:42.000000000 +0100 -+++ SDL2-2.0.8/src/video/windows/SDL_windowsmessagebox.c 2020-10-05 12:51:31.389436939 +0200 -@@ -350,7 +350,11 @@ - HFONT DialogFont; - SIZE Size; - RECT TextSize; -+#ifdef __midipix__ -+ uint16_t *wmessage; -+#else - wchar_t* wmessage; -+#endif - TEXTMETRIC TM; - - HWND ParentWindow = NULL; diff --git a/patches/sdl2/wchar.patch b/patches/sdl2/wchar.patch index ea5a7dfb..8513c88e 100644 --- a/patches/sdl2/wchar.patch +++ b/patches/sdl2/wchar.patch @@ -1,26 +1,24 @@ -diff -ru SDL2-2.0.8.orig/src/video/windows/SDL_windowsevents.c SDL2-2.0.8/src/video/windows/SDL_windowsevents.c ---- SDL2-2.0.8.orig/src/video/windows/SDL_windowsevents.c 2018-03-01 17:34:42.000000000 +0100 -+++ SDL2-2.0.8/src/video/windows/SDL_windowsevents.c 2020-10-05 13:11:43.595494306 +0200 -@@ -47,6 +47,10 @@ - #include "wmmsg.h" - #endif - -+#ifdef __midipix__ -+#define sdl_window_data (uint16_t[]){'S','D','L','_','W','i','n','d','o','w','D','a','t','a',0} -+#endif -+ - /* For processing mouse WM_*BUTTON* and WM_MOUSEMOVE message-data from GetMessageExtraInfo() */ - #define MOUSEEVENTF_FROMTOUCH 0xFF515700 - -@@ -384,7 +388,11 @@ +diff -ru SDL2-2.0.12.orig/src/video/windows/SDL_windowsmessagebox.c SDL2-2.0.12/src/video/windows/SDL_windowsmessagebox.c +--- SDL2-2.0.12.orig/src/video/windows/SDL_windowsmessagebox.c 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12/src/video/windows/SDL_windowsmessagebox.c 2020-10-07 14:04:09.877146877 +0200 +@@ -803,7 +803,7 @@ } - + + /* If we cannot load comctl32.dll use the old messagebox! */ +- hComctl32 = LoadLibrary(TEXT("Comctl32.dll")); ++ hComctl32 = LoadLibrary((uint16_t[]){'C','o','m','c','t','l','3','2','.','d','l','l',0}); + if (hComctl32 == NULL) { + return WIN_ShowOldMessageBox(messageboxdata, buttonid); + } +diff -ru SDL2-2.0.12.orig/src/video/windows/SDL_windowsevents.c SDL2-2.0.12/src/video/windows/SDL_windowsevents.c +--- SDL2-2.0.12.orig/src/video/windows/SDL_windowsevents.c 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12/src/video/windows/SDL_windowsevents.c 2020-10-07 14:00:09.021392356 +0200 +@@ -416,7 +416,7 @@ + } + /* Get the window data for the window */ -+#ifdef __midipix__ -+ data = (SDL_WindowData *) GetProp(hwnd, sdl_window_data); -+#else - data = (SDL_WindowData *) GetProp(hwnd, TEXT("SDL_WindowData")); -+#endif +- data = (SDL_WindowData *) GetProp(hwnd, TEXT("SDL_WindowData")); ++ data = (SDL_WindowData *) GetProp(hwnd, (uint16_t[]){'S','D','L','_','W','i','n','d','o','w','D','a','t','a',0}); if (!data) { return CallWindowProc(DefWindowProc, hwnd, msg, wParam, lParam); } diff --git a/patches/sdl2/win32.patch b/patches/sdl2/win32.patch index 0cc8167a..fc99beb4 100644 --- a/patches/sdl2/win32.patch +++ b/patches/sdl2/win32.patch @@ -1,3 +1,18 @@ +diff -ru SDL2-2.0.12.orig/src/video/windows/SDL_windowsvideo.c SDL2-2.0.12/src/video/windows/SDL_windowsvideo.c +--- SDL2-2.0.12.orig/src/video/windows/SDL_windowsvideo.c 2020-03-11 02:36:18.000000000 +0100 ++++ SDL2-2.0.12/src/video/windows/SDL_windowsvideo.c 2020-10-07 13:49:51.592298088 +0200 +@@ -43,6 +43,10 @@ + SDL_bool g_WindowsEnableMessageLoop = SDL_TRUE; + SDL_bool g_WindowFrameUsableWhileCursorHidden = SDL_TRUE; + ++#ifndef ES_CONTINUOUS ++#define ES_CONTINUOUS ((DWORD)0x80000000) ++#endif ++ + static void SDLCALL + UpdateWindowsEnableMessageLoop(void *userdata, const char *name, const char *oldValue, const char *newValue) + { + --- SDL2-2.0.8.orig/src/video/windows/SDL_windowsvideo.c 2018-03-01 17:34:42.000000000 +0100 +++ SDL2-2.0.8/src/video/windows/SDL_windowsvideo.c 2020-10-05 01:07:51.101894646 +0200 @@ -240,13 +240,17 @@ |