Module: wine Branch: master Commit: 955e27d0e37fc084a92dd392a7abb2783b7a13bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=955e27d0e37fc084a92dd392a7...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Sun Aug 19 22:01:36 2012 +0400
msctf: Call interface methods properly.
---
dlls/msctf/categorymgr.c | 2 +- dlls/msctf/compartmentmgr.c | 6 +++--- dlls/msctf/context.c | 8 ++++---- dlls/msctf/displayattributemgr.c | 2 +- dlls/msctf/documentmgr.c | 6 +++--- dlls/msctf/inputprocessor.c | 6 +++--- dlls/msctf/langbarmgr.c | 2 +- dlls/msctf/range.c | 2 +- dlls/msctf/tests/inputprocessor.c | 16 ++++++++-------- dlls/msctf/threadmgr.c | 8 ++++---- 10 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index a487404..167e059 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -68,7 +68,7 @@ static HRESULT WINAPI CategoryMgr_QueryInterface(ITfCategoryMgr *iface, REFIID i
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCategoryMgr_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index bb55d69..a5bae3f 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -131,7 +131,7 @@ static HRESULT WINAPI CompartmentMgr_QueryInterface(ITfCompartmentMgr *iface, RE
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCompartmentMgr_AddRef(iface); return S_OK; }
@@ -304,7 +304,7 @@ static HRESULT WINAPI CompartmentEnumGuid_QueryInterface(IEnumGUID *iface, REFII
if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumGUID_AddRef(iface); return S_OK; }
@@ -464,7 +464,7 @@ static HRESULT WINAPI Compartment_QueryInterface(ITfCompartment *iface, REFIID i
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCompartment_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index c013cf9..c8d3ac4 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -141,10 +141,10 @@ static void Context_Destructor(Context *This) }
if (This->pITextStoreACP) - ITextStoreACPSink_Release(This->pITextStoreACP); + ITextStoreACP_Release(This->pITextStoreACP);
if (This->pITfContextOwnerCompositionSink) - ITextStoreACPSink_Release(This->pITfContextOwnerCompositionSink); + ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);
if (This->defaultCookie) { @@ -216,7 +216,7 @@ static HRESULT WINAPI Context_QueryInterface(ITfContext *iface, REFIID iid, LPVO
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfContext_AddRef(iface); return S_OK; }
@@ -896,7 +896,7 @@ static HRESULT WINAPI TextStoreACPSink_QueryInterface(ITextStoreACPSink *iface,
if (*ppvOut) { - IUnknown_AddRef(iface); + ITextStoreACPSink_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/displayattributemgr.c b/dlls/msctf/displayattributemgr.c index 44c61ab..0893a8f 100644 --- a/dlls/msctf/displayattributemgr.c +++ b/dlls/msctf/displayattributemgr.c @@ -61,7 +61,7 @@ static HRESULT WINAPI DisplayAttributeMgr_QueryInterface(ITfDisplayAttributeMgr
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfDisplayAttributeMgr_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 4e21624..884b098 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -113,7 +113,7 @@ static HRESULT WINAPI DocumentMgr_QueryInterface(ITfDocumentMgr *iface, REFIID i
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfDocumentMgr_AddRef(iface); return S_OK; }
@@ -161,7 +161,7 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) if (This->contextStack[1]) /* FUll */ return TF_E_STACKFULL;
- if (!pic || FAILED(IUnknown_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) + if (!pic || FAILED(ITfContext_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) return E_INVALIDARG;
if (This->contextStack[0] == NULL) @@ -364,7 +364,7 @@ static HRESULT WINAPI EnumTfContext_QueryInterface(IEnumTfContexts *iface, REFII
if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfContexts_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 5242f14..2340604 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -172,7 +172,7 @@ static HRESULT WINAPI InputProcessorProfiles_QueryInterface(ITfInputProcessorPro
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfInputProcessorProfiles_AddRef(iface); return S_OK; }
@@ -803,7 +803,7 @@ static HRESULT WINAPI ProfilesEnumGuid_QueryInterface(IEnumGUID *iface, REFIID i
if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumGUID_AddRef(iface); return S_OK; }
@@ -959,7 +959,7 @@ static HRESULT WINAPI EnumTfLanguageProfiles_QueryInterface(IEnumTfLanguageProfi
if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfLanguageProfiles_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/langbarmgr.c b/dlls/msctf/langbarmgr.c index 5e814a7..cf9e4a3 100644 --- a/dlls/msctf/langbarmgr.c +++ b/dlls/msctf/langbarmgr.c @@ -61,7 +61,7 @@ static HRESULT WINAPI LangBarMgr_QueryInterface(ITfLangBarMgr *iface, REFIID iid
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfLangBarMgr_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index 3412954..ae5129b 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -77,7 +77,7 @@ static HRESULT WINAPI Range_QueryInterface(ITfRange *iface, REFIID iid, LPVOID *
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfRange_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8f409c3..a732730 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -203,7 +203,7 @@ static HRESULT WINAPI TextStoreACP_QueryInterface(ITextStoreACP *iface, REFIID i
if (*ppvOut) { - IUnknown_AddRef(iface); + ITextStoreACP_AddRef(iface); return S_OK; }
@@ -492,7 +492,7 @@ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *i
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfThreadMgrEventSink_AddRef(iface); return S_OK; }
@@ -752,7 +752,7 @@ static HRESULT WINAPI TextService_QueryInterface(ITfTextInputProcessor *iface, R
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfTextInputProcessor_AddRef(iface); return S_OK; }
@@ -1079,7 +1079,7 @@ static HRESULT WINAPI KeyEventSink_QueryInterface(ITfKeyEventSink *iface, REFIID
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfKeyEventSink_AddRef(iface); return S_OK; }
@@ -1305,8 +1305,8 @@ static void test_EnumDocumentMgr(ITfThreadMgr *tm, ITfDocumentMgr *search, ITfDo
static inline int check_context_refcount(ITfContext *iface) { - IUnknown_AddRef(iface); - return IUnknown_Release(iface); + ITfContext_AddRef(iface); + return ITfContext_Release(iface); }
@@ -1341,7 +1341,7 @@ static HRESULT WINAPI TextEditSink_QueryInterface(ITfTextEditSink *iface, REFIID
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfTextEditSink_AddRef(iface); return S_OK; }
@@ -1697,7 +1697,7 @@ static HRESULT WINAPI EditSession_QueryInterface(ITfEditSession *iface, REFIID i
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfEditSession_AddRef(iface); return S_OK; }
diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index af3ebbf..5a18b39 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -279,7 +279,7 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid,
if (*ppvOut) { - IUnknown_AddRef(iface); + ITfThreadMgr_AddRef(iface); return S_OK; }
@@ -422,7 +422,7 @@ static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *p
if (!pdimFocus) check = NULL; - else if (FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) + else if (FAILED(ITfDocumentMgr_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) return E_INVALIDARG;
ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus); @@ -724,7 +724,7 @@ static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface, if (check != NULL) return CONNECT_E_ADVISELIMIT;
- if (FAILED(IUnknown_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*) &check))) + if (FAILED(ITfKeyEventSink_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*) &check))) return E_INVALIDARG;
set_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown*)check); @@ -1333,7 +1333,7 @@ static HRESULT WINAPI EnumTfDocumentMgr_QueryInterface(IEnumTfDocumentMgrs *ifac
if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfDocumentMgrs_AddRef(iface); return S_OK; }