Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-02 12:15:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- msctf: Define function calling convention compatibly for MSVC. Patch sent to and accepted by Wine.

Browse source 
svn path=/trunk/; revision=43132
This commit is contained in:
Stefan Ginsberg 2009-09-24 18:01:03 +00:00
parent 28f4e36884
commit bea4561694
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/msctf/compartmentmgr.c
View file

@ -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,
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);

12
reactos/dll/win32/msctf/context.c
View file

@ -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,
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)
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(
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)
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,
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);

4
reactos/dll/win32/msctf/documentmgr.c
View file

@ -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,
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);

4
reactos/dll/win32/msctf/inputprocessor.c
View file

@ -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,
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);

14
reactos/dll/win32/msctf/threadmgr.c
View file

@ -572,7 +572,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;
@ -607,7 +607,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);
@ -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) ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim)
{ {
struct list *cursor; struct list *cursor;
@ -1090,7 +1090,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;
@ -1107,7 +1107,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)
{ {
@ -1125,7 +1125,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;
@ -1142,7 +1142,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;