mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Load configuration from directory with non ASCII characters

Browse source
This commit is contained in:
Alexander Koblov 2013-08-06 18:12:32 +00:00
commit 169c062f97
2 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/wcx/zip/src/ZipConfDlg.pas
View file

@ -3,9 +3,7 @@
-------------------------------------------------------------------------
WCX plugin for working with *.zip, *.gz, *.bz2, *.tar, *.tgz, *.tbz archives
Copyright (C) 2008-2012 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2008-2013 Alexander Koblov (alexx2000@mail.ru)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@ -41,7 +39,7 @@ procedure SaveConfig;
implementation
uses ZipFunc, AbZipTyp, IniFiles;
uses ZipFunc, AbZipTyp, DCClassesUtf8;
function DlgProc (pDlg: PtrUInt; DlgItemName: PAnsiChar; Msg, wParam, lParam: PtrInt): PtrInt; dcpcall;
var
@ -141,9 +139,9 @@ end;
procedure LoadConfig;
var
gIni: TIniFile;
gIni: TIniFileEx;
begin
gIni:= TIniFile.Create(gStartupInfo.PluginConfDir + IniFileName);
gIni:= TIniFileEx.Create(gStartupInfo.PluginConfDir + IniFileName);
try
gCompressionMethodToUse:= TAbZipSupportedMethod(gIni.ReadInteger('Configuration', 'CompressionMethodToUse', 2));
gDeflationOption:= TAbZipDeflationOption(gIni.ReadInteger('Configuration', 'DeflationOption', 0));
@ -155,9 +153,9 @@ end;
procedure SaveConfig;
var
gIni: TIniFile;
gIni: TIniFileEx;
begin
gIni:= TIniFile.Create(gStartupInfo.PluginConfDir + IniFileName);
gIni:= TIniFileEx.Create(gStartupInfo.PluginConfDir + IniFileName);
try
gIni.WriteInteger('Configuration', 'CompressionMethodToUse', Integer(gCompressionMethodToUse));
gIni.WriteInteger('Configuration', 'DeflationOption', Integer(gDeflationOption));

21
plugins/wcx/zip/src/ZipFunc.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
WCX plugin for working with *.zip, *.gz, *.tar, *.tgz archives
Copyright (C) 2007-2012 Koblov Alexander (Alexx2000@mail.ru)
Copyright (C) 2007-2013 Alexander Koblov (alexx2000@mail.ru)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@ -94,7 +94,7 @@ var
implementation
uses
SysUtils, ZipConfDlg, IniFiles, AbBrowse, DCOSUtils, DCStrUtils, DCConvertEncoding;
SysUtils, ZipConfDlg, AbBrowse, DCOSUtils, DCStrUtils, DCConvertEncoding;
procedure StringToArrayW(src: WideString;
pDst: PWideChar;
@ -149,7 +149,7 @@ begin
on EWriteError do
ArchiveData.OpenResult := E_EWRITE;
else
;
ArchiveData.OpenResult := -1;
end;
if (Result = 0) and Assigned(Arc) then
@ -188,7 +188,7 @@ begin
on EWriteError do
ArchiveData.OpenResult := E_EWRITE;
else
;
ArchiveData.OpenResult := -1;
end;
if (Result = 0) and Assigned(Arc) then
@ -752,21 +752,12 @@ begin
end;
procedure ExtensionInitialize(StartupInfo: PExtensionStartupInfo); dcpcall;
var
gIni: TIniFile;
begin
gStartupInfo:= StartupInfo^;
// load configuration from ini file
gIni:= TIniFile.Create(gStartupInfo.PluginConfDir + IniFileName);
try
LoadConfig;
finally
gIni.Free;
end;
// Load configuration from ini file
LoadConfig;
end;
{ TAbZipKitEx }
constructor TAbZipKitEx.Create(AOwner: TComponent);