ole32: Explicitly specify CDECL calling convention on exported functions.

dlls/ole32/memlockbytes16.c

@@ -174,7 +174,7 @@ static void HGLOBALLockBytesImpl16_Destroy(HGLOBALLockBytesImpl16* This)
  * This implements the IUnknown method AddRef for this
  * class
  */
-ULONG HGLOBALLockBytesImpl16_AddRef(ILockBytes16* iface)
+ULONG CDECL HGLOBALLockBytesImpl16_AddRef(ILockBytes16* iface)
 {
   HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface;
 
@@ -188,7 +188,7 @@ ULONG HGLOBALLockBytesImpl16_AddRef(ILockBytes16* iface)
  * This implements the IUnknown method QueryInterface for this
  * class
  */
-HRESULT HGLOBALLockBytesImpl16_QueryInterface(
+HRESULT CDECL HGLOBALLockBytesImpl16_QueryInterface(
       ILockBytes16*  iface,	/* [in] SEGPTR */
       REFIID       riid,        /* [in] */
       void**       ppvObject)   /* [out][iid_is] (ptr to SEGPTR!) */
@@ -235,7 +235,7 @@ HRESULT HGLOBALLockBytesImpl16_QueryInterface(
  * This implements the IUnknown method Release for this
  * class
  */
-ULONG HGLOBALLockBytesImpl16_Release(ILockBytes16* iface)
+ULONG CDECL HGLOBALLockBytesImpl16_Release(ILockBytes16* iface)
 {
   HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface;
   ULONG ref;
@@ -260,7 +260,7 @@ ULONG HGLOBALLockBytesImpl16_Release(ILockBytes16* iface)
  *
  * See the documentation of ILockBytes for more info.
  */
-HRESULT HGLOBALLockBytesImpl16_ReadAt(
+HRESULT CDECL HGLOBALLockBytesImpl16_ReadAt(
       ILockBytes16*  iface,
       ULARGE_INTEGER ulOffset,  /* [in] */
       void*          pv,        /* [out][length_is][size_is] */
@@ -332,7 +332,7 @@ HRESULT HGLOBALLockBytesImpl16_ReadAt(
  *
  * See the documentation of ILockBytes for more info.
  */
-HRESULT HGLOBALLockBytesImpl16_SetSize(
+HRESULT CDECL HGLOBALLockBytesImpl16_SetSize(
       ILockBytes16*   iface,
       ULARGE_INTEGER  libNewSize)   /* [in] */
 {
@@ -371,7 +371,7 @@ HRESULT HGLOBALLockBytesImpl16_SetSize(
  *
  * See the documentation of ILockBytes for more info.
  */
-HRESULT HGLOBALLockBytesImpl16_WriteAt(
+HRESULT CDECL HGLOBALLockBytesImpl16_WriteAt(
       ILockBytes16*  iface,
       ULARGE_INTEGER ulOffset,    /* [in] */
       const void*    pv,          /* [in][size_is] */
@@ -433,7 +433,7 @@ HRESULT HGLOBALLockBytesImpl16_WriteAt(
  *
  * See the documentation of ILockBytes for more info.
  */
-HRESULT HGLOBALLockBytesImpl16_Flush(ILockBytes16* iface)
+HRESULT CDECL HGLOBALLockBytesImpl16_Flush(ILockBytes16* iface)
 {
   TRACE("(%p)\n",iface);
   return S_OK;
@@ -446,7 +446,7 @@ HRESULT HGLOBALLockBytesImpl16_Flush(ILockBytes16* iface)
  *
  * See the documentation of ILockBytes for more info.
  */
-HRESULT HGLOBALLockBytesImpl16_LockRegion(
+HRESULT CDECL HGLOBALLockBytesImpl16_LockRegion(
       ILockBytes16*  iface,
       ULARGE_INTEGER libOffset,   /* [in] */
       ULARGE_INTEGER cb,          /* [in] */
@@ -462,7 +462,7 @@ HRESULT HGLOBALLockBytesImpl16_LockRegion(
  *
  * See the documentation of ILockBytes for more info.
  */
-HRESULT HGLOBALLockBytesImpl16_UnlockRegion(
+HRESULT CDECL HGLOBALLockBytesImpl16_UnlockRegion(
       ILockBytes16*  iface,
       ULARGE_INTEGER libOffset,   /* [in] */
       ULARGE_INTEGER cb,          /* [in] */
@@ -479,7 +479,7 @@ HRESULT HGLOBALLockBytesImpl16_UnlockRegion(
  *
  * See the documentation of ILockBytes for more info.
  */
-HRESULT HGLOBALLockBytesImpl16_Stat(
+HRESULT CDECL HGLOBALLockBytesImpl16_Stat(
       ILockBytes16*iface,
       STATSTG16*   pstatstg,     /* [out] */
       DWORD        grfStatFlag)  /* [in] */

dlls/ole32/ole16.c

@@ -69,7 +69,7 @@ typedef struct
 /******************************************************************************
  *		IMalloc16_QueryInterface	[COMPOBJ.500]
  */
-HRESULT IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) {
+HRESULT CDECL IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) {
         IMalloc16Impl *This = (IMalloc16Impl *)iface;
 
 	TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
@@ -85,7 +85,7 @@ HRESULT IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) {
 /******************************************************************************
  *		IMalloc16_AddRef	[COMPOBJ.501]
  */
-ULONG IMalloc16_fnAddRef(IMalloc16* iface) {
+ULONG CDECL IMalloc16_fnAddRef(IMalloc16* iface) {
         IMalloc16Impl *This = (IMalloc16Impl *)iface;
 	TRACE("(%p)->AddRef()\n",This);
 	return 1; /* cannot be freed */
@@ -94,7 +94,7 @@ ULONG IMalloc16_fnAddRef(IMalloc16* iface) {
 /******************************************************************************
  *		IMalloc16_Release	[COMPOBJ.502]
  */
-ULONG IMalloc16_fnRelease(IMalloc16* iface) {
+ULONG CDECL IMalloc16_fnRelease(IMalloc16* iface) {
         IMalloc16Impl *This = (IMalloc16Impl *)iface;
 	TRACE("(%p)->Release()\n",This);
 	return 1; /* cannot be freed */
@@ -103,7 +103,7 @@ ULONG IMalloc16_fnRelease(IMalloc16* iface) {
 /******************************************************************************
  * IMalloc16_Alloc [COMPOBJ.503]
  */
-SEGPTR IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
+SEGPTR CDECL IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
         IMalloc16Impl *This = (IMalloc16Impl *)iface;
 	TRACE("(%p)->Alloc(%ld)\n",This,cb);
         return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) );
@@ -112,7 +112,7 @@ SEGPTR IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
 /******************************************************************************
  * IMalloc16_Free [COMPOBJ.505]
  */
-VOID IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
+VOID CDECL IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
 {
     void *ptr = MapSL(pv);
     IMalloc16Impl *This = (IMalloc16Impl *)iface;
@@ -124,7 +124,7 @@ VOID IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
 /******************************************************************************
  * IMalloc16_Realloc [COMPOBJ.504]
  */
-SEGPTR IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
+SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
 {
     SEGPTR ret;
     IMalloc16Impl *This = (IMalloc16Impl *)iface;
@@ -144,7 +144,7 @@ SEGPTR IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
 /******************************************************************************
  * IMalloc16_GetSize [COMPOBJ.506]
  */
-DWORD IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv)
+DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv)
 {
 	IMalloc16Impl *This = (IMalloc16Impl *)iface;
         TRACE("(%p)->GetSize(%08lx)\n",This,pv);
@@ -154,7 +154,7 @@ DWORD IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv)
 /******************************************************************************
  * IMalloc16_DidAlloc [COMPOBJ.507]
  */
-INT16 IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) {
+INT16 CDECL IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) {
         IMalloc16 *This = (IMalloc16 *)iface;
 	TRACE("(%p)->DidAlloc(%p)\n",This,pv);
 	return (INT16)-1;
@@ -163,7 +163,7 @@ INT16 IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) {
 /******************************************************************************
  * IMalloc16_HeapMinimize [COMPOBJ.508]
  */
-LPVOID IMalloc16_fnHeapMinimize(IMalloc16* iface) {
+LPVOID CDECL IMalloc16_fnHeapMinimize(IMalloc16* iface) {
         IMalloc16Impl *This = (IMalloc16Impl *)iface;
 	TRACE("(%p)->HeapMinimize()\n",This);
 	return NULL;

dlls/ole32/storage.c

@@ -1071,7 +1071,7 @@ typedef struct
 /******************************************************************************
  *		IStream16_QueryInterface	[STORAGE.518]
  */
-HRESULT IStream16_fnQueryInterface(
+HRESULT CDECL IStream16_fnQueryInterface(
 	IStream16* iface,REFIID refiid,LPVOID *obj
 ) {
 	IStream16Impl *This = (IStream16Impl *)iface;
@@ -1087,7 +1087,7 @@ HRESULT IStream16_fnQueryInterface(
 /******************************************************************************
  * IStream16_AddRef [STORAGE.519]
  */
-ULONG IStream16_fnAddRef(IStream16* iface) {
+ULONG CDECL IStream16_fnAddRef(IStream16* iface) {
 	IStream16Impl *This = (IStream16Impl *)iface;
 	return InterlockedIncrement(&This->ref);
 }
@@ -1149,7 +1149,7 @@ _ilockbytes16_flush(SEGPTR lockbytes) {
 /******************************************************************************
  * IStream16_Release [STORAGE.520]
  */
-ULONG IStream16_fnRelease(IStream16* iface) {
+ULONG CDECL IStream16_fnRelease(IStream16* iface) {
 	IStream16Impl *This = (IStream16Impl *)iface;
         ULONG ref;
 
@@ -1176,7 +1176,7 @@ ULONG IStream16_fnRelease(IStream16* iface) {
  * FIXME
  *    Does not handle 64 bits
  */
-HRESULT IStream16_fnSeek(
+HRESULT CDECL IStream16_fnSeek(
 	IStream16* iface,LARGE_INTEGER offset,DWORD whence,ULARGE_INTEGER *newpos
 ) {
 	IStream16Impl *This = (IStream16Impl *)iface;
@@ -1220,7 +1220,7 @@ HRESULT IStream16_fnSeek(
 /******************************************************************************
  *		IStream16_Read	[STORAGE.521]
  */
-HRESULT IStream16_fnRead(
+HRESULT CDECL IStream16_fnRead(
         IStream16* iface,void  *pv,ULONG cb,ULONG  *pcbRead
 ) {
 	IStream16Impl *This = (IStream16Impl *)iface;
@@ -1282,7 +1282,7 @@ HRESULT IStream16_fnRead(
 /******************************************************************************
  *		IStream16_Write	[STORAGE.522]
  */
-HRESULT IStream16_fnWrite(
+HRESULT CDECL IStream16_fnWrite(
         IStream16* iface,const void *pv,ULONG cb,ULONG *pcbWrite
 ) {
 	IStream16Impl *This = (IStream16Impl *)iface;
@@ -1667,7 +1667,7 @@ ULONG WINAPI IStream_fnRelease(IStream* iface) {
 /******************************************************************************
  *		IStorage16_QueryInterface	[STORAGE.500]
  */
-HRESULT IStorage16_fnQueryInterface(
+HRESULT CDECL IStorage16_fnQueryInterface(
 	IStorage16* iface,REFIID refiid,LPVOID *obj
 ) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1684,7 +1684,7 @@ HRESULT IStorage16_fnQueryInterface(
 /******************************************************************************
  * IStorage16_AddRef [STORAGE.501]
  */
-ULONG IStorage16_fnAddRef(IStorage16* iface) {
+ULONG CDECL IStorage16_fnAddRef(IStorage16* iface) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
 	return InterlockedIncrement(&This->ref);
 }
@@ -1692,7 +1692,7 @@ ULONG IStorage16_fnAddRef(IStorage16* iface) {
 /******************************************************************************
  * IStorage16_Release [STORAGE.502]
  */
-ULONG IStorage16_fnRelease(IStorage16* iface) {
+ULONG CDECL IStorage16_fnRelease(IStorage16* iface) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
         ULONG ref;
         ref = InterlockedDecrement(&This->ref);
@@ -1707,7 +1707,7 @@ ULONG IStorage16_fnRelease(IStorage16* iface) {
 /******************************************************************************
  * IStorage16_Stat [STORAGE.517]
  */
-HRESULT IStorage16_fnStat(
+HRESULT CDECL IStorage16_fnStat(
         LPSTORAGE16 iface,STATSTG16 *pstatstg, DWORD grfStatFlag
 ) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1735,7 +1735,7 @@ HRESULT IStorage16_fnStat(
 /******************************************************************************
  *		IStorage16_Commit	[STORAGE.509]
  */
-HRESULT IStorage16_fnCommit(
+HRESULT CDECL IStorage16_fnCommit(
         LPSTORAGE16 iface,DWORD commitflags
 ) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1748,7 +1748,7 @@ HRESULT IStorage16_fnCommit(
 /******************************************************************************
  * IStorage16_CopyTo [STORAGE.507]
  */
-HRESULT IStorage16_fnCopyTo(LPSTORAGE16 iface,DWORD ciidExclude,const IID *rgiidExclude,SNB16 SNB16Exclude,IStorage16 *pstgDest) {
+HRESULT CDECL IStorage16_fnCopyTo(LPSTORAGE16 iface,DWORD ciidExclude,const IID *rgiidExclude,SNB16 SNB16Exclude,IStorage16 *pstgDest) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
 	FIXME("IStorage16(%p)->(0x%08lx,%s,%p,%p),stub!\n",
 		This,ciidExclude,debugstr_guid(rgiidExclude),SNB16Exclude,pstgDest
@@ -1760,7 +1760,7 @@ HRESULT IStorage16_fnCopyTo(LPSTORAGE16 iface,DWORD ciidExclude,const IID *rgiid
 /******************************************************************************
  * IStorage16_CreateStorage [STORAGE.505]
  */
-HRESULT IStorage16_fnCreateStorage(
+HRESULT CDECL IStorage16_fnCreateStorage(
 	LPSTORAGE16 iface,LPCOLESTR16 pwcsName,DWORD grfMode,DWORD dwStgFormat,DWORD reserved2, IStorage16 **ppstg
 ) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1829,7 +1829,7 @@ HRESULT IStorage16_fnCreateStorage(
 /******************************************************************************
  *		IStorage16_CreateStream	[STORAGE.503]
  */
-HRESULT IStorage16_fnCreateStream(
+HRESULT CDECL IStorage16_fnCreateStream(
 	LPSTORAGE16 iface,LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved1,DWORD reserved2, IStream16 **ppstm
 ) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1893,7 +1893,7 @@ HRESULT IStorage16_fnCreateStream(
 /******************************************************************************
  *		IStorage16_OpenStorage	[STORAGE.506]
  */
-HRESULT IStorage16_fnOpenStorage(
+HRESULT CDECL IStorage16_fnOpenStorage(
 	LPSTORAGE16 iface,LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg
 ) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1933,7 +1933,7 @@ HRESULT IStorage16_fnOpenStorage(
 /******************************************************************************
  * IStorage16_OpenStream [STORAGE.504]
  */
-HRESULT IStorage16_fnOpenStream(
+HRESULT CDECL IStorage16_fnOpenStream(
 	LPSTORAGE16 iface,LPCOLESTR16 pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream16 **ppstm
 ) {
 	IStorage16Impl *This = (IStorage16Impl *)iface;