Nikolay Sivov : wineboot: Do not use SHGetMalloc() internally.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 664d57d0ebea341b38507739a01ece74e0ef55c0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=664d57d0ebea341b38507739a...

Author: Nikolay Sivov 
Date:   Mon Jan 27 11:33:51 2020 +0300

wineboot: Do not use SHGetMalloc() internally.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

programs/wineboot/wineboot.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index dd9a5bd8f6..8e3e234397 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -1267,7 +1267,6 @@ static BOOL ProcessStartupItems(void)
 {
     BOOL ret = FALSE;
     HRESULT hr;
-    IMalloc *ppM = NULL;
     IShellFolder *psfDesktop = NULL, *psfStartup = NULL;
     LPITEMIDLIST pidlStartup = NULL, pidlItem;
     ULONG NumPIDLs;
@@ -1277,13 +1276,6 @@ static BOOL ProcessStartupItems(void)

WINE_TRACE("Processing items in the StartUp folder.\n");

-    hr = SHGetMalloc(&ppM);
-    if (FAILED(hr))
-    {
-	WINE_ERR("Couldn't get IMalloc object.\n");
-	goto done;
-    }
-
     hr = SHGetDesktopFolder(&psfDesktop);
     if (FAILED(hr))
     {
@@ -1333,7 +1325,7 @@ static BOOL ProcessStartupItems(void)
             }
    }

-	IMalloc_Free(ppM, pidlItem);
+        ILFree(pidlItem);
     }

/* Return success */
@@ -1342,7 +1334,7 @@ static BOOL ProcessStartupItems(void)
 done:
     if (iEnumList) IEnumIDList_Release(iEnumList);
     if (psfStartup) IShellFolder_Release(psfStartup);
-    if (pidlStartup) IMalloc_Free(ppM, pidlStartup);
+    if (pidlStartup) ILFree(pidlStartup);

return ret;
 }