Module: wine Branch: master Commit: fdcd7e8fbe2c0996a1164ed91b67bea9cefb6db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdcd7e8fbe2c0996a1164ed91...
Author: Michael Stefaniuc mstefani@winehq.org Date: Tue Jan 30 23:40:57 2018 +0100
explorerframe: Use the global HeapAlloc() wrappers.
Signed-off-by: Michael Stefaniuc mstefani@winehq.org Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/explorerframe/explorerframe_main.h | 10 ---------- dlls/explorerframe/taskbarlist.c | 1 + 2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index ec8b363..14e551c 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -34,14 +34,4 @@ static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_ref HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 26a2c1a..a50f8a9 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,6 +21,7 @@ #include "explorerframe_main.h"
#include "wine/debug.h" +#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(explorerframe);