有用性が低いSwfへの対応を取りやめ。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@311 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/doc/history.html b/doc/history.html
index 807624d..12ba6f7 100644 (file)
--- a/doc/history.html
+++ b/doc/history.html
@@ -44,6 +44,7 @@
      <dt>7zArc</dt>\r
      <dd>\r
       <ul>\r
+       <li class="chg">有用性が低いSwfへの対応を取りやめ。</li>\r
        <li class="fix">Linux上でマルチバイト文字を含む名前のファイルを扱えなかったバグを修正。</li>\r
        <li class="fix">作業ディレクトリからライブラリを読み込まないよう修正。</li>\r
       </ul>\r

diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index bdc378c..d1225e8 100644 (file)
--- 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;\r
                _fiInfo->nCompressLevelMax   = 9;\r
        }\r
-#if 0\r
-       else if (guidList[nBase] == CLSID_CFormatRar)  { _fiInfo->szTypeName = wxT("Rar");     _fiInfo->szSuffix = wxT("rar"); }\r
-#endif\r
+//     else if (guidList[nBase] == CLSID_CFormatRar)  { _fiInfo->szTypeName = wxT("Rar");     _fiInfo->szSuffix = wxT("rar"); }\r
 #ifdef __LINUX__\r
        else if (guidList[nBase] == CLSID_CFormatArj)  { _fiInfo->szTypeName = wxT("Arj");     _fiInfo->szSuffix = wxT("arj"); _fiInfo->fEncryptPassword = true; _fiInfo->fSFX = true; }\r
 #endif\r
@@ -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"); }\r
        else if (guidList[nBase] == CLSID_CFormatMslz) { _fiInfo->szTypeName = wxT("MSLZ");    _fiInfo->szSuffix = wxT("xx_"); _fiInfo->fArchive = false; }\r
        else if (guidList[nBase] == CLSID_CFormatFlv)  { _fiInfo->szTypeName = wxT("Flv");     _fiInfo->szSuffix = wxT("flv"); }\r
-       else if (guidList[nBase] == CLSID_CFormatSwf)  { _fiInfo->szTypeName = wxT("Swf");     _fiInfo->szSuffix = wxT("swf"); }\r
-       else if (guidList[nBase] == CLSID_CFormatSwfc) { _fiInfo->szTypeName = wxT("Swfc");    _fiInfo->szSuffix = wxT("swfc");}\r
+//     else if (guidList[nBase] == CLSID_CFormatSwf)  { _fiInfo->szTypeName = wxT("Swf");     _fiInfo->szSuffix = wxT("swf"); }\r
+       else if (guidList[nBase] == CLSID_CFormatSwfc) { _fiInfo->szTypeName = wxT("Swfc");    _fiInfo->szSuffix = wxT("swf"); }\r
        else if (guidList[nBase] == CLSID_CFormatNtfs) { _fiInfo->szTypeName = wxT("NTFS");    _fiInfo->szSuffix = wxT("ntfs");}\r
        else if (guidList[nBase] == CLSID_CFormatFat)  { _fiInfo->szTypeName = wxT("FAT");     _fiInfo->szSuffix = wxT("fat"); }\r
        else if (guidList[nBase] == CLSID_CFormatMbr)  { _fiInfo->szTypeName = wxT("Mbr");     _fiInfo->szSuffix = wxT("mbr"); }\r
        else if (guidList[nBase] == CLSID_CFormatVhd)  { _fiInfo->szTypeName = wxT("Vhd");     _fiInfo->szSuffix = wxT("vhd"); }\r
-#if 0\r
-       else if (guidList[nBase] == CLSID_CFormatPe)   { _fiInfo->szTypeName = wxT("PE");      _fiInfo->szSuffix = wxT("exe"); _fiInfo->fArchive = false; }\r
-       else if (guidList[nBase] == CLSID_CFormatElf)  { _fiInfo->szTypeName = wxT("ELF");     _fiInfo->fArchive = false; }\r
-#endif\r
+//     else if (guidList[nBase] == CLSID_CFormatPe)   { _fiInfo->szTypeName = wxT("PE");      _fiInfo->szSuffix = wxT("exe"); _fiInfo->fArchive = false; }\r
+//     else if (guidList[nBase] == CLSID_CFormatElf)  { _fiInfo->szTypeName = wxT("ELF");     _fiInfo->fArchive = false; }\r
        else if (guidList[nBase] == CLSID_CFormatMachO){ _fiInfo->szTypeName = wxT("Mach-O"); }\r
        else if (guidList[nBase] == CLSID_CFormatUdf)  { _fiInfo->szTypeName = wxT("Udf");     _fiInfo->szSuffix = wxT("udf"); }\r
        else if (guidList[nBase] == CLSID_CFormatXar)  { _fiInfo->szTypeName = wxT("Xar");     _fiInfo->szSuffix = wxT("xar"); }\r

diff --git a/src/plugin/7zArc/7zArc.h b/src/plugin/7zArc/7zArc.h
index 98893b7..4665e83 100644 (file)
--- 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[] = {\r
        CLSID_CFormatZip,\r
        CLSID_CFormatBZip2,\r
-#if 0\r
-       CLSID_CFormatRar,\r
-#endif\r
+//     CLSID_CFormatRar,\r
 #ifdef __LINUX__\r
        CLSID_CFormatArj,\r
 #endif\r
@@ -109,16 +107,14 @@ const GUID guidList[] = {
        CLSID_CFormatApm,\r
        CLSID_CFormatMslz,\r
        CLSID_CFormatFlv,\r
-       CLSID_CFormatSwf,\r
+//     CLSID_CFormatSwf,\r
        CLSID_CFormatSwfc,\r
        CLSID_CFormatNtfs,\r
        CLSID_CFormatFat,\r
        CLSID_CFormatMbr,\r
        CLSID_CFormatVhd,\r
-#if 0\r
-       CLSID_CFormatPe,\r
-       CLSID_CFormatElf,\r
-#endif\r
+//     CLSID_CFormatPe,\r
+//     CLSID_CFormatElf,\r
        CLSID_CFormatMachO,\r
        CLSID_CFormatUdf,\r
        CLSID_CFormatXar,\r