Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 21:46:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCTF] Sync with Wine Staging 3.9. CORE-14656

Browse source
This commit is contained in:
Amine Khaldi 2018-06-04 03:41:08 +01:00
parent 217390ae60
commit 4335e46944
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dll/win32/msctf/context.c
View file

@ -758,14 +758,14 @@ static HRESULT WINAPI TextStoreACPSink_OnTextChange(ITextStoreACPSink *iface,
{ {
Context *This = impl_from_ITextStoreACPSink(iface); Context *This = impl_from_ITextStoreACPSink(iface);
FIXME("STUB:(%p)\n",This); FIXME("STUB:(%p)\n",This);
return E_NOTIMPL; return S_OK;
} }
static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *iface) static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *iface)
{ {
Context *This = impl_from_ITextStoreACPSink(iface); Context *This = impl_from_ITextStoreACPSink(iface);
FIXME("STUB:(%p)\n",This); FIXME("STUB:(%p)\n",This);
return E_NOTIMPL; return S_OK;
} }
static HRESULT WINAPI TextStoreACPSink_OnLayoutChange(ITextStoreACPSink *iface, static HRESULT WINAPI TextStoreACPSink_OnLayoutChange(ITextStoreACPSink *iface,
@ -773,7 +773,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLayoutChange(ITextStoreACPSink *iface,
{ {
Context *This = impl_from_ITextStoreACPSink(iface); Context *This = impl_from_ITextStoreACPSink(iface);
FIXME("STUB:(%p)\n",This); FIXME("STUB:(%p)\n",This);
return E_NOTIMPL; return S_OK;
} }
static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface, static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface,

1
dll/win32/msctf/msctf_internal.h
View file

@ -31,6 +31,7 @@
#define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 #define COOKIE_MAGIC_COMPARTMENTSINK 0x0060
#define COOKIE_MAGIC_DMSINK 0x0070 #define COOKIE_MAGIC_DMSINK 0x0070
#define COOKIE_MAGIC_THREADFOCUSSINK 0x0080 #define COOKIE_MAGIC_THREADFOCUSSINK 0x0080
#define COOKIE_MAGIC_KEYTRACESINK 0x0090
extern DWORD tlsIndex DECLSPEC_HIDDEN; extern DWORD tlsIndex DECLSPEC_HIDDEN;
extern TfClientId processId DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN;

12
dll/win32/msctf/threadmgr.c
View file

@ -621,6 +621,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface,
return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie);
} }
if (IsEqualIID(riid, &IID_ITfKeyTraceEventSink))
{
WARN("semi-stub for ITfKeyTraceEventSink: sink won't be used.\n");
return advise_sink(&This->KeyTraceEventSink, &IID_ITfKeyTraceEventSink,
COOKIE_MAGIC_KEYTRACESINK, punk, pdwCookie);
}
FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid));
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -628,10 +635,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface,
static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie)
{ {
ThreadMgr *This = impl_from_ITfSource(iface); ThreadMgr *This = impl_from_ITfSource(iface);
DWORD magic;
TRACE("(%p) %x\n",This,pdwCookie); TRACE("(%p) %x\n",This,pdwCookie);
if (get_Cookie_magic(pdwCookie) != COOKIE_MAGIC_TMSINK && get_Cookie_magic(pdwCookie) != COOKIE_MAGIC_THREADFOCUSSINK) magic = get_Cookie_magic(pdwCookie);
if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK
&& magic != COOKIE_MAGIC_KEYTRACESINK)
return E_INVALIDARG; return E_INVALIDARG;
return unadvise_sink(pdwCookie); return unadvise_sink(pdwCookie);

2
media/doc/README.WINE
View file

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