[PDH] Sync with Wine Staging 2.9. CORE-13362
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 3 Jun 2017 22:35:01 +0000 (22:35 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 3 Jun 2017 22:35:01 +0000 (22:35 +0000)
88c4d33 pdh: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.

svn path=/trunk/; revision=74835

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

index c4b2bd9..3a3f882 100644 (file)
@@ -49,19 +49,19 @@ static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug =
 };
 static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 };
 
 };
 static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 };
 
-static inline void *heap_alloc( SIZE_T size )
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
 {
 {
-    return HeapAlloc( GetProcessHeap(), 0, size );
+    return HeapAlloc(GetProcessHeap(), 0, size);
 }
 
 }
 
-static inline void *heap_alloc_zero( SIZE_T size )
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
 {
 {
-    return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size );
+    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
 }
 
 }
 
-static inline void heap_free( LPVOID mem )
+static inline BOOL heap_free(void *mem)
 {
 {
-    HeapFree( GetProcessHeap(), 0, mem );
+    return HeapFree(GetProcessHeap(), 0, mem);
 }
 
 static inline WCHAR *pdh_strdup( const WCHAR *src )
 }
 
 static inline WCHAR *pdh_strdup( const WCHAR *src )
index 6347db0..bac16e3 100644 (file)
@@ -147,7 +147,7 @@ reactos/dll/win32/oledlg              # Synced to WineStaging-2.9
 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/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
 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