Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-05 19:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCTF] Sync with Wine Staging 1.9.4. CORE-10912

Browse source 
svn path=/trunk/; revision=70884
This commit is contained in:
Amine Khaldi 2016-03-03 13:48:58 +00:00
parent 0737aa31b7
commit 565ee09080
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
reactos/dll/win32/msctf/msctf.c
View file

@ -35,7 +35,7 @@ typedef struct
typedef struct { typedef struct {
TF_LANGUAGEPROFILE LanguageProfile; TF_LANGUAGEPROFILE LanguageProfile;
ITfTextInputProcessor *pITfTextInputProcessor; ITfTextInputProcessor *pITfTextInputProcessor;
ITfThreadMgr *pITfThreadMgr; ITfThreadMgrEx *pITfThreadMgrEx;
ITfKeyEventSink *pITfKeyEventSink; ITfKeyEventSink *pITfKeyEventSink;
TfClientId tid; TfClientId tid;
} ActivatedTextService; } ActivatedTextService;
@ -269,7 +269,7 @@ DWORD enumerate_Cookie(DWORD magic, DWORD *index)
/***************************************************************************** /*****************************************************************************
* Active Text Service Management * Active Text Service Management
*****************************************************************************/ *****************************************************************************/
static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm) static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgrEx *tm)
{ {
HRESULT hr; HRESULT hr;
@ -281,7 +281,7 @@ static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm)
&IID_ITfTextInputProcessor, (void**)&actsvr->pITfTextInputProcessor); &IID_ITfTextInputProcessor, (void**)&actsvr->pITfTextInputProcessor);
if (FAILED(hr)) return hr; 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)) if (FAILED(hr))
{ {
ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor);
@ -289,8 +289,8 @@ static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm)
return hr; return hr;
} }
actsvr->pITfThreadMgr = tm; actsvr->pITfThreadMgrEx = tm;
ITfThreadMgr_AddRef(tm); ITfThreadMgrEx_AddRef(tm);
return hr; return hr;
} }
@ -302,9 +302,9 @@ static HRESULT deactivate_given_ts(ActivatedTextService *actsvr)
{ {
hr = ITfTextInputProcessor_Deactivate(actsvr->pITfTextInputProcessor); hr = ITfTextInputProcessor_Deactivate(actsvr->pITfTextInputProcessor);
ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor);
ITfThreadMgr_Release(actsvr->pITfThreadMgr); ITfThreadMgrEx_Release(actsvr->pITfThreadMgrEx);
actsvr->pITfTextInputProcessor = NULL; actsvr->pITfTextInputProcessor = NULL;
actsvr->pITfThreadMgr = NULL; actsvr->pITfThreadMgrEx = NULL;
} }
return hr; return hr;
@ -333,7 +333,7 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp)
ActivatedTextService *actsvr; ActivatedTextService *actsvr;
ITfCategoryMgr *catmgr; ITfCategoryMgr *catmgr;
AtsEntry *entry; AtsEntry *entry;
ITfThreadMgr *tm = TlsGetValue(tlsIndex); ITfThreadMgrEx *tm = TlsGetValue(tlsIndex);
ITfClientId *clientid; ITfClientId *clientid;
if (!tm) return E_UNEXPECTED; if (!tm) return E_UNEXPECTED;
@ -341,7 +341,7 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp)
actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService)); actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService));
if (!actsvr) return E_OUTOFMEMORY; 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_GetClientId(clientid, &lp->clsid, &actsvr->tid);
ITfClientId_Release(clientid); ITfClientId_Release(clientid);
@ -408,7 +408,7 @@ BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *profile)
return FALSE; return FALSE;
} }
HRESULT activate_textservices(ITfThreadMgr *tm) HRESULT activate_textservices(ITfThreadMgrEx *tm)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
AtsEntry *ats; AtsEntry *ats;

2
reactos/dll/win32/msctf/msctf_internal.h
View file

@ -82,7 +82,7 @@ extern DWORD enumerate_Cookie(DWORD magic, DWORD *index) DECLSPEC_HIDDEN;
/* activated text services functions */ /* activated text services functions */
extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN;
extern BOOL get_active_textservice(REFCLSID rclsid, 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 HRESULT deactivate_textservices(void) DECLSPEC_HIDDEN;
extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN; extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN;

2
reactos/dll/win32/msctf/threadmgr.c
View file

@ -576,7 +576,7 @@ static HRESULT WINAPI ThreadMgr_ActivateEx(ITfThreadMgrEx *iface, TfClientId *id
ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId); ITfClientId_GetClientId(&This->ITfClientId_iface, &guid, &processId);
} }
activate_textservices((ITfThreadMgr *)iface); activate_textservices(iface);
This->activationCount++; This->activationCount++;
*id = processId; *id = processId;
return S_OK; return S_OK;

2
reactos/media/doc/README.WINE
View file

@ -108,7 +108,7 @@ reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.55
reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.55
reactos/dll/win32/mscms # 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/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/msftedit # Synced to WineStaging-1.7.55
reactos/dll/win32/msg711.acm # 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 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.55