From f15f23e0a3873817856c650afba2fed457934f1a Mon Sep 17 00:00:00 2001
From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Wed, 3 Nov 2010 12:02:25 +0000
Subject: [PATCH 1/1] =?utf8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?utf8?q?=E3=81=AE=E5=B1=9E=E6=80=A7=E3=81=A8=E4=BD=9C=E6=88=90/=E5=8F=82?=
 =?utf8?q?=E7=85=A7=E6=99=82=E5=88=BB=E3=81=AE=E5=BE=A9=E5=85=83=E3=82=92?=
 =?utf8?q?=E8=A1=8C=E3=81=86=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?=
 =?utf8?q?=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@414 9df91469-1e22-0410-86e7-ea8537beb833
---
 doc/history.html              |  7 +++++++
 src/plugin/7zArc/7zArc.cpp    | 24 +++++++++++++++++++-----
 src/plugin/7zArc/7zArc.vcproj |  4 ++++
 src/plugin/7zArc/Makefile     |  2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/doc/history.html b/doc/history.html
index 08c9ae8..d5025c5 100644
--- a/doc/history.html
+++ b/doc/history.html
@@ -38,6 +38,13 @@
        <li class="fix">Linux上でダイアログでファイルを保存したり複数のファイルを選択したりする機能が動作していなかったバグを修正。</li>
       </ul>
      </dd>
+     <dt>7zArc</dt>
+     <dd>
+      <ul>
+       <li class="add">SquashFS,CramFS,PPMdへの対応を追加。</li>
+       <li class="add">ファイルの属性と作成/参照時刻の復元を行う機能を追加。</li>
+      </ul>
+     </dd>
      <dt>cuiWrapper</dt>
      <dd>
       <ul>
diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index c428739..3d40b42 100644
--- a/src/plugin/7zArc/7zArc.cpp
+++ b/src/plugin/7zArc/7zArc.cpp
@@ -82,18 +82,30 @@ int GetFileInformation2(void * _hArchive, TPI_FILEINFO * _fiInfo, wxULongLong_t
 		NWindows::NTime::FileTimeToUnixTime(prop.filetime, t);
 		_fiInfo->tmModified.Set((time_t) t);
 	}
+	else
+	{
+		_fiInfo->tmModified.SetToCurrent();
+	}
 	hArc->GetProperty(nIndex, kpidCTime, & prop);
 	if (prop.vt == VT_FILETIME)
 	{
 		NWindows::NTime::FileTimeToUnixTime(prop.filetime, t);
 		_fiInfo->tmCreate.Set((time_t) t);
 	}
+	else
+	{
+		_fiInfo->tmCreate.SetToCurrent();
+	}
 	hArc->GetProperty(nIndex, kpidATime, & prop);
 	if (prop.vt == VT_FILETIME)
 	{
 		NWindows::NTime::FileTimeToUnixTime(prop.filetime, t);
 		_fiInfo->tmAccess.Set((time_t) t);
 	}
+	else
+	{
+		_fiInfo->tmAccess.SetToCurrent();
+	}
 	hArc->GetProperty(nIndex, kpidPath, & prop);
 	if (prop.vt == VT_BSTR)
 	{
@@ -498,12 +510,14 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(int nResult)
 	default:                                                       this->nErrorCode = TPI_ERROR_UNDEFINED;       break;
 	}
 
-	// 更新時刻を記録。
+	// 時刻を記録。
 	if (_outFileStream != NULL)
 	{
-		FILETIME ft;
-		NWindows::NTime::UnixTimeToFileTime(this->piInfo.fiInfo.tmModified.GetTicks(), ft);
-		_outFileStreamSpec->SetMTime(& ft);
+		FILETIME ftAccess, ftCreate, ftModified;
+		NWindows::NTime::UnixTimeToFileTime(this->piInfo.fiInfo.tmAccess.GetTicks(),   ftAccess);
+		NWindows::NTime::UnixTimeToFileTime(this->piInfo.fiInfo.tmCreate.GetTicks(),   ftCreate);
+		NWindows::NTime::UnixTimeToFileTime(this->piInfo.fiInfo.tmModified.GetTicks(), ftModified);
+		_outFileStreamSpec->SetTime(& ftCreate, & ftAccess, & ftModified);
 		_outFileStreamSpec->Close();
 	}
 	_outFileStream.Release();
@@ -511,7 +525,7 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(int nResult)
 	// 属性を記録。
 	if (this->nMode == NArchive::NExtract::NAskMode::kExtract)
 	{
-//		NWindows::NFile::NDirectory::MySetFileAttributes(this->piInfo.fiInfo.fnFileName.GetFullPath(), this->piInfo.fiInfo.dwAttribute);
+		NWindows::NFile::NDirectory::MySetFileAttributes(this->piInfo.fnDestination.GetFullPath(), this->piInfo.fiInfo.dwAttribute);
 	}
 
 	return S_OK;
diff --git a/src/plugin/7zArc/7zArc.vcproj b/src/plugin/7zArc/7zArc.vcproj
index e9aaea7..4278bae 100644
--- a/src/plugin/7zArc/7zArc.vcproj
+++ b/src/plugin/7zArc/7zArc.vcproj
@@ -103,6 +103,10 @@
 			Name="7-zip"
 			>
 			<File
+				RelativePath=".\7-zip\CPP\Windows\FileDir.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\7-zip\cpp\windows\FileFind.cpp"
 				>
 			</File>
diff --git a/src/plugin/7zArc/Makefile b/src/plugin/7zArc/Makefile
index f9bc917..bdd85ae 100644
--- a/src/plugin/7zArc/Makefile
+++ b/src/plugin/7zArc/Makefile
@@ -4,5 +4,5 @@ PLUGIN_NAME = 7zArc
 7ZBASE      = 7-zip_linux
 CPPFLAGS_ADD= -I$(7ZBASE)/CPP -I$(7ZBASE)/CPP/myWindows -I$(7ZBASE)/CPP/include_windows -I$(7ZBASE)/CPP/7zip/UI/Client7z -DUSE_WIN_FILE
 7ZDIR       = ../../plugin/7zArc/$(7ZBASE)/CPP
-OBJS_ADD    = $(7ZDIR)/7zip/Common/FileStreams.o $(7ZDIR)/Common/MyString.o $(7ZDIR)/Common/MyVector.o $(7ZDIR)/Common/MyWindows.o $(7ZDIR)/Common/StringConvert.o $(7ZDIR)/myWindows/wine_date_and_time.o $(7ZDIR)/Windows/FileFind.o $(7ZDIR)/Windows/FileIO.o $(7ZDIR)/Windows/PropVariant.o $(7ZDIR)/Windows/Time.o
+OBJS_ADD    = $(7ZDIR)/7zip/Common/FileStreams.o $(7ZDIR)/Common/MyString.o $(7ZDIR)/Common/MyVector.o $(7ZDIR)/Common/MyWindows.o $(7ZDIR)/Common/StringConvert.o $(7ZDIR)/myWindows/wine_date_and_time.o $(7ZDIR)/Windows/FileDir.o $(7ZDIR)/Windows/FileFind.o $(7ZDIR)/Windows/FileIO.o $(7ZDIR)/Windows/PropVariant.o $(7ZDIR)/Windows/Time.o
 include ../Makefile.default
-- 
2.11.0