ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Remove confusing uses of the __thiscall specifier.

This commit is contained in:
Alexandre Julliard 2015-03-12 14:20:14 +09:00
parent 603bc1d3f8
commit c6c3ccad36
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/ole32/stg_prop.c
View File

@ -1034,13 +1034,7 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This,
return hr; return hr;
} }
#ifdef __i386__ static void* WINAPI Allocate_CoTaskMemAlloc(void *this, ULONG size)
#define __thiscall __stdcall
#else
#define __thiscall __cdecl
#endif
static __thiscall void* Allocate_CoTaskMemAlloc(void *userdata, ULONG size)
{ {
return CoTaskMemAlloc(size); return CoTaskMemAlloc(size);
} }
@ -1049,7 +1043,7 @@ static __thiscall void* 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* (WINAPI *allocate)(void *this, ULONG size), void *allocate_data)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -2738,13 +2732,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* WINAPI Allocate_PMemoryAllocator(void *this, ULONG cbSize);
#else #else
static void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize) static void* WINAPI Allocate_PMemoryAllocator(void *this, ULONG cbSize)
{ {
void* (__thiscall *fn)(void*,ULONG) = **(void***)this; void* (WINAPI *fn)(void*,ULONG) = **(void***)this;
return fn(this, cbSize); return fn(this, cbSize);
} }

10
dlls/ole32/tests/propvariant.c
View File

@ -349,18 +349,12 @@ typedef struct _PMemoryAllocator {
struct _PMemoryAllocator_vtable *vt; struct _PMemoryAllocator_vtable *vt;
} PMemoryAllocator; } PMemoryAllocator;
#ifdef __i386__ static void * WINAPI PMemoryAllocator_Allocate(PMemoryAllocator *_this, ULONG cbSize)
#define __thiscall __stdcall
#else
#define __thiscall __cdecl
#endif
static void * __thiscall PMemoryAllocator_Allocate(PMemoryAllocator *_this, ULONG cbSize)
{ {
return CoTaskMemAlloc(cbSize); return CoTaskMemAlloc(cbSize);
} }
static void __thiscall PMemoryAllocator_Free(PMemoryAllocator *_this, void *pv) static void WINAPI PMemoryAllocator_Free(PMemoryAllocator *_this, void *pv)
{ {
CoTaskMemFree(pv); CoTaskMemFree(pv);
} }