From 848ca6b0c0de335aca5fb0566954da487ef92467 Mon Sep 17 00:00:00 2001
From: paul <paul@idefix.freepascal.org>
Date: Sat, 17 Sep 2011 11:34:42 +0000
Subject: [PATCH] merge r14130 from cpstrnew branch by paul: pass unicodestring
to rawbytestring arguments with converting to default system code page
git-svn-id: trunk@19091 -
---
rtl/inc/ustrings.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc
index e42372a9f2..75ee6712c9 100644
--- a/rtl/inc/ustrings.inc
+++ b/rtl/inc/ustrings.inc
@@ -320,7 +320,11 @@ begin
result:='';
Size:=Length(S2);
if Size>0 then
+ begin
+ if cp=$ffff then
+ cp:=DefaultSystemCodePage;
widestringmanager.Unicode2AnsiMoveProc(PUnicodeChar(Pointer(S2)),result,cp,Size);
+ end;
end;