From 13d03d3364ba22d6f9719e131cba82cfb18c6476 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Feb 2017 17:34:21 +0000 Subject: [PATCH] [INSENG] Sync with Wine Staging 2.2. CORE-12823 dabb589 inseng: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). svn path=/trunk/; revision=73951 --- reactos/dll/win32/inseng/inseng_private.h | 4 ++-- reactos/media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/inseng/inseng_private.h b/reactos/dll/win32/inseng/inseng_private.h index 308df924800..d6862ea413c 100644 --- a/reactos/dll/win32/inseng/inseng_private.h +++ b/reactos/dll/win32/inseng/inseng_private.h @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(inseng); -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_zero_alloc(size_t len) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index e83ea774006..796021a32f6 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -81,7 +81,7 @@ reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-1.9.23 reactos/dll/win32/inetmib1 # Synced to WineStaging-1.9.11 reactos/dll/win32/initpki # Synced to WineStaging-1.9.11 -reactos/dll/win32/inseng # Synced to WineStaging-1.9.23 +reactos/dll/win32/inseng # Synced to WineStaging-2.2 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 reactos/dll/win32/itss # Synced to WineStaging-1.9.11