Author: sginsberg
Date: Thu Sep 24 20:01:03 2009
New Revision: 43132
URL: http://svn.reactos.org/svn/reactos?rev=43132&view=rev
Log:
- msctf: Define function calling convention compatibly for MSVC. Patch sent to
and accepted by Wine.
Modified:
trunk/reactos/dll/win32/msctf/compartmentmgr.c
trunk/reactos/dll/win32/msctf/context.c
trunk/reactos/dll/win32/msctf/documentmgr.c
trunk/reactos/dll/win32/msctf/inputprocessor.c
trunk/reactos/dll/win32/msctf/threadmgr.c
Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/compartmentmgr.c?rev=43132&r1=43131&r2=43132&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/compartmentmgr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/compartmentmgr.c [iso-8859-1] Thu Sep 24
20:01:03 2009
@@ -572,7 +572,7 @@
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 @@
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);
Modified: trunk/reactos/dll/win32/msctf/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?rev=43132&r1=43131&r2=43132&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] Thu Sep 24 20:01:03
2009
@@ -599,7 +599,7 @@
/*****************************************************
* 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 @@
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 @@
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 @@
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 @@
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 @@
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);
Modified: trunk/reactos/dll/win32/msctf/documentmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmgr.c?rev=43132&r1=43131&r2=43132&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] Thu Sep 24
20:01:03 2009
@@ -288,7 +288,7 @@
/*****************************************************
* 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 @@
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);
Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputprocessor.c?rev=43132&r1=43131&r2=43132&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] Thu Sep 24
20:01:03 2009
@@ -694,7 +694,7 @@
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 @@
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);
Modified: trunk/reactos/dll/win32/msctf/threadmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.c?rev=43132&r1=43131&r2=43132&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Thu Sep 24 20:01:03
2009
@@ -572,7 +572,7 @@
/*****************************************************
* 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 @@
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 WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr(
+static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr(
ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim)
{
struct list *cursor;
@@ -1090,7 +1090,7 @@
return S_OK;
}
-static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr(
+static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr(
ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim)
{
struct list *cursor;
@@ -1107,7 +1107,7 @@
return S_OK;
}
-static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus(
+static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus(
ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus,
ITfDocumentMgr *pdimPrevFocus)
{
@@ -1125,7 +1125,7 @@
return S_OK;
}
-static WINAPI HRESULT ThreadMgrEventSink_OnPushContext(
+static HRESULT WINAPI ThreadMgrEventSink_OnPushContext(
ITfThreadMgrEventSink *iface, ITfContext *pic)
{
struct list *cursor;
@@ -1142,7 +1142,7 @@
return S_OK;
}
-static WINAPI HRESULT ThreadMgrEventSink_OnPopContext(
+static HRESULT WINAPI ThreadMgrEventSink_OnPopContext(
ITfThreadMgrEventSink *iface, ITfContext *pic)
{
struct list *cursor;
