Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 20:50:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

svn path=/trunk/; revision=73940
This commit is contained in:
Amine Khaldi 2017-02-26 16:56:41 +00:00
parent ffa916c3c7
commit f03e637c36
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/atl/atl.c
View file

@ -28,9 +28,9 @@ HINSTANCE atl_instance;
typedef unsigned char cpp_bool; typedef unsigned char cpp_bool;
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 BOOL heap_free(void *mem) static inline BOOL heap_free(void *mem)

2
reactos/dll/win32/atl/atl.spec
View file

@ -8,7 +8,7 @@
13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr)
14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 14 stdcall AtlUnmarshalPtr(ptr ptr ptr)
15 stdcall AtlModuleGetClassObject(ptr 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) 17 stdcall AtlModuleRegisterClassObjects(ptr long long)
18 stdcall AtlModuleRegisterServer(ptr long ptr) 18 stdcall AtlModuleRegisterServer(ptr long ptr)
19 stdcall AtlModuleRegisterTypeLib(ptr wstr) 19 stdcall AtlModuleRegisterTypeLib(ptr wstr)

2
reactos/media/doc/README.WINE
View file

@ -45,7 +45,7 @@ reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4
reactos/dll/win32/activeds # Synced to WineStaging-1.9.11 reactos/dll/win32/activeds # Synced to WineStaging-1.9.11
reactos/dll/win32/actxprxy # 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/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/atl80 # Synced to WineStaging-1.9.11
reactos/dll/win32/atl100 # 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 reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.23