diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2009-06-02 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:15:59 +0300 |
commit | 829409452d85cd6dd9dfc9151f109d6e13a2bb1c (patch) | |
tree | e0acaea47044d167f35fa197584dee1bde41c329 /CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp | |
parent | 8874e4fbc9faabdcff719b9b2ac8ebad4f282bbe (diff) |
9.04 beta
Diffstat (limited to 'CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp')
-rwxr-xr-x | CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp index d867b74a..e5353c21 100755 --- a/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp +++ b/CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp @@ -2,12 +2,7 @@ #include "StdAfx.h" -#include "ExtractEngine.h" - -#include "Common/StringConvert.h" - #include "Windows/FileDir.h" -#include "Windows/FileFind.h" #include "Windows/Thread.h" #include "../../UI/Common/OpenArchive.h" @@ -15,6 +10,7 @@ #include "../../UI/FileManager/FormatUtils.h" #include "ExtractCallback.h" +#include "ExtractEngine.h" using namespace NWindows; @@ -40,18 +36,18 @@ struct CThreadExtracting void Process() { NFile::NFind::CFileInfoW fi; - if (!NFile::NFind::FindFile(FileName, fi)) + if (!fi.Find(FileName)) { ErrorMessage = kCantFindArchive; Result = E_FAIL; return; } - Result = MyOpenArchive(Codecs, CIntVector(), FileName, ArchiveLink, ExtractCallbackSpec); + Result = ArchiveLink.Open2(Codecs, CIntVector(), false, NULL, FileName, ExtractCallbackSpec); if (Result != S_OK) { if (Result != S_OK) - ErrorMessage = kCantOpenArchive; + ErrorMessage = kCantOpenArchive; return; } |