Decrease complement count

nathancorvussolis · Nov 6, 2016 · 3439be1 · 3439be1
1 parent 177b57d
commit 3439be1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/imcrvmgr/SearchUserDictionary.cpp b/imcrvmgr/SearchUserDictionary.cpp
@@ -2,7 +2,7 @@
 #include "configxml.h"
 #include "imcrvmgr.h"
 
-#define MAX_COMPLEMENT_RESULT 1024
+#define MAX_COMPLEMENT_RESULT 256
 
 //ユーザー辞書
 SKKDIC userdic;

diff --git a/imcrvtip/FunctionProvider.cpp b/imcrvtip/FunctionProvider.cpp
@@ -64,10 +64,6 @@ HRESULT CTextService::GetFunction(REFGUID rguid, REFIID riid, IUnknown **ppunk)
 	{
 		*ppunk = (ITfFnGetPreferredTouchKeyboardLayout *)this;
 	}
-	else
-	{
-		return E_INVALIDARG;
-	}
 
 	if(*ppunk)
 	{
@@ -103,36 +99,33 @@ HRESULT CTextService::GetDisplayName(BSTR *pbstrName)
 
 HRESULT CTextService::Show(HWND hwndParent, LANGID langid, REFGUID rguidProfile)
 {
-	if(IsEqualGUID(rguidProfile, c_guidProfile))
-	{
-		_StartConfigure();
-	}
-	else
+	if(!IsEqualGUID(rguidProfile, c_guidProfile))
 	{
 		return E_INVALIDARG;
 	}
 
+	_StartConfigure();
+
 	return S_OK;
 }
 
 HRESULT CTextService::Show(HWND hwndParent)
 {
 	_StartConfigure();
+
 	return S_OK;
 }
 
 HRESULT CTextService::GetLayout(TKBLayoutType *pTKBLayoutType, WORD *pwPreferredLayoutId)
 {
-	if(pTKBLayoutType != nullptr && pwPreferredLayoutId != nullptr)
-	{
-		*pTKBLayoutType = TKBLT_OPTIMIZED;
-		*pwPreferredLayoutId = TKBL_OPT_JAPANESE_ABC;
-	}
-	else
+	if(pTKBLayoutType == nullptr || pwPreferredLayoutId == nullptr)
 	{
 		return E_INVALIDARG;
 	}
 
+	*pTKBLayoutType = TKBLT_OPTIMIZED;
+	*pwPreferredLayoutId = TKBL_OPT_JAPANESE_ABC;
+
 	return S_OK;
 }