paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 16:39:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: resolve the inconsistency with BOM removal from the string on conversion from UTF8 to NSString

Browse Source
This commit is contained in:
Dmitry Boyarintsev 2021-09-03 22:42:46 -04:00 committed by Maxim Ganetsky
parent cbb2859959
commit 10e94128a0
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/interfaces/cocoa/cocoautils.pas
View File

@ -785,11 +785,21 @@ end;
function NSStringUtf8(const s: String): NSString;
var
cf: CFStringRef;
w : WideString;
begin
{NSString and CFStringRef are interchangable}
cf := CFStringCreateWithCString(nil, Pointer(PChar(S)), kCFStringEncodingUTF8);
Result := NSString(cf);
// we cannot use (CFString or NSString) UTF8 related functions, because
// all of them are removing BOM.
// CFStringCreateWithBytes - removes BOM (not matter what "external representation" parameter is)
// CFStringCreateWithCString - removes BOM
// This is inconsistent with other WS, where BOM is actually kept, even if it's present
// Thus the LCL/FPC conversion to Unicode takes place first
if length(s) = 0 then
Result := NSString.alloc.init
else
begin
w:=UTF8Decode(s);
Result := NSString.alloc.initWithCharacters_length(@w[1], length(w));
end;
end;
function NSStringToString(ns: NSString): String;