summaryrefslogtreecommitdiffhomepage
path: root/patches/sdl2/u16.patch
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2020-10-05 14:05:24 +0200
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-10-05 16:10:02 +0100
commit213fe0adcfea44a11be64f8138712b877cbef31e (patch)
treea6de731b40472e61eb4000dbb91c033b08b9e6ed /patches/sdl2/u16.patch
parenta35f6d2a19ab9c5b0b8f6bb84197e02e7416ba3f (diff)
downloadmidipix_build-213fe0adcfea44a11be64f8138712b877cbef31e.tar.bz2
midipix_build-213fe0adcfea44a11be64f8138712b877cbef31e.tar.xz
groups/251.native_packages_lib.group: sdl2 switch to win32
Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
Diffstat (limited to 'patches/sdl2/u16.patch')
-rw-r--r--patches/sdl2/u16.patch123
1 files changed, 123 insertions, 0 deletions
diff --git a/patches/sdl2/u16.patch b/patches/sdl2/u16.patch
new file mode 100644
index 00000000..d282e5e7
--- /dev/null
+++ b/patches/sdl2/u16.patch
@@ -0,0 +1,123 @@
+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)
++#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)
+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 @@
+ #endif /* HAVE_STRLEN */
+ }
+
++#ifdef __midipix__
++#include <u16ports/u16ports.h>
++
++size_t
++SDL_wcslen(const uint16_t * string)
++{
++ return u16_wcslen(string);
++}
++
++size_t
++SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) uint16_t *dst, const uint16_t *src, size_t maxlen)
++{
++ size_t srclen = u16_wcslen(src);
++ if(maxlen > 0) {
++ size_t len = SDL_min(srclen, maxlen - 1);
++ SDL_memcpy(dst, src, len * sizeof(uint16_t));
++ dst[len] = '\0';
++ }
++ return srclen;
++}
++
++size_t
++SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) uint16_t *dst, const uint16_t *src, size_t maxlen)
++{
++ size_t dstlen = u16_wcslen(dst);
++ size_t srclen = u16_wcslen(src);
++ if (dstlen < maxlen) {
++ SDL_wcslcpy(dst + dstlen, src, maxlen - dstlen);
++ }
++ return dstlen + srclen;
++}
++
++int
++SDL_wcscmp(const uint16_t *str1, const uint16_t *str2)
++{
++ return u16_wcscmp(str1, str2);
++}
++#else
+ size_t
+ SDL_wcslen(const wchar_t * string)
+ {
+@@ -476,6 +514,7 @@
+ return (int)(*str1 - *str2);
+ #endif /* HAVE_WCSCMP */
+ }
++#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;