Handle error in ITfCandidateList ::SetResult

nathancorvussolis · Nov 8, 2016 · d819a47 · d819a47
1 parent f459d26
commit d819a47
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 55 deletions.
diff --git a/imcrvtip/DisplayAttributeInfo.h b/imcrvtip/DisplayAttributeInfo.h
@@ -14,6 +14,7 @@ class CDisplayAttributeInfo : public ITfDisplayAttributeInfo
 		_pguid = &guid;
 		_pDisplayAttribute = pDisplayAttribute;
 	}
+
 	~CDisplayAttributeInfo()
 	{
 		DllRelease();
@@ -42,10 +43,12 @@ class CDisplayAttributeInfo : public ITfDisplayAttributeInfo
 
 		return E_NOINTERFACE;
 	}
+
 	STDMETHODIMP_(ULONG) AddRef(void)
 	{
 		return ++_cRef;
 	}
+
 	STDMETHODIMP_(ULONG) Release(void)
 	{
 		if(--_cRef == 0)
@@ -74,6 +77,7 @@ class CDisplayAttributeInfo : public ITfDisplayAttributeInfo
 
 		return S_OK;
 	}
+
 	STDMETHODIMP GetDescription(BSTR *pbstrDesc)
 	{
 		BSTR bstrDesc;
@@ -96,6 +100,7 @@ class CDisplayAttributeInfo : public ITfDisplayAttributeInfo
 
 		return S_OK;
 	}
+
 	STDMETHODIMP GetAttributeInfo(TF_DISPLAYATTRIBUTE *pda)
 	{
 		if(pda == nullptr)
@@ -107,10 +112,12 @@ class CDisplayAttributeInfo : public ITfDisplayAttributeInfo
 
 		return S_OK;
 	}
+
 	STDMETHODIMP SetAttributeInfo(const TF_DISPLAYATTRIBUTE *pda)
 	{
 		return S_OK;
 	}
+
 	STDMETHODIMP Reset()
 	{
 		return SetAttributeInfo(_pDisplayAttribute);

diff --git a/imcrvtip/EditSession.h b/imcrvtip/EditSession.h
@@ -18,6 +18,7 @@ class CEditSessionBase : public ITfEditSession
 		_pTextService = pTextService;
 		_pTextService->AddRef();
 	}
+
 	virtual ~CEditSessionBase()
 	{
 		SafeRelease(&_pContext);
@@ -47,10 +48,12 @@ class CEditSessionBase : public ITfEditSession
 
 		return E_NOINTERFACE;
 	}
+
 	STDMETHODIMP_(ULONG) AddRef(void)
 	{
 		return ++_cRef;
 	}
+
 	STDMETHODIMP_(ULONG) Release(void)
 	{
 		if(--_cRef == 0)

diff --git a/imcrvtip/EnumDisplayAttributeInfo.h b/imcrvtip/EnumDisplayAttributeInfo.h
@@ -10,8 +10,9 @@ class CEnumDisplayAttributeInfo : public IEnumTfDisplayAttributeInfo
 		DllAddRef();
 
 		_cRef = 1;
-		_iIndex = 0;
+		_nIndex = 0;
 	}
+
 	~CEnumDisplayAttributeInfo()
 	{
 		DllRelease();
@@ -40,10 +41,12 @@ class CEnumDisplayAttributeInfo : public IEnumTfDisplayAttributeInfo
 
 		return E_NOINTERFACE;
 	}
+
 	STDMETHODIMP_(ULONG) AddRef(void)
 	{
 		return ++_cRef;
 	}
+
 	STDMETHODIMP_(ULONG) Release(void)
 	{
 		if(--_cRef == 0)
@@ -76,12 +79,13 @@ class CEnumDisplayAttributeInfo : public IEnumTfDisplayAttributeInfo
 			return E_OUTOFMEMORY;
 		}
 
-		pClone->_iIndex = _iIndex;
+		pClone->_nIndex = _nIndex;
 
 		*ppEnum = pClone;
 
 		return S_OK;
 	}
+
 	STDMETHODIMP Next(ULONG ulCount, ITfDisplayAttributeInfo **rgInfo, ULONG *pcFetched)
 	{
 		ULONG cFetched = 0;
@@ -99,29 +103,28 @@ class CEnumDisplayAttributeInfo : public IEnumTfDisplayAttributeInfo
 
 		while(cFetched < ulCount)
 		{
-			if(_iIndex >= DISPLAYATTRIBUTE_INFO_NUM)
+			if(_nIndex >= DISPLAYATTRIBUTE_INFO_NUM)
 			{
 				break;
 			}
 
 			try
 			{
 				pDisplayAttributeInfo = new CDisplayAttributeInfo(
-					c_gdDisplayAttributeInfo[_iIndex].guid, &CTextService::display_attribute_info[_iIndex]);
+					c_gdDisplayAttributeInfo[_nIndex].guid, &CTextService::display_attribute_info[_nIndex]);
 			}
 			catch(...)
 			{
 				for(ULONG i = 0; i < cFetched; i++)
 				{
 					delete *(rgInfo + i);
 				}
-				cFetched = 0;
 				return E_OUTOFMEMORY;
 			}
 
 			*(rgInfo + cFetched) = pDisplayAttributeInfo;
 			cFetched++;
-			_iIndex++;
+			_nIndex++;
 		}
 
 		if(pcFetched != nullptr)
@@ -131,27 +134,28 @@ class CEnumDisplayAttributeInfo : public IEnumTfDisplayAttributeInfo
 
 		return (cFetched == ulCount) ? S_OK : S_FALSE;
 	}
+
 	STDMETHODIMP Reset()
 	{
-		_iIndex = 0;
+		_nIndex = 0;
 		return S_OK;
 	}
+
 	STDMETHODIMP Skip(ULONG ulCount)
 	{
-		if((ulCount < DISPLAYATTRIBUTE_INFO_NUM) &&
-			((_iIndex + ulCount) < DISPLAYATTRIBUTE_INFO_NUM))
+		if((_nIndex + ulCount) >= DISPLAYATTRIBUTE_INFO_NUM)
 		{
-			_iIndex += ulCount;
-			return S_OK;
+			_nIndex = DISPLAYATTRIBUTE_INFO_NUM;
+			return S_FALSE;
 		}
 
-		_iIndex = DISPLAYATTRIBUTE_INFO_NUM;
-		return S_FALSE;
+		_nIndex += ulCount;
+		return S_OK;
 	}
 
 private:
-	LONG _iIndex;
 	LONG _cRef;
+	ULONG _nIndex;
 };
 
 #endif //ENUMDISPLAYATTRIBUTEINFO_H
diff --git a/imcrvtip/FnCandidateList.h b/imcrvtip/FnCandidateList.h
@@ -3,28 +3,9 @@
 #define FNCANDIDATELIST_H
 
 #include "TextService.h"
-#include "EditSession.h"
 #include "FnCandidateString.h"
 #include "FnEnumCandidates.h"
 
-class CSetResultEditSession : public CEditSessionBase
-{
-public:
-	CSetResultEditSession(CTextService *pTextService, ITfContext *pContext) : CEditSessionBase(pTextService, pContext)
-	{
-	}
-
-	~CSetResultEditSession()
-	{
-	}
-
-	// ITfEditSession
-	STDMETHODIMP DoEditSession(TfEditCookie ec)
-	{
-		return _pTextService->_HandleCharReturn(ec, _pContext);
-	}
-};
-
 class CFnCandidateList : public ITfCandidateList
 {
 public:
@@ -48,6 +29,7 @@ class CFnCandidateList : public ITfCandidateList
 		DllRelease();
 	}
 
+	// IUnknown
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppvObj)
 	{
 		if(ppvObj == nullptr)
@@ -87,6 +69,7 @@ class CFnCandidateList : public ITfCandidateList
 		return _cRef;
 	}
 
+	// ITfCandidateList
 	STDMETHODIMP EnumCandidates(IEnumTfCandidates **ppEnum)
 	{
 		CFnEnumCandidates *pCandidateEnum;
@@ -155,7 +138,14 @@ class CFnCandidateList : public ITfCandidateList
 		HRESULT hr = S_OK;
 		if(imcr == CAND_FINALIZED)
 		{
-			hr = _pTextService->_SetReconvertResult(_searchkey, _candidates, nIndex);
+			try
+			{
+				hr = _pTextService->_SetResult(_searchkey, _candidates, nIndex);
+			}
+			catch(...)
+			{
+				hr = E_FAIL;
+			}
 		}
 
 		return hr;

diff --git a/imcrvtip/FnCandidateString.h b/imcrvtip/FnCandidateString.h
@@ -10,7 +10,7 @@ class CFnCandidateString : public ITfCandidateString
 		DllAddRef();
 
 		_cRef = 1;
-		_iIndex = index;
+		_nIndex = index;
 		_candidate = candidate;
 	}
 
@@ -19,6 +19,7 @@ class CFnCandidateString : public ITfCandidateString
 		DllRelease();
 	}
 
+	// IUnknown
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppvObj)
 	{
 		if(ppvObj == nullptr)
@@ -58,6 +59,7 @@ class CFnCandidateString : public ITfCandidateString
 		return _cRef;
 	}
 
+	// ITfCandidateString
 	STDMETHODIMP GetString(BSTR *pbstr)
 	{
 		BSTR bstr;
@@ -88,14 +90,14 @@ class CFnCandidateString : public ITfCandidateString
 			return E_INVALIDARG;
 		}
 
-		*pnIndex = _iIndex;
+		*pnIndex = _nIndex;
 
 		return S_OK;
 	}
 
 private:
 	LONG _cRef;
-	LONG _iIndex;
+	ULONG _nIndex;
 	std::wstring _candidate;
 };
 

diff --git a/imcrvtip/FnEnumCandidates.h b/imcrvtip/FnEnumCandidates.h
@@ -12,7 +12,7 @@ class CFnEnumCandidates : public IEnumTfCandidates
 		DllAddRef();
 
 		_cRef = 1;
-		_iIndex = 0;
+		_nIndex = 0;
 		_candidates = candidates;
 	}
 
@@ -21,6 +21,7 @@ class CFnEnumCandidates : public IEnumTfCandidates
 		DllRelease();
 	}
 
+	// IUnknown
 	STDMETHODIMP QueryInterface(REFIID riid, void **ppvObj)
 	{
 		if(ppvObj == nullptr)
@@ -60,6 +61,7 @@ class CFnEnumCandidates : public IEnumTfCandidates
 		return _cRef;
 	}
 
+	// IEnumTfCandidates
 	STDMETHODIMP Clone(IEnumTfCandidates **ppEnum)
 	{
 		CFnEnumCandidates *pClone;
@@ -80,7 +82,7 @@ class CFnEnumCandidates : public IEnumTfCandidates
 			return E_OUTOFMEMORY;
 		}
 
-		pClone->_iIndex = _iIndex;
+		pClone->_nIndex = _nIndex;
 
 		*ppEnum = pClone;
 
@@ -104,28 +106,27 @@ class CFnEnumCandidates : public IEnumTfCandidates
 
 		while(cFetched < ulCount)
 		{
-			if(_iIndex >= (LONG)_candidates.size())
+			if(_nIndex >= (ULONG)_candidates.size())
 			{
 				break;
 			}
 
 			try
 			{
-				pCandidateString = new CFnCandidateString(_iIndex, _candidates[_iIndex].first.first);
+				pCandidateString = new CFnCandidateString(_nIndex, _candidates[_nIndex].first.first);
 			}
 			catch(...)
 			{
 				for(ULONG i = 0; i < cFetched; i++)
 				{
 					delete *(ppCand + i);
 				}
-				cFetched = 0;
 				return E_OUTOFMEMORY;
 			}
 
 			*(ppCand + cFetched) = pCandidateString;
 			cFetched++;
-			_iIndex++;
+			_nIndex++;
 		}
 
 		if(pcFetched != nullptr)
@@ -138,26 +139,25 @@ class CFnEnumCandidates : public IEnumTfCandidates
 
 	STDMETHODIMP Reset(void)
 	{
-		_iIndex = 0;
+		_nIndex = 0;
 		return S_OK;
 	}
 
 	STDMETHODIMP Skip(ULONG ulCount)
 	{
-		if((ulCount < (ULONG)_candidates.size()) &&
-			((_iIndex + ulCount) < (ULONG)_candidates.size()))
+		if((_nIndex + ulCount) >= (ULONG)_candidates.size())
 		{
-			_iIndex += ulCount;
-			return S_OK;
+			_nIndex = (ULONG)_candidates.size();
+			return S_FALSE;
 		}
 
-		_iIndex = (LONG)_candidates.size();
-		return S_FALSE;
+		_nIndex += ulCount;
+		return S_OK;
 	}
 
 private:
 	LONG _cRef;
-	LONG _iIndex;
+	ULONG _nIndex;
 	CANDIDATES _candidates;
 };