mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: Use LazUTF8

Browse source
This commit is contained in:
Alexander Koblov 2015-05-03 10:00:23 +00:00
commit 9d05904fb3
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/wfx/ftp/src/FtpConfDlg.pas
View file

@ -37,7 +37,7 @@ function ShowFtpConfDlg: Boolean;
implementation
uses
FtpFunc, FtpUtils, blcksock, ssl_openssl_lib;
LazUTF8, FtpFunc, FtpUtils, blcksock, ssl_openssl_lib;
function DlgProc (pDlg: PtrUInt; DlgItemName: PAnsiChar; Msg, wParam, lParam: PtrInt): PtrInt; dcpcall;
var
@ -73,10 +73,10 @@ begin
Data:= PtrInt(PAnsiChar(Text));
SendDlgMsg(pDlg, 'edtPassword', DM_SETTEXT, Data, 0);
end;
Text:= AnsiToUtf8(gConnection.Path);
Text:= SysToUTF8(gConnection.Path);
Data:= PtrInt(PAnsiChar(Text));
SendDlgMsg(pDlg, 'edtRemoteDir', DM_SETTEXT, Data, 0);
Text:= AnsiToUtf8(gConnection.InitCommands);
Text:= gConnection.InitCommands;
Data:= PtrInt(PAnsiChar(Text));
SendDlgMsg(pDlg, 'edtInitCommands', DM_SETTEXT, Data, 0);
Data:= PtrInt(gConnection.PassiveMode);
@ -155,10 +155,10 @@ begin
gConnection.MasterPassword:= Boolean(Data);
Data:= SendDlgMsg(pDlg, 'edtRemoteDir', DM_GETTEXT, 0, 0);
Text:= PAnsiChar(Data);
gConnection.Path:= Utf8ToAnsi(Text);
gConnection.Path:= UTF8ToSys(Text);
Data:= SendDlgMsg(pDlg, 'edtInitCommands', DM_GETTEXT, 0, 0);
Text:= PAnsiChar(Data);
gConnection.InitCommands:= Utf8ToAnsi(Text);
gConnection.InitCommands:= Text;
Data:= SendDlgMsg(pDlg, 'chkPassiveMode', DM_GETCHECK, 0, 0);
gConnection.PassiveMode:= Boolean(Data);
Data:= SendDlgMsg(pDlg, 'chkAutoTLS', DM_GETCHECK, 0, 0);

5
plugins/wfx/ftp/src/ftp.lpi
View file

@ -87,6 +87,11 @@ end;"/>
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<RequiredPackages Count="1">
<Item1>
<PackageName Value="LazUtils"/>
</Item1>
</RequiredPackages>
<Units Count="5">
<Unit0>
<Filename Value="ftp.dpr"/>

6
plugins/wfx/ftp/src/ftpadv.pas
View file

@ -91,7 +91,7 @@ type
implementation
uses
FtpFunc;
LazUTF8, FtpFunc;
function Dummy(const S: String): String;
begin
@ -188,8 +188,8 @@ begin
if FUnicode then
begin
FTPCommand('OPTS UTF8 ON');
ClientToServer:= @AnsiToUtf8;
ServerToClient:= @Utf8ToAnsi;
ClientToServer:= @SysToUTF8;
ServerToClient:= @UTF8ToSys;
Exit;
end;
end;