Nikolay Sivov : oleaut32: Use CoTaskMem* when dealing with CUSTDATA.

Alexandre Julliard julliard at winehq.org
Mon Jan 27 13:32:53 CST 2014


Module: wine
Branch: master
Commit: 1abafbffda7a1db8ba76a73a31569413c14c6440
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1abafbffda7a1db8ba76a73a31569413c14c6440

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Jan 27 00:12:11 2014 +0400

oleaut32: Use CoTaskMem* when dealing with CUSTDATA.

---

 dlls/oleaut32/typelib.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 812612a..d94abe7 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5343,7 +5343,7 @@ static HRESULT TLB_copy_all_custdata(struct list *custdata_list, CUSTDATA *pCust
 
     ct = list_count(custdata_list);
 
-    pCustData->prgCustData = heap_alloc_zero(ct * sizeof(CUSTDATAITEM));
+    pCustData->prgCustData = CoTaskMemAlloc(ct * sizeof(CUSTDATAITEM));
     if(!pCustData->prgCustData)
         return E_OUTOFMEMORY;
 
@@ -11230,8 +11230,7 @@ void WINAPI ClearCustData(CUSTDATA *lpCust)
             for (i = 0; i < lpCust->cCustData; i++)
                 VariantClear(&lpCust->prgCustData[i].varValue);
 
-            /* FIXME - Should be using a per-thread IMalloc */
-            heap_free(lpCust->prgCustData);
+            CoTaskMemFree(lpCust->prgCustData);
             lpCust->prgCustData = NULL;
         }
         lpCust->cCustData = 0;




More information about the wine-cvs mailing list