paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 09:06:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r14144 from cpstrnew branch by paul:

Browse Source 
call MultiByteToWideChar with dwFlags=0 for UTF8 code page

git-svn-id: trunk@19100 -
This commit is contained in:
paul 2011-09-17 11:56:16 +00:00
parent 55434fd1d8
commit 233004f72b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rtl/win/syswin.inc
View File

@ -292,6 +292,7 @@ const
MB_PRECOMPOSED = 1; MB_PRECOMPOSED = 1;
CP_ACP = 0; CP_ACP = 0;
CP_UTF16 = 1200; CP_UTF16 = 1200;
CP_UTF8 = 65001;
WC_NO_BEST_FIT_CHARS = $400; WC_NO_BEST_FIT_CHARS = $400;
function MultiByteToWideChar(CodePage:UINT; dwFlags:DWORD; lpMultiByteStr:PChar; cchMultiByte:longint; lpWideCharStr:PWideChar;cchWideChar:longint):longint; function MultiByteToWideChar(CodePage:UINT; dwFlags:DWORD; lpMultiByteStr:PChar; cchMultiByte:longint; lpWideCharStr:PWideChar;cchWideChar:longint):longint;
@ -322,15 +323,20 @@ procedure Win32Unicode2AnsiMove(source:punicodechar;var dest:RawByteString;cp :
procedure Win32Ansi2UnicodeMove(source:pchar;cp : TSystemCodePage;var dest:UnicodeString;len:SizeInt); procedure Win32Ansi2UnicodeMove(source:pchar;cp : TSystemCodePage;var dest:UnicodeString;len:SizeInt);
var var
destlen: SizeInt; destlen: SizeInt;
dwflags: DWORD;
begin begin
// retrieve length including trailing #0 // retrieve length including trailing #0
// not anymore, because this must also be usable for single characters // not anymore, because this must also be usable for single characters
destlen:=MultiByteToWideChar(cp, MB_PRECOMPOSED, source, len, nil, 0); if cp=CP_UTF8 then
dwFlags:=0
else
dwFlags:=MB_PRECOMPOSED;
destlen:=MultiByteToWideChar(cp, dwFlags, source, len, nil, 0);
// this will null-terminate // this will null-terminate
setlength(dest, destlen); setlength(dest, destlen);
if destlen>0 then if destlen>0 then
begin begin
MultiByteToWideChar(cp, MB_PRECOMPOSED, source, len, @dest[1], destlen); MultiByteToWideChar(cp, dwFlags, source, len, @dest[1], destlen);
PUnicodeRec(pointer(dest)-UnicodeFirstOff)^.CodePage:=CP_UTF16; PUnicodeRec(pointer(dest)-UnicodeFirstOff)^.CodePage:=CP_UTF16;
end; end;
end; end;
@ -377,14 +383,19 @@ procedure Win32Wide2AnsiMove(source:pwidechar;var dest:RawByteString;cp : TSyste
procedure Win32Ansi2WideMove(source:pchar;cp : TSystemCodePage;var dest:widestring;len:SizeInt); procedure Win32Ansi2WideMove(source:pchar;cp : TSystemCodePage;var dest:widestring;len:SizeInt);
var var
destlen: SizeInt; destlen: SizeInt;
dwFlags: DWORD;
begin begin
// retrieve length including trailing #0 // retrieve length including trailing #0
// not anymore, because this must also be usable for single characters // not anymore, because this must also be usable for single characters
destlen:=MultiByteToWideChar(cp, MB_PRECOMPOSED, source, len, nil, 0); if cp=CP_UTF8 then
dwFlags:=0
else
dwFlags:=MB_PRECOMPOSED;
destlen:=MultiByteToWideChar(cp, dwFlags, source, len, nil, 0);
// this will null-terminate // this will null-terminate
setlength(dest, destlen); setlength(dest, destlen);
if destlen>0 then if destlen>0 then
MultiByteToWideChar(cp, MB_PRECOMPOSED, source, len, @dest[1], destlen); MultiByteToWideChar(cp, dwFlags, source, len, @dest[1], destlen);
end; end;