Rémi Bernon : ole32: Allocate and free moniker lists with CRT allocations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 93f8819c95407769992c69f75905708178f2b5ce
URL:    https://gitlab.winehq.org/wine/wine/-/commit/93f8819c95407769992c69f75905708...

Author: Rémi Bernon 
Date:   Thu Jan 12 20:58:16 2023 +0100

ole32: Allocate and free moniker lists with CRT allocations.

The RunningObjectTableImpl_EnumRunning codepath returns a list allocated
from combase MIDL_user_allocate, which uses msvcrt heap.

---

dlls/ole32/moniker.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index f98b21bdf2b..ec026758b2f 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -1033,8 +1033,8 @@ static ULONG   WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface)
         TRACE("(%p) Deleting\n",This);

for (i = 0; i < This->moniker_list->size; i++)
-            HeapFree(GetProcessHeap(), 0, This->moniker_list->interfaces[i]);
-        HeapFree(GetProcessHeap(), 0, This->moniker_list);
+            free(This->moniker_list->interfaces[i]);
+        free(This->moniker_list);
         HeapFree(GetProcessHeap(), 0, This);
     }

@@ -1119,7 +1119,7 @@ static HRESULT   WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker

*ppenum = NULL;

-    moniker_list = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size]));
+    moniker_list = malloc(FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size]));
     if (!moniker_list)
         return E_OUTOFMEMORY;

@@ -1127,13 +1127,13 @@ static HRESULT   WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker
     for (i = 0; i < This->moniker_list->size; i++)
     {
         SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->moniker_list->interfaces[i]->ulCntData]);
-        moniker_list->interfaces[i] = HeapAlloc(GetProcessHeap(), 0, size);
+        moniker_list->interfaces[i] = malloc(size);
         if (!moniker_list->interfaces[i])
         {
             ULONG end = i;
             for (i = 0; i < end; i++)
-                HeapFree(GetProcessHeap(), 0, moniker_list->interfaces[i]);
-            HeapFree(GetProcessHeap(), 0, moniker_list);
+                free(moniker_list->interfaces[i]);
+            free(moniker_list);
             return E_OUTOFMEMORY;
         }
         memcpy(moniker_list->interfaces[i], This->moniker_list->interfaces[i], size);