Nikolay Sivov : msctf: Set fActive directly in ActivateLanguageProfile() ( Coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d4bbcc44cb8e3e4d01121e1f4d24e3a0a5b01b84
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d4bbcc44cb8e3e4d01121e1f4d...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Sun Jun  7 09:25:42 2015 +0300

msctf: Set fActive directly in ActivateLanguageProfile() (Coverity).

---

 dlls/msctf/inputprocessor.c | 5 ++---
 dlls/msctf/msctf.c          | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c
index 89eb746..01af325 100644
--- a/dlls/msctf/inputprocessor.c
+++ b/dlls/msctf/inputprocessor.c
@@ -549,10 +549,9 @@ static HRESULT WINAPI InputProcessorProfiles_ActivateLanguageProfile(
     LanguageProfile.clsid = *rclsid;
     LanguageProfile.langid = langid;
     LanguageProfile.guidProfile = *guidProfiles;
+    LanguageProfile.fActive = TRUE;
 
-    hr = add_active_textservice(&LanguageProfile);
-
-    return hr;
+    return add_active_textservice(&LanguageProfile);
 }
 
 static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile(
diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c
index 4ea6a0a..85d2540 100644
--- a/dlls/msctf/msctf.c
+++ b/dlls/msctf/msctf.c
@@ -371,7 +371,6 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp)
 
     actsvr->pITfTextInputProcessor = NULL;
     actsvr->LanguageProfile = *lp;
-    actsvr->LanguageProfile.fActive = TRUE;
     actsvr->pITfKeyEventSink = NULL;
 
     /* get TIP category */