Author: akhaldi Date: Thu Mar 3 13:48:58 2016 New Revision: 70884
URL: http://svn.reactos.org/svn/reactos?rev=70884&view=rev Log: [MSCTF] Sync with Wine Staging 1.9.4. CORE-10912
Modified: trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/msctf_internal.h trunk/reactos/dll/win32/msctf/threadmgr.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msctf/msctf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?rev... ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Thu Mar 3 13:48:58 2016 @@ -35,7 +35,7 @@ typedef struct { TF_LANGUAGEPROFILE LanguageProfile; ITfTextInputProcessor *pITfTextInputProcessor; - ITfThreadMgr *pITfThreadMgr; + ITfThreadMgrEx *pITfThreadMgrEx; ITfKeyEventSink *pITfKeyEventSink; TfClientId tid; } ActivatedTextService; @@ -269,7 +269,7 @@ /***************************************************************************** * Active Text Service Management *****************************************************************************/ -static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm) +static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgrEx *tm) { HRESULT hr;
@@ -281,7 +281,7 @@ &IID_ITfTextInputProcessor, (void**)&actsvr->pITfTextInputProcessor); if (FAILED(hr)) return hr;
- hr = ITfTextInputProcessor_Activate(actsvr->pITfTextInputProcessor, tm, actsvr->tid); + hr = ITfTextInputProcessor_Activate(actsvr->pITfTextInputProcessor, (ITfThreadMgr *)tm, actsvr->tid); if (FAILED(hr)) { ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); @@ -289,8 +289,8 @@ return hr; }
- actsvr->pITfThreadMgr = tm; - ITfThreadMgr_AddRef(tm); + actsvr->pITfThreadMgrEx = tm; + ITfThreadMgrEx_AddRef(tm); return hr; }
@@ -302,9 +302,9 @@ { hr = ITfTextInputProcessor_Deactivate(actsvr->pITfTextInputProcessor); ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); - ITfThreadMgr_Release(actsvr->pITfThreadMgr); + ITfThreadMgrEx_Release(actsvr->pITfThreadMgrEx); actsvr->pITfTextInputProcessor = NULL; - actsvr->pITfThreadMgr = NULL; + actsvr->pITfThreadMgrEx = NULL; }
return hr; @@ -333,7 +333,7 @@ ActivatedTextService *actsvr; ITfCategoryMgr *catmgr; AtsEntry *entry; - ITfThreadMgr *tm = TlsGetValue(tlsIndex); + ITfThreadMgrEx *tm = TlsGetValue(tlsIndex); ITfClientId *clientid;
if (!tm) return E_UNEXPECTED; @@ -341,7 +341,7 @@ actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService)); if (!actsvr) return E_OUTOFMEMORY;
- ITfThreadMgr_QueryInterface(tm,&IID_ITfClientId,(LPVOID)&clientid); + ITfThreadMgrEx_QueryInterface(tm, &IID_ITfClientId, (void **)&clientid); ITfClientId_GetClientId(clientid, &lp->clsid, &actsvr->tid); ITfClientId_Release(clientid);
@@ -408,7 +408,7 @@ return FALSE; }
-HRESULT activate_textservices(ITfThreadMgr *tm) +HRESULT activate_textservices(ITfThreadMgrEx *tm) { HRESULT hr = S_OK; AtsEntry *ats;
Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inter... ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Thu Mar 3 13:48:58 2016 @@ -82,7 +82,7 @@ /* activated text services functions */ extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; -extern HRESULT activate_textservices(ITfThreadMgr *tm) DECLSPEC_HIDDEN; +extern HRESULT activate_textservices(ITfThreadMgrEx *tm) DECLSPEC_HIDDEN; extern HRESULT deactivate_textservices(void) DECLSPEC_HIDDEN;
extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.c... ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Thu Mar 3 13:48:58 2016 @@ -576,7 +576,7 @@ ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId); }
- activate_textservices((ITfThreadMgr *)iface); + activate_textservices(iface); This->activationCount++; *id = processId; return S_OK;
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Mar 3 13:48:58 2016 @@ -108,7 +108,7 @@ reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mscms # Synced to WineStaging-1.7.55 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-1.7.55 +reactos/dll/win32/msctf # Synced to WineStaging-1.9.4 reactos/dll/win32/msftedit # Synced to WineStaging-1.7.55 reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.55