diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2015-10-05 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:56 +0300 |
| commit | 6543c280208393fa32cb0094f770d14c1cfb13b2 (patch) | |
| tree | beb90f5e81e85e7957463ee5ad89cab0b3566560 /CPP/7zip/Bundles | |
| parent | f6444c32568553e0261ca0105083658f12be6284 (diff) | |
15.0815.08
Diffstat (limited to 'CPP/7zip/Bundles')
| -rw-r--r-- | CPP/7zip/Bundles/Format7zF/Arc.mak | 1 | ||||
| -rw-r--r-- | CPP/7zip/Bundles/Format7zF/Format7z.dsp | 8 | ||||
| -rw-r--r-- | CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.cpp | 6 | ||||
| -rw-r--r-- | CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/CPP/7zip/Bundles/Format7zF/Arc.mak b/CPP/7zip/Bundles/Format7zF/Arc.mak index 3ea45b5d..d4002e9b 100644 --- a/CPP/7zip/Bundles/Format7zF/Arc.mak +++ b/CPP/7zip/Bundles/Format7zF/Arc.mak @@ -61,6 +61,7 @@ AR_OBJS = \ $O\DeflateProps.obj \ $O\DmgHandler.obj \ $O\ElfHandler.obj \ + $O\ExtHandler.obj \ $O\FatHandler.obj \ $O\FlvHandler.obj \ $O\GzHandler.obj \ diff --git a/CPP/7zip/Bundles/Format7zF/Format7z.dsp b/CPP/7zip/Bundles/Format7zF/Format7z.dsp index f22d746e..69d4f3a0 100644 --- a/CPP/7zip/Bundles/Format7zF/Format7z.dsp +++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsp @@ -283,6 +283,10 @@ SOURCE=..\..\..\Common\MyInitGuid.h # End Source File # Begin Source File +SOURCE=..\..\..\Common\MyLinux.h +# End Source File +# Begin Source File + SOURCE=..\..\..\Common\MyMap.cpp # End Source File # Begin Source File @@ -2431,6 +2435,10 @@ SOURCE=..\..\Archive\ElfHandler.cpp # End Source File # Begin Source File +SOURCE=..\..\Archive\ExtHandler.cpp +# End Source File +# Begin Source File + SOURCE=..\..\Archive\FatHandler.cpp # End Source File # Begin Source File diff --git a/CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.cpp b/CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.cpp index ac7df6b2..79330630 100644 --- a/CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.cpp +++ b/CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.cpp @@ -141,7 +141,7 @@ STDMETHODIMP CExtractCallbackImp::GetStream(UInt32 index, } RINOK(_archiveHandler->GetProperty(index, kpidMTime, &prop)); - switch(prop.vt) + switch (prop.vt) { case VT_EMPTY: _processedFileInfo.MTime = _defaultMTime; break; case VT_FILETIME: _processedFileInfo.MTime = prop.filetime; break; @@ -215,7 +215,7 @@ STDMETHODIMP CExtractCallbackImp::PrepareOperation(Int32 askExtractMode) STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 resultEOperationResult) { - switch(resultEOperationResult) + switch (resultEOperationResult) { case NArchive::NExtract::NOperationResult::kOK: break; @@ -223,7 +223,7 @@ STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 resultEOperationResul default: { _outFileStream.Release(); - switch(resultEOperationResult) + switch (resultEOperationResult) { case NArchive::NExtract::NOperationResult::kUnsupportedMethod: _message = kUnsupportedMethod; diff --git a/CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp b/CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp index cd2584fd..d3890235 100644 --- a/CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp +++ b/CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp @@ -281,7 +281,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, execInfo.hProcess = 0; /* BOOL success = */ ::ShellExecuteEx(&execInfo); UINT32 result = (UINT32)(UINT_PTR)execInfo.hInstApp; - if(result <= 32) + if (result <= 32) { if (!assumeYes) ShowErrorMessage(L"Can not open file"); |