[ros-diffs] [akhaldi] 60303: [MSCTF] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sun Sep 22 16:16:21 2013
New Revision: 60303

URL: http://svn.reactos.org/svn/reactos?rev=60303&view=rev
Log:
[MSCTF]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/msctf/CMakeLists.txt
    trunk/reactos/dll/win32/msctf/categorymgr.c
    trunk/reactos/dll/win32/msctf/compartmentmgr.c
    trunk/reactos/dll/win32/msctf/context.c
    trunk/reactos/dll/win32/msctf/displayattributemgr.c
    trunk/reactos/dll/win32/msctf/documentmgr.c
    trunk/reactos/dll/win32/msctf/inputprocessor.c
    trunk/reactos/dll/win32/msctf/langbarmgr.c
    trunk/reactos/dll/win32/msctf/msctf.c
    trunk/reactos/dll/win32/msctf/msctf.spec
    trunk/reactos/dll/win32/msctf/range.c
    trunk/reactos/dll/win32/msctf/threadmgr.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/msctf/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/CMakeLists.txt	[iso-8859-1] Sun Sep 22 16:16:21 2013
@@ -1,11 +1,9 @@
-
-add_definitions(-D__WINESRC__)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
+add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(msctf.dll msctf.spec)
 
 list(APPEND SOURCE
@@ -19,12 +17,10 @@
     msctf.c
     range.c
     threadmgr.c
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
 
-add_library(msctf SHARED ${SOURCE})
-
+add_library(msctf SHARED ${SOURCE} version.rc)
 set_module_type(msctf win32dll)
 target_link_libraries(msctf uuid wine)
 add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)

Modified: trunk/reactos/dll/win32/msctf/categorymgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/categorymg…
==============================================================================
--- trunk/reactos/dll/win32/msctf/categorymgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/categorymgr.c	[iso-8859-1] Sun Sep 22 16:16:21 2013
@@ -72,7 +72,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfCategoryMgr_AddRef(iface);
         return S_OK;
     }
 
@@ -245,7 +245,7 @@
 
         if (ulCount)
         {
-            int j;
+            ULONG j;
             BOOL found = FALSE;
             for (j = 0; j < ulCount; j++)
                 if (IsEqualGUID(&guid, ppcatidList[j]))

Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/compartmen…
==============================================================================
--- trunk/reactos/dll/win32/msctf/compartmentmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/compartmentmgr.c	[iso-8859-1] Sun Sep 22 16:16:21 2013
@@ -135,7 +135,7 @@
 
         if (*ppvOut)
         {
-            IUnknown_AddRef(iface);
+            ITfCompartmentMgr_AddRef(iface);
             return S_OK;
         }
 
@@ -308,7 +308,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        IEnumGUID_AddRef(iface);
         return S_OK;
     }
 
@@ -468,7 +468,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfCompartment_AddRef(iface);
         return S_OK;
     }
 
@@ -621,7 +621,7 @@
     if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK)
         return E_INVALIDARG;
 
-    sink = (CompartmentSink*)remove_Cookie(pdwCookie);
+    sink = remove_Cookie(pdwCookie);
     if (!sink)
         return CONNECT_E_NOCONNECTION;
 

Modified: trunk/reactos/dll/win32/msctf/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?…
==============================================================================
--- trunk/reactos/dll/win32/msctf/context.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/context.c	[iso-8859-1] Sun Sep 22 16:16:21 2013
@@ -145,10 +145,10 @@
     }
 
     if (This->pITextStoreACP)
-        ITextStoreACPSink_Release(This->pITextStoreACP);
+        ITextStoreACP_Release(This->pITextStoreACP);
 
     if (This->pITfContextOwnerCompositionSink)
-        ITextStoreACPSink_Release(This->pITfContextOwnerCompositionSink);
+       
ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink);
 
     if (This->defaultCookie)
     {
@@ -220,7 +220,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfContext_AddRef(iface);
         return S_OK;
     }
 
@@ -373,7 +373,7 @@
 {
     TS_SELECTION_ACP *acp;
     Context *This = (Context *)iface;
-    INT i;
+    ULONG i;
     HRESULT hr;
 
     TRACE("(%p) %i %i %p\n",This,ec,ulCount,pSelection);
@@ -646,7 +646,7 @@
     if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK)
         return E_INVALIDARG;
 
-    sink = (ContextSink*)remove_Cookie(pdwCookie);
+    sink = remove_Cookie(pdwCookie);
     if (!sink)
         return CONNECT_E_NOCONNECTION;
 
@@ -900,7 +900,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITextStoreACPSink_AddRef(iface);
         return S_OK;
     }
 

Modified: trunk/reactos/dll/win32/msctf/displayattributemgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/displayatt…
==============================================================================
--- trunk/reactos/dll/win32/msctf/displayattributemgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/displayattributemgr.c	[iso-8859-1] Sun Sep 22 16:16:21
2013
@@ -65,7 +65,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfDisplayAttributeMgr_AddRef(iface);
         return S_OK;
     }
 

Modified: trunk/reactos/dll/win32/msctf/documentmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg…
==============================================================================
--- trunk/reactos/dll/win32/msctf/documentmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/documentmgr.c	[iso-8859-1] Sun Sep 22 16:16:21 2013
@@ -76,7 +76,7 @@
     return CONTAINING_RECORD(iface, DocumentMgr, ITfSource_iface);
 }
 
-static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface)\
+static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface)
 {
     return CONTAINING_RECORD(iface, EnumTfContext, IEnumTfContexts_iface);
 }
@@ -117,7 +117,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfDocumentMgr_AddRef(iface);
         return S_OK;
     }
 
@@ -165,7 +165,7 @@
     if (This->contextStack[1])  /* FUll */
         return TF_E_STACKFULL;
 
-    if (!pic || FAILED(IUnknown_QueryInterface(pic,&IID_ITfContext,(LPVOID*)
&check)))
+    if (!pic || FAILED(ITfContext_QueryInterface(pic,&IID_ITfContext,(LPVOID*)
&check)))
         return E_INVALIDARG;
 
     if (This->contextStack[0] == NULL)
@@ -190,14 +190,14 @@
         if (This->contextStack[0])
         {
            
ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]);
+            Context_Uninitialize(This->contextStack[0]);
             ITfContext_Release(This->contextStack[0]);
-            Context_Uninitialize(This->contextStack[0]);
         }
         if (This->contextStack[1])
         {
            
ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[1]);
+            Context_Uninitialize(This->contextStack[1]);
             ITfContext_Release(This->contextStack[1]);
-            Context_Uninitialize(This->contextStack[1]);
         }
         This->contextStack[0] = This->contextStack[1] = NULL;
         ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface);
@@ -211,8 +211,8 @@
         return E_FAIL;
 
     ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]);
+    Context_Uninitialize(This->contextStack[0]);
     ITfContext_Release(This->contextStack[0]);
-    Context_Uninitialize(This->contextStack[0]);
     This->contextStack[0] = This->contextStack[1];
     This->contextStack[1] = NULL;
 
@@ -368,7 +368,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        IEnumTfContexts_AddRef(iface);
         return S_OK;
     }
 

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 Sep 22 16:16:21 2013
@@ -176,7 +176,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfInputProcessorProfiles_AddRef(iface);
         return S_OK;
     }
 
@@ -743,7 +743,7 @@
     if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_IPPSINK)
         return E_INVALIDARG;
 
-    sink = (InputProcessorProfilesSink*)remove_Cookie(pdwCookie);
+    sink = remove_Cookie(pdwCookie);
     if (!sink)
         return CONNECT_E_NOCONNECTION;
 
@@ -807,7 +807,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        IEnumGUID_AddRef(iface);
         return S_OK;
     }
 
@@ -963,7 +963,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        IEnumTfLanguageProfiles_AddRef(iface);
         return S_OK;
     }
 

Modified: trunk/reactos/dll/win32/msctf/langbarmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/langbarmgr…
==============================================================================
--- trunk/reactos/dll/win32/msctf/langbarmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/langbarmgr.c	[iso-8859-1] Sun Sep 22 16:16:21 2013
@@ -65,7 +65,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfLangBarMgr_AddRef(iface);
         return S_OK;
     }
 

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 Sep 22 16:16:21 2013
@@ -39,6 +39,7 @@
 //#include "comcat.h"
 #include <rpcproxy.h>
 #include <msctf.h>
+#include <inputscope.h>
 
 #include "msctf_internal.h"
 
@@ -202,7 +203,7 @@
  */
 DWORD generate_Cookie(DWORD magic, LPVOID data)
 {
-    int i;
+    UINT i;
 
     /* try to reuse IDs if possible */
     for (i = 0; i < id_last; i++)
@@ -286,7 +287,7 @@
 
 DWORD enumerate_Cookie(DWORD magic, DWORD *index)
 {
-    int i;
+    unsigned int i;
     for (i = *index; i < id_last; i++)
         if (cookies[i].id != 0 && cookies[i].magic == magic)
         {
@@ -530,6 +531,7 @@
             tlsIndex = TlsAlloc();
             break;
         case DLL_PROCESS_DETACH:
+            if (fImpLoad) break;
             TlsFree(tlsIndex);
             break;
     }
@@ -605,7 +607,7 @@
 /***********************************************************************
  *              SetInputScope(MSCTF.@)
  */
-HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope)
+HRESULT WINAPI SetInputScope(HWND hwnd, InputScope inputscope)
 {
     FIXME("STUB: %p %i\n",hwnd,inputscope);
     return S_OK;
@@ -614,16 +616,16 @@
 /***********************************************************************
  *              SetInputScopes(MSCTF.@)
  */
-HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes,
+HRESULT WINAPI SetInputScopes(HWND hwnd, const InputScope *pInputScopes,
                               UINT cInputScopes, WCHAR **ppszPhraseList,
                               UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS)
 {
-    int i;
+    UINT i;
     FIXME("STUB: %p ... %s %s\n",hwnd, debugstr_w(pszRegExp),
debugstr_w(pszSRGS));
     for (i = 0; i < cInputScopes; i++)
-        TRACE("\tScope[%i] = %i\n",i,pInputScopes[i]);
+        TRACE("\tScope[%u] = %i\n",i,pInputScopes[i]);
     for (i = 0; i < cPhrases; i++)
-        TRACE("\tPhrase[%i] = %s\n",i,debugstr_w(ppszPhraseList[i]));
+        TRACE("\tPhrase[%u] = %s\n",i,debugstr_w(ppszPhraseList[i]));
 
     return S_OK;
 }
@@ -654,3 +656,11 @@
     TRACE("\n");
     return LangBarMgr_Constructor(NULL,(IUnknown**)pppbm);
 }
+
+HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim)
+{
+    FIXME("stub %p\n", pplbim);
+    *pplbim = NULL;
+
+    return E_NOTIMPL;
+}

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 Sep 22 16:16:21 2013
@@ -12,7 +12,7 @@
 @ stub TF_CreateCicLoadMutex
 @ stub TF_CreateDisplayAttributeMgr
 @ stdcall TF_CreateInputProcessorProfiles(ptr)
-@ stub TF_CreateLangBarItemMgr
+@ stdcall TF_CreateLangBarItemMgr(ptr)
 @ stdcall TF_CreateLangBarMgr(ptr)
 @ stdcall TF_CreateThreadMgr(ptr)
 @ stub TF_DllDetachInOther

Modified: trunk/reactos/dll/win32/msctf/range.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/range.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msctf/range.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/range.c	[iso-8859-1] Sun Sep 22 16:16:21 2013
@@ -81,7 +81,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfRange_AddRef(iface);
         return S_OK;
     }
 

Modified: trunk/reactos/dll/win32/msctf/threadmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.…
==============================================================================
--- trunk/reactos/dll/win32/msctf/threadmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/threadmgr.c	[iso-8859-1] Sun Sep 22 16:16:21 2013
@@ -283,7 +283,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfThreadMgr_AddRef(iface);
         return S_OK;
     }
 
@@ -426,7 +426,7 @@
 
     if (!pdimFocus)
         check = NULL;
-    else if (FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*)
&check)))
+    else if
(FAILED(ITfDocumentMgr_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*)
&check)))
         return E_INVALIDARG;
 
    
ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl,
check, This->focus);
@@ -666,7 +666,7 @@
     if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK)
         return E_INVALIDARG;
 
-    sink = (ThreadMgrSink*)remove_Cookie(pdwCookie);
+    sink = remove_Cookie(pdwCookie);
     if (!sink)
         return CONNECT_E_NOCONNECTION;
 
@@ -728,7 +728,7 @@
     if (check != NULL)
         return CONNECT_E_ADVISELIMIT;
 
-    if (FAILED(IUnknown_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*)
&check)))
+    if (FAILED(ITfKeyEventSink_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*)
&check)))
         return E_INVALIDARG;
 
     set_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown*)check);
@@ -1337,7 +1337,7 @@
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        IEnumTfDocumentMgrs_AddRef(iface);
         return S_OK;
     }
 
@@ -1396,7 +1396,7 @@
 
 static HRESULT WINAPI EnumTfDocumentMgr_Skip( IEnumTfDocumentMgrs* iface, ULONG celt)
 {
-    INT i;
+    ULONG i;
     EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface;
     TRACE("(%p)\n",This);
     for(i = 0; i < celt && This->index != NULL; i++)

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 Sep 22 16:16:21 2013
@@ -110,7 +110,7 @@
 reactos/dll/win32/mscat32         # Synced to Wine-1.7.1
 reactos/dll/win32/mscms           # Synced to Wine-1.7.1
 reactos/dll/win32/mscoree         # Synced to Wine-1.5.4
-reactos/dll/win32/msctf           # Synced to Wine-1.5.4
+reactos/dll/win32/msctf           # Synced to Wine-1.7.1
 reactos/dll/win32/msftedit        # Synced to Wine-1.5.19
 reactos/dll/win32/msg711.acm      # Synced to Wine-1.5.19
 reactos/dll/win32/msgsm32.acm     # Synced to Wine-1.5.4