Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:56:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=68456
This commit is contained in:
Amine Khaldi 2015-07-19 22:54:48 +00:00
parent 47a6c45fd6
commit 9f4e57acd8
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/msctf/inputprocessor.c
View file

@ -527,10 +527,9 @@ static HRESULT WINAPI InputProcessorProfiles_ActivateLanguageProfile(
LanguageProfile.clsid = *rclsid; LanguageProfile.clsid = *rclsid;
LanguageProfile.langid = langid; LanguageProfile.langid = langid;
LanguageProfile.guidProfile = *guidProfiles; LanguageProfile.guidProfile = *guidProfiles;
LanguageProfile.fActive = TRUE;
hr = add_active_textservice(&LanguageProfile); return add_active_textservice(&LanguageProfile);
return hr;
} }
static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile( static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile(

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

@ -23,8 +23,6 @@
#include <rpcproxy.h> #include <rpcproxy.h>
#include <inputscope.h> #include <inputscope.h>
static LONG MSCTF_refCount;
static HINSTANCE MSCTF_hinstance; static HINSTANCE MSCTF_hinstance;
typedef struct typedef struct
@ -92,7 +90,6 @@ static void ClassFactory_Destructor(ClassFactory *This)
{ {
TRACE("Destroying class factory %p\n", This); TRACE("Destroying class factory %p\n", This);
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
MSCTF_refCount--;
} }
static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) 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); TRACE("(%p)->(%x)\n", This, fLock);
if(fLock)
InterlockedIncrement(&MSCTF_refCount);
else
InterlockedDecrement(&MSCTF_refCount);
return S_OK; return S_OK;
} }
@ -172,7 +164,6 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut)
This->ctor = ctor; This->ctor = ctor;
*ppvOut = This; *ppvOut = This;
TRACE("Created class factory %p\n", This); TRACE("Created class factory %p\n", This);
MSCTF_refCount++;
return S_OK; return S_OK;
} }
@ -362,7 +353,6 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp)
actsvr->pITfTextInputProcessor = NULL; actsvr->pITfTextInputProcessor = NULL;
actsvr->LanguageProfile = *lp; actsvr->LanguageProfile = *lp;
actsvr->LanguageProfile.fActive = TRUE;
actsvr->pITfKeyEventSink = NULL; actsvr->pITfKeyEventSink = NULL;
/* get TIP category */ /* get TIP category */
@ -521,7 +511,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
*/ */
HRESULT WINAPI DllCanUnloadNow(void) 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; return E_NOTIMPL;
} }
/***********************************************************************
* TF_InitMlngInfo (MSCTF.@)
*/
HRESULT WINAPI TF_InitMlngInfo(void)
{
FIXME("stub\n");
return S_OK;
}

2
reactos/dll/win32/msctf/msctf.spec
View file

@ -24,7 +24,7 @@
@ stub TF_GetThreadFlags @ stub TF_GetThreadFlags
@ stdcall TF_GetThreadMgr(ptr) @ stdcall TF_GetThreadMgr(ptr)
@ stub TF_InatExtractIcon @ stub TF_InatExtractIcon
@ stub TF_InitMlngInfo @ stdcall TF_InitMlngInfo()
@ stub TF_InitSystem @ stub TF_InitSystem
@ stub TF_InvalidAssemblyListCache @ stub TF_InvalidAssemblyListCache
@ stdcall TF_InvalidAssemblyListCacheIfExist() @ stdcall TF_InvalidAssemblyListCacheIfExist()

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

@ -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 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 HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) DECLSPEC_HIDDEN;
extern const WCHAR szwSystemTIPKey[]; extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN;
extern const WCHAR szwSystemCTFKey[]; extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN;
#endif /* __WINE_MSCTF_I_H */ #endif /* __WINE_MSCTF_I_H */

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

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