From 6c51ec49f9382d4a91727afc4145abe6b700c8a3 Mon Sep 17 00:00:00 2001 From: suve Date: Sat, 31 Dec 2022 13:13:13 +0100 Subject: [PATCH 1/5] Add definition for SDL_iconv_string() --- units/sdlstdinc.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/units/sdlstdinc.inc b/units/sdlstdinc.inc index 20cb33ef..fbfbb9e5 100644 --- a/units/sdlstdinc.inc +++ b/units/sdlstdinc.inc @@ -105,3 +105,12 @@ function SDL_realloc(mem: Pointer; size: csize_t): Pointer; cdecl; *) procedure SDL_free(mem: Pointer); cdecl; external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_free' {$ENDIF} {$ENDIF}; + +(** + * This function converts a string between encodings in one pass, returning a + * string that must be freed with SDL_free(), or NIL on error. + * + * \since This function is available since SDL 2.0.0. + *) +function SDL_iconv_string(tocode, fromcode, inbuf: PAnsiChar; inbytesleft: csize_t): PAnsiChar; cdecl + external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv_string' {$ENDIF} {$ENDIF}; From c089bb2acd7fa305de3274d66f55c4313ad76489 Mon Sep 17 00:00:00 2001 From: suve Date: Sat, 31 Dec 2022 13:26:26 +0100 Subject: [PATCH 2/5] Add functions resembling SDL_iconv_utf8_* macros --- units/sdl2.pas | 20 ++++++++++++++++++++ units/sdlstdinc.inc | 5 +++++ 2 files changed, 25 insertions(+) diff --git a/units/sdl2.pas b/units/sdl2.pas index 2d68861b..035d34b3 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -203,6 +203,8 @@ interface implementation +uses Strings; + // Macros from "sdl_version.h" procedure SDL_VERSION(out x: TSDL_Version); begin @@ -427,6 +429,24 @@ function SDL_SHAPEMODEALPHA(mode: TWindowShapeMode): Boolean; Result := (mode = ShapeModeDefault) or (mode = ShapeModeBinarizeAlpha) or (mode = ShapeModeReverseBinarizeAlpha); end; +// from "sdl_stdinc.h" + +// Note: We're using FPC's Strings.strlen() here, not SDL_strlen(). +function SDL_iconv_utf8_locale(str: PAnsiChar): PAnsiChar; cdecl; +begin + Result := SDL_iconv_string('', 'UTF-8', str, Strings.strlen(str)+1) +end; + +function SDL_iconv_utf8_ucs2(str: PAnsiChar): pcUint16; cdecl; +begin + Result := pcUint16(SDL_iconv_string('UCS-2-INTERNAL', 'UTF-8', str, Strings.strlen(str)+1)) +end; + +function SDL_iconv_utf8_ucs4(str: PAnsiChar): pcUint32; cdecl; +begin + Result := pcUint32(SDL_iconv_string('UCS-4-INTERNAL', 'UTF-8', str, Strings.strlen(str)+1)) +end; + //from "sdl_video.h" function SDL_WINDOWPOS_UNDEFINED_DISPLAY(X: Variant): Variant; diff --git a/units/sdlstdinc.inc b/units/sdlstdinc.inc index fbfbb9e5..5e0a1202 100644 --- a/units/sdlstdinc.inc +++ b/units/sdlstdinc.inc @@ -114,3 +114,8 @@ procedure SDL_free(mem: Pointer); cdecl; *) function SDL_iconv_string(tocode, fromcode, inbuf: PAnsiChar; inbytesleft: csize_t): PAnsiChar; cdecl external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv_string' {$ENDIF} {$ENDIF}; + +// These are macros in the original C headers, we will reimplement them as simple Pascal functions. +function SDL_iconv_utf8_locale(str: PAnsiChar): PAnsiChar; cdecl; +function SDL_iconv_utf8_ucs2(str: PAnsiChar): pcUint16; cdecl; +function SDL_iconv_utf8_ucs4(str: PAnsiChar): pcUint32; cdecl; From 785e609b447a27427369bd6185aa585c8f2f01c8 Mon Sep 17 00:00:00 2001 From: suve Date: Sat, 31 Dec 2022 13:39:39 +0100 Subject: [PATCH 3/5] Add the SDL_iconv type and related functions --- units/sdlstdinc.inc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/units/sdlstdinc.inc b/units/sdlstdinc.inc index 5e0a1202..f4069eda 100644 --- a/units/sdlstdinc.inc +++ b/units/sdlstdinc.inc @@ -119,3 +119,23 @@ function SDL_iconv_string(tocode, fromcode, inbuf: PAnsiChar; inbytesleft: csize function SDL_iconv_utf8_locale(str: PAnsiChar): PAnsiChar; cdecl; function SDL_iconv_utf8_ucs2(str: PAnsiChar): pcUint16; cdecl; function SDL_iconv_utf8_ucs4(str: PAnsiChar): pcUint32; cdecl; + +(* The SDL implementation of iconv() returns these error codes *) +const + SDL_ICONV_ERROR = csize_t(-1); + SDL_ICONV_E2BIG = csize_t(-2); + SDL_ICONV_EILSEQ = csize_t(-3); + SDL_ICONV_EINVAL = csize_t(-4); + +type + TSDL_iconv = record end; + PSDL_iconv = ^TSDL_iconv; + +function SDL_iconv_open(tocode, fromcode: PAnsiChar): PSDL_iconv; cdecl; + external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv_open' {$ENDIF} {$ENDIF}; + +function SDL_iconv_close(cd: PSDL_iconv): cint; cdecl; + external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv_close' {$ENDIF} {$ENDIF}; + +function SDL_iconv(cd: PSDL_iconv; inbuf: PPAnsiChar; inbytesleft: pcsize_t; outbuf: PPAnsiChar; outbytesleft: pcsize_t): csize_t; cdecl; + external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv' {$ENDIF} {$ENDIF}; From e2fc28255593d24defb28a71adc990521b3b4ea3 Mon Sep 17 00:00:00 2001 From: suve Date: Sat, 31 Dec 2022 13:52:52 +0100 Subject: [PATCH 4/5] Add missing const specifiers to iconv functions --- units/sdl2.pas | 6 +++--- units/sdlstdinc.inc | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 035d34b3..719ce652 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -432,17 +432,17 @@ function SDL_SHAPEMODEALPHA(mode: TWindowShapeMode): Boolean; // from "sdl_stdinc.h" // Note: We're using FPC's Strings.strlen() here, not SDL_strlen(). -function SDL_iconv_utf8_locale(str: PAnsiChar): PAnsiChar; cdecl; +function SDL_iconv_utf8_locale(Const str: PAnsiChar): PAnsiChar; cdecl; begin Result := SDL_iconv_string('', 'UTF-8', str, Strings.strlen(str)+1) end; -function SDL_iconv_utf8_ucs2(str: PAnsiChar): pcUint16; cdecl; +function SDL_iconv_utf8_ucs2(Const str: PAnsiChar): pcUint16; cdecl; begin Result := pcUint16(SDL_iconv_string('UCS-2-INTERNAL', 'UTF-8', str, Strings.strlen(str)+1)) end; -function SDL_iconv_utf8_ucs4(str: PAnsiChar): pcUint32; cdecl; +function SDL_iconv_utf8_ucs4(Const str: PAnsiChar): pcUint32; cdecl; begin Result := pcUint32(SDL_iconv_string('UCS-4-INTERNAL', 'UTF-8', str, Strings.strlen(str)+1)) end; diff --git a/units/sdlstdinc.inc b/units/sdlstdinc.inc index f4069eda..16a1eebb 100644 --- a/units/sdlstdinc.inc +++ b/units/sdlstdinc.inc @@ -112,13 +112,13 @@ procedure SDL_free(mem: Pointer); cdecl; * * \since This function is available since SDL 2.0.0. *) -function SDL_iconv_string(tocode, fromcode, inbuf: PAnsiChar; inbytesleft: csize_t): PAnsiChar; cdecl +function SDL_iconv_string(Const tocode, fromcode, inbuf: PAnsiChar; inbytesleft: csize_t): PAnsiChar; cdecl; external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv_string' {$ENDIF} {$ENDIF}; // These are macros in the original C headers, we will reimplement them as simple Pascal functions. -function SDL_iconv_utf8_locale(str: PAnsiChar): PAnsiChar; cdecl; -function SDL_iconv_utf8_ucs2(str: PAnsiChar): pcUint16; cdecl; -function SDL_iconv_utf8_ucs4(str: PAnsiChar): pcUint32; cdecl; +function SDL_iconv_utf8_locale(Const str: PAnsiChar): PAnsiChar; cdecl; +function SDL_iconv_utf8_ucs2(Const str: PAnsiChar): pcUint16; cdecl; +function SDL_iconv_utf8_ucs4(Const str: PAnsiChar): pcUint32; cdecl; (* The SDL implementation of iconv() returns these error codes *) const @@ -131,11 +131,11 @@ type TSDL_iconv = record end; PSDL_iconv = ^TSDL_iconv; -function SDL_iconv_open(tocode, fromcode: PAnsiChar): PSDL_iconv; cdecl; +function SDL_iconv_open(Const tocode, fromcode: PAnsiChar): PSDL_iconv; cdecl; external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv_open' {$ENDIF} {$ENDIF}; function SDL_iconv_close(cd: PSDL_iconv): cint; cdecl; external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv_close' {$ENDIF} {$ENDIF}; -function SDL_iconv(cd: PSDL_iconv; inbuf: PPAnsiChar; inbytesleft: pcsize_t; outbuf: PPAnsiChar; outbytesleft: pcsize_t): csize_t; cdecl; +function SDL_iconv(cd: PSDL_iconv; Const inbuf: PPAnsiChar; inbytesleft: pcsize_t; outbuf: PPAnsiChar; outbytesleft: pcsize_t): csize_t; cdecl; external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_iconv' {$ENDIF} {$ENDIF}; From 4ed1838161fcaa2ee973510357bb76b3c20bbecb Mon Sep 17 00:00:00 2001 From: suve Date: Thu, 9 Mar 2023 23:50:33 +0100 Subject: [PATCH 5/5] Use the AnsiStrings unit for strlen() with Delphi --- units/sdl2.pas | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/units/sdl2.pas b/units/sdl2.pas index 719ce652..d7e1742d 100644 --- a/units/sdl2.pas +++ b/units/sdl2.pas @@ -203,7 +203,19 @@ interface implementation -uses Strings; +(* + * We need an strlen() implementation for some operations on C-strings. + * FPC ships one in the Strings unit; Delphi has one in the AnsiStrings unit. + * Since FPC defines "DELPHI" when building in Delphi-compatibility mode, + * check if "FPC" is defined to determine which compiler is used. + *) +uses + {$IFDEF FPC} + Strings + {$ELSE} + AnsiStrings + {$ENDIF} + ; // Macros from "sdl_version.h" procedure SDL_VERSION(out x: TSDL_Version); @@ -434,17 +446,17 @@ function SDL_SHAPEMODEALPHA(mode: TWindowShapeMode): Boolean; // Note: We're using FPC's Strings.strlen() here, not SDL_strlen(). function SDL_iconv_utf8_locale(Const str: PAnsiChar): PAnsiChar; cdecl; begin - Result := SDL_iconv_string('', 'UTF-8', str, Strings.strlen(str)+1) + Result := SDL_iconv_string('', 'UTF-8', str, strlen(str)+1) end; function SDL_iconv_utf8_ucs2(Const str: PAnsiChar): pcUint16; cdecl; begin - Result := pcUint16(SDL_iconv_string('UCS-2-INTERNAL', 'UTF-8', str, Strings.strlen(str)+1)) + Result := pcUint16(SDL_iconv_string('UCS-2-INTERNAL', 'UTF-8', str, strlen(str)+1)) end; function SDL_iconv_utf8_ucs4(Const str: PAnsiChar): pcUint32; cdecl; begin - Result := pcUint32(SDL_iconv_string('UCS-4-INTERNAL', 'UTF-8', str, Strings.strlen(str)+1)) + Result := pcUint32(SDL_iconv_string('UCS-4-INTERNAL', 'UTF-8', str, strlen(str)+1)) end; //from "sdl_video.h"