From bea45616949cdbcd11a4eea90fcb05fa1aea8cb6 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Thu, 24 Sep 2009 18:01:03 +0000 Subject: [PATCH] - msctf: Define function calling convention compatibly for MSVC. Patch sent to and accepted by Wine. svn path=/trunk/; revision=43132 --- reactos/dll/win32/msctf/compartmentmgr.c | 4 ++-- reactos/dll/win32/msctf/context.c | 12 ++++++------ reactos/dll/win32/msctf/documentmgr.c | 4 ++-- reactos/dll/win32/msctf/inputprocessor.c | 4 ++-- reactos/dll/win32/msctf/threadmgr.c | 14 +++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/reactos/dll/win32/msctf/compartmentmgr.c b/reactos/dll/win32/msctf/compartmentmgr.c index 06a691d9967..4f6408d1e4b 100644 --- a/reactos/dll/win32/msctf/compartmentmgr.c +++ b/reactos/dll/win32/msctf/compartmentmgr.c @@ -572,7 +572,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) return Compartment_Release((ITfCompartment *)This); } -static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI CompartmentSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { CompartmentSink *cs; @@ -607,7 +607,7 @@ static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, return S_OK; } -static WINAPI HRESULT CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { CompartmentSink *sink; Compartment *This = impl_from_ITfSourceVtbl(iface); diff --git a/reactos/dll/win32/msctf/context.c b/reactos/dll/win32/msctf/context.c index c13235c7783..1b4e3cfb546 100644 --- a/reactos/dll/win32/msctf/context.c +++ b/reactos/dll/win32/msctf/context.c @@ -599,7 +599,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI ContextSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ContextSink *es; @@ -632,7 +632,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, return S_OK; } -static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ContextSink *sink; Context *This = impl_from_ITfSourceVtbl(iface); @@ -683,7 +683,7 @@ static ULONG WINAPI InsertAtSelection_Release(ITfInsertAtSelection *iface) return Context_Release((ITfContext *)This); } -static WINAPI HRESULT InsertAtSelection_InsertTextAtSelection( +static HRESULT WINAPI InsertAtSelection_InsertTextAtSelection( ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags, const WCHAR *pchText, LONG cch, ITfRange **ppRange) { @@ -719,7 +719,7 @@ static WINAPI HRESULT InsertAtSelection_InsertTextAtSelection( return hr; } -static WINAPI HRESULT InsertAtSelection_InsertEmbeddedAtSelection( +static HRESULT WINAPI InsertAtSelection_InsertEmbeddedAtSelection( ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags, IDataObject *pDataObject, ITfRange **ppRange) { @@ -759,7 +759,7 @@ static ULONG WINAPI SourceSingle_Release(ITfSourceSingle *iface) return Context_Release((ITfContext *)This); } -static WINAPI HRESULT SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, +static HRESULT WINAPI SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, TfClientId tid, REFIID riid, IUnknown *punk) { Context *This = impl_from_ITfSourceSingleVtbl(iface); @@ -767,7 +767,7 @@ static WINAPI HRESULT SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, return E_NOTIMPL; } -static WINAPI HRESULT SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, +static HRESULT WINAPI SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, TfClientId tid, REFIID riid) { Context *This = impl_from_ITfSourceSingleVtbl(iface); diff --git a/reactos/dll/win32/msctf/documentmgr.c b/reactos/dll/win32/msctf/documentmgr.c index 0a25b3d3b67..fec3de3786e 100644 --- a/reactos/dll/win32/msctf/documentmgr.c +++ b/reactos/dll/win32/msctf/documentmgr.c @@ -288,7 +288,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT DocumentMgrSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI DocumentMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { DocumentMgr *This = impl_from_ITfSourceVtbl(iface); @@ -296,7 +296,7 @@ static WINAPI HRESULT DocumentMgrSource_AdviseSink(ITfSource *iface, return E_NOTIMPL; } -static WINAPI HRESULT DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { DocumentMgr *This = impl_from_ITfSourceVtbl(iface); FIXME("STUB:(%p)\n",This); diff --git a/reactos/dll/win32/msctf/inputprocessor.c b/reactos/dll/win32/msctf/inputprocessor.c index 0935c4444e2..ba4a76d83b5 100644 --- a/reactos/dll/win32/msctf/inputprocessor.c +++ b/reactos/dll/win32/msctf/inputprocessor.c @@ -694,7 +694,7 @@ static ULONG WINAPI IPPSource_Release(ITfSource *iface) return InputProcessorProfiles_Release((ITfInputProcessorProfiles *)This); } -static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI IPPSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { InputProcessorProfilesSink *ipps; @@ -729,7 +729,7 @@ static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, return S_OK; } -static WINAPI HRESULT IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { InputProcessorProfilesSink *sink; InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); diff --git a/reactos/dll/win32/msctf/threadmgr.c b/reactos/dll/win32/msctf/threadmgr.c index 0661fec1bcd..b77e0f2c0b7 100644 --- a/reactos/dll/win32/msctf/threadmgr.c +++ b/reactos/dll/win32/msctf/threadmgr.c @@ -572,7 +572,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) /***************************************************** * ITfSource functions *****************************************************/ -static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, +static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ThreadMgrSink *tms; @@ -607,7 +607,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, return S_OK; } -static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ThreadMgrSink *sink; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); @@ -1073,7 +1073,7 @@ static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) } -static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( +static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr( ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim) { struct list *cursor; @@ -1090,7 +1090,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( +static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) { struct list *cursor; @@ -1107,7 +1107,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( +static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) { @@ -1125,7 +1125,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( +static HRESULT WINAPI ThreadMgrEventSink_OnPushContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { struct list *cursor; @@ -1142,7 +1142,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( return S_OK; } -static WINAPI HRESULT ThreadMgrEventSink_OnPopContext( +static HRESULT WINAPI ThreadMgrEventSink_OnPopContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { struct list *cursor;