From 166ef7fd96539a3e2e79610e65aacd5dcb53670a Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Fri, 7 Oct 2005 00:49:05 +0000 Subject: [PATCH] fixes bug 284331 "SHGetMalloc API call is deprecated" patch by David Gardiner (david.gardiner@unisa.edu.au), r=darin git-svn-id: svn://10.0.0.236/trunk@181746 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/xre/nsXREDirProvider.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mozilla/toolkit/xre/nsXREDirProvider.cpp b/mozilla/toolkit/xre/nsXREDirProvider.cpp index 7fd1a378493..1bf696a1165 100644 --- a/mozilla/toolkit/xre/nsXREDirProvider.cpp +++ b/mozilla/toolkit/xre/nsXREDirProvider.cpp @@ -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