From: sirakaba Date: Wed, 9 Feb 2011 13:29:52 +0000 (+0000) Subject: TPI_FILEINFO, TPI_ARCHIVEINFOのtmModifiedをtmModifyに変更。 X-Git-Tag: 0.01beta10~4 X-Git-Url: http://git.osdn.net/view?p=tpi%2Flychee.git;a=commitdiff_plain;h=1d7a7ef98079b75ef3c9cbe99e66310bdec43a82 TPI_FILEINFO, TPI_ARCHIVEINFOのtmModifiedをtmModifyに変更。 git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@482 9df91469-1e22-0410-86e7-ea8537beb833 --- diff --git a/src/common/handle/TPIHandle.cpp b/src/common/handle/TPIHandle.cpp index b226088..c54bdcf 100644 --- a/src/common/handle/TPIHandle.cpp +++ b/src/common/handle/TPIHandle.cpp @@ -162,7 +162,7 @@ bool TPIHandle::GetFileInformation(TPI_FILEINFO * _fiInfo, bool _bFirst) _fiInfo->dwCRC32 = 0; _fiInfo->tmAccess = 0; _fiInfo->tmCreate = 0; - _fiInfo->tmModified = 0; + _fiInfo->tmModify = 0; _fiInfo->nPackedSize = 0; _fiInfo->nUnpackedSize = 0; _fiInfo->fnFileName.Clear(); @@ -198,7 +198,7 @@ bool TPIHandle::GetArchiveInformation(TPI_ARCHIVEINFO * _aiInfo) _aiInfo->nRecoveryRecord= 0; _aiInfo->tmAccess = 0; _aiInfo->tmCreate = 0; - _aiInfo->tmModified = 0; + _aiInfo->tmModify = 0; _aiInfo->eOSType = 0; _aiInfo->nFileSize = 0; _aiInfo->nPackedSize = 0; diff --git a/src/common/header/plugin.h b/src/common/header/plugin.h index e616023..6c1a5ea 100644 --- a/src/common/header/plugin.h +++ b/src/common/header/plugin.h @@ -291,7 +291,7 @@ typedef struct _TPI_tagFILEINFO wxULongLong_t nFileId; /**< 一意のファイルID */ wxDateTime tmAccess; /**< 最終参照日時 */ wxDateTime tmCreate; /**< 作成日時 */ - wxDateTime tmModified; /**< 最終更新日時 */ + wxDateTime tmModify; /**< 最終更新日時 */ wxFileName fnFileName; /**< ファイル名 */ wxString szStoredName; /**< 格納された名前 */ wxString szMethod; /**< 格納メソッド */ @@ -321,7 +321,7 @@ typedef struct _TPI_tagARCHIVEINFO wxULongLong_t nSplitSize; /**< 分割サイズ */ wxDateTime tmAccess; /**< 最終参照日時 */ wxDateTime tmCreate; /**< 作成日時 */ - wxDateTime tmModified; /**< 最終更新日時 */ + wxDateTime tmModify; /**< 最終更新日時 */ wxFileName fnArchive; /**< ファイル名 */ wxString szComment; /**< コメント */ TPI_FORMATINFO fiInfo; /**< 形式に関する情報を格納 */ diff --git a/src/lychee/cls_listctrl.cpp b/src/lychee/cls_listctrl.cpp index 44de895..23df9f1 100644 --- a/src/lychee/cls_listctrl.cpp +++ b/src/lychee/cls_listctrl.cpp @@ -77,7 +77,7 @@ wxString myListCtrl::OnGetItemText(long i, long column) const #endif } case 6: - return fi->tmModified.Format(_("%Y/%m/%d %H:%M:%S")); + return fi->tmModify.Format(_("%Y/%m/%d %H:%M:%S")); case 7: return fi->fnFileName.GetPath(); case 8: @@ -137,7 +137,7 @@ int ListCtrlCompareProc(void ** pItem1, void ** pItem2) g_nSortColumn == 1 ? NumCmp(nUnpackedSize) : // Unpacked g_nSortColumn == 2 ? NumCmp(nPackedSize) : // Packed g_nSortColumn == 3 ? NumCmp(wCompressRatio) : // Ratio - g_nSortColumn == 6 ? NumCmp(tmModified) : // Last modified + g_nSortColumn == 6 ? NumCmp(tmModify) : // Last modified g_nSortColumn == 7 ? ::wxStricmp(item1->fnFileName.GetPath(), item2->fnFileName.GetPath()) : // Path g_nSortColumn == 8 ? ::wxStricmp(GetFileTypeName(item1->fnFileName), GetFileTypeName(item2->fnFileName)) : // Type g_nSortColumn == 9 ? NumCmp(nFileId) : // No diff --git a/src/lychee/dlg_process.cpp b/src/lychee/dlg_process.cpp index 54cb22d..d23eded 100644 --- a/src/lychee/dlg_process.cpp +++ b/src/lychee/dlg_process.cpp @@ -201,7 +201,7 @@ int ProcessDialog::CallbackProc(unsigned int _uMsg, void * _pStructure) { OverwriteDialog odDlg; odDlg.fnExist = & piInfo->fnDestination; - odDlg.tmWrite = & piInfo->fiInfo.tmModified; + odDlg.tmWrite = & piInfo->fiInfo.tmModify; odDlg.nWriteSize = piInfo->fiInfo.nUnpackedSize; this->nOverwriteMode = odDlg.ShowModal(); diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp index bab6376..6e53a3c 100644 --- a/src/lychee/frm_main.cpp +++ b/src/lychee/frm_main.cpp @@ -509,10 +509,10 @@ void MainFrame::OnArcOpen(wxCommandEvent& e) this->statusbar->SetStatusText(this->fnArchive.GetFullPath(), 4); this->statusbar->SetToolTip( wxString::Format( - _("%s(%s)\nModified: %s\nCreated: %s\nTPI: %s(%s)"), + _("%s(%s)\nModify: %s\nCreate: %s\nTPI: %s(%s)"), this->fnArchive.GetFullName().c_str(), this->aiArchive.fiInfo.szTypeName.c_str(), - this->aiArchive.tmModified.Format(_("%Y/%m/%d %H:%M:%S")).c_str(), - this->aiArchive.tmCreate.Format( _("%Y/%m/%d %H:%M:%S")).c_str(), + this->aiArchive.tmModify.Format(_("%Y/%m/%d %H:%M:%S")).c_str(), + this->aiArchive.tmCreate.Format(_("%Y/%m/%d %H:%M:%S")).c_str(), this->aiArchive.fiInfo.szTPIName.c_str(), this->aiArchive.fiInfo.szEngineName.c_str() ) ); diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp index ec5250d..d1c8885 100644 --- a/src/plugin/7zArc/7zArc.cpp +++ b/src/plugin/7zArc/7zArc.cpp @@ -93,11 +93,11 @@ int GetFileInformation2(void * _hArchive, TPI_FILEINFO * _fiInfo, wxULongLong_t if (prop.vt == VT_FILETIME) { NWindows::NTime::FileTimeToUnixTime(prop.filetime, t); - _fiInfo->tmModified.Set((time_t) t); + _fiInfo->tmModify.Set((time_t) t); } else { - _fiInfo->tmModified.SetToCurrent(); + _fiInfo->tmModify.SetToCurrent(); } hArc->GetProperty(nIndex, kpidCTime, & prop); if (prop.vt == VT_FILETIME) @@ -388,11 +388,11 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(int nResult) // 時刻を記録。 if (_outFileStream != NULL) { - 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); + FILETIME ftAccess, ftCreate, ftModify; + NWindows::NTime::UnixTimeToFileTime(this->piInfo.fiInfo.tmAccess.GetTicks(), ftAccess); + NWindows::NTime::UnixTimeToFileTime(this->piInfo.fiInfo.tmCreate.GetTicks(), ftCreate); + NWindows::NTime::UnixTimeToFileTime(this->piInfo.fiInfo.tmModify.GetTicks(), ftModify); + _outFileStreamSpec->SetTime(& ftCreate, & ftAccess, & ftModify); _outFileStreamSpec->Close(); } _outFileStream.Release(); @@ -535,15 +535,9 @@ STDMETHODIMP CArchiveUpdateCallback::GetStream(unsigned int nIndex, ISequentialI this->GetProperty(nIndex, kpidSize, & prop); this->piInfo.fiInfo.nUnpackedSize = prop.vt == VT_UI8 ? prop.uhVal.QuadPart : prop.ulVal; unsigned int t; - this->GetProperty(nIndex, kpidMTime, & prop); - NWindows::NTime::FileTimeToUnixTime(prop.filetime, t); - this->piInfo.fiInfo.tmModified.Set((time_t) t); - this->GetProperty(nIndex, kpidCTime, & prop); - NWindows::NTime::FileTimeToUnixTime(prop.filetime, t); - this->piInfo.fiInfo.tmCreate.Set((time_t) t); - this->GetProperty(nIndex, kpidATime, & prop); - NWindows::NTime::FileTimeToUnixTime(prop.filetime, t); - this->piInfo.fiInfo.tmAccess.Set((time_t) t); + this->GetProperty(nIndex, kpidMTime, & prop); NWindows::NTime::FileTimeToUnixTime(prop.filetime, t); this->piInfo.fiInfo.tmModify.Set((time_t) t); + this->GetProperty(nIndex, kpidCTime, & prop); NWindows::NTime::FileTimeToUnixTime(prop.filetime, t); this->piInfo.fiInfo.tmCreate.Set((time_t) t); + this->GetProperty(nIndex, kpidATime, & prop); NWindows::NTime::FileTimeToUnixTime(prop.filetime, t); this->piInfo.fiInfo.tmAccess.Set((time_t) t); this->GetProperty(nIndex, kpidPath, & prop); this->piInfo.fiInfo.szStoredName = WC2String(prop.bstrVal); this->piInfo.fiInfo.nFileId = nIndex; @@ -852,7 +846,7 @@ int __stdcall GetArchiveInformation if (prop.vt == VT_FILETIME) { NWindows::NTime::FileTimeToUnixTime(prop.filetime, t); - _aiInfo->tmModified.Set((time_t) t); + _aiInfo->tmModify.Set((time_t) t); } hArc->GetArchiveProperty(kpidCTime, & prop); if (prop.vt == VT_FILETIME) diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp index 9b770ec..88059bc 100644 --- a/src/plugin/calLibrary/calLibrary.cpp +++ b/src/plugin/calLibrary/calLibrary.cpp @@ -94,7 +94,7 @@ BOOL __stdcall CallbackProc(HWND, unsigned int _uMsg, unsigned int _uState, void // EXTRACTINGINFOEXW -> TPI_FILEINFO変換。 piInfo.fiInfo.dwCRC32 = ex->dwCRC; - piInfo.fiInfo.tmModified.SetFromDOS(MAKELONG(ex->wTime, ex->wDate)); + piInfo.fiInfo.tmModify.SetFromDOS(MAKELONG(ex->wTime, ex->wDate)); piInfo.fiInfo.nPackedSize = ex->dwCompressedSize; piInfo.fiInfo.nUnpackedSize = ex->exinfo.dwFileSize; piInfo.fiInfo.eOSType = ex->uOSType; @@ -113,7 +113,7 @@ BOOL __stdcall CallbackProc(HWND, unsigned int _uMsg, unsigned int _uState, void // EXTRACTINGINFOEX -> TPI_FILEINFO変換。 piInfo.fiInfo.dwCRC32 = ex->dwCRC; - piInfo.fiInfo.tmModified.SetFromDOS(MAKELONG(ex->wTime, ex->wDate)); + piInfo.fiInfo.tmModify.SetFromDOS(MAKELONG(ex->wTime, ex->wDate)); piInfo.fiInfo.nPackedSize = ex->dwCompressedSize; piInfo.fiInfo.nUnpackedSize = ex->exinfo.dwFileSize; piInfo.fiInfo.eOSType = ex->uOSType; @@ -139,7 +139,7 @@ BOOL __stdcall CallbackProc(HWND, unsigned int _uMsg, unsigned int _uState, void piInfo.fiInfo.dwCRC32 = ex->dwCRC; piInfo.fiInfo.tmAccess = FileTimeToWxDateTime(& ex->ftAccessTime); piInfo.fiInfo.tmCreate = FileTimeToWxDateTime(& ex->ftCreateTime); - piInfo.fiInfo.tmModified = FileTimeToWxDateTime(& ex->ftWriteTime); + piInfo.fiInfo.tmModify = FileTimeToWxDateTime(& ex->ftWriteTime); piInfo.fiInfo.nPackedSize = ex->llCompressedSize; piInfo.fiInfo.nUnpackedSize = ex->llFileSize; piInfo.fiInfo.eOSType = ex->uOSType; @@ -161,7 +161,7 @@ BOOL __stdcall CallbackProc(HWND, unsigned int _uMsg, unsigned int _uState, void piInfo.fiInfo.dwCRC32 = ex->dwCRC; piInfo.fiInfo.tmAccess = FileTimeToWxDateTime(& ex->ftAccessTime); piInfo.fiInfo.tmCreate = FileTimeToWxDateTime(& ex->ftCreateTime); - piInfo.fiInfo.tmModified = FileTimeToWxDateTime(& ex->ftWriteTime); + piInfo.fiInfo.tmModify = FileTimeToWxDateTime(& ex->ftWriteTime); piInfo.fiInfo.nPackedSize = ex->llCompressedSize; piInfo.fiInfo.nUnpackedSize = ex->llFileSize; piInfo.fiInfo.eOSType = ex->uOSType; @@ -252,7 +252,7 @@ BOOL __stdcall EnumMembersProc(void * _lpEis) piInfo.fiInfo.dwCRC32 = ex->dwCRC; piInfo.fiInfo.tmAccess = FileTimeToWxDateTime(& ex->ftAccessTime); piInfo.fiInfo.tmCreate = FileTimeToWxDateTime(& ex->ftCreateTime); - piInfo.fiInfo.tmModified = FileTimeToWxDateTime(& ex->ftWriteTime); + piInfo.fiInfo.tmModify = FileTimeToWxDateTime(& ex->ftWriteTime); piInfo.fiInfo.nPackedSize = ex->dwCompressedSize; piInfo.fiInfo.nUnpackedSize = ex->dwOriginalSize; piInfo.fiInfo.eOSType = ex->uOSType; @@ -281,7 +281,7 @@ BOOL __stdcall EnumMembersProc(void * _lpEis) piInfo.fiInfo.dwCRC32 = ex->dwCRC; piInfo.fiInfo.tmAccess = FileTimeToWxDateTime(& ex->ftAccessTime); piInfo.fiInfo.tmCreate = FileTimeToWxDateTime(& ex->ftCreateTime); - piInfo.fiInfo.tmModified = FileTimeToWxDateTime(& ex->ftWriteTime); + piInfo.fiInfo.tmModify = FileTimeToWxDateTime(& ex->ftWriteTime); piInfo.fiInfo.nPackedSize = ex->dwCompressedSize; piInfo.fiInfo.nUnpackedSize = ex->dwOriginalSize; piInfo.fiInfo.eOSType = ex->uOSType; @@ -313,7 +313,7 @@ BOOL __stdcall EnumMembersProc(void * _lpEis) piInfo.fiInfo.dwCRC32 = ex->dwCRC; piInfo.fiInfo.tmAccess = FileTimeToWxDateTime(& ex->ftAccessTime); piInfo.fiInfo.tmCreate = FileTimeToWxDateTime(& ex->ftCreateTime); - piInfo.fiInfo.tmModified = FileTimeToWxDateTime(& ex->ftWriteTime); + piInfo.fiInfo.tmModify = FileTimeToWxDateTime(& ex->ftWriteTime); piInfo.fiInfo.nPackedSize = ex->llCompressedSize; piInfo.fiInfo.nUnpackedSize = ex->llOriginalSize; piInfo.fiInfo.eOSType = ex->uOSType; @@ -342,7 +342,7 @@ BOOL __stdcall EnumMembersProc(void * _lpEis) piInfo.fiInfo.dwCRC32 = ex->dwCRC; piInfo.fiInfo.tmAccess = FileTimeToWxDateTime(& ex->ftAccessTime); piInfo.fiInfo.tmCreate = FileTimeToWxDateTime(& ex->ftCreateTime); - piInfo.fiInfo.tmModified = FileTimeToWxDateTime(& ex->ftWriteTime); + piInfo.fiInfo.tmModify = FileTimeToWxDateTime(& ex->ftWriteTime); piInfo.fiInfo.nPackedSize = ex->llCompressedSize; piInfo.fiInfo.nUnpackedSize = ex->llOriginalSize; piInfo.fiInfo.eOSType = ex->uOSType; @@ -821,7 +821,7 @@ int __stdcall GetFileInformation _fiInfo->eOSType = iiInfoW.uOSType; _fiInfo->nPackedSize = iiInfoW.dwCompressedSize; _fiInfo->nUnpackedSize = iiInfoW.dwOriginalSize; - _fiInfo->tmModified.SetFromDOS(MAKELONG(iiInfoW.wTime, iiInfoW.wDate)); + _fiInfo->tmModify.SetFromDOS(MAKELONG(iiInfoW.wTime, iiInfoW.wDate)); _fiInfo->szStoredName = WC2String(iiInfoW.szFileName); if (wcslen(iiInfoW.szFileName) >= 510 && fpName) { @@ -836,7 +836,7 @@ int __stdcall GetFileInformation _fiInfo->eOSType = iiInfo.uOSType; _fiInfo->nPackedSize = iiInfo.dwCompressedSize; _fiInfo->nUnpackedSize = iiInfo.dwOriginalSize; - _fiInfo->tmModified.SetFromDOS(MAKELONG(iiInfo.wTime, iiInfo.wDate)); + _fiInfo->tmModify.SetFromDOS(MAKELONG(iiInfo.wTime, iiInfo.wDate)); _fiInfo->szStoredName = UTF82String(iiInfo.szFileName); if (strlen(iiInfo.szFileName) >= 510 && fpName) { @@ -946,7 +946,7 @@ int __stdcall GetArchiveInformation FILETIME ft; MySetArcTime(GetArcAccessTime, tmAccess, false); MySetArcTime(GetArcCreateTime, tmCreate, false); - MySetArcTime(GetArcWriteTime, tmModified, true); + MySetArcTime(GetArcWriteTime, tmModify, true); fpProc = ::GetAPIAddress("GetArcRatio", false); if (fpProc != NULL) diff --git a/src/plugin/cuiWrapper/cuiWrapper.cpp b/src/plugin/cuiWrapper/cuiWrapper.cpp index 675864b..7c6da87 100644 --- a/src/plugin/cuiWrapper/cuiWrapper.cpp +++ b/src/plugin/cuiWrapper/cuiWrapper.cpp @@ -387,7 +387,7 @@ int __stdcall GetFileInformation // 更新時刻取得。 if (piDate.nStart != 0 || piDate.nCount != 0) { - _fiInfo->tmModified.ParseFormat(piDate.nCount == 0 ? asOutput[s_nCurrentLine + piDate.nLine].Mid(piDate.nStart) : asOutput[s_nCurrentLine + piDate.nLine].Mid(piDate.nStart, piDate.nCount), szDateFormat); + _fiInfo->tmModify.ParseFormat(piDate.nCount == 0 ? asOutput[s_nCurrentLine + piDate.nLine].Mid(piDate.nStart) : asOutput[s_nCurrentLine + piDate.nLine].Mid(piDate.nStart, piDate.nCount), szDateFormat); } // 最後に次の行へ進めておく。 diff --git a/src/plugin/eggArc/eggArc.cpp b/src/plugin/eggArc/eggArc.cpp index accf53e..2763956 100644 --- a/src/plugin/eggArc/eggArc.cpp +++ b/src/plugin/eggArc/eggArc.cpp @@ -86,7 +86,7 @@ int __stdcall GetFileInformation2 _fiInfo->dwCRC32 = fhInfo.crc; _fiInfo->nPackedSize = fhInfo.packedSize; _fiInfo->nUnpackedSize = fhInfo.unpackedSize; - _fiInfo->tmModified = fhInfo.lastModified; + _fiInfo->tmModify = fhInfo.lastModified; _fiInfo->szComment = WC2String(fhInfo.comment); _fiInfo->szStoredName = WC2String(fhInfo.fileName); _fiInfo->szMethod = fhInfo.method == 2 ? wxT("ALZ") : fhInfo.method == 0 ? wxT("EGG") : wxT("unknown"); diff --git a/src/plugin/rarArc/rarArc.cpp b/src/plugin/rarArc/rarArc.cpp index b2c1652..edf75e8 100644 --- a/src/plugin/rarArc/rarArc.cpp +++ b/src/plugin/rarArc/rarArc.cpp @@ -302,7 +302,7 @@ int __stdcall GetFileInformation _fiInfo->nUnpackedSize = hdInfo.UnpSizeHigh; _fiInfo->nUnpackedSize = _fiInfo->nUnpackedSize << 32; _fiInfo->nUnpackedSize += hdInfo.UnpSize; - _fiInfo->tmModified.SetFromDOS(hdInfo.FileTime); + _fiInfo->tmModify.SetFromDOS(hdInfo.FileTime); _fiInfo->eOSType = hdInfo.HostOS; _fiInfo->szStoredName = WC2String(hdInfo.FileNameW); _fiInfo->szMethod.Printf(wxT("%x"), hdInfo.Method); @@ -404,7 +404,7 @@ int __stdcall Command piInfo.fiInfo.nUnpackedSize = hdInfo.UnpSizeHigh; piInfo.fiInfo.nUnpackedSize = piInfo.fiInfo.nUnpackedSize << 32; piInfo.fiInfo.nUnpackedSize += hdInfo.UnpSize; - piInfo.fiInfo.tmModified.SetFromDOS(hdInfo.FileTime); + piInfo.fiInfo.tmModify.SetFromDOS(hdInfo.FileTime); if (g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, & piInfo) != TPI_CALLBACK_CONTINUE) { nErrorCode = TPI_ERROR_D_SKIPPED; diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp index f37316a..6e614f4 100644 --- a/src/plugin/spiLibrary/spiLibrary.cpp +++ b/src/plugin/spiLibrary/spiLibrary.cpp @@ -256,7 +256,7 @@ int __stdcall GetFileInformation _fiInfo->nUnpackedSize = pfiInfo.filesize; _fiInfo->wCompressRatio = pfiInfo.compsize >= pfiInfo.filesize ? 1000 : (WORD) (1000 * pfiInfo.compsize / pfiInfo.filesize); _fiInfo->nFileId = nFilePointer++; - _fiInfo->tmModified = pfiInfo.timestamp; + _fiInfo->tmModify = pfiInfo.timestamp; _fiInfo->szStoredName = MB2String(pfiInfo.path) + MB2String(pfiInfo.filename); _fiInfo->fnFileName = wxFileName(_fiInfo->szStoredName); _fiInfo->szMethod = MB2String((char *) pfiInfo.method);