msctf: Call interface methods properly.

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }
 

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;
     }