From c130169bb899b569b6114b305286aea2b186ebe7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 3 Jun 2017 19:02:10 +0000 Subject: [PATCH] [HLINK] Sync with Wine Staging 2.9. CORE-13362 d5c3a31 hlink: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. svn path=/trunk/; revision=74798 --- reactos/dll/win32/hlink/hlink_private.h | 8 ++++---- reactos/media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/hlink/hlink_private.h b/reactos/dll/win32/hlink/hlink_private.h index b50744addd0..1674f662f46 100644 --- a/reactos/dll/win32/hlink/hlink_private.h +++ b/reactos/dll/win32/hlink/hlink_private.h @@ -41,14 +41,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlink); extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } static inline BOOL heap_free(void *mem) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 852cb1f209f..6f0835a51fc 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -70,7 +70,7 @@ reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 reactos/dll/win32/gdiplus # Synced to WineStaging-2.9 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.9 -reactos/dll/win32/hlink # Synced to WineStaging-2.2 +reactos/dll/win32/hlink # Synced to WineStaging-2.9 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/iccvid # Synced to WineStaging-2.2