Module: wine Branch: master Commit: 61ce905bc459725b3e1ee2cf6d54f9947db003d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ce905bc459725b3e1ee2cf6...
Author: Huw Davies huw@codeweavers.com Date: Fri Mar 19 09:14:17 2021 +0000
include: Fix spelling of the InPlace methods.
Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/riched20/editor.h | 4 ++-- dlls/riched20/tests/txtsrv.c | 4 ++-- dlls/riched20/txtsrv.c | 20 ++++++++++---------- include/textserv.h | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e7d392c71c6..bad48ba54da 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -394,8 +394,8 @@ extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) #define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) -#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) -#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxInPlaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInPlaceActivate(This,a) +#define ITextServices_OnTxInPlaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInPlaceDeactivate(This) #define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) #define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) #define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index f41375d871a..de6d8a8df24 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -61,8 +61,8 @@ static ITextServicesVtbl itextServicesStdcallVtbl; #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) #define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) -#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) -#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxInPlaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInPlaceActivate(This,a) +#define ITextServices_OnTxInPlaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInPlaceDeactivate(This) #define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) #define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) #define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 5a8929e6c67..d637d52ea3b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -232,8 +232,8 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c return hr; }
-DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceActivate(ITextServices *iface, LPCRECT prcClient) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceActivate,8) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate(ITextServices *iface, LPCRECT prcClient) { struct text_services *services = impl_from_ITextServices( iface );
@@ -241,8 +241,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceActivate(ITextServices * return E_NOTIMPL; }
-DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceDeactivate(ITextServices *iface) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceDeactivate,4) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface );
@@ -450,8 +450,8 @@ DEFINE_STDCALL_WRAPPER(5, ITextServices_TxGetHScroll) DEFINE_STDCALL_WRAPPER(6, ITextServices_TxGetVScroll) DEFINE_STDCALL_WRAPPER(7, ITextServices_OnTxSetCursor) DEFINE_STDCALL_WRAPPER(8, ITextServices_TxQueryHitPoint) -DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInplaceActivate) -DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInplaceDeactivate) +DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInPlaceActivate) +DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInPlaceDeactivate) DEFINE_STDCALL_WRAPPER(11, ITextServices_OnTxUIActivate) DEFINE_STDCALL_WRAPPER(12, ITextServices_OnTxUIDeactivate) DEFINE_STDCALL_WRAPPER(13, ITextServices_TxGetText) @@ -474,8 +474,8 @@ const ITextServicesVtbl text_services_stdcall_vtbl = STDCALL(ITextServices_TxGetVScroll), STDCALL(ITextServices_OnTxSetCursor), STDCALL(ITextServices_TxQueryHitPoint), - STDCALL(ITextServices_OnTxInplaceActivate), - STDCALL(ITextServices_OnTxInplaceDeactivate), + STDCALL(ITextServices_OnTxInPlaceActivate), + STDCALL(ITextServices_OnTxInPlaceDeactivate), STDCALL(ITextServices_OnTxUIActivate), STDCALL(ITextServices_OnTxUIDeactivate), STDCALL(ITextServices_TxGetText), @@ -501,8 +501,8 @@ static const ITextServicesVtbl textservices_vtbl = THISCALL(fnTextSrv_TxGetVScroll), THISCALL(fnTextSrv_OnTxSetCursor), THISCALL(fnTextSrv_TxQueryHitPoint), - THISCALL(fnTextSrv_OnTxInplaceActivate), - THISCALL(fnTextSrv_OnTxInplaceDeactivate), + THISCALL(fnTextSrv_OnTxInPlaceActivate), + THISCALL(fnTextSrv_OnTxInPlaceDeactivate), THISCALL(fnTextSrv_OnTxUIActivate), THISCALL(fnTextSrv_OnTxUIDeactivate), THISCALL(fnTextSrv_TxGetText), diff --git a/include/textserv.h b/include/textserv.h index 1272a6bba00..3abdcee6a30 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -103,10 +103,10 @@ DECLARE_INTERFACE_(ITextServices,IUnknown) INT y, DWORD* pHitResult) PURE;
- THISCALLMETHOD_(HRESULT,OnTxInplaceActivate)( THIS_ + THISCALLMETHOD_(HRESULT,OnTxInPlaceActivate)( THIS_ LPCRECT prcClient) PURE;
- THISCALLMETHOD_(HRESULT,OnTxInplaceDeactivate)( THIS ) PURE; + THISCALLMETHOD_(HRESULT,OnTxInPlaceDeactivate)( THIS ) PURE;
THISCALLMETHOD_(HRESULT,OnTxUIActivate)( THIS ) PURE;