From d3db94495ad0f73020dd0947a7411e64b02d5ad3 Mon Sep 17 00:00:00 2001 From: sirakaba Date: Sun, 3 Oct 2010 02:39:28 +0000 Subject: [PATCH] =?utf8?q?=E5=BE=AE=E4=BF=AE=E6=AD=A3=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@379 9df91469-1e22-0410-86e7-ea8537beb833 --- src/plugin/7zArc/7zArc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp index 8784487..4f071be 100644 --- a/src/plugin/7zArc/7zArc.cpp +++ b/src/plugin/7zArc/7zArc.cpp @@ -428,7 +428,7 @@ STDMETHODIMP CArchiveExtractCallback::GetStream(unsigned int nIndex, ISequential this->piInfo.eMessage = TPI_MESSAGE_ASK; this->piInfo.eStatus = TPI_PARAM_DEST; GetFileInformation2(this->hArc, & this->piInfo.fiInfo, nIndex); - this->piInfo.fnDestination = wxFileName(swInfo->fnDestinationDirectory.GetFullPath() + wxFileName::GetPathSeparator() + (swInfo->fStoreDirectoryPathes ? this->piInfo.fiInfo.fnFileName.GetPath() : (wxString) wxEmptyString), this->piInfo.fiInfo.fnFileName.GetFullName()); + this->piInfo.fnDestination = wxFileName(swInfo->fnDestinationDirectory.GetFullPath() + wxFileName::GetPathSeparator() + (swInfo->fStoreDirectoryPathes ? this->piInfo.fiInfo.fnFileName.GetPath() : (wxString) wxEmptyString, wxPATH_DOS), this->piInfo.fiInfo.fnFileName.GetFullName()); if (g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, & this->piInfo) != TPI_CALLBACK_CONTINUE) { this->nErrorCode = TPI_ERROR_D_SKIPPED; @@ -652,10 +652,10 @@ STDMETHODIMP CArchiveUpdateCallback::GetStream(unsigned int nIndex, ISequentialI this->GetProperty(nIndex, kpidPath, & prop); this->piInfo.fiInfo.szStoredName = WC2String(prop.bstrVal); this->piInfo.fiInfo.nFileId = nIndex; - this->piInfo.fiInfo.fnFileName = wxFileName(this->piInfo.fiInfo.szStoredName); + this->piInfo.fiInfo.fnFileName = wxFileName(this->piInfo.fiInfo.szStoredName, wxPATH_DOS); this->piInfo.fiInfo.fnFileName.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG, this->swInfo->fnDestinationDirectory.GetFullPath()); this->piInfo.eStatus = TPI_STATUS_BEGINPROCESS; - this->piInfo.fnDestination = wxFileName(this->piInfo.fiInfo.szStoredName); + this->piInfo.fnDestination = wxFileName(this->piInfo.fiInfo.szStoredName, wxPATH_DOS); // コールバック関数に送信。 if (g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, & this->piInfo) != TPI_CALLBACK_CONTINUE) -- 2.11.0