From 9f4e57acd826c0de324af8c7d02caeb69ad3ad32 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 19 Jul 2015 22:54:48 +0000
Subject: [PATCH] [MSCTF] Sync with Wine Staging 1.7.47. CORE-9924

svn path=/trunk/; revision=68456
---
 reactos/dll/win32/msctf/inputprocessor.c |  5 ++---
 reactos/dll/win32/msctf/msctf.c          | 21 ++++++++++-----------
 reactos/dll/win32/msctf/msctf.spec       |  2 +-
 reactos/dll/win32/msctf/msctf_internal.h |  4 ++--
 reactos/media/doc/README.WINE            |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/reactos/dll/win32/msctf/inputprocessor.c b/reactos/dll/win32/msctf/inputprocessor.c
index 6770a97ce8a..434a3a5b0c3 100644
--- a/reactos/dll/win32/msctf/inputprocessor.c
+++ b/reactos/dll/win32/msctf/inputprocessor.c
@@ -527,10 +527,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/reactos/dll/win32/msctf/msctf.c b/reactos/dll/win32/msctf/msctf.c
index 61f4c843764..4068d8fb69c 100644
--- a/reactos/dll/win32/msctf/msctf.c
+++ b/reactos/dll/win32/msctf/msctf.c
@@ -23,8 +23,6 @@
 #include <rpcproxy.h>
 #include <inputscope.h>
 
-static LONG MSCTF_refCount;
-
 static HINSTANCE MSCTF_hinstance;
 
 typedef struct
@@ -92,7 +90,6 @@ static void ClassFactory_Destructor(ClassFactory *This)
 {
     TRACE("Destroying class factory %p\n", This);
     HeapFree(GetProcessHeap(),0,This);
-    MSCTF_refCount--;
 }
 
 static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut)
@@ -145,11 +142,6 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock)
 
     TRACE("(%p)->(%x)\n", This, fLock);
 
-    if(fLock)
-        InterlockedIncrement(&MSCTF_refCount);
-    else
-        InterlockedDecrement(&MSCTF_refCount);
-
     return S_OK;
 }
 
@@ -172,7 +164,6 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut)
     This->ctor = ctor;
     *ppvOut = This;
     TRACE("Created class factory %p\n", This);
-    MSCTF_refCount++;
     return S_OK;
 }
 
@@ -362,7 +353,6 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp)
 
     actsvr->pITfTextInputProcessor = NULL;
     actsvr->LanguageProfile = *lp;
-    actsvr->LanguageProfile.fActive = TRUE;
     actsvr->pITfKeyEventSink = NULL;
 
     /* get TIP category */
@@ -521,7 +511,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    return MSCTF_refCount ? S_FALSE : S_OK;
+    return S_FALSE;
 }
 
 /***********************************************************************
@@ -642,3 +632,12 @@ HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim)
 
     return E_NOTIMPL;
 }
+
+/***********************************************************************
+ *              TF_InitMlngInfo (MSCTF.@)
+ */
+HRESULT WINAPI TF_InitMlngInfo(void)
+{
+    FIXME("stub\n");
+    return S_OK;
+}
diff --git a/reactos/dll/win32/msctf/msctf.spec b/reactos/dll/win32/msctf/msctf.spec
index 4dbfb92541d..c3d909ccf5d 100644
--- a/reactos/dll/win32/msctf/msctf.spec
+++ b/reactos/dll/win32/msctf/msctf.spec
@@ -24,7 +24,7 @@
 @ stub TF_GetThreadFlags
 @ stdcall TF_GetThreadMgr(ptr)
 @ stub TF_InatExtractIcon
-@ stub TF_InitMlngInfo
+@ stdcall TF_InitMlngInfo()
 @ stub TF_InitSystem
 @ stub TF_InvalidAssemblyListCache
 @ stdcall TF_InvalidAssemblyListCacheIfExist()
diff --git a/reactos/dll/win32/msctf/msctf_internal.h b/reactos/dll/win32/msctf/msctf_internal.h
index c6b26436f66..339a3c9e539 100644
--- a/reactos/dll/win32/msctf/msctf_internal.h
+++ b/reactos/dll/win32/msctf/msctf_internal.h
@@ -89,7 +89,7 @@ extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN;
 extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink) DECLSPEC_HIDDEN;
 extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) DECLSPEC_HIDDEN;
 
-extern const WCHAR szwSystemTIPKey[];
-extern const WCHAR szwSystemCTFKey[];
+extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN;
+extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN;
 
 #endif /* __WINE_MSCTF_I_H */
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 56aab9dac6a..65174df7689 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -111,7 +111,7 @@ reactos/dll/win32/msadp32.acm         # Synced to WineStaging-1.7.47
 reactos/dll/win32/mscat32             # Synced to WineStaging-1.7.37
 reactos/dll/win32/mscms               # Synced to WineStaging-1.7.37
 reactos/dll/win32/mscoree             # Synced to Wine-1.5.4
-reactos/dll/win32/msctf               # Synced to WineStaging-1.7.37
+reactos/dll/win32/msctf               # Synced to WineStaging-1.7.47
 reactos/dll/win32/msftedit            # Synced to WineStaging-1.7.37
 reactos/dll/win32/msg711.acm          # Synced to WineStaging-1.7.37
 reactos/dll/win32/msgsm32.acm         # Synced to WineStaging-1.7.37