Author: akhaldi Date: Sun Feb 26 19:27:59 2017 New Revision: 73975
URL: http://svn.reactos.org/svn/reactos?rev=73975&view=rev Log: [SHDOCVW] Sync with Wine Staging 2.2. CORE-12823
f3d33f5 shdocvw: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.h... ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] Sun Feb 26 19:27:59 2017 @@ -57,7 +57,7 @@
/* memory allocation functions */
-static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 19:27:59 2017 @@ -171,7 +171,7 @@ reactos/dll/win32/sensapi # Synced to WineStaging-1.9.11 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-1.9.11 -reactos/dll/win32/shdocvw # Synced to WineStaging-1.9.11 +reactos/dll/win32/shdocvw # Synced to WineStaging-2.2 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-1.9.11 reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.23