Commit 32648d48 authored by Stefan Ginsberg's avatar Stefan Ginsberg Committed by Alexandre Julliard

msctf: Define function calling convention compatibly for MSVC.

parent 9bd2ce97
...@@ -572,7 +572,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) ...@@ -572,7 +572,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface)
return Compartment_Release((ITfCompartment *)This); 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) REFIID riid, IUnknown *punk, DWORD *pdwCookie)
{ {
CompartmentSink *cs; CompartmentSink *cs;
...@@ -607,7 +607,7 @@ static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, ...@@ -607,7 +607,7 @@ static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface,
return S_OK; return S_OK;
} }
static WINAPI HRESULT CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
{ {
CompartmentSink *sink; CompartmentSink *sink;
Compartment *This = impl_from_ITfSourceVtbl(iface); Compartment *This = impl_from_ITfSourceVtbl(iface);
......
...@@ -599,7 +599,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) ...@@ -599,7 +599,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface)
/***************************************************** /*****************************************************
* ITfSource functions * ITfSource functions
*****************************************************/ *****************************************************/
static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, static HRESULT WINAPI ContextSource_AdviseSink(ITfSource *iface,
REFIID riid, IUnknown *punk, DWORD *pdwCookie) REFIID riid, IUnknown *punk, DWORD *pdwCookie)
{ {
ContextSink *es; ContextSink *es;
...@@ -632,7 +632,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, ...@@ -632,7 +632,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface,
return S_OK; return S_OK;
} }
static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) static HRESULT WINAPI ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
{ {
ContextSink *sink; ContextSink *sink;
Context *This = impl_from_ITfSourceVtbl(iface); Context *This = impl_from_ITfSourceVtbl(iface);
...@@ -683,7 +683,7 @@ static ULONG WINAPI InsertAtSelection_Release(ITfInsertAtSelection *iface) ...@@ -683,7 +683,7 @@ static ULONG WINAPI InsertAtSelection_Release(ITfInsertAtSelection *iface)
return Context_Release((ITfContext *)This); return Context_Release((ITfContext *)This);
} }
static WINAPI HRESULT InsertAtSelection_InsertTextAtSelection( static HRESULT WINAPI InsertAtSelection_InsertTextAtSelection(
ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags, ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags,
const WCHAR *pchText, LONG cch, ITfRange **ppRange) const WCHAR *pchText, LONG cch, ITfRange **ppRange)
{ {
...@@ -719,7 +719,7 @@ static WINAPI HRESULT InsertAtSelection_InsertTextAtSelection( ...@@ -719,7 +719,7 @@ static WINAPI HRESULT InsertAtSelection_InsertTextAtSelection(
return hr; return hr;
} }
static WINAPI HRESULT InsertAtSelection_InsertEmbeddedAtSelection( static HRESULT WINAPI InsertAtSelection_InsertEmbeddedAtSelection(
ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags, ITfInsertAtSelection *iface, TfEditCookie ec, DWORD dwFlags,
IDataObject *pDataObject, ITfRange **ppRange) IDataObject *pDataObject, ITfRange **ppRange)
{ {
...@@ -759,7 +759,7 @@ static ULONG WINAPI SourceSingle_Release(ITfSourceSingle *iface) ...@@ -759,7 +759,7 @@ static ULONG WINAPI SourceSingle_Release(ITfSourceSingle *iface)
return Context_Release((ITfContext *)This); 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) TfClientId tid, REFIID riid, IUnknown *punk)
{ {
Context *This = impl_from_ITfSourceSingleVtbl(iface); Context *This = impl_from_ITfSourceSingleVtbl(iface);
...@@ -767,7 +767,7 @@ static WINAPI HRESULT SourceSingle_AdviseSingleSink( ITfSourceSingle *iface, ...@@ -767,7 +767,7 @@ static WINAPI HRESULT SourceSingle_AdviseSingleSink( ITfSourceSingle *iface,
return E_NOTIMPL; return E_NOTIMPL;
} }
static WINAPI HRESULT SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, static HRESULT WINAPI SourceSingle_UnadviseSingleSink( ITfSourceSingle *iface,
TfClientId tid, REFIID riid) TfClientId tid, REFIID riid)
{ {
Context *This = impl_from_ITfSourceSingleVtbl(iface); Context *This = impl_from_ITfSourceSingleVtbl(iface);
......
...@@ -288,7 +288,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) ...@@ -288,7 +288,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface)
/***************************************************** /*****************************************************
* ITfSource functions * ITfSource functions
*****************************************************/ *****************************************************/
static WINAPI HRESULT DocumentMgrSource_AdviseSink(ITfSource *iface, static HRESULT WINAPI DocumentMgrSource_AdviseSink(ITfSource *iface,
REFIID riid, IUnknown *punk, DWORD *pdwCookie) REFIID riid, IUnknown *punk, DWORD *pdwCookie)
{ {
DocumentMgr *This = impl_from_ITfSourceVtbl(iface); DocumentMgr *This = impl_from_ITfSourceVtbl(iface);
...@@ -296,7 +296,7 @@ static WINAPI HRESULT DocumentMgrSource_AdviseSink(ITfSource *iface, ...@@ -296,7 +296,7 @@ static WINAPI HRESULT DocumentMgrSource_AdviseSink(ITfSource *iface,
return E_NOTIMPL; 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); DocumentMgr *This = impl_from_ITfSourceVtbl(iface);
FIXME("STUB:(%p)\n",This); FIXME("STUB:(%p)\n",This);
......
...@@ -694,7 +694,7 @@ static ULONG WINAPI IPPSource_Release(ITfSource *iface) ...@@ -694,7 +694,7 @@ static ULONG WINAPI IPPSource_Release(ITfSource *iface)
return InputProcessorProfiles_Release((ITfInputProcessorProfiles *)This); 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) REFIID riid, IUnknown *punk, DWORD *pdwCookie)
{ {
InputProcessorProfilesSink *ipps; InputProcessorProfilesSink *ipps;
...@@ -729,7 +729,7 @@ static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, ...@@ -729,7 +729,7 @@ static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface,
return S_OK; return S_OK;
} }
static WINAPI HRESULT IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) static HRESULT WINAPI IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
{ {
InputProcessorProfilesSink *sink; InputProcessorProfilesSink *sink;
InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface); InputProcessorProfiles *This = impl_from_ITfSourceVtbl(iface);
......
...@@ -617,7 +617,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) ...@@ -617,7 +617,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface)
/***************************************************** /*****************************************************
* ITfSource functions * ITfSource functions
*****************************************************/ *****************************************************/
static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface,
REFIID riid, IUnknown *punk, DWORD *pdwCookie) REFIID riid, IUnknown *punk, DWORD *pdwCookie)
{ {
ThreadMgrSink *tms; ThreadMgrSink *tms;
...@@ -652,7 +652,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, ...@@ -652,7 +652,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface,
return S_OK; return S_OK;
} }
static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
{ {
ThreadMgrSink *sink; ThreadMgrSink *sink;
ThreadMgr *This = impl_from_ITfSourceVtbl(iface); ThreadMgr *This = impl_from_ITfSourceVtbl(iface);
...@@ -1118,7 +1118,7 @@ static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) ...@@ -1118,7 +1118,7 @@ static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface)
} }
static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr(
ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim) ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim)
{ {
struct list *cursor; struct list *cursor;
...@@ -1135,7 +1135,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( ...@@ -1135,7 +1135,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr(
return S_OK; return S_OK;
} }
static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr(
ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim)
{ {
struct list *cursor; struct list *cursor;
...@@ -1152,7 +1152,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( ...@@ -1152,7 +1152,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr(
return S_OK; return S_OK;
} }
static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus(
ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus,
ITfDocumentMgr *pdimPrevFocus) ITfDocumentMgr *pdimPrevFocus)
{ {
...@@ -1170,7 +1170,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( ...@@ -1170,7 +1170,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus(
return S_OK; return S_OK;
} }
static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( static HRESULT WINAPI ThreadMgrEventSink_OnPushContext(
ITfThreadMgrEventSink *iface, ITfContext *pic) ITfThreadMgrEventSink *iface, ITfContext *pic)
{ {
struct list *cursor; struct list *cursor;
...@@ -1187,7 +1187,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( ...@@ -1187,7 +1187,7 @@ static WINAPI HRESULT ThreadMgrEventSink_OnPushContext(
return S_OK; return S_OK;
} }
static WINAPI HRESULT ThreadMgrEventSink_OnPopContext( static HRESULT WINAPI ThreadMgrEventSink_OnPopContext(
ITfThreadMgrEventSink *iface, ITfContext *pic) ITfThreadMgrEventSink *iface, ITfContext *pic)
{ {
struct list *cursor; struct list *cursor;
...@@ -1238,7 +1238,7 @@ static ULONG WINAPI ThreadMgrSourceSingle_Release(ITfSourceSingle *iface) ...@@ -1238,7 +1238,7 @@ static ULONG WINAPI ThreadMgrSourceSingle_Release(ITfSourceSingle *iface)
return ThreadMgr_Release((ITfThreadMgr *)This); return ThreadMgr_Release((ITfThreadMgr *)This);
} }
static WINAPI HRESULT ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *iface, static HRESULT WINAPI ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *iface,
TfClientId tid, REFIID riid, IUnknown *punk) TfClientId tid, REFIID riid, IUnknown *punk)
{ {
ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
...@@ -1246,7 +1246,7 @@ static WINAPI HRESULT ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *i ...@@ -1246,7 +1246,7 @@ static WINAPI HRESULT ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *i
return E_NOTIMPL; return E_NOTIMPL;
} }
static WINAPI HRESULT ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, static HRESULT WINAPI ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface,
TfClientId tid, REFIID riid) TfClientId tid, REFIID riid)
{ {
ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment