Module: wine Branch: master Commit: c41ccf892cff593d56b18eedabb551b6e5bdd862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c41ccf892cff593d56b18eeda...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Jun 2 17:08:49 2021 +0300
msctf/range: Remove unused argument from range creation helper.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msctf/context.c | 16 +++++----------- dlls/msctf/msctf_internal.h | 2 +- dlls/msctf/range.c | 8 ++------ 3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 63f2bf5455d..9eb61efa411 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -267,7 +267,6 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, TF_SELECTION *pSelection, ULONG *pcFetched) { Context *This = impl_from_ITfContext(iface); - EditCookie *cookie; ULONG count, i; ULONG totalFetched = 0; HRESULT hr = S_OK; @@ -289,8 +288,6 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, return E_NOTIMPL; }
- cookie = get_Cookie_data(ec); - if (ulIndex == TF_DEFAULT_SELECTION) count = 1; else @@ -310,7 +307,7 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, { pSelection[totalFetched].style.ase = acps.style.ase; pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar; - Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); + Range_Constructor(iface, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); totalFetched ++; } else @@ -364,7 +361,7 @@ static HRESULT WINAPI Context_GetStart (ITfContext *iface, TfEditCookie ec, ITfRange **ppStart) { Context *This = impl_from_ITfContext(iface); - EditCookie *cookie; + TRACE("(%p) %i %p\n",This,ec,ppStart);
if (!ppStart) @@ -378,15 +375,13 @@ static HRESULT WINAPI Context_GetStart (ITfContext *iface, if (get_Cookie_magic(ec)!=COOKIE_MAGIC_EDITCOOKIE) return TF_E_NOLOCK;
- cookie = get_Cookie_data(ec); - return Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, 0, 0, ppStart); + return Range_Constructor(iface, 0, 0, ppStart); }
static HRESULT WINAPI Context_GetEnd (ITfContext *iface, TfEditCookie ec, ITfRange **ppEnd) { Context *This = impl_from_ITfContext(iface); - EditCookie *cookie; LONG end; TRACE("(%p) %i %p\n",This,ec,ppEnd);
@@ -407,10 +402,9 @@ static HRESULT WINAPI Context_GetEnd (ITfContext *iface, return E_NOTIMPL; }
- cookie = get_Cookie_data(ec); ITextStoreACP_GetEndACP(This->pITextStoreACP,&end);
- return Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, end, end, ppEnd); + return Range_Constructor(iface, end, end, ppEnd); }
static HRESULT WINAPI Context_GetActiveView (ITfContext *iface, @@ -720,7 +714,7 @@ static HRESULT WINAPI InsertAtSelection_InsertTextAtSelection(
hr = ITextStoreACP_InsertTextAtSelection(This->pITextStoreACP, dwFlags, pchText, cch, &acpStart, &acpEnd, &change); if (SUCCEEDED(hr)) - Range_Constructor(&This->ITfContext_iface, This->pITextStoreACP, cookie->lockType, change.acpStart, change.acpNewEnd, ppRange); + Range_Constructor(&This->ITfContext_iface, change.acpStart, change.acpNewEnd, ppRange);
return hr; } diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 9d60e18e6f3..45a39806c22 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -45,7 +45,7 @@ extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr ** extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) DECLSPEC_HIDDEN; extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN; +extern HRESULT Range_Constructor(ITfContext *context, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN; extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut) DECLSPEC_HIDDEN; extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This) DECLSPEC_HIDDEN; extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index 85922791bad..ac2540b2b11 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -41,10 +41,8 @@ typedef struct tagRange { /* const ITfRangeACPVtb *RangeACPVtbl; */ LONG refCount;
- ITextStoreACP *pITextStoreACP; ITfContext *context;
- DWORD lockType; TfGravity gravityStart, gravityEnd; DWORD anchorStart, anchorEnd;
@@ -328,7 +326,7 @@ static const ITfRangeVtbl Range_RangeVtbl = Range_GetContext };
-HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) +HRESULT Range_Constructor(ITfContext *context, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) { Range *This;
@@ -336,14 +334,12 @@ HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD l if (This == NULL) return E_OUTOFMEMORY;
- TRACE("(%p) %p %p\n",This, context, textstore); + TRACE("(%p) %p\n", This, context);
This->ITfRange_iface.lpVtbl = &Range_RangeVtbl; This->refCount = 1; This->context = context; ITfContext_AddRef(This->context); - This->pITextStoreACP = textstore; - This->lockType = lockType; This->anchorStart = anchorStart; This->anchorEnd = anchorEnd;