paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 05:19:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

lclproc: use UTF16String for routines with UTF16 in name, handle vtUnicodeString variant parts

Browse Source 
git-svn-id: trunk@35368 -
This commit is contained in:
paul 2012-02-15 02:38:55 +00:00
parent 69545efcb9
commit eb71c915df
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/lclproc.pas
View File

@ -369,10 +369,10 @@ procedure AssignUTF8ListToAnsi(UTF8List, AnsiList: TStrings);
// Felipe: Don't substitute with calls to lazutf16 because lazutf16 includes // Felipe: Don't substitute with calls to lazutf16 because lazutf16 includes
// some initialization code and tables, which are not necessary for the LCL // some initialization code and tables, which are not necessary for the LCL
function UTF16CharacterLength(p: PWideChar): integer; function UTF16CharacterLength(p: PWideChar): integer;
function UTF16Length(const s: widestring): PtrInt; function UTF16Length(const s: UTF16String): PtrInt;
function UTF16Length(p: PWideChar; WordCount: PtrInt): PtrInt; function UTF16Length(p: PWideChar; WordCount: PtrInt): PtrInt;
function UTF16CharacterToUnicode(p: PWideChar; out CharLen: integer): Cardinal; function UTF16CharacterToUnicode(p: PWideChar; out CharLen: integer): Cardinal;
function UnicodeToUTF16(u: cardinal): widestring; function UnicodeToUTF16(u: cardinal): UTF16String;
//compare functions //compare functions
@ -1657,6 +1657,7 @@ begin
vtPWideChar: DbgOut(Args[i].VPWideChar); vtPWideChar: DbgOut(Args[i].VPWideChar);
vtWideChar: DbgOut(AnsiString(Args[i].VWideChar)); vtWideChar: DbgOut(AnsiString(Args[i].VWideChar));
vtWidestring: DbgOut(AnsiString(WideString(Args[i].VWideString))); vtWidestring: DbgOut(AnsiString(WideString(Args[i].VWideString)));
vtUnicodeString: DbgOut(AnsiString(UnicodeString(Args[i].VUnicodeString)));
vtObject: DbgOut(DbgSName(Args[i].VObject)); vtObject: DbgOut(DbgSName(Args[i].VObject));
vtClass: DbgOut(DbgSName(Args[i].VClass)); vtClass: DbgOut(DbgSName(Args[i].VClass));
vtPointer: DbgOut(Dbgs(Args[i].VPointer)); vtPointer: DbgOut(Dbgs(Args[i].VPointer));
@ -2533,6 +2534,7 @@ begin
vtPWideChar: s:=AnsiString(WideString(s)+Args[i].VPWideChar); vtPWideChar: s:=AnsiString(WideString(s)+Args[i].VPWideChar);
vtWideChar: s:=AnsiString(WideString(s)+Args[i].VWideChar); vtWideChar: s:=AnsiString(WideString(s)+Args[i].VWideChar);
vtWidestring: s:=AnsiString(WideString(s)+WideString(Args[i].VWideString)); vtWidestring: s:=AnsiString(WideString(s)+WideString(Args[i].VWideString));
vtUnicodeString: s:=AnsiString(UnicodeString(s)+UnicodeString(Args[i].VUnicodeString));
vtObject: s:=s+DbgSName(Args[i].VObject); vtObject: s:=s+DbgSName(Args[i].VObject);
vtClass: s:=s+DbgSName(Args[i].VClass); vtClass: s:=s+DbgSName(Args[i].VClass);
vtPointer: s:=s+Dbgs(Args[i].VPointer); vtPointer: s:=s+Dbgs(Args[i].VPointer);
@ -2934,7 +2936,7 @@ begin
end; end;
end; end;
function UTF16Length(const s: widestring): PtrInt; function UTF16Length(const s: UTF16String): PtrInt;
begin begin
Result:=UTF16Length(PWideChar(s),length(s)); Result:=UTF16Length(PWideChar(s),length(s));
end; end;
@ -2982,7 +2984,7 @@ begin
end; end;
end; end;
function UnicodeToUTF16(u: cardinal): widestring; function UnicodeToUTF16(u: cardinal): UTF16String;
begin begin
// u should be <= $10FFFF to fit into UTF-16 // u should be <= $10FFFF to fit into UTF-16