PATCH: 16bit ifaces are cdecl
Marcus Meissner
meissner at suse.de
Thu Jul 21 10:49:31 CDT 2005
Hi,
Found while debugging a 16bit app using OLE..
Ciao, Marcus
Changelog:
16bit interfaces are cdecl, so drop the WINAPI.
Index: dlls/ole32/ifs.h
===================================================================
RCS file: /home/wine/wine/dlls/ole32/ifs.h,v
retrieving revision 1.14
diff -u -r1.14 ifs.h
--- dlls/ole32/ifs.h 13 Dec 2004 21:19:02 -0000 1.14
+++ dlls/ole32/ifs.h 21 Jul 2005 15:40:29 -0000
@@ -29,6 +29,11 @@
typedef LPSTR LPOLESTR16;
typedef LPCSTR LPCOLESTR16;
+#define STDMETHOD16CALLTYPE __cdecl
+#define STDMETHOD16(m) HRESULT (STDMETHOD16CALLTYPE *m)
+#define STDMETHOD16_(t,m) t (STDMETHOD16CALLTYPE *m)
+
+
/***********************************************************************
* IMalloc16 interface
*/
@@ -39,16 +44,16 @@
DECLARE_INTERFACE_(IMalloc16,IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD16_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD16_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD16_(ULONG,Release)(THIS) PURE;
/*** IMalloc16 methods ***/
- STDMETHOD_(LPVOID,Alloc)(THIS_ DWORD cb) PURE;
- STDMETHOD_(LPVOID,Realloc)(THIS_ LPVOID pv, DWORD cb) PURE;
- STDMETHOD_(void,Free)(THIS_ LPVOID pv) PURE;
- STDMETHOD_(DWORD,GetSize)(THIS_ LPVOID pv) PURE;
- STDMETHOD_(INT16,DidAlloc)(THIS_ LPVOID pv) PURE;
- STDMETHOD_(LPVOID,HeapMinimize)(THIS) PURE;
+ STDMETHOD16_(LPVOID,Alloc)(THIS_ DWORD cb) PURE;
+ STDMETHOD16_(LPVOID,Realloc)(THIS_ LPVOID pv, DWORD cb) PURE;
+ STDMETHOD16_(void,Free)(THIS_ LPVOID pv) PURE;
+ STDMETHOD16_(DWORD,GetSize)(THIS_ LPVOID pv) PURE;
+ STDMETHOD16_(INT16,DidAlloc)(THIS_ LPVOID pv) PURE;
+ STDMETHOD16_(LPVOID,HeapMinimize)(THIS) PURE;
};
#undef INTERFACE
@@ -64,17 +69,17 @@
DECLARE_INTERFACE_(ILockBytes16,IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD16_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD16_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD16_(ULONG,Release)(THIS) PURE;
/*** ILockBytes16 methods ***/
- STDMETHOD(ReadAt)(THIS_ ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) PURE;
- STDMETHOD(WriteAt)(THIS_ ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) PURE;
- STDMETHOD(Flush)(THIS) PURE;
- STDMETHOD(SetSize)(THIS_ ULARGE_INTEGER cb) PURE;
- STDMETHOD(LockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE;
- STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE;
- STDMETHOD(Stat)(THIS_ STATSTG *pstatstg, DWORD grfStatFlag) PURE;
+ STDMETHOD16(ReadAt)(THIS_ ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) PURE;
+ STDMETHOD16(WriteAt)(THIS_ ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) PURE;
+ STDMETHOD16(Flush)(THIS) PURE;
+ STDMETHOD16(SetSize)(THIS_ ULARGE_INTEGER cb) PURE;
+ STDMETHOD16(LockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE;
+ STDMETHOD16(UnlockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE;
+ STDMETHOD16(Stat)(THIS_ STATSTG *pstatstg, DWORD grfStatFlag) PURE;
};
#undef INTERFACE
@@ -101,22 +106,22 @@
DECLARE_INTERFACE_(IStream16,ISequentialStream)
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD16_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD16_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD16_(ULONG,Release)(THIS) PURE;
/*** ISequentialStream methods ***/
- STDMETHOD_(HRESULT,Read)(THIS_ void* pv, ULONG cb, ULONG* pcbRead) PURE;
- STDMETHOD_(HRESULT,Write)(THIS_ const void* pv, ULONG cb, ULONG* pcbWritten) PURE;
+ STDMETHOD16_(HRESULT,Read)(THIS_ void* pv, ULONG cb, ULONG* pcbRead) PURE;
+ STDMETHOD16_(HRESULT,Write)(THIS_ const void* pv, ULONG cb, ULONG* pcbWritten) PURE;
/*** IStream16 methods ***/
- STDMETHOD(Seek)(THIS_ LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) PURE;
- STDMETHOD(SetSize)(THIS_ ULARGE_INTEGER libNewSize) PURE;
- STDMETHOD(CopyTo)(THIS_ IStream16* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten) PURE;
- STDMETHOD(Commit)(THIS_ DWORD grfCommitFlags) PURE;
- STDMETHOD(Revert)(THIS) PURE;
- STDMETHOD(LockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE;
- STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE;
- STDMETHOD(Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE;
- STDMETHOD(Clone)(THIS_ IStream16** ppstm) PURE;
+ STDMETHOD16(Seek)(THIS_ LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) PURE;
+ STDMETHOD16(SetSize)(THIS_ ULARGE_INTEGER libNewSize) PURE;
+ STDMETHOD16(CopyTo)(THIS_ IStream16* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten) PURE;
+ STDMETHOD16(Commit)(THIS_ DWORD grfCommitFlags) PURE;
+ STDMETHOD16(Revert)(THIS) PURE;
+ STDMETHOD16(LockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE;
+ STDMETHOD16(UnlockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE;
+ STDMETHOD16(Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE;
+ STDMETHOD16(Clone)(THIS_ IStream16** ppstm) PURE;
};
#undef INTERFACE
@@ -130,25 +135,25 @@
DECLARE_INTERFACE_(IStorage16,IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
+ STDMETHOD16_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD16_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD16_(ULONG,Release)(THIS) PURE;
/*** IStorage16 methods ***/
- STDMETHOD_(HRESULT,CreateStream)(THIS_ LPCOLESTR16 pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream16** ppstm) PURE;
- STDMETHOD_(HRESULT,OpenStream)(THIS_ LPCOLESTR16 pwcsName, void* reserved1, DWORD grfMode, DWORD reserved2, IStream16** ppstm) PURE;
- STDMETHOD_(HRESULT,CreateStorage)(THIS_ LPCOLESTR16 pwcsName, DWORD grfMode, DWORD dwStgFmt, DWORD reserved2, IStorage16** ppstg) PURE;
- STDMETHOD_(HRESULT,OpenStorage)(THIS_ LPCOLESTR16 pwcsName, IStorage16* pstgPriority, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16** ppstg) PURE;
- STDMETHOD_(HRESULT,CopyTo)(THIS_ DWORD ciidExclude, const IID* rgiidExclude, SNB16 snbExclude, IStorage16* pstgDest) PURE;
- STDMETHOD_(HRESULT,MoveElementTo)(THIS_ LPCOLESTR16 pwcsName, IStorage16* pstgDest, LPCOLESTR16 pwcsNewName, DWORD grfFlags) PURE;
- STDMETHOD_(HRESULT,Commit)(THIS_ DWORD grfCommitFlags) PURE;
- STDMETHOD_(HRESULT,Revert)(THIS) PURE;
- STDMETHOD_(HRESULT,EnumElements)(THIS_ DWORD reserved1, void* reserved2, DWORD reserved3, IEnumSTATSTG** ppenum) PURE;
- STDMETHOD_(HRESULT,DestroyElement)(THIS_ LPCOLESTR16 pwcsName) PURE;
- STDMETHOD_(HRESULT,RenameElement)(THIS_ LPCOLESTR16 pwcsOldName, LPCOLESTR16 pwcsNewName) PURE;
- STDMETHOD_(HRESULT,SetElementTimes)(THIS_ LPCOLESTR16 pwcsName, const FILETIME* pctime, const FILETIME* patime, const FILETIME* pmtime) PURE;
- STDMETHOD_(HRESULT,SetClass)(THIS_ REFCLSID clsid) PURE;
- STDMETHOD_(HRESULT,SetStateBits)(THIS_ DWORD grfStateBits, DWORD grfMask) PURE;
- STDMETHOD_(HRESULT,Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE;
+ STDMETHOD16_(HRESULT,CreateStream)(THIS_ LPCOLESTR16 pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream16** ppstm) PURE;
+ STDMETHOD16_(HRESULT,OpenStream)(THIS_ LPCOLESTR16 pwcsName, void* reserved1, DWORD grfMode, DWORD reserved2, IStream16** ppstm) PURE;
+ STDMETHOD16_(HRESULT,CreateStorage)(THIS_ LPCOLESTR16 pwcsName, DWORD grfMode, DWORD dwStgFmt, DWORD reserved2, IStorage16** ppstg) PURE;
+ STDMETHOD16_(HRESULT,OpenStorage)(THIS_ LPCOLESTR16 pwcsName, IStorage16* pstgPriority, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16** ppstg) PURE;
+ STDMETHOD16_(HRESULT,CopyTo)(THIS_ DWORD ciidExclude, const IID* rgiidExclude, SNB16 snbExclude, IStorage16* pstgDest) PURE;
+ STDMETHOD16_(HRESULT,MoveElementTo)(THIS_ LPCOLESTR16 pwcsName, IStorage16* pstgDest, LPCOLESTR16 pwcsNewName, DWORD grfFlags) PURE;
+ STDMETHOD16_(HRESULT,Commit)(THIS_ DWORD grfCommitFlags) PURE;
+ STDMETHOD16_(HRESULT,Revert)(THIS) PURE;
+ STDMETHOD16_(HRESULT,EnumElements)(THIS_ DWORD reserved1, void* reserved2, DWORD reserved3, IEnumSTATSTG** ppenum) PURE;
+ STDMETHOD16_(HRESULT,DestroyElement)(THIS_ LPCOLESTR16 pwcsName) PURE;
+ STDMETHOD16_(HRESULT,RenameElement)(THIS_ LPCOLESTR16 pwcsOldName, LPCOLESTR16 pwcsNewName) PURE;
+ STDMETHOD16_(HRESULT,SetElementTimes)(THIS_ LPCOLESTR16 pwcsName, const FILETIME* pctime, const FILETIME* patime, const FILETIME* pmtime) PURE;
+ STDMETHOD16_(HRESULT,SetClass)(THIS_ REFCLSID clsid) PURE;
+ STDMETHOD16_(HRESULT,SetStateBits)(THIS_ DWORD grfStateBits, DWORD grfMask) PURE;
+ STDMETHOD16_(HRESULT,Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE;
};
#undef INTERFACE
Index: dlls/ole32/ole16.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/ole16.c,v
retrieving revision 1.17
diff -u -r1.17 ole16.c
--- dlls/ole32/ole16.c 5 Jul 2005 12:43:44 -0000 1.17
+++ dlls/ole32/ole16.c 21 Jul 2005 15:40:29 -0000
@@ -69,7 +69,7 @@
/******************************************************************************
* IMalloc16_QueryInterface [COMPOBJ.500]
*/
-HRESULT WINAPI IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) {
+HRESULT 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 @@
/******************************************************************************
* IMalloc16_AddRef [COMPOBJ.501]
*/
-ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) {
+ULONG IMalloc16_fnAddRef(IMalloc16* iface) {
IMalloc16Impl *This = (IMalloc16Impl *)iface;
TRACE("(%p)->AddRef()\n",This);
return 1; /* cannot be freed */
@@ -94,7 +94,7 @@
/******************************************************************************
* IMalloc16_Release [COMPOBJ.502]
*/
-ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) {
+ULONG IMalloc16_fnRelease(IMalloc16* iface) {
IMalloc16Impl *This = (IMalloc16Impl *)iface;
TRACE("(%p)->Release()\n",This);
return 1; /* cannot be freed */
@@ -103,7 +103,7 @@
/******************************************************************************
* IMalloc16_Alloc [COMPOBJ.503]
*/
-SEGPTR WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
+SEGPTR 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 @@
/******************************************************************************
* IMalloc16_Free [COMPOBJ.505]
*/
-VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
+VOID IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
{
void *ptr = MapSL(pv);
IMalloc16Impl *This = (IMalloc16Impl *)iface;
@@ -124,7 +124,7 @@
/******************************************************************************
* IMalloc16_Realloc [COMPOBJ.504]
*/
-SEGPTR WINAPI IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
+SEGPTR IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
{
SEGPTR ret;
IMalloc16Impl *This = (IMalloc16Impl *)iface;
@@ -144,7 +144,7 @@
/******************************************************************************
* IMalloc16_GetSize [COMPOBJ.506]
*/
-DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv)
+DWORD IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv)
{
IMalloc16Impl *This = (IMalloc16Impl *)iface;
TRACE("(%p)->GetSize(%08lx)\n",This,pv);
@@ -154,7 +154,7 @@
/******************************************************************************
* IMalloc16_DidAlloc [COMPOBJ.507]
*/
-INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
+INT16 IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
IMalloc16 *This = (IMalloc16 *)iface;
TRACE("(%p)->DidAlloc(%p)\n",This,pv);
return (INT16)-1;
@@ -163,7 +163,7 @@
/******************************************************************************
* IMalloc16_HeapMinimize [COMPOBJ.508]
*/
-LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) {
+LPVOID IMalloc16_fnHeapMinimize(IMalloc16* iface) {
IMalloc16Impl *This = (IMalloc16Impl *)iface;
TRACE("(%p)->HeapMinimize()\n",This);
return NULL;
Index: dlls/ole32/storage.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/storage.c,v
retrieving revision 1.46
diff -u -r1.46 storage.c
--- dlls/ole32/storage.c 5 Jul 2005 12:43:44 -0000 1.46
+++ dlls/ole32/storage.c 21 Jul 2005 15:40:29 -0000
@@ -968,7 +968,7 @@
/******************************************************************************
* IStream16_QueryInterface [STORAGE.518]
*/
-HRESULT WINAPI IStream16_fnQueryInterface(
+HRESULT IStream16_fnQueryInterface(
IStream16* iface,REFIID refiid,LPVOID *obj
) {
IStream16Impl *This = (IStream16Impl *)iface;
@@ -984,7 +984,7 @@
/******************************************************************************
* IStream16_AddRef [STORAGE.519]
*/
-ULONG WINAPI IStream16_fnAddRef(IStream16* iface) {
+ULONG IStream16_fnAddRef(IStream16* iface) {
IStream16Impl *This = (IStream16Impl *)iface;
return InterlockedIncrement(&This->ref);
}
@@ -992,7 +992,7 @@
/******************************************************************************
* IStream16_Release [STORAGE.520]
*/
-ULONG WINAPI IStream16_fnRelease(IStream16* iface) {
+ULONG IStream16_fnRelease(IStream16* iface) {
IStream16Impl *This = (IStream16Impl *)iface;
ULONG ref;
FlushFileBuffers(This->hf);
@@ -1011,7 +1011,7 @@
* FIXME
* Does not handle 64 bits
*/
-HRESULT WINAPI IStream16_fnSeek(
+HRESULT IStream16_fnSeek(
IStream16* iface,LARGE_INTEGER offset,DWORD whence,ULARGE_INTEGER *newpos
) {
IStream16Impl *This = (IStream16Impl *)iface;
@@ -1055,7 +1055,7 @@
/******************************************************************************
* IStream16_Read [STORAGE.521]
*/
-HRESULT WINAPI IStream16_fnRead(
+HRESULT IStream16_fnRead(
IStream16* iface,void *pv,ULONG cb,ULONG *pcbRead
) {
IStream16Impl *This = (IStream16Impl *)iface;
@@ -1117,7 +1117,7 @@
/******************************************************************************
* IStream16_Write [STORAGE.522]
*/
-HRESULT WINAPI IStream16_fnWrite(
+HRESULT IStream16_fnWrite(
IStream16* iface,const void *pv,ULONG cb,ULONG *pcbWrite
) {
IStream16Impl *This = (IStream16Impl *)iface;
@@ -1515,7 +1515,7 @@
/******************************************************************************
* IStorage16_QueryInterface [STORAGE.500]
*/
-HRESULT WINAPI IStorage16_fnQueryInterface(
+HRESULT IStorage16_fnQueryInterface(
IStorage16* iface,REFIID refiid,LPVOID *obj
) {
IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1532,7 +1532,7 @@
/******************************************************************************
* IStorage16_AddRef [STORAGE.501]
*/
-ULONG WINAPI IStorage16_fnAddRef(IStorage16* iface) {
+ULONG IStorage16_fnAddRef(IStorage16* iface) {
IStorage16Impl *This = (IStorage16Impl *)iface;
return InterlockedIncrement(&This->ref);
}
@@ -1540,7 +1540,7 @@
/******************************************************************************
* IStorage16_Release [STORAGE.502]
*/
-ULONG WINAPI IStorage16_fnRelease(IStorage16* iface) {
+ULONG IStorage16_fnRelease(IStorage16* iface) {
IStorage16Impl *This = (IStorage16Impl *)iface;
ULONG ref;
ref = InterlockedDecrement(&This->ref);
@@ -1555,7 +1555,7 @@
/******************************************************************************
* IStorage16_Stat [STORAGE.517]
*/
-HRESULT WINAPI IStorage16_fnStat(
+HRESULT IStorage16_fnStat(
LPSTORAGE16 iface,STATSTG16 *pstatstg, DWORD grfStatFlag
) {
IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1583,7 +1583,7 @@
/******************************************************************************
* IStorage16_Commit [STORAGE.509]
*/
-HRESULT WINAPI IStorage16_fnCommit(
+HRESULT IStorage16_fnCommit(
LPSTORAGE16 iface,DWORD commitflags
) {
IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1596,7 +1596,7 @@
/******************************************************************************
* IStorage16_CopyTo [STORAGE.507]
*/
-HRESULT WINAPI IStorage16_fnCopyTo(LPSTORAGE16 iface,DWORD ciidExclude,const IID *rgiidExclude,SNB16 SNB16Exclude,IStorage16 *pstgDest) {
+HRESULT 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
@@ -1608,7 +1608,7 @@
/******************************************************************************
* IStorage16_CreateStorage [STORAGE.505]
*/
-HRESULT WINAPI IStorage16_fnCreateStorage(
+HRESULT IStorage16_fnCreateStorage(
LPSTORAGE16 iface,LPCOLESTR16 pwcsName,DWORD grfMode,DWORD dwStgFormat,DWORD reserved2, IStorage16 **ppstg
) {
IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1673,7 +1673,7 @@
/******************************************************************************
* IStorage16_CreateStream [STORAGE.503]
*/
-HRESULT WINAPI IStorage16_fnCreateStream(
+HRESULT IStorage16_fnCreateStream(
LPSTORAGE16 iface,LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved1,DWORD reserved2, IStream16 **ppstm
) {
IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1731,7 +1731,7 @@
/******************************************************************************
* IStorage16_OpenStorage [STORAGE.506]
*/
-HRESULT WINAPI IStorage16_fnOpenStorage(
+HRESULT IStorage16_fnOpenStorage(
LPSTORAGE16 iface,LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg
) {
IStorage16Impl *This = (IStorage16Impl *)iface;
@@ -1766,7 +1766,7 @@
/******************************************************************************
* IStorage16_OpenStream [STORAGE.504]
*/
-HRESULT WINAPI IStorage16_fnOpenStream(
+HRESULT IStorage16_fnOpenStream(
LPSTORAGE16 iface,LPCOLESTR16 pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream16 **ppstm
) {
IStorage16Impl *This = (IStorage16Impl *)iface;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20050721/1fffc534/attachment.pgp
More information about the wine-patches
mailing list