Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-19 18:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
4dcdbf3 iccvid: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

svn path=/trunk/; revision=73948
This commit is contained in:
Amine Khaldi 2017-02-26 17:25:49 +00:00
parent 3dcc353592
commit 1f5449e7c5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/iccvid/iccvid.c
View file

@ -85,14 +85,14 @@ typedef struct _ICCVID_Info
cinepak_info *cvinfo; cinepak_info *cvinfo;
} ICCVID_Info; } ICCVID_Info;
static inline LPVOID heap_alloc( size_t size ) static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
{ {
return HeapAlloc( GetProcessHeap(), 0, size ); return HeapAlloc(GetProcessHeap(), 0, size);
} }
static inline BOOL heap_free( LPVOID ptr ) static inline BOOL heap_free(void *mem)
{ {
return HeapFree( GetProcessHeap(), 0, ptr ); return HeapFree(GetProcessHeap(), 0, mem);
} }
static inline int get_stride(int width, int depth) static inline int get_stride(int width, int depth)

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

@ -73,7 +73,7 @@ reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.2
reactos/dll/win32/hlink # Synced to WineStaging-2.2 reactos/dll/win32/hlink # Synced to WineStaging-2.2
reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16
reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11
reactos/dll/win32/iccvid # Synced to WineStaging-1.9.11 reactos/dll/win32/iccvid # Synced to WineStaging-2.2
reactos/dll/win32/ieframe # Synced to WineStaging-1.9.16 reactos/dll/win32/ieframe # Synced to WineStaging-1.9.16
reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.9.11
reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11