微修正。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@379 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp
index 8784487..4f071be 100644 (file)
--- 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;\r
        this->piInfo.eStatus    = TPI_PARAM_DEST;\r
        GetFileInformation2(this->hArc, & this->piInfo.fiInfo, nIndex);\r
-       this->piInfo.fnDestination          = wxFileName(swInfo->fnDestinationDirectory.GetFullPath() + wxFileName::GetPathSeparator() + (swInfo->fStoreDirectoryPathes ? this->piInfo.fiInfo.fnFileName.GetPath() : (wxString) wxEmptyString), this->piInfo.fiInfo.fnFileName.GetFullName());\r
+       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());\r
        if (g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, & this->piInfo) != TPI_CALLBACK_CONTINUE)\r
        {\r
                this->nErrorCode = TPI_ERROR_D_SKIPPED;\r
@@ -652,10 +652,10 @@ STDMETHODIMP CArchiveUpdateCallback::GetStream(unsigned int nIndex, ISequentialI
        this->GetProperty(nIndex, kpidPath, & prop);\r
        this->piInfo.fiInfo.szStoredName = WC2String(prop.bstrVal);\r
        this->piInfo.fiInfo.nFileId         = nIndex;\r
-       this->piInfo.fiInfo.fnFileName      = wxFileName(this->piInfo.fiInfo.szStoredName);\r
+       this->piInfo.fiInfo.fnFileName      = wxFileName(this->piInfo.fiInfo.szStoredName, wxPATH_DOS);\r
        this->piInfo.fiInfo.fnFileName.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG, this->swInfo->fnDestinationDirectory.GetFullPath());\r
        this->piInfo.eStatus                = TPI_STATUS_BEGINPROCESS;\r
-       this->piInfo.fnDestination          = wxFileName(this->piInfo.fiInfo.szStoredName);\r
+       this->piInfo.fnDestination          = wxFileName(this->piInfo.fiInfo.szStoredName, wxPATH_DOS);\r
 \r
        // コールバック関数に送信。\r
        if (g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, & this->piInfo) != TPI_CALLBACK_CONTINUE)\r