Commit 84e06f22 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

shell32: Do not use SHGetMalloc() internally.

parent 664d57d0
...@@ -405,7 +405,6 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLEST ...@@ -405,7 +405,6 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLEST
static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename)
{ {
IShellLinkImpl *This = impl_from_IPersistFile(iface); IShellLinkImpl *This = impl_from_IPersistFile(iface);
IMalloc *pMalloc;
TRACE("(%p)->(%p)\n", This, filename); TRACE("(%p)->(%p)\n", This, filename);
...@@ -415,8 +414,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *f ...@@ -415,8 +414,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *f
return S_FALSE; return S_FALSE;
} }
SHGetMalloc(&pMalloc); *filename = CoTaskMemAlloc((strlenW(This->filepath) + 1) * sizeof(WCHAR));
*filename = IMalloc_Alloc(pMalloc, (strlenW(This->filepath)+1)*sizeof(WCHAR));
if (!*filename) return E_OUTOFMEMORY; if (!*filename) return E_OUTOFMEMORY;
strcpyW(*filename, This->filepath); strcpyW(*filename, This->filepath);
......
...@@ -760,7 +760,6 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) ...@@ -760,7 +760,6 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
CHAR link_dir[MAX_PATH]; CHAR link_dir[MAX_PATH];
CHAR new_lnk_filepath[MAX_PATH]; CHAR new_lnk_filepath[MAX_PATH];
CHAR new_lnk_name[MAX_PATH]; CHAR new_lnk_name[MAX_PATH];
IMalloc *ppM;
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
HWND hwnd = 0; /* FIXME: get real window handle */ HWND hwnd = 0; /* FIXME: get real window handle */
INT ret; INT ret;
...@@ -815,24 +814,18 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) ...@@ -815,24 +814,18 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
/* Get path to user's "Recent" directory /* Get path to user's "Recent" directory
*/ */
if(SUCCEEDED(SHGetMalloc(&ppM))) { if (SUCCEEDED(SHGetSpecialFolderLocation(hwnd, CSIDL_RECENT, &pidl)))
if (SUCCEEDED(SHGetSpecialFolderLocation(hwnd, CSIDL_RECENT, {
&pidl))) {
SHGetPathFromIDListA(pidl, link_dir); SHGetPathFromIDListA(pidl, link_dir);
IMalloc_Free(ppM, pidl); ILFree(pidl);
} }
else { else
{
/* serious issues */ /* serious issues */
link_dir[0] = 0; link_dir[0] = 0;
ERR("serious issues 1\n"); ERR("serious issues 1\n");
} }
IMalloc_Release(ppM);
}
else {
/* serious issues */
link_dir[0] = 0;
ERR("serious issues 2\n");
}
TRACE("Users Recent dir %s\n", link_dir); TRACE("Users Recent dir %s\n", link_dir);
/* If no input, then go clear the lists */ /* If no input, then go clear the lists */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment