From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Tue, 12 Apr 2011 12:03:52 +0000 (+0000)
Subject: UEFI形式への対応を追加。
X-Git-Tag: 0.01beta12~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d53113b3869689247b4db8ad9fddcee5f076ff12;p=tpi%2Flychee.git

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
--- 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
--- a/doc/history.html
+++ b/doc/history.html
@@ -61,6 +61,7 @@
      <dt>7zArc</dt>
      <dd>
       <ul>
+       <li class="add">UEFI形式への対応を追加。</li>
        <li class="fix">cpio.xzを内部にもつrpmをxz形式と誤認識してしまうバグを修正。</li>
       </ul>
      </dd>
diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index efacb00..4700503 100644
--- a/src/plugin/7zArc/7zArc.cpp
+++ b/src/plugin/7zArc/7zArc.cpp
@@ -154,7 +154,7 @@ public:
 	STDMETHOD(CryptoGetTextPassword)(BSTR *password);
 	int nErrorCode;
 	wxString szSubArchiveName;
-	NWindows::NFile::NFind::CFileInfoW fiInfo;
+	NWindows::NFile::NFind::CFileInfo fiInfo;
 
 private:
 	TPI_PROCESSINFO piInfo;
@@ -434,9 +434,9 @@ public:
 	MY_UNKNOWN_IMP2(IArchiveUpdateCallback2, ICryptoGetTextPassword2)
 	INTERFACE_IArchiveUpdateCallback2(;)
 	STDMETHOD(CryptoGetTextPassword2)(int * nPasswordIsDefined, BSTR * szPassword);
-	CArchiveUpdateCallback(TPI_SWITCHES *, CObjectVector<NWindows::NFile::NFind::CFileInfoW> *);
+	CArchiveUpdateCallback(TPI_SWITCHES *, CObjectVector<NWindows::NFile::NFind::CFileInfo> *);
 
-	const CObjectVector<NWindows::NFile::NFind::CFileInfoW> * fiItems;
+	const CObjectVector<NWindows::NFile::NFind::CFileInfo> * fiItems;
 	int nErrorCode;
 
 private:
@@ -445,7 +445,7 @@ private:
 	TPI_SWITCHES * swInfo;
 };
 
-CArchiveUpdateCallback::CArchiveUpdateCallback(TPI_SWITCHES * swInfo, CObjectVector<NWindows::NFile::NFind::CFileInfoW> * fiItems)
+CArchiveUpdateCallback::CArchiveUpdateCallback(TPI_SWITCHES * swInfo, CObjectVector<NWindows::NFile::NFind::CFileInfo> * fiItems)
 {
 	this->swInfo = swInfo;
 	this->fiItems = fiItems;
@@ -498,7 +498,7 @@ STDMETHODIMP CArchiveUpdateCallback::GetProperty(unsigned int nIndex, PROPID pro
 		return S_OK;
 	}
 
-	const NWindows::NFile::NFind::CFileInfoW fiItem = (* this->fiItems)[nIndex];
+	const NWindows::NFile::NFind::CFileInfo fiItem = (* this->fiItems)[nIndex];
 	switch (propID)
 	{
 		case kpidPath:  prop = fiItem.Name;  break;
@@ -929,10 +929,10 @@ int __stdcall Command
 //	case TPI_COMMAND_ADD:
 	{
 		// 入力リストを作成。
-		CObjectVector<NWindows::NFile::NFind::CFileInfoW> fiItems;
+		CObjectVector<NWindows::NFile::NFind::CFileInfo> fiItems;
 		for (unsigned int i = 0; i < _szFiles.GetCount(); i++)
 		{
-			NWindows::NFile::NFind::CFileInfoW fi;
+			NWindows::NFile::NFind::CFileInfo fi;
 			wxFileName fn(_szFiles[i]);
 			fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG, _swInfo->fnDestinationDirectory.GetFullPath());
 			if (! fi.Find(fn.GetFullPath().c_str()))
diff --git a/src/plugin/7zArc/7zArc.vcproj b/src/plugin/7zArc/7zArc.vcproj
index afef0f2..4fa155a 100644
--- a/src/plugin/7zArc/7zArc.vcproj
+++ b/src/plugin/7zArc/7zArc.vcproj
@@ -121,6 +121,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\7-zip\CPP\Common\MyString.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\7-zip\CPP\Common\MyVector.cpp"
 				>
 			</File>
@@ -129,6 +133,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\7-zip\CPP\Common\StringConvert.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\7-zip\CPP\Windows\Time.cpp"
 				>
 			</File>