Stefan Ginsberg : msctf: Define function calling convention compatibly for MSVC.
Alexandre Julliard
julliard at winehq.org
Tue Sep 22 13:56:34 CDT 2009
Module: wine
Branch: master
Commit: 32648d48022721cf6ce2538cd5ac06b7559b7df9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=32648d48022721cf6ce2538cd5ac06b7559b7df9
Author: Stefan Ginsberg <stefan__100__ at hotmail.com>
Date: Sat Sep 19 23:33:29 2009 +0200
msctf: Define function calling convention compatibly for MSVC.
---
dlls/msctf/compartmentmgr.c | 4 ++--
dlls/msctf/context.c | 12 ++++++------
dlls/msctf/documentmgr.c | 4 ++--
dlls/msctf/inputprocessor.c | 4 ++--
dlls/msctf/threadmgr.c | 18 +++++++++---------
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c
index 06a691d..4f6408d 100644
--- a/dlls/msctf/compartmentmgr.c
+++ b/dlls/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/dlls/msctf/context.c b/dlls/msctf/context.c
index c13235c..1b4e3cf 100644
--- a/dlls/msctf/context.c
+++ b/dlls/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/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c
index 0a25b3d..fec3de3 100644
--- a/dlls/msctf/documentmgr.c
+++ b/dlls/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/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c
index 0935c44..ba4a76d 100644
--- a/dlls/msctf/inputprocessor.c
+++ b/dlls/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/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c
index 85b11a1..56f1c36 100644
--- a/dlls/msctf/threadmgr.c
+++ b/dlls/msctf/threadmgr.c
@@ -617,7 +617,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;
@@ -652,7 +652,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);
@@ -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)
{
struct list *cursor;
@@ -1135,7 +1135,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;
@@ -1152,7 +1152,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)
{
@@ -1170,7 +1170,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;
@@ -1187,7 +1187,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;
@@ -1238,7 +1238,7 @@ static ULONG WINAPI ThreadMgrSourceSingle_Release(ITfSourceSingle *iface)
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)
{
ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
@@ -1246,7 +1246,7 @@ static WINAPI HRESULT ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *i
return E_NOTIMPL;
}
-static WINAPI HRESULT ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface,
+static HRESULT WINAPI ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface,
TfClientId tid, REFIID riid)
{
ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface);
More information about the wine-cvs
mailing list