[akhaldi] 68456: [MSCTF] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Sun Jul 19 22:54:48 2015
New Revision: 68456

URL: http://svn.reactos.org/svn/reactos?rev=68456&view=rev
Log:
[MSCTF] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/win32/msctf/inputprocessor.c
    trunk/reactos/dll/win32/msctf/msctf.c
    trunk/reactos/dll/win32/msctf/msctf.spec
    trunk/reactos/dll/win32/msctf/msctf_internal.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce…
==============================================================================
--- trunk/reactos/dll/win32/msctf/inputprocessor.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/inputprocessor.c	[iso-8859-1] Sun Jul 19 22:54:48 2015
@@ -527,10 +527,9 @@
     LanguageProfile.clsid = *rclsid;
     LanguageProfile.langid = langid;
     LanguageProfile.guidProfile = *guidProfiles;
-
-    hr = add_active_textservice(&LanguageProfile);
-
-    return hr;
+    LanguageProfile.fActive = TRUE;
+
+    return add_active_textservice(&LanguageProfile);
 }
 
 static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile(

Modified: trunk/reactos/dll/win32/msctf/msctf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msctf/msctf.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/msctf.c	[iso-8859-1] Sun Jul 19 22:54:48 2015
@@ -23,8 +23,6 @@
 #include <rpcproxy.h>
 #include <inputscope.h>
 
-static LONG MSCTF_refCount;
-
 static HINSTANCE MSCTF_hinstance;
 
 typedef struct
@@ -92,7 +90,6 @@
 {
     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 @@
 
     TRACE("(%p)->(%x)\n", This, fLock);
 
-    if(fLock)
-        InterlockedIncrement(&MSCTF_refCount);
-    else
-        InterlockedDecrement(&MSCTF_refCount);
-
     return S_OK;
 }
 
@@ -172,7 +164,6 @@
     This->ctor = ctor;
     *ppvOut = This;
     TRACE("Created class factory %p\n", This);
-    MSCTF_refCount++;
     return S_OK;
 }
 
@@ -362,7 +353,6 @@
 
     actsvr->pITfTextInputProcessor = NULL;
     actsvr->LanguageProfile = *lp;
-    actsvr->LanguageProfile.fActive = TRUE;
     actsvr->pITfKeyEventSink = NULL;
 
     /* get TIP category */
@@ -521,7 +511,7 @@
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    return MSCTF_refCount ? S_FALSE : S_OK;
+    return S_FALSE;
 }
 
 /***********************************************************************
@@ -642,3 +632,12 @@
 
     return E_NOTIMPL;
 }
+
+/***********************************************************************
+ *              TF_InitMlngInfo (MSCTF.@)
+ */
+HRESULT WINAPI TF_InitMlngInfo(void)
+{
+    FIXME("stub\n");
+    return S_OK;
+}

Modified: trunk/reactos/dll/win32/msctf/msctf.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.spec…
==============================================================================
--- trunk/reactos/dll/win32/msctf/msctf.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/msctf.spec	[iso-8859-1] Sun Jul 19 22:54:48 2015
@@ -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()

Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte…
==============================================================================
--- trunk/reactos/dll/win32/msctf/msctf_internal.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/msctf_internal.h	[iso-8859-1] Sun Jul 19 22:54:48 2015
@@ -89,7 +89,7 @@
 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 */

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Jul 19 22:54:48 2015
@@ -111,7 +111,7 @@
 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