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

* more unicode fixes in the udialogs unit

Browse Source 
git-svn-id: branches/unicodekvm@48617 -
This commit is contained in:
nickysn 2021-02-10 16:27:23 +00:00
parent 1d0ec1b966
commit 5013e7039a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fv/src/dialogs.inc
View File

@ -1349,9 +1349,13 @@ BEGIN
S.Read(W, sizeof(w)); SelStart:=w; { Read selected start } S.Read(W, sizeof(w)); SelStart:=w; { Read selected start }
S.Read(W, sizeof(w)); SelEnd:=w; { Read selected end } S.Read(W, sizeof(w)); SelEnd:=w; { Read selected end }
S.Read(B, SizeOf(B)); { Read string length } S.Read(B, SizeOf(B)); { Read string length }
{$ifdef FV_UNICODE}
Data:=S.ReadUnicodeString;
{$else FV_UNICODE}
GetMem(Data, B + 1); { Allocate memory } GetMem(Data, B + 1); { Allocate memory }
S.Read(Data^[1], B); { Read string data } S.Read(Data^[1], B); { Read string data }
SetLength(Data^, B); { Xfer string length } SetLength(Data^, B); { Xfer string length }
{$endif FV_UNICODE}
If (Options AND ofVersion >= ofVersion20) Then { Version 2 or above } If (Options AND ofVersion >= ofVersion20) Then { Version 2 or above }
Validator := PValidator(S.Get); { Get any validator } Validator := PValidator(S.Get); { Get any validator }
Options := Options OR ofVersion20; { Set version 2 flag } Options := Options OR ofVersion20; { Set version 2 flag }
@ -1362,7 +1366,9 @@ END;
{---------------------------------------------------------------------------} {---------------------------------------------------------------------------}
DESTRUCTOR TInputLine.Done; DESTRUCTOR TInputLine.Done;
BEGIN BEGIN
{$ifndef FV_UNICODE}
If (Data <> Nil) Then FreeMem(Data, MaxLen + 1); { Release any memory } If (Data <> Nil) Then FreeMem(Data, MaxLen + 1); { Release any memory }
{$endif FV_UNICODE}
SetValidator(Nil); { Clear any validator } SetValidator(Nil); { Clear any validator }
Inherited Done; { Call ancestor } Inherited Done; { Call ancestor }
END; END;
@ -1546,7 +1552,11 @@ BEGIN
w:=FirstPos;S.Write(w, SizeOf(w)); { Read first position } w:=FirstPos;S.Write(w, SizeOf(w)); { Read first position }
w:=SelStart;S.Write(w, SizeOf(w)); { Read selected start } w:=SelStart;S.Write(w, SizeOf(w)); { Read selected start }
w:=SelEnd;S.Write(w, SizeOf(w)); { Read selected end } w:=SelEnd;S.Write(w, SizeOf(w)); { Read selected end }
{$ifdef FV_UNICODE}
S.WriteUnicodeString(Data); { Write the data }
{$else FV_UNICODE}
S.WriteStr(Data); { Write the data } S.WriteStr(Data); { Write the data }
{$endif FV_UNICODE}
S.Put(Validator); { Write any validator } S.Put(Validator); { Write any validator }
END; END;