From fd5a15fda5fa8cc8ead64e2a53c9e480385d9fd1 Mon Sep 17 00:00:00 2001
From: paul <paul@idefix.freepascal.org>
Date: Sat, 17 Sep 2011 15:39:46 +0000
Subject: [PATCH] rtl: manual merge some cpstrnew changes which was impossible
 to merge using regular tools due to the merge conflicts

git-svn-id: trunk@19132 -
---
 rtl/inc/ustrings.inc |  8 +-------
 rtl/inc/wstrings.inc | 10 +---------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc
index bbd099f8ab..ce28be56aa 100644
--- a/rtl/inc/ustrings.inc
+++ b/rtl/inc/ustrings.inc
@@ -1759,13 +1759,7 @@ var
 begin
   SetLength(S,Len);
   If (Buf<>Nil) and (Len>0) then
-    begin
-      BufLen := IndexByte(Buf^, Len+1, 0);
-      If (BufLen>0) and (BufLen < Len) then
-        Len := BufLen;
-      widestringmanager.Ansi2UnicodeMoveProc(Buf,DefaultSystemCodePage,S,Len);
-      //PUnicodeChar(Pointer(S)+Len*sizeof(UnicodeChar))^:=#0;
-    end;
+    widestringmanager.Ansi2UnicodeMoveProc(Buf,DefaultSystemCodePage,S,Len);
 end;
 
 
diff --git a/rtl/inc/wstrings.inc b/rtl/inc/wstrings.inc
index a17453f57b..f1fbeb3ded 100644
--- a/rtl/inc/wstrings.inc
+++ b/rtl/inc/wstrings.inc
@@ -1026,18 +1026,10 @@ end;
 
 
 Procedure SetString (Out S : WideString; Buf : PChar; Len : SizeInt);
-var
-  BufLen : SizeInt;
 begin
   SetLength(S,Len);
   If (Buf<>Nil) and (Len>0) then
-    begin
-      BufLen := IndexByte(Buf^, Len+1, 0);
-      If (BufLen>0) and (BufLen < Len) then
-        Len := BufLen;
-      widestringmanager.Ansi2WideMoveProc(Buf,DefaultSystemCodePage,S,Len);
-      //PWideChar(Pointer(S)+Len*sizeof(WideChar))^:=#0;
-    end;
+    widestringmanager.Ansi2WideMoveProc(Buf,DefaultSystemCodePage,S,Len);
 end;