Remove SHGetMalloc

Author: gorogoro123

sakura_core/util/shell.cpp

@@ -175,22 +175,19 @@ static LRESULT CALLBACK PropSheetWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, L
 				//       （フォルダ名の末尾に'\\'を付加してもWindows 2000では付加しないのと同じ動作になってしまう）
 				LPSHELLFOLDER pDesktopFolder;
 				if( SUCCEEDED(::SHGetDesktopFolder(&pDesktopFolder)) ){
-					LPMALLOC pMalloc;
-					if( SUCCEEDED(::SHGetMalloc(&pMalloc)) ){
+					{
 						LPITEMIDLIST pIDL;
 						WCHAR* pszDisplayName = szPath;
 						if( SUCCEEDED(pDesktopFolder->ParseDisplayName(nullptr, nullptr, pszDisplayName, nullptr, &pIDL, nullptr)) ){
-							SHELLEXECUTEINFO si;
-							::ZeroMemory( &si, sizeof(si) );
+							SHELLEXECUTEINFO si = {};
 							si.cbSize   = sizeof(si);
 							si.fMask    = SEE_MASK_IDLIST;
 							si.lpVerb   = L"open";
 							si.lpIDList = pIDL;
 							si.nShow    = SW_SHOWNORMAL;
 							::ShellExecuteEx( &si );	// フォルダを開く
-							pMalloc->Free( (void*)pIDL );
+							CoTaskMemFree(pIDL);
 						}
-						pMalloc->Release();
 					}
 					pDesktopFolder->Release();
 				}

sakura_core/window/CEditWnd.cpp

@@ -3385,22 +3385,20 @@ LRESULT CEditWnd::OnMouseMove( WPARAM wParam, LPARAM lParam )
 					cmemDir   = GetDocument()->m_cDocFile.GetFilePathClass().GetDirPath().c_str();
 
 					IDataObject *DataObject;
-					IMalloc *Malloc;
 					IShellFolder *Desktop, *Folder;
 					LPITEMIDLIST PathID, ItemID;
-					SHGetMalloc(&Malloc);
 					SHGetDesktopFolder(&Desktop);
 					DWORD Eaten, Attribs;
 					if(SUCCEEDED(Desktop->ParseDisplayName(nullptr, nullptr, cmemDir.GetStringPtr(), &Eaten, &PathID, &Attribs)))
 					{
 						Desktop->BindToObject(PathID, nullptr, IID_IShellFolder, (void**)&Folder);
-						Malloc->Free(PathID);
+						CoTaskMemFree(PathID);
 						if(SUCCEEDED(Folder->ParseDisplayName(nullptr, nullptr, cmemTitle.GetStringPtr(), &Eaten, &ItemID, &Attribs)))
 						{
 							LPCITEMIDLIST List[1];
 							List[0] = ItemID;
 							Folder->GetUIObjectOf(nullptr, 1, List, IID_IDataObject, nullptr, (void**)&DataObject);
-							Malloc->Free(ItemID);
+							CoTaskMemFree(ItemID);
 #define DDASTEXT
 #ifdef  DDASTEXT
 							//テキストでも持たせる…便利
@@ -3434,7 +3432,6 @@ LRESULT CEditWnd::OnMouseMove( WPARAM wParam, LPARAM lParam )
 						Folder->Release();
 					}
 					Desktop->Release();
-					Malloc->Release();
 				}
 			}
 		}