From ac024d1cdad717651efc68600a7f7529b7b15ea0 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 4 Jun 2017 01:49:25 +0000 Subject: [PATCH] [WMIUTILS] Sync with Wine Staging 2.9. CORE-13362 b16f08b wmiutils: Simplify and standardize the heap_xxx() declarations. svn path=/trunk/; revision=74870 --- reactos/dll/win32/wmiutils/wmiutils_private.h | 19 ++++++++----------- reactos/media/doc/README.WINE | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/reactos/dll/win32/wmiutils/wmiutils_private.h b/reactos/dll/win32/wmiutils/wmiutils_private.h index 2b76f712e71..6782bd85cc0 100644 --- a/reactos/dll/win32/wmiutils/wmiutils_private.h +++ b/reactos/dll/win32/wmiutils/wmiutils_private.h @@ -21,27 +21,24 @@ HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; -static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); -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 void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); -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 void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc( void *mem, size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *strdupW( const WCHAR *src ) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 824d4326111..8c341586aaf 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -209,7 +209,7 @@ reactos/dll/win32/winscard # Synced to WineStaging-2.2 reactos/dll/win32/wintrust # Synced to WineStaging-2.9 reactos/dll/win32/wldap32 # Synced to WineStaging-2.2 reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 -reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11 +reactos/dll/win32/wmiutils # Synced to WineStaging-2.9 reactos/dll/win32/wmvcore # Synced to WineStaging-2.2 reactos/dll/win32/wshom.ocx # Synced to WineStaging-2.2 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11