[ros-diffs] [akhaldi] 73940: [ATL] Sync with Wine Staging 2.2. CORE-12823 de24275 atl: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). 26e8873 atl: Fix AtlModuleInit spec file entry.

Author: akhaldi
Date: Sun Feb 26 16:56:41 2017
New Revision: 73940

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

de24275 atl: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
26e8873 atl: Fix AtlModuleInit spec file entry.

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

Modified: trunk/reactos/dll/win32/atl/atl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.c?rev=73…
==============================================================================
--- trunk/reactos/dll/win32/atl/atl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl.c	[iso-8859-1] Sun Feb 26 16:56:41 2017
@@ -28,9 +28,9 @@
 
 typedef unsigned char cpp_bool;
 
-static inline void *heap_alloc(size_t len)
-{
-    return HeapAlloc(GetProcessHeap(), 0, len);
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
+{
+    return HeapAlloc(GetProcessHeap(), 0, size);
 }
 
 static inline BOOL heap_free(void *mem)

Modified: trunk/reactos/dll/win32/atl/atl.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev…
==============================================================================
--- trunk/reactos/dll/win32/atl/atl.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl.spec	[iso-8859-1] Sun Feb 26 16:56:41 2017
@@ -8,7 +8,7 @@
 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr)
 14 stdcall AtlUnmarshalPtr(ptr ptr ptr)
 15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr)
-16 stdcall AtlModuleInit(ptr long long)
+16 stdcall AtlModuleInit(ptr ptr long)
 17 stdcall AtlModuleRegisterClassObjects(ptr long long)
 18 stdcall AtlModuleRegisterServer(ptr long ptr)
 19 stdcall AtlModuleRegisterTypeLib(ptr wstr)

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 16:56:41 2017
@@ -45,7 +45,7 @@
 reactos/dll/win32/activeds            # Synced to WineStaging-1.9.11
 reactos/dll/win32/actxprxy            # Synced to WineStaging-1.9.11
 reactos/dll/win32/advpack             # Synced to WineStaging-1.9.11
-reactos/dll/win32/atl                 # Synced to WineStaging-1.9.16
+reactos/dll/win32/atl                 # Synced to WineStaging-2.2
 reactos/dll/win32/atl80               # Synced to WineStaging-1.9.11
 reactos/dll/win32/atl100              # Synced to WineStaging-1.9.11
 reactos/dll/win32/avifil32            # Synced to WineStaging-1.9.23