[ros-diffs] [akhaldi] 74835: [PDH] Sync with Wine Staging 2.9. CORE-13362 88c4d33 pdh: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.

Author: akhaldi
Date: Sat Jun  3 22:35:01 2017
New Revision: 74835

URL: http://svn.reactos.org/svn/reactos?rev=74835&view=rev
Log:
[PDH] Sync with Wine Staging 2.9. CORE-13362

88c4d33 pdh: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.

Modified:
    trunk/reactos/dll/win32/pdh/pdh_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/pdh/pdh_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/pdh/pdh_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pdh/pdh_main.c	[iso-8859-1] Sat Jun  3 22:35:01 2017
@@ -49,19 +49,19 @@
 };
 static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 };
 
-static inline void *heap_alloc( SIZE_T size )
-{
-    return HeapAlloc( GetProcessHeap(), 0, size );
-}
-
-static inline void *heap_alloc_zero( SIZE_T size )
-{
-    return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size );
-}
-
-static inline void heap_free( LPVOID mem )
-{
-    HeapFree( GetProcessHeap(), 0, mem );
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
+{
+    return HeapAlloc(GetProcessHeap(), 0, size);
+}
+
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
+{
+    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
+}
+
+static inline BOOL heap_free(void *mem)
+{
+    return HeapFree(GetProcessHeap(), 0, mem);
 }
 
 static inline WCHAR *pdh_strdup( 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] Sat Jun  3 22:35:01 2017
@@ -147,7 +147,7 @@
 reactos/dll/win32/olepro32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/olesvr32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/olethk32            # Synced to WineStaging-1.9.11
-reactos/dll/win32/pdh                 # Synced to WineStaging-1.9.11
+reactos/dll/win32/pdh                 # Synced to WineStaging-2.9
 reactos/dll/win32/pidgen              # Synced to WineStaging-1.9.11
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
 reactos/dll/win32/printui             # Synced to WineStaging-1.9.11