Use paths_*() functions instead of shlwapi functions

--HG--
branch : stable

diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp
index 17465ee..6204e80 100644 (file)
--- a/Src/7zCommon.cpp
+++ b/Src/7zCommon.cpp
@@ -109,6 +109,7 @@ DATE:               BY:                                     DESCRIPTION:
 #include "version.h"
 #include "Environment.h"
 #include "Merge7zFormatRegister.h"
+#include "paths.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -249,13 +250,10 @@ CTempPathContext *CTempPathContext::DeleteHead()
  */
 DWORD NTAPI VersionOf7z()
 {
-       TCHAR path[MAX_PATH];
-       GetModuleFileName(0, path, sizeof path/sizeof*path);
-       PathRemoveFileSpec(path);
-       PathAppend(path, _T("Merge7z\\7z.dll"));
+       String path = paths_ConcatPath(env_GetProgPath(), _T("Merge7z\\7z.dll"));
        unsigned versionMS = 0;
        unsigned versionLS = 0;
-       CVersionInfo(path).GetFixedFileVersion(versionMS, versionLS);
+       CVersionInfo(path.c_str()).GetFixedFileVersion(versionMS, versionLS);
        return versionMS;
 }
 

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index f37a9b8..663a061 100644 (file)
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -1735,18 +1735,16 @@ void CImgMergeFrame::OnUpdateImgUseBackColor(CCmdUI* pCmdUI)
  */
 bool CImgMergeFrame::GenerateReport(LPCTSTR szFileName)
 {
-       TCHAR imgdir_full[MAX_PATH];
-       String imgdir, imgfilepath[3], diffimg_filename[3];
-       lstrcpy(imgdir_full, ucr::toTString(szFileName).c_str());
-       PathRemoveExtension(imgdir_full);
-       PathAddExtension(imgdir_full, _T(".files"));
-       imgdir = PathFindFileName(imgdir_full);
+       String imgdir_full, imgdir, imgfilepath[3], diffimg_filename[3], path, name, ext;
+       paths_SplitFilename(szFileName, &path, &name, &ext);
+       imgdir_full = paths_ConcatPath(path, name) + _T(".files");
+       imgdir = paths_FindFileName(imgdir_full);
        paths_CreateIfNeeded(imgdir_full);
        for (int i = 0; i < m_pImgMergeWindow->GetPaneCount(); ++i)
        {
                imgfilepath[i] = ucr::toTString(m_pImgMergeWindow->GetFileName(i));
                diffimg_filename[i] = string_format(_T("%s/%d.png"), imgdir.c_str(), i + 1);
-               m_pImgMergeWindow->SaveDiffImageAs(i, ucr::toUTF16(string_format(_T("%s\\%d.png"), imgdir_full, i + 1)).c_str());
+               m_pImgMergeWindow->SaveDiffImageAs(i, ucr::toUTF16(string_format(_T("%s\\%d.png"), imgdir_full.c_str(), i + 1)).c_str());
        }
 
        UniStdioFile file;