paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-19 21:19:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* don't convert ansistrings when calling setcodepage() with a code page

Browse Source 
number that means the same as the existing one but is nevertheless
    different (e.g. CP_ACP and the actual value of DefaultSystemCodePage)

git-svn-id: branches/cpstrrtl@25299 -
This commit is contained in:
Jonas Maebe 2013-08-19 22:04:11 +00:00
parent b115231ea4
commit 14d62028ff
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rtl/inc/astrings.inc
View File

@ -1420,10 +1420,19 @@ procedure InternalSetCodePage(var s : RawByteString; CodePage : TSystemCodePage;
{ use this wrapper for the simple case to avoid the generation of a temp. ansistring which causes
extra exception frames }
procedure SetCodePage(var s : RawByteString; CodePage : TSystemCodePage; Convert : Boolean = True);
var
TranslatedCodePage,
TranslatedCurrentCodePage: TSystemCodePage;
begin
if (S='') or (PAnsiRec(pointer(S)-AnsiFirstOff)^.CodePage=CodePage) then
exit
else if not Convert and (PAnsiRec(pointer(S)-AnsiFirstOff)^.Ref=1) then
if (S='') then
exit;
{ if we're just replacing a placeholder code page with its actual value or
vice versa, we don't have to perform any conversion }
TranslatedCurrentCodePage:=TranslatePlaceholderCP(PAnsiRec(pointer(S)-AnsiFirstOff)^.CodePage);
TranslatedCodePage:=TranslatePlaceholderCP(CodePage);
Convert:=Convert and
(TranslatedCurrentCodePage<>TranslatedCodePage);
if not Convert and (PAnsiRec(pointer(S)-AnsiFirstOff)^.Ref=1) then
PAnsiRec(pointer(S)-AnsiFirstOff)^.CodePage:=CodePage
else
InternalSetCodePage(S,CodePage,Convert);