Author: akhaldi
Date: Sat Jun 3 19:02:10 2017
New Revision: 74798
URL:
http://svn.reactos.org/svn/reactos?rev=74798&view=rev
Log:
[HLINK] Sync with Wine Staging 2.9. CORE-13362
d5c3a31 hlink: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
Modified:
trunk/reactos/dll/win32/hlink/hlink_private.h
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/hlink/hlink_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_priv…
==============================================================================
--- trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] Sat Jun 3 19:02:10 2017
@@ -41,14 +41,14 @@
extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
-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 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 inline BOOL heap_free(void *mem)
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 19:02:10 2017
@@ -70,7 +70,7 @@
reactos/dll/win32/fusion # Synced to WineStaging-1.9.23
reactos/dll/win32/gdiplus # Synced to WineStaging-2.9
reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.9
-reactos/dll/win32/hlink # Synced to WineStaging-2.2
+reactos/dll/win32/hlink # Synced to WineStaging-2.9
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-2.2