From 868b443eae04e700b945f54d5062e5ff71d907ec Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Tue, 28 Oct 2014 18:56:47 +0000
Subject: [PATCH] Fixed: WideString compatibility for Join function

---
 X2UtStrings.pas | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/X2UtStrings.pas b/X2UtStrings.pas
index bc2f8c9..f3194b0 100644
--- a/X2UtStrings.pas
+++ b/X2UtStrings.pas
@@ -374,12 +374,12 @@ begin
     begin
       if not firstItem then
       begin
-        Move(PChar(AGlue)^, resultPos^, glueLength);
+        Move(PChar(AGlue)^, resultPos^, glueLength * SizeOf(Char));
         Inc(resultPos, glueLength);
       end else
         firstItem := False;
 
-      Move(PChar(ASource[itemIndex])^, resultPos^, itemLength);
+      Move(PChar(ASource[itemIndex])^, resultPos^, itemLength * SizeOf(Char));
       Inc(resultPos, itemLength);
     end;
   end;
@@ -419,8 +419,8 @@ var
   iDest:      Integer;
 
 begin
-  iSrcLength  := Length(ASource);
-  iLength     := Length(AReplace);
+  iSrcLength  := Length(ASource) * SizeOf(Char);
+  iLength     := Length(AReplace) * SizeOf(Char);
   iDiff       := iLength - ALength;
   iDest       := 1;