From: sdottaka <sdottaka@users.sourceforge.net>
Date: Sun, 24 May 2015 08:49:28 +0000 (+0900)
Subject: FileOrFolderSelect.cpp: Use CoTaskMemFree() instead of IMalloc::Free()
X-Git-Tag: 2.16.4+-jp-10~850^2~48
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d96736ccffee88705a73645157d41cefbc957fde;p=winmerge-jp%2Fwinmerge-jp.git

FileOrFolderSelect.cpp: Use CoTaskMemFree() instead of IMalloc::Free()

--HG--
branch : stable
---

diff --git a/Src/FileOrFolderSelect.cpp b/Src/FileOrFolderSelect.cpp
index 8dd116367..a62f1b9bf 100644
--- a/Src/FileOrFolderSelect.cpp
+++ b/Src/FileOrFolderSelect.cpp
@@ -136,7 +136,6 @@ BOOL SelectFolder(String& path, LPCTSTR root_path /*=NULL*/,
 			HWND hwndOwner /*=NULL*/) 
 {
 	BROWSEINFO bi;
-	LPMALLOC pMalloc;
 	LPITEMIDLIST pidl;
 	TCHAR szPath[MAX_PATH] = {0};
 	BOOL bRet = FALSE;
@@ -155,7 +154,6 @@ BOOL SelectFolder(String& path, LPCTSTR root_path /*=NULL*/,
 	bi.lParam = (LPARAM)root_path;
 
 	pidl = SHBrowseForFolder(&bi);
-
 	if (pidl)
 	{
 		if (SHGetPathFromIDList(pidl, szPath))
@@ -163,10 +161,7 @@ BOOL SelectFolder(String& path, LPCTSTR root_path /*=NULL*/,
 			path = szPath;
 			bRet = TRUE;
 		}
-
-		SHGetMalloc(&pMalloc);
-		pMalloc->Free(pidl);
-		pMalloc->Release();
+		CoTaskMemFree(pidl);
 	}
 	return bRet;
 }