xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-10 08:07:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

9.21

Browse Source
This commit is contained in:
Igor Pavlov
2011-04-11 00:00:00 +00:00
committed by Kornel Lesiński
parent de4f8c22fe
commit 35596517f2
322 changed files with 9989 additions and 7759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CPP/7zip/UI/GUI/ExtractGUI.cpp
View File

@@ -8,6 +8,7 @@
#include "Windows/Error.h"
#include "Windows/FileDir.h"
#include "Windows/FileFind.h"
#include "Windows/FileName.h"
#include "Windows/Thread.h"
#include "../FileManager/ExtractCallback.h"
@@ -128,7 +129,7 @@ HRESULT ExtractGUI(
if (!options.TestMode)
{
UString outputDir = options.OutputDir;
FString outputDir = options.OutputDir;
#ifndef UNDER_CE
if (outputDir.IsEmpty())
NFile::NDirectory::MyGetCurrentDirectory(outputDir);
@@ -136,20 +137,22 @@ HRESULT ExtractGUI(
if (showDialog)
{
CExtractDialog dialog;
if (!NFile::NDirectory::MyGetFullPathName(outputDir, dialog.DirectoryPath))
FString outputDirFull;
if (!NFile::NDirectory::MyGetFullPathName(outputDir, outputDirFull))
{
ShowErrorMessage(kIncorrectOutDir);
messageWasDisplayed = true;
return E_FAIL;
}
NFile::NName::NormalizeDirPathPrefix(dialog.DirectoryPath);
NFile::NName::NormalizeDirPathPrefix(outputDirFull);
dialog.DirectoryPath = fs2us(outputDirFull);
// dialog.OverwriteMode = options.OverwriteMode;
// dialog.PathMode = options.PathMode;
if (dialog.Create(hwndParent) != IDOK)
return E_ABORT;
outputDir = dialog.DirectoryPath;
outputDir = us2fs(dialog.DirectoryPath);
options.OverwriteMode = dialog.OverwriteMode;
options.PathMode = dialog.PathMode;
#ifndef _SFX