瀏覽代碼

Merged revisions 1236 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk

r1236 (florian)
* StringToWideChar fixed

git-svn-id: branches/fixes_2_0@1237 -

florian 20 年之前
父節點
當前提交
9ec32d5690
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      rtl/inc/wstrings.inc

+ 4 - 2
rtl/inc/wstrings.inc

@@ -682,9 +682,11 @@ function StringToWideChar(const Src : AnsiString;Dest : PWideChar;DestSize : Siz
   begin
   begin
      widestringmanager.Ansi2WideMoveProc(PChar(Src),temp,Length(Src));
      widestringmanager.Ansi2WideMoveProc(PChar(Src),temp,Length(Src));
      if Length(temp)<DestSize then
      if Length(temp)<DestSize then
-       move(temp[1],Dest^,Length(temp))
+       move(temp[1],Dest^,Length(temp)*SizeOf(WideChar))
      else
      else
-       move(temp[1],Dest^,destsize);
+       move(temp[1],Dest^,(DestSize-1)*SizeOf(WideChar));
+
+     Dest[DestSize-1]:=#0;
 
 
      result:=Dest;
      result:=Dest;