[SHDOCVW] Sync with Wine Staging 2.2. CORE-12823

f3d33f5 shdocvw: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

svn path=/trunk/; revision=73975

diff --git a/reactos/dll/win32/shdocvw/shdocvw.h b/reactos/dll/win32/shdocvw/shdocvw.h
index 3d40e19..626a9f8 100644 (file)
--- a/reactos/dll/win32/shdocvw/shdocvw.h
+++ b/reactos/dll/win32/shdocvw/shdocvw.h
@@ -57,7 +57,7 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r
 
 /* memory allocation functions */
 
 
 /* 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);
 }
 {
     return HeapAlloc(GetProcessHeap(), 0, len);
 }

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 7cff334..848411c 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -171,7 +171,7 @@ reactos/dll/win32/security            # Forked (different .spec)
 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/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
 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