[WMIUTILS] Sync with Wine Staging 2.9. CORE-13362
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 4 Jun 2017 01:49:25 +0000 (01:49 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 4 Jun 2017 01:49:25 +0000 (01:49 +0000)
b16f08b wmiutils: Simplify and standardize the heap_xxx() declarations.

svn path=/trunk/; revision=74870

reactos/dll/win32/wmiutils/wmiutils_private.h
reactos/media/doc/README.WINE

index 2b76f71..6782bd8 100644 (file)
 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 )
index 824d432..8c34158 100644 (file)
@@ -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