mirror of
https://github.com/reactos/reactos.git
synced 2025-07-10 01:17:58 +00:00
Follow-up of #8224. JIRA issue: CORE-19361 - Add cicIsNullPtr function in Cicero <cicbase.h>. - Reordering of CMakeLists.txt items. - Minor refactoring.
This commit is contained in:
parent
93181db68b
commit
6ba2363bdb
4 changed files with 16 additions and 19 deletions
|
@ -26,18 +26,17 @@
|
|||
#include <wine/debug.h>
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
|
||||
|
||||
static inline bool cicIsNullPtr(LPCVOID ptr)
|
||||
{
|
||||
return !ptr;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class CContext
|
||||
: public ITfContext
|
||||
, public ITfSource
|
||||
// , public ITfContextComposition
|
||||
, public ITfContextOwnerCompositionServices
|
||||
// , public ITfContextOwnerServices
|
||||
, public ITfInsertAtSelection
|
||||
// , public ITfMouseTracker
|
||||
// , public ITfQueryEmbedded
|
||||
, public ITfSourceSingle
|
||||
, public ITextStoreACPSink
|
||||
, public ITextStoreACPServices
|
||||
|
@ -412,15 +411,13 @@ STDMETHODIMP CContext::GetSelection(
|
|||
hr = m_pITextStoreACP->GetSelection(ulIndex + i, 1, &acps, &fetched);
|
||||
if (hr == TS_E_NOLOCK)
|
||||
return TF_E_NOLOCK;
|
||||
else if (SUCCEEDED(hr))
|
||||
{
|
||||
pSelection[totalFetched].style.ase = (TfActiveSelEnd)acps.style.ase;
|
||||
pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar;
|
||||
Range_Constructor(this, m_pITextStoreACP, cookie->lockType, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range);
|
||||
totalFetched++;
|
||||
}
|
||||
else
|
||||
else if (FAILED(hr))
|
||||
break;
|
||||
|
||||
pSelection[totalFetched].style.ase = (TfActiveSelEnd)acps.style.ase;
|
||||
pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar;
|
||||
Range_Constructor(this, m_pITextStoreACP, cookie->lockType, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range);
|
||||
totalFetched++;
|
||||
}
|
||||
|
||||
*pcFetched = totalFetched;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue