From 9d57577e65f98ae92d13d86359fb6e99d068e9a5 Mon Sep 17 00:00:00 2001
From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Sun, 19 Sep 2010 02:25:50 +0000
Subject: [PATCH] =?utf8?q?=E6=9C=89=E7=94=A8=E6=80=A7=E3=81=8C=E4=BD=8E?=
 =?utf8?q?=E3=81=84Swf=E3=81=B8=E3=81=AE=E5=AF=BE=E5=BF=9C=E3=82=92?=
 =?utf8?q?=E5=8F=96=E3=82=8A=E3=82=84=E3=82=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@311 9df91469-1e22-0410-86e7-ea8537beb833
---
 doc/history.html           |  1 +
 src/plugin/7zArc/7zArc.cpp | 14 +++++---------
 src/plugin/7zArc/7zArc.h   | 12 ++++--------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/doc/history.html b/doc/history.html
index 807624d..12ba6f7 100644
--- a/doc/history.html
+++ b/doc/history.html
@@ -44,6 +44,7 @@
      <dt>7zArc</dt>
      <dd>
       <ul>
+       <li class="chg">有用性が低いSwfへの対応を取りやめ。</li>
        <li class="fix">Linux上でマルチバイト文字を含む名前のファイルを扱えなかったバグを修正。</li>
        <li class="fix">作業ディレクトリからライブラリを読み込まないよう修正。</li>
       </ul>
diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index bdc378c..d1225e8 100644
--- a/src/plugin/7zArc/7zArc.cpp
+++ b/src/plugin/7zArc/7zArc.cpp
@@ -161,9 +161,7 @@ int __stdcall GetFormatInformation2(TPI_FORMATINFO * _fiInfo, wxULongLong_t & nI
 		_fiInfo->nCompressLevelMin   = 1;
 		_fiInfo->nCompressLevelMax   = 9;
 	}
-#if 0
-	else if (guidList[nBase] == CLSID_CFormatRar)  { _fiInfo->szTypeName = wxT("Rar");     _fiInfo->szSuffix = wxT("rar"); }
-#endif
+//	else if (guidList[nBase] == CLSID_CFormatRar)  { _fiInfo->szTypeName = wxT("Rar");     _fiInfo->szSuffix = wxT("rar"); }
 #ifdef __LINUX__
 	else if (guidList[nBase] == CLSID_CFormatArj)  { _fiInfo->szTypeName = wxT("Arj");     _fiInfo->szSuffix = wxT("arj"); _fiInfo->fEncryptPassword = true; _fiInfo->fSFX = true; }
 #endif
@@ -203,16 +201,14 @@ int __stdcall GetFormatInformation2(TPI_FORMATINFO * _fiInfo, wxULongLong_t & nI
 	else if (guidList[nBase] == CLSID_CFormatApm)  { _fiInfo->szTypeName = wxT("Apm");     _fiInfo->szSuffix = wxT("apm"); }
 	else if (guidList[nBase] == CLSID_CFormatMslz) { _fiInfo->szTypeName = wxT("MSLZ");    _fiInfo->szSuffix = wxT("xx_"); _fiInfo->fArchive = false; }
 	else if (guidList[nBase] == CLSID_CFormatFlv)  { _fiInfo->szTypeName = wxT("Flv");     _fiInfo->szSuffix = wxT("flv"); }
-	else if (guidList[nBase] == CLSID_CFormatSwf)  { _fiInfo->szTypeName = wxT("Swf");     _fiInfo->szSuffix = wxT("swf"); }
-	else if (guidList[nBase] == CLSID_CFormatSwfc) { _fiInfo->szTypeName = wxT("Swfc");    _fiInfo->szSuffix = wxT("swfc");}
+//	else if (guidList[nBase] == CLSID_CFormatSwf)  { _fiInfo->szTypeName = wxT("Swf");     _fiInfo->szSuffix = wxT("swf"); }
+	else if (guidList[nBase] == CLSID_CFormatSwfc) { _fiInfo->szTypeName = wxT("Swfc");    _fiInfo->szSuffix = wxT("swf"); }
 	else if (guidList[nBase] == CLSID_CFormatNtfs) { _fiInfo->szTypeName = wxT("NTFS");    _fiInfo->szSuffix = wxT("ntfs");}
 	else if (guidList[nBase] == CLSID_CFormatFat)  { _fiInfo->szTypeName = wxT("FAT");     _fiInfo->szSuffix = wxT("fat"); }
 	else if (guidList[nBase] == CLSID_CFormatMbr)  { _fiInfo->szTypeName = wxT("Mbr");     _fiInfo->szSuffix = wxT("mbr"); }
 	else if (guidList[nBase] == CLSID_CFormatVhd)  { _fiInfo->szTypeName = wxT("Vhd");     _fiInfo->szSuffix = wxT("vhd"); }
-#if 0
-	else if (guidList[nBase] == CLSID_CFormatPe)   { _fiInfo->szTypeName = wxT("PE");      _fiInfo->szSuffix = wxT("exe"); _fiInfo->fArchive = false; }
-	else if (guidList[nBase] == CLSID_CFormatElf)  { _fiInfo->szTypeName = wxT("ELF");     _fiInfo->fArchive = false; }
-#endif
+//	else if (guidList[nBase] == CLSID_CFormatPe)   { _fiInfo->szTypeName = wxT("PE");      _fiInfo->szSuffix = wxT("exe"); _fiInfo->fArchive = false; }
+//	else if (guidList[nBase] == CLSID_CFormatElf)  { _fiInfo->szTypeName = wxT("ELF");     _fiInfo->fArchive = false; }
 	else if (guidList[nBase] == CLSID_CFormatMachO){ _fiInfo->szTypeName = wxT("Mach-O"); }
 	else if (guidList[nBase] == CLSID_CFormatUdf)  { _fiInfo->szTypeName = wxT("Udf");     _fiInfo->szSuffix = wxT("udf"); }
 	else if (guidList[nBase] == CLSID_CFormatXar)  { _fiInfo->szTypeName = wxT("Xar");     _fiInfo->szSuffix = wxT("xar"); }
diff --git a/src/plugin/7zArc/7zArc.h b/src/plugin/7zArc/7zArc.h
index 98893b7..4665e83 100644
--- a/src/plugin/7zArc/7zArc.h
+++ b/src/plugin/7zArc/7zArc.h
@@ -88,9 +88,7 @@ DEFINE_GUID(CLSID_CFormatGZip,  0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x
 const GUID guidList[] = {
 	CLSID_CFormatZip,
 	CLSID_CFormatBZip2,
-#if 0
-	CLSID_CFormatRar,
-#endif
+//	CLSID_CFormatRar,
 #ifdef __LINUX__
 	CLSID_CFormatArj,
 #endif
@@ -109,16 +107,14 @@ const GUID guidList[] = {
 	CLSID_CFormatApm,
 	CLSID_CFormatMslz,
 	CLSID_CFormatFlv,
-	CLSID_CFormatSwf,
+//	CLSID_CFormatSwf,
 	CLSID_CFormatSwfc,
 	CLSID_CFormatNtfs,
 	CLSID_CFormatFat,
 	CLSID_CFormatMbr,
 	CLSID_CFormatVhd,
-#if 0
-	CLSID_CFormatPe,
-	CLSID_CFormatElf,
-#endif
+//	CLSID_CFormatPe,
+//	CLSID_CFormatElf,
 	CLSID_CFormatMachO,
 	CLSID_CFormatUdf,
 	CLSID_CFormatXar,
-- 
2.11.0