[PATCH] msvcrt: Use the global HeapAlloc() wrappers

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc 
---
 dlls/msvcrt/lock.c   |  1 +
 dlls/msvcrt/msvcrt.h | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c
index b8b8672314..583e4298d9 100644
--- a/dlls/msvcrt/lock.c
+++ b/dlls/msvcrt/lock.c
@@ -25,6 +25,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winternl.h"
+#include "wine/heap.h"
 #include "msvcrt.h"
 #include "cppexcept.h"
 #include "mtdll.h"
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index a380613077..65ced6d26d 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -1429,20 +1429,5 @@ typedef struct {
     _FPIEEE_VALUE Result;
 } _FPIEEE_RECORD, *_PFPIEEE_RECORD;

-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 INHERIT_THREAD_PRIORITY 0xF000
 #endif /* __WINE_MSVCRT_H */

[Piotr Caban]

Signed-off-by: Piotr Caban