xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2026-01-31 10:24:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.60 beta

Browse Source
This commit is contained in:
Igor Pavlov
2008-08-19 00:00:00 +00:00
committed by Kornel Lesiński
parent 173c07e166
commit c10e6b16f6
107 changed files with 490 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CPP/7zip/UI/GUI/CompressDialog.cpp
+2 -2
View File
@@ -426,7 +426,7 @@ void CCompressDialog::OnButtonSFX()
UString fileName;
m_ArchivePath.GetText(fileName);
int dotPos = fileName.ReverseFind(L'.');
int slashPos = fileName.ReverseFind(L'\\');
int slashPos = fileName.ReverseFind(WCHAR_PATH_SEPARATOR);
if (dotPos < 0 || dotPos <= slashPos)
dotPos = -1;
bool isSFX = IsSFX();
@@ -707,7 +707,7 @@ void CCompressDialog::SetArchiveName(const UString &name)
if (!Info.KeepName)
{
int dotPos = fileName.ReverseFind('.');
int slashPos = MyMax(fileName.ReverseFind('\\'), fileName.ReverseFind('/'));
int slashPos = MyMax(fileName.ReverseFind(WCHAR_PATH_SEPARATOR), fileName.ReverseFind('/'));
if (dotPos >= 0 && dotPos > slashPos + 1)
fileName = fileName.Left(dotPos);
}
CPP/7zip/UI/GUI/UpdateCallbackGUI.cpp
+2 -6
View File
@@ -167,9 +167,7 @@ HRESULT CUpdateCallbackGUI::CryptoGetTextPassword2(Int32 *passwordIsDefined, BST
}
}
*passwordIsDefined = BoolToInt(PasswordIsDefined);
CMyComBSTR tempName(Password);
*password = tempName.Detach();
return S_OK;
return StringToBstr(Password, password);
}
/*
@@ -211,9 +209,7 @@ HRESULT CUpdateCallbackGUI::Open_CryptoGetTextPassword(BSTR *password)
Password = dialog.Password;
PasswordIsDefined = true;
}
CMyComBSTR tempName(Password);
*password = tempName.Detach();
return S_OK;
return StringToBstr(Password, password);
}
HRESULT CUpdateCallbackGUI::Open_GetPasswordIfAny(UString &password)
CPP/7zip/UI/GUI/UpdateGUI.cpp
+1 -1
View File
@@ -239,7 +239,7 @@ static HRESULT ShowDialog(
for (int i = 0; i < item.PathParts.Size(); i++)
{
if (i > 0)
name += L'\\';
name += WCHAR_PATH_SEPARATOR;
name += item.PathParts[i];
}
if (NFind::FindFile(name, fileInfo))