[PATCH] includes: Fix macros for ITextServices

[Maarten Lankhorst]

---
 dlls/riched20/tests/txtsrv.c |    8 +++++++-
 include/textserv.h           |   19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c
index 3d47490..c28f5a7 100644
--- a/dlls/riched20/tests/txtsrv.c
+++ b/dlls/riched20/tests/txtsrv.c
@@ -29,6 +29,9 @@
 #include <objbase.h>
 #include <richedit.h>
 #include <initguid.h>
+
+#undef COBJMACROS
+/* Don't define ITextServices, we override it here */
 #include <textserv.h>
 #include <wine/test.h>
 
@@ -44,6 +47,9 @@ static HMODULE hmoduleRichEdit;
 #define TXTSERV_VTABLE(This) (This)->lpVtbl
 #endif /* __i386__ */
 
+#define ITextServices_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define ITextServices_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define ITextServices_Release(p) (p)->lpVtbl->Release(p)
 #define ITextServices_TxSendMessage(This,a,b,c,d) TXTSERV_VTABLE(This)->TxSendMessage(This,a,b,c,d)
 #define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l)
 #define ITextServices_TxGetHScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetHScroll(This,a,b,c,d,e)
@@ -84,7 +90,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface,
 
     if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) {
         *ppvObject = This;
-        ITextHost_AddRef((ITextHost *)*ppvObject);
+        IUnknown_AddRef((IUnknown *)*ppvObject);
         return S_OK;
     }
 
diff --git a/include/textserv.h b/include/textserv.h
index 977b742..820fc0a 100644
--- a/include/textserv.h
+++ b/include/textserv.h
@@ -147,6 +147,25 @@ DECLARE_INTERFACE_(ITextServices,IUnknown)
 #define ITextServices_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITextServices_AddRef(p) (p)->lpVtbl->AddRef(p)
 #define ITextServices_Release(p) (p)->lpVtbl->Release(p)
+/*** ITextServices methods ***/
+#define ITextServices_TxSendMessage(p,a,b,c,d) (p)->lpVtbl->TxSendMessage(p,a,b
+#define ITextServices_TxDraw(p,a,b,c,d,e,f,g,h,i,j,k,l) (p)->lpVtbl->TxDraw(p,a
+#define ITextServices_TxGetHScroll(p,a,b,c,d,e) (p)->lpVtbl->TxGetHScroll(p,a,b
+#define ITextServices_TxGetVScroll(p,a,b,c,d,e) (p)->lpVtbl->TxGetVScroll(p,a,b
+#define ITextServices_OnTxSetCursor(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->OnTxSetCu
+#define ITextServices_TxQueryHitPoint(p,a,b,c,d,e,f,g,h,i,j) (p)->lpVtbl->TxQue
+#define ITextServices_OnTxInplaceActivate(p,a) (p)->lpVtbl->OnTxInplaceActivate
+#define ITextServices_OnTxInplaceDeactivate(p) (p)->lpVtbl->OnTxInplaceDeactiva
+#define ITextServices_OnTxUIActivate(p) (p)->lpVtbl->OnTxUIActivate(p)
+#define ITextServices_OnTxUIDeactivate(p) (p)->lpVtbl->OnTxUIDeactivate(p)
+#define ITextServices_TxGetText(p,a) (p)->lpVtbl->TxGetText(p,a)
+#define ITextServices_TxSetText(p,a) (p)->lpVtbl->TxSetText(p,a)
+#define ITextServices_TxGetCurrentTargetX(p,a) (p)->lpVtbl->TxGetCurrentTargetX
+#define ITextServices_TxGetBaseLinePos(p,a) (p)->lpVtbl->TxGetBaseLinePos(p,a)
+#define ITextServices_TxGetNaturalSize(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->TxGetNat
+#define ITextServices_TxGetDropTarget(p,a) (p)->lpVtbl->TxGetDropTarget(p,a)
+#define ITextServices_OnTxPropertyBitsChange(p,a,b) (p)->lpVtbl->OnTxPropertyBi
+#define ITextServices_TxGetCachedSize(p,a,b) (p)->lpVtbl->TxGetCachedSize(p,a,b
 #endif
 
 #undef INTERFACE
-- 
1.5.6.5


--------------060008000406050605060702--