Author: akhaldi
Date: Sun Jun 4 01:49:25 2017
New Revision: 74870
URL:
http://svn.reactos.org/svn/reactos?rev=74870&view=rev
Log:
[WMIUTILS] Sync with Wine Staging 2.9. CORE-13362
b16f08b wmiutils: Simplify and standardize the heap_xxx() declarations.
Modified:
trunk/reactos/dll/win32/wmiutils/wmiutils_private.h
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/wmiutils/wmiutils_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/wmiutil…
==============================================================================
--- trunk/reactos/dll/win32/wmiutils/wmiutils_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wmiutils/wmiutils_private.h [iso-8859-1] Sun Jun 4 01:49:25
2017
@@ -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 )
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jun 4 01:49:25 2017
@@ -209,7 +209,7 @@
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