Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes bug 284331 "SHGetMalloc API call is deprecated" patch by David Gardiner (david.gardiner@unisa.edu.au), r=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@181746 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net 2005-10-07 00:49:05 +00:00
parent c513e3af68
commit 166ef7fd96
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/toolkit/xre/nsXREDirProvider.cpp
View File

@ -674,12 +674,8 @@ GetProfileFolderName(char* aProfileFolderName, const char* aSource)
static nsresult
GetShellFolderPath(int folder, char result[MAXPATHLEN])
{
LPMALLOC pMalloc;
LPITEMIDLIST pItemIDList = NULL;
if (!SUCCEEDED(SHGetMalloc(&pMalloc)))
return NS_ERROR_OUT_OF_MEMORY;
nsresult rv;
if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, folder, &pItemIDList)) &&
SUCCEEDED(SHGetPathFromIDList(pItemIDList, result))) {
@ -688,9 +684,8 @@ GetShellFolderPath(int folder, char result[MAXPATHLEN])
rv = NS_ERROR_NOT_AVAILABLE;
}
if (pItemIDList)
pMalloc->Free(pItemIDList);
pMalloc->Release();
CoTaskMemFree(pItemIDList);
return rv;
}
#endif