OSDN Git Service

TPI_FILEINFO, TPI_ARCHIVEINFOのtmModifiedをtmModifyに変更。
authorsirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Wed, 9 Feb 2011 13:29:52 +0000 (13:29 +0000)
committersirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Wed, 9 Feb 2011 13:29:52 +0000 (13:29 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@482 9df91469-1e22-0410-86e7-ea8537beb833

src/common/handle/TPIHandle.cpp
src/common/header/plugin.h
src/lychee/cls_listctrl.cpp
src/lychee/dlg_process.cpp
src/lychee/frm_main.cpp
src/plugin/7zArc/7zArc.cpp
src/plugin/calLibrary/calLibrary.cpp
src/plugin/cuiWrapper/cuiWrapper.cpp
src/plugin/eggArc/eggArc.cpp
src/plugin/rarArc/rarArc.cpp
src/plugin/spiLibrary/spiLibrary.cpp

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