[ros-diffs] [akhaldi] 73948: [ICCVID] Sync with Wine Staging 2.2. CORE-12823 4dcdbf3 iccvid: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

Author: akhaldi
Date: Sun Feb 26 17:25:49 2017
New Revision: 73948

URL: http://svn.reactos.org/svn/reactos?rev=73948&view=rev
Log:
[ICCVID] Sync with Wine Staging 2.2. CORE-12823

4dcdbf3 iccvid: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

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

Modified: trunk/reactos/dll/win32/iccvid/iccvid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/iccvid.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/iccvid.c	[iso-8859-1] Sun Feb 26 17:25:49 2017
@@ -85,14 +85,14 @@
     cinepak_info *cvinfo;
 } ICCVID_Info;
 
-static inline LPVOID heap_alloc( size_t size )
-{
-    return HeapAlloc( GetProcessHeap(), 0, size );
-}
-
-static inline BOOL heap_free( LPVOID ptr )
-{
-    return HeapFree( GetProcessHeap(), 0, ptr );
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
+{
+    return HeapAlloc(GetProcessHeap(), 0, size);
+}
+
+static inline BOOL heap_free(void *mem)
+{
+    return HeapFree(GetProcessHeap(), 0, mem);
 }
 
 static inline int get_stride(int width, int depth)

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 Feb 26 17:25:49 2017
@@ -73,7 +73,7 @@
 reactos/dll/win32/hlink               # Synced to WineStaging-2.2
 reactos/dll/win32/hnetcfg             # Synced to WineStaging-1.9.16
 reactos/dll/win32/httpapi             # Synced to WineStaging-1.9.11
-reactos/dll/win32/iccvid              # Synced to WineStaging-1.9.11
+reactos/dll/win32/iccvid              # Synced to WineStaging-2.2
 reactos/dll/win32/ieframe             # Synced to WineStaging-1.9.16
 reactos/dll/win32/imaadp32.acm        # Synced to WineStaging-1.9.11
 reactos/dll/win32/imagehlp            # Synced to WineStaging-1.9.11