UEFI形式への対応を追加。

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

diff --git a/bin/lib/7zArc.xml b/bin/lib/7zArc.xml
index 1dbde82..3a8c62e 100644 (file)
--- a/bin/lib/7zArc.xml
+++ b/bin/lib/7zArc.xml
@@ -21,6 +21,9 @@
  <library name="0x0a" typename="LZMA"     suffix="lzma"        extract=''    test='' />
  <library name="0x0b" typename="LZMA86"   suffix="lzma"        extract=''    test='' />
  <library name="0x0d" typename="PPMd"     suffix="pmd"         extract=''    test='' archive="0" />
+ <library name="0xcf" typename="TE"       suffix="te"          extract=''    test='' />
+ <library name="0xd0" typename="UEFIc"    suffix="scap"        extract=''    test='' />
+ <library name="0xd1" typename="UEFIs"                         extract=''    test='' />
  <library name="0xd2" typename="SquashFS" suffix="squashfs"    extract=''    test='' />
  <library name="0xd3" typename="CramFS"   suffix="cramfs"      extract=''    test='' />
  <library name="0xd4" typename="Apm"                           extract=''    test='' />
@@ -57,7 +60,7 @@
  <library name="0xef" typename="GZip"     suffix="gz"          extract=''    test='' archive="0"
         level-min="0" level-max="9"
         create  ='-mx=%94' />
- <library name="0x0c" typename="XZ"       suffix="xz"          extract='%5'  test='' archive="0"
+ <library name="0x0c" typename="XZ"       suffix="xz"          extract='%5'  test='' archive="0" disable-win="1"
         level-min="0" level-max="9"
         create  ='-mx=%94' />
  <!--

diff --git a/doc/history.html b/doc/history.html
index 10c79bb..6a88496 100644 (file)
--- a/doc/history.html
+++ b/doc/history.html
@@ -61,6 +61,7 @@
      <dt>7zArc</dt>\r
      <dd>\r
       <ul>\r
+       <li class="add">UEFI形式への対応を追加。</li>\r
        <li class="fix">cpio.xzを内部にもつrpmをxz形式と誤認識してしまうバグを修正。</li>\r
       </ul>\r
      </dd>\r

diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index efacb00..4700503 100644 (file)
--- a/src/plugin/7zArc/7zArc.cpp
+++ b/src/plugin/7zArc/7zArc.cpp
@@ -154,7 +154,7 @@ public:
        STDMETHOD(CryptoGetTextPassword)(BSTR *password);\r
        int nErrorCode;\r
        wxString szSubArchiveName;\r
-       NWindows::NFile::NFind::CFileInfoW fiInfo;\r
+       NWindows::NFile::NFind::CFileInfo fiInfo;\r
 \r
 private:\r
        TPI_PROCESSINFO piInfo;\r
@@ -434,9 +434,9 @@ public:
        MY_UNKNOWN_IMP2(IArchiveUpdateCallback2, ICryptoGetTextPassword2)\r
        INTERFACE_IArchiveUpdateCallback2(;)\r
        STDMETHOD(CryptoGetTextPassword2)(int * nPasswordIsDefined, BSTR * szPassword);\r
-       CArchiveUpdateCallback(TPI_SWITCHES *, CObjectVector<NWindows::NFile::NFind::CFileInfoW> *);\r
+       CArchiveUpdateCallback(TPI_SWITCHES *, CObjectVector<NWindows::NFile::NFind::CFileInfo> *);\r
 \r
-       const CObjectVector<NWindows::NFile::NFind::CFileInfoW> * fiItems;\r
+       const CObjectVector<NWindows::NFile::NFind::CFileInfo> * fiItems;\r
        int nErrorCode;\r
 \r
 private:\r
@@ -445,7 +445,7 @@ private:
        TPI_SWITCHES * swInfo;\r
 };\r
 \r
-CArchiveUpdateCallback::CArchiveUpdateCallback(TPI_SWITCHES * swInfo, CObjectVector<NWindows::NFile::NFind::CFileInfoW> * fiItems)\r
+CArchiveUpdateCallback::CArchiveUpdateCallback(TPI_SWITCHES * swInfo, CObjectVector<NWindows::NFile::NFind::CFileInfo> * fiItems)\r
 {\r
        this->swInfo = swInfo;\r
        this->fiItems = fiItems;\r
@@ -498,7 +498,7 @@ STDMETHODIMP CArchiveUpdateCallback::GetProperty(unsigned int nIndex, PROPID pro
                return S_OK;\r
        }\r
 \r
-       const NWindows::NFile::NFind::CFileInfoW fiItem = (* this->fiItems)[nIndex];\r
+       const NWindows::NFile::NFind::CFileInfo fiItem = (* this->fiItems)[nIndex];\r
        switch (propID)\r
        {\r
                case kpidPath:  prop = fiItem.Name;  break;\r
@@ -929,10 +929,10 @@ int __stdcall Command
 //     case TPI_COMMAND_ADD:\r
        {\r
                // 入力リストを作成。\r
-               CObjectVector<NWindows::NFile::NFind::CFileInfoW> fiItems;\r
+               CObjectVector<NWindows::NFile::NFind::CFileInfo> fiItems;\r
                for (unsigned int i = 0; i < _szFiles.GetCount(); i++)\r
                {\r
-                       NWindows::NFile::NFind::CFileInfoW fi;\r
+                       NWindows::NFile::NFind::CFileInfo fi;\r
                        wxFileName fn(_szFiles[i]);\r
                        fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG, _swInfo->fnDestinationDirectory.GetFullPath());\r
                        if (! fi.Find(fn.GetFullPath().c_str()))\r

diff --git a/src/plugin/7zArc/7zArc.vcproj b/src/plugin/7zArc/7zArc.vcproj
index afef0f2..4fa155a 100644 (file)
--- a/src/plugin/7zArc/7zArc.vcproj
+++ b/src/plugin/7zArc/7zArc.vcproj
@@ -121,6 +121,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\7-zip\CPP\Common\MyString.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\7-zip\CPP\Common\MyVector.cpp"\r
                                >\r
                        </File>\r
@@ -129,6 +133,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\7-zip\CPP\Common\StringConvert.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\7-zip\CPP\Windows\Time.cpp"\r
                                >\r
                        </File>\r