Michael Stefaniuc : inetcpl.cpl: Use the global HeapAlloc() wrappers.
Alexandre Julliard
julliard at winehq.org
Thu Feb 1 16:14:52 CST 2018
Module: wine
Branch: master
Commit: 16c394faab5698926da26349c0a366fd101117cb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c394faab5698926da26349c0a366fd101117cb
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Wed Jan 31 22:51:00 2018 +0100
inetcpl.cpl: Use the global HeapAlloc() wrappers.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/inetcpl.cpl/inetcpl.h | 19 -------------------
dlls/inetcpl.cpl/security.c | 1 +
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h
index 4aae292..50d4bd1 100644
--- a/dlls/inetcpl.cpl/inetcpl.h
+++ b/dlls/inetcpl.cpl/inetcpl.h
@@ -31,25 +31,6 @@ INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
-/* ## Memory allocation functions ## */
-
-static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len )
-{
- return HeapAlloc( GetProcessHeap(), 0, len );
-}
-
-static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len )
-{
- return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len );
-}
-
-static inline BOOL heap_free( void *mem )
-{
- return HeapFree( GetProcessHeap(), 0, mem );
-}
-
-/* ######### */
-
#define NUM_PROPERTY_PAGES 8
/* icons */
diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c
index 6d79057..543ada4 100644
--- a/dlls/inetcpl.cpl/security.c
+++ b/dlls/inetcpl.cpl/security.c
@@ -37,6 +37,7 @@
#include "inetcpl.h"
#include "wine/debug.h"
+#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
More information about the wine-cvs
mailing list