From b71d295b30923abfc230ad43fcd38fff9925a6f2 Mon Sep 17 00:00:00 2001 From: Jochen Tucht Date: Wed, 22 Jun 2005 21:21:11 +0000 Subject: [PATCH] RFE: [ 1205833 ] You can unzip more than just zip #1: Treat .ear and .war like .zip --- ArchiveSupport/Merge7z/Merge7zCommon.cpp | 5 +++++ ArchiveSupport/Merge7z/Merge7zCommon.h | 2 +- ArchiveSupport/Merge7z/revision.txt | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.cpp b/ArchiveSupport/Merge7z/Merge7zCommon.cpp index bcec68074..bfa5fe000 100755 --- a/ArchiveSupport/Merge7z/Merge7zCommon.cpp +++ b/ArchiveSupport/Merge7z/Merge7zCommon.cpp @@ -29,6 +29,7 @@ DATE: BY: DESCRIPTION: 2005/01/15 Jochen Tucht Changed as explained in revision.txt 2005/02/26 Jochen Tucht Changed as explained in revision.txt 2005/03/19 Jochen Tucht Changed as explained in revision.txt +2005/06/22 Jochen Tucht Treat .ear and .war like .zip */ #include "stdafx.h" @@ -602,6 +603,8 @@ Merge7z::Format *Merge7z::GuessFormat(LPCTSTR path) ENUM(Z) ENUM(ZIP) ENUM(JAR) + ENUM(WAR) + ENUM(EAR) ENUM(XPI) ENUM(RAR) ENUM(BZ2) @@ -626,6 +629,8 @@ Merge7z::Format *Merge7z::GuessFormat(LPCTSTR path) break; case EnumList::ZIP: case EnumList::JAR: + case EnumList::WAR: + case EnumList::EAR: case EnumList::XPI: pFormat = &CZipHandler; break; diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.h b/ArchiveSupport/Merge7z/Merge7zCommon.h index e74d0b5a2..ce2337e75 100755 --- a/ArchiveSupport/Merge7z/Merge7zCommon.h +++ b/ArchiveSupport/Merge7z/Merge7zCommon.h @@ -10,7 +10,7 @@ #include "7zip/Common/FileStreams.h" // Merge7z includes #include "tools.h" -#define DllBuild_Merge7z 11 +#define DllBuild_Merge7z 12 #define DLLPSTUB /##/ #include "Merge7z.h" diff --git a/ArchiveSupport/Merge7z/revision.txt b/ArchiveSupport/Merge7z/revision.txt index a9a4c0d20..0fc8ccabb 100755 --- a/ArchiveSupport/Merge7z/revision.txt +++ b/ArchiveSupport/Merge7z/revision.txt @@ -38,3 +38,5 @@ VERSION(2,2) // according to LANGID given in HIWORD(dwFlags) // Allow for Merge7z::LoadLang(MAKEINTATOM(LANGID)) // Don't show error message on intentional abort + +"*"//2005/06/22 Jochen Tucht Treat .ear and .war like .zip -- 2.11.0