Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/msxml3/msxml_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 1c052152be..94ef66b23d 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -24,6 +24,7 @@ #include "dispex.h"
#include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h"
#ifndef __WINE_CONFIG_H @@ -164,31 +165,11 @@ const IID *get_riid_from_tid(enum tid_t tid) DECLSPEC_HIDDEN;
/* memory allocation functions */
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); }
-static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;
That's obviously correct, but saxreader.c and schema.c are still using HeapAlloc() directly. I think it makes sense to fix all of it in one go.
On 02/03/2018 04:03 PM, Nikolay Sivov wrote:
That's obviously correct, but saxreader.c and schema.c are still using HeapAlloc() directly. I think it makes sense to fix all of it in one go.For me that's a separate patch. I'm ignoring the HeapAlloc
transformation at the moment.
I'm focusing now on removing the local wrappers. Once I'm done with those I'll shift my attention to the heap_strdup* wrappers. Then I'm still thinking to give the infallible heap_alloc variant another go. Only after that is settled it makes sense for me to go over all the HeapAlloc() and see how to transform them. But of course everybody else doesn't have to follow this and do the HeapAlloc ==> heap_alloc change as they see fit.
bye michael
On 2/3/2018 7:34 PM, Michael Stefaniuc wrote:
On 02/03/2018 04:03 PM, Nikolay Sivov wrote:
That's obviously correct, but saxreader.c and schema.c are still using HeapAlloc() directly. I think it makes sense to fix all of it in one go.For me that's a separate patch. I'm ignoring the HeapAlloc
transformation at the moment.
I'm focusing now on removing the local wrappers. Once I'm done with those I'll shift my attention to the heap_strdup* wrappers. Then I'm still thinking to give the infallible heap_alloc variant another go. Only after that is settled it makes sense for me to go over all the HeapAlloc() and see how to transform them. But of course everybody else doesn't have to follow this and do the HeapAlloc ==> heap_alloc change as they see fit.
Alright then.
bye michael
-
Michael Stefaniuc -
Nikolay Sivov