Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-23 20:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OLE32]

Browse source 
- Fix compilation with newer GCC

svn path=/trunk/; revision=57905
This commit is contained in:
Jérôme Gardou 2012-12-13 16:00:44 +00:00
parent f85ab10caf
commit 3bddc1bdba
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/dll/win32/ole32/stg_prop.c
View file

@ -1035,12 +1035,12 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This,
} }
#ifdef __i386__ #ifdef __i386__
#define __thiscall __stdcall #define __thiscall_wrapper __stdcall
#else #else
#define __thiscall __cdecl #define __thiscall_wrapper __cdecl
#endif #endif
static void* __thiscall Allocate_CoTaskMemAlloc(void *userdata, ULONG size) static void* __thiscall_wrapper Allocate_CoTaskMemAlloc(void *userdata, ULONG size)
{ {
return CoTaskMemAlloc(size); return CoTaskMemAlloc(size);
} }
@ -1049,7 +1049,7 @@ static void* __thiscall Allocate_CoTaskMemAlloc(void *userdata, ULONG size)
* end of the buffer. * end of the buffer.
*/ */
static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data,
UINT codepage, void* (__thiscall *allocate)(void *userdata, ULONG size), void *allocate_data) UINT codepage, void* (__thiscall_wrapper *allocate)(void *userdata, ULONG size), void *allocate_data)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -2738,13 +2738,13 @@ end:
"jmp *(4*(" #num "))(%eax)" ) "jmp *(4*(" #num "))(%eax)" )
DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8) DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8)
extern void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize); extern void* __stdcall Allocate_PMemoryAllocator(void *this, ULONG cbSize);
#else #else
static void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize) static void* __cdecl Allocate_PMemoryAllocator(void *this, ULONG cbSize)
{ {
void* (__thiscall *fn)(void*,ULONG) = **(void***)this; void* (__cdecl *fn)(void*,ULONG) = **(void***)this;
return fn(this, cbSize); return fn(this, cbSize);
} }