Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 71571: [COMCTL32_WINETEST] - Fix copypasta'd test list entry
by tfaber＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: tfaber Date: Sun Jun 5 21:00:22 2016 New Revision: 71571 URL: http://svn.reactos.org/svn/reactos?rev=71571&view=rev Log: [COMCTL32_WINETEST] - Fix copypasta'd test list entry Modified: trunk/rostests/winetests/comctl32/testlist.c Modified: trunk/rostests/winetests/comctl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/testli… ============================================================================== --- trunk/rostests/winetests/comctl32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/testlist.c [iso-8859-1] Sun Jun 5 21:00:22 2016 @@ -31,7 +31,7 @@ const struct test winetest_testlist[] = { - { "button", func_animate }, + { "animate", func_animate }, { "button", func_button }, { "comboex", func_comboex }, { "datetime", func_datetime },

1 0

[akhaldi] 71570: [DBGHELP] GET_ENTRY => CONTAINING_RECORD.
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:47:14 2016 New Revision: 71570 URL: http://svn.reactos.org/svn/reactos?rev=71570&view=rev Log: [DBGHELP] GET_ENTRY => CONTAINING_RECORD. Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff trunk/reactos/dll/win32/dbghelp/symbol.c Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] Sun Jun 5 19:47:14 2016 @@ -529,7 +529,7 @@ + + /* try to find the pointer in our ht */ + while ((ptr = hash_table_iter_up(&hti))) { -+ idx_to_ptr = GET_ENTRY(ptr, struct symt_idx_to_ptr, hash_elt); ++ idx_to_ptr = CONTAINING_RECORD(ptr, struct symt_idx_to_ptr, hash_elt); + if (idx_to_ptr->sym == sym) + return idx_to_ptr->idx; } Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Sun Jun 5 19:47:14 2016 @@ -68,7 +68,7 @@ /* try to find the pointer in our ht */ while ((ptr = hash_table_iter_up(&hti))) { - idx_to_ptr = GET_ENTRY(ptr, struct symt_idx_to_ptr, hash_elt); + idx_to_ptr = CONTAINING_RECORD(ptr, struct symt_idx_to_ptr, hash_elt); if (idx_to_ptr->sym == sym) return idx_to_ptr->idx; }

1 0

[akhaldi] 71569: [MSCTF_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:38:56 2016 New Revision: 71569 URL: http://svn.reactos.org/svn/reactos?rev=71569&view=rev Log: [MSCTF_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/msctf/inputprocessor.c Modified: trunk/rostests/winetests/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproc… ============================================================================== --- trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] Sun Jun 5 19:38:56 2016 @@ -62,6 +62,7 @@ static DWORD tmSinkCookie; static DWORD tmSinkRefCount; +static DWORD dmSinkCookie; static DWORD documentStatus; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; @@ -117,9 +118,7 @@ *sink = (*sink & ~SINK_EXPECTED_COUNT_MASK) + (count << 16); return; default: - if (todo) - todo_wine winetest_ok(0, "Unexpected %s sink\n",name); - else + todo_wine_if (todo) winetest_ok(0, "Unexpected %s sink\n",name); } *sink = SINK_FIRED; @@ -147,9 +146,7 @@ winetest_trace("optional sink %s not fired\n",name); break; default: - if (todo) - todo_wine winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); - else + todo_wine_if (todo) winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); } *sink = SINK_UNEXPECTED; @@ -230,12 +227,18 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, REFIID riid, IUnknown *punk, DWORD dwMask) { + ITextStoreACPServices *services; HRESULT hr; sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); - hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink,(LPVOID*)(&ACPSink)); + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); + + hr = ITextStoreACPSink_QueryInterface(ACPSink, &IID_ITextStoreACPServices, (void**)&services); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStoreACPServices_Release(services); + return S_OK; } @@ -620,6 +623,42 @@ return S_OK; } +static HRESULT WINAPI TfTransitoryExtensionSink_QueryInterface(ITfTransitoryExtensionSink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfTransitoryExtensionSink, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TfTransitoryExtensionSink_AddRef(ITfTransitoryExtensionSink *iface) +{ + return 2; +} + +static ULONG WINAPI TfTransitoryExtensionSink_Release(ITfTransitoryExtensionSink *iface) +{ + return 1; +} + +static HRESULT WINAPI TfTransitoryExtensionSink_OnTransitoryExtensionUpdated(ITfTransitoryExtensionSink *iface, ITfContext *pic, + TfEditCookie ecReadOnly, ITfRange *pResultRange, ITfRange *pCompositionRange, BOOL *pfDeleteResultRange) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ITfTransitoryExtensionSinkVtbl TfTransitoryExtensionSinkVtbl = { + TfTransitoryExtensionSink_QueryInterface, + TfTransitoryExtensionSink_AddRef, + TfTransitoryExtensionSink_Release, + TfTransitoryExtensionSink_OnTransitoryExtensionUpdated +}; + +static ITfTransitoryExtensionSink TfTransitoryExtensionSink = { &TfTransitoryExtensionSinkVtbl }; /******************************************************************************************** * Stub text service for testing @@ -1051,6 +1090,34 @@ ITfSource_Release(source); } +static void test_DocumentMgrAdviseSinks(void) +{ + ITfSource *source; + HRESULT hr; + + hr = ITfDocumentMgr_QueryInterface(g_dm, &IID_ITfSource, (void**)&source); + ok(hr == S_OK,"Failed to get IID_ITfSource for DocumentMgr\n"); + + dmSinkCookie = 0; + hr = ITfSource_AdviseSink(source, &IID_ITfTransitoryExtensionSink, (IUnknown*)&TfTransitoryExtensionSink, &dmSinkCookie); + ok(hr == S_OK,"Failed to Advise Sink\n"); + + ITfSource_Release(source); +} + +static void test_DocumentMgrUnadviseSinks(void) +{ + ITfSource *source = NULL; + HRESULT hr; + + hr = ITfDocumentMgr_QueryInterface(g_dm, &IID_ITfSource, (void**)&source); + ok(hr == S_OK,"Failed to get IID_ITfSource for DocumentMgr\n"); + + hr = ITfSource_UnadviseSink(source, dmSinkCookie); + ok(hr == S_OK,"Failed to unadvise Sink\n"); + ITfSource_Release(source); +} + /********************************************************************** * ITfKeyEventSink **********************************************************************/ @@ -1204,13 +1271,13 @@ ok(hr == E_INVALIDARG,"Wrong return, expected E_INVALIDARG\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, 0, &CLSID_PreservedKey, &tfpk, NULL, 0); - ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); + ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey improperly succeeded\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); ok(SUCCEEDED(hr),"ITfKeystrokeMgr_PreserveKey failed\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); - ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); + ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey improperly succeeded\n"); preserved = FALSE; hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); @@ -1225,7 +1292,7 @@ if (hr == S_FALSE) ok(preserved == FALSE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); - ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); + ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey improperly succeeded\n"); hr = ITfKeystrokeMgr_UnadviseKeyEventSink(keymgr,tid); ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n"); @@ -1425,13 +1492,16 @@ ok(cid == cid2, "Second activate client ID does not match\n"); hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfThreadMgrEx, (void **)&tmex); - ok(SUCCEEDED(hr), "Unable to acquire ITfThreadMgrEx interface\n"); - - hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0); - ok(SUCCEEDED(hr), "Failed to Activate\n"); - ok(cid == cid2, "ActivateEx client ID does not match\n"); - - ITfThreadMgrEx_Release(tmex); + if (hr == S_OK) + { + hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0); + ok(SUCCEEDED(hr), "Failed to Activate\n"); + ok(cid == cid2, "ActivateEx client ID does not match\n"); + + ITfThreadMgrEx_Release(tmex); + } + else + win_skip("ITfThreadMgrEx is not supported\n"); hr = ITfThreadMgr_Deactivate(g_tm); ok(SUCCEEDED(hr), "Failed to Deactivate\n"); @@ -2235,6 +2305,7 @@ test_ThreadMgrAdviseSinks(); test_Activate(); test_startSession(); + test_DocumentMgrAdviseSinks(); test_TfGuidAtom(); test_ClientId(); test_KeystrokeMgr(); @@ -2245,6 +2316,7 @@ test_FindClosestCategory(); test_Disable(); test_ThreadMgrUnadviseSinks(); + test_DocumentMgrUnadviseSinks(); test_UnregisterCategory(); test_Unregister(); test_profile_mgr();

1 0

[akhaldi] 71568: [MSCTF] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:38:23 2016 New Revision: 71568 URL: http://svn.reactos.org/svn/reactos?rev=71568&view=rev Log: [MSCTF] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c trunk/reactos/dll/win32/msctf/context.c trunk/reactos/dll/win32/msctf/documentmgr.c trunk/reactos/dll/win32/msctf/inputprocessor.c 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/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 Jun 5 19:38:23 2016 @@ -46,15 +46,6 @@ struct list *cursor; } CompartmentEnumGuid; - -typedef struct tagCompartmentSink { - struct list entry; - union { - IUnknown *pIUnknown; - ITfCompartmentEventSink *pITfCompartmentEventSink; - } interfaces; -} CompartmentSink; - typedef struct tagCompartment { ITfCompartment ITfCompartment_iface; ITfSource ITfSource_iface; @@ -423,23 +414,11 @@ /************************************************** * ITfCompartment **************************************************/ -static void free_sink(CompartmentSink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); -} - static void Compartment_Destructor(Compartment *This) { - struct list *cursor, *cursor2; TRACE("destroying %p\n", This); VariantClear(&This->variant); - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CompartmentEventSink) - { - CompartmentSink* sink = LIST_ENTRY(cursor,CompartmentSink,entry); - list_remove(cursor); - free_sink(sink); - } + free_sinks(&This->CompartmentEventSink); HeapFree(GetProcessHeap(),0,This); } @@ -489,6 +468,7 @@ TfClientId tid, const VARIANT *pvarValue) { Compartment *This = impl_from_ITfCompartment(iface); + ITfCompartmentEventSink *sink; struct list *cursor; TRACE("(%p) %i %p\n",This,tid,pvarValue); @@ -514,10 +494,9 @@ else if (V_VT(pvarValue) == VT_UNKNOWN) IUnknown_AddRef(V_UNKNOWN(&This->variant)); - LIST_FOR_EACH(cursor, &This->CompartmentEventSink) - { - CompartmentSink* sink = LIST_ENTRY(cursor,CompartmentSink,entry); - ITfCompartmentEventSink_OnChange(sink->interfaces.pITfCompartmentEventSink,&This->valueData->guid); + SINK_FOR_EACH(cursor, &This->CompartmentEventSink, ITfCompartmentEventSink, sink) + { + ITfCompartmentEventSink_OnChange(sink, &This->valueData->guid); } return S_OK; @@ -572,7 +551,6 @@ REFIID riid, IUnknown *punk, DWORD *pdwCookie) { Compartment *This = impl_from_ITfSource(iface); - CompartmentSink *cs; TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); @@ -580,47 +558,23 @@ return E_INVALIDARG; if (IsEqualIID(riid, &IID_ITfCompartmentEventSink)) - { - cs = HeapAlloc(GetProcessHeap(),0,sizeof(CompartmentSink)); - if (!cs) - return E_OUTOFMEMORY; - if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&cs->interfaces.pITfCompartmentEventSink))) - { - HeapFree(GetProcessHeap(),0,cs); - return CONNECT_E_CANNOTCONNECT; - } - list_add_head(&This->CompartmentEventSink,&cs->entry); - *pdwCookie = generate_Cookie(COOKIE_MAGIC_COMPARTMENTSINK , cs); - } - else - { - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; - } - - TRACE("cookie %x\n",*pdwCookie); - - return S_OK; + return advise_sink(&This->CompartmentEventSink, &IID_ITfCompartmentEventSink, + COOKIE_MAGIC_COMPARTMENTSINK, punk, pdwCookie); + + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; } static HRESULT WINAPI CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { Compartment *This = impl_from_ITfSource(iface); - CompartmentSink *sink; TRACE("(%p) %x\n",This,pdwCookie); if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK) return E_INVALIDARG; - sink = remove_Cookie(pdwCookie); - if (!sink) - return CONNECT_E_NOCONNECTION; - - list_remove(&sink->entry); - free_sink(sink); - - return S_OK; + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl CompartmentSourceVtbl = 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 Jun 5 19:38:23 2016 @@ -20,19 +20,6 @@ #include "msctf_internal.h" -typedef struct tagContextSink { - struct list entry; - union { - /* Context Sinks */ - IUnknown *pIUnknown; - /* ITfContextKeyEventSink *pITfContextKeyEventSink; */ - /* ITfEditTransactionSink *pITfEditTransactionSink; */ - /* ITfStatusSink *pITfStatusSink; */ - ITfTextEditSink *pITfTextEditSink; - /* ITfTextLayoutSink *pITfTextLayoutSink; */ - } interfaces; -} ContextSink; - typedef struct tagContext { ITfContext ITfContext_iface; ITfSource ITfSource_iface; @@ -43,6 +30,8 @@ /* const ITfMouseTrackerVtbl *MouseTrackerVtbl; */ /* const ITfQueryEmbeddedVtbl *QueryEmbeddedVtbl; */ ITfSourceSingle ITfSourceSingle_iface; + ITextStoreACPSink ITextStoreACPSink_iface; + ITextStoreACPServices ITextStoreACPServices_iface; LONG refCount; BOOL connected; @@ -57,7 +46,6 @@ ITextStoreACP *pITextStoreACP; ITfContextOwnerCompositionSink *pITfContextOwnerCompositionSink; - ITextStoreACPSink *pITextStoreACPSink; ITfEditSession* currentEditSession; /* kept as separate lists to reduce unnecessary iterations */ @@ -74,17 +62,6 @@ Context *pOwningContext; } EditCookie; -typedef struct tagTextStoreACPSink { - ITextStoreACPSink ITextStoreACPSink_iface; - /* const ITextStoreACPServicesVtbl *TextStoreACPServicesVtbl; */ - LONG refCount; - - Context *pContext; -} TextStoreACPSink; - - -static HRESULT TextStoreACPSink_Constructor(ITextStoreACPSink **ppOut, Context *pContext); - static inline Context *impl_from_ITfContext(ITfContext *iface) { return CONTAINING_RECORD(iface, Context, ITfContext_iface); @@ -105,31 +82,26 @@ return CONTAINING_RECORD(iface, Context, ITfSourceSingle_iface); } -static inline TextStoreACPSink *impl_from_ITextStoreACPSink(ITextStoreACPSink *iface) -{ - return CONTAINING_RECORD(iface, TextStoreACPSink, ITextStoreACPSink_iface); -} - -static void free_sink(ContextSink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); +static inline Context *impl_from_ITextStoreACPSink(ITextStoreACPSink *iface) +{ + return CONTAINING_RECORD(iface, Context, ITextStoreACPSink_iface); +} + +static inline Context *impl_from_ITextStoreACPServices(ITextStoreACPServices *iface) +{ + return CONTAINING_RECORD(iface, Context, ITextStoreACPServices_iface); } static void Context_Destructor(Context *This) { - struct list *cursor, *cursor2; EditCookie *cookie; TRACE("destroying %p\n", This); - if (This->pITextStoreACPSink) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)This->pITextStoreACPSink); - ITextStoreACPSink_Release(This->pITextStoreACPSink); - } - if (This->pITextStoreACP) + { + ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); ITextStoreACP_Release(This->pITextStoreACP); + } if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink); @@ -141,36 +113,11 @@ This->defaultCookie = 0; } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pContextKeyEventSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pEditTransactionSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pStatusSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pTextEditSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pTextLayoutSink) - { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - list_remove(cursor); - free_sink(sink); - } + free_sinks(&This->pContextKeyEventSink); + free_sinks(&This->pEditTransactionSink); + free_sinks(&This->pStatusSink); + free_sinks(&This->pTextEditSink); + free_sinks(&This->pTextLayoutSink); CompartmentMgr_Destructor(This->CompartmentMgr); HeapFree(GetProcessHeap(),0,This); @@ -590,53 +537,29 @@ REFIID riid, IUnknown *punk, DWORD *pdwCookie) { Context *This = impl_from_ITfSource(iface); - ContextSink *es; + TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); if (!riid || !punk || !pdwCookie) return E_INVALIDARG; if (IsEqualIID(riid, &IID_ITfTextEditSink)) - { - es = HeapAlloc(GetProcessHeap(),0,sizeof(ContextSink)); - if (!es) - return E_OUTOFMEMORY; - if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&es->interfaces.pITfTextEditSink))) - { - HeapFree(GetProcessHeap(),0,es); - return CONNECT_E_CANNOTCONNECT; - } - list_add_head(&This->pTextEditSink ,&es->entry); - *pdwCookie = generate_Cookie(COOKIE_MAGIC_CONTEXTSINK, es); - } - else - { - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; - } - - TRACE("cookie %x\n",*pdwCookie); - return S_OK; + return advise_sink(&This->pTextEditSink, &IID_ITfTextEditSink, COOKIE_MAGIC_CONTEXTSINK, punk, pdwCookie); + + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; } static HRESULT WINAPI ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { Context *This = impl_from_ITfSource(iface); - ContextSink *sink; TRACE("(%p) %x\n",This,pdwCookie); if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK) return E_INVALIDARG; - sink = remove_Cookie(pdwCookie); - if (!sink) - return CONNECT_E_NOCONNECTION; - - list_remove(&sink->entry); - free_sink(sink); - - return S_OK; + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl ContextSourceVtbl = @@ -769,114 +692,22 @@ SourceSingle_UnadviseSingleSink, }; -HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) -{ - Context *This; - EditCookie *cookie; - - This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(Context)); - if (This == NULL) - return E_OUTOFMEMORY; - - cookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); - if (cookie == NULL) - { - HeapFree(GetProcessHeap(),0,This); - return E_OUTOFMEMORY; - } - - TRACE("(%p) %x %p %p %p\n",This, tidOwner, punk, ppOut, pecTextStore); - - This->ITfContext_iface.lpVtbl= &ContextVtbl; - This->ITfSource_iface.lpVtbl = &ContextSourceVtbl; - This->ITfInsertAtSelection_iface.lpVtbl = &InsertAtSelectionVtbl; - This->ITfSourceSingle_iface.lpVtbl = &ContextSourceSingleVtbl; - This->refCount = 1; - This->tidOwner = tidOwner; - This->connected = FALSE; - This->manager = mgr; - - CompartmentMgr_Constructor((IUnknown*)&This->ITfContext_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); - - cookie->lockType = TF_ES_READ; - cookie->pOwningContext = This; - - if (punk) - { - IUnknown_QueryInterface(punk, &IID_ITextStoreACP, - (LPVOID*)&This->pITextStoreACP); - - IUnknown_QueryInterface(punk, &IID_ITfContextOwnerCompositionSink, - (LPVOID*)&This->pITfContextOwnerCompositionSink); - - if (!This->pITextStoreACP && !This->pITfContextOwnerCompositionSink) - FIXME("Unhandled pUnk\n"); - } - - This->defaultCookie = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE,cookie); - *pecTextStore = This->defaultCookie; - - list_init(&This->pContextKeyEventSink); - list_init(&This->pEditTransactionSink); - list_init(&This->pStatusSink); - list_init(&This->pTextEditSink); - list_init(&This->pTextLayoutSink); - - *ppOut = &This->ITfContext_iface; - TRACE("returning %p\n", *ppOut); - - return S_OK; -} - -HRESULT Context_Initialize(ITfContext *iface, ITfDocumentMgr *manager) -{ - Context *This = impl_from_ITfContext(iface); - - if (This->pITextStoreACP) - { - if (SUCCEEDED(TextStoreACPSink_Constructor(&This->pITextStoreACPSink, This))) - ITextStoreACP_AdviseSink(This->pITextStoreACP, &IID_ITextStoreACPSink, - (IUnknown*)This->pITextStoreACPSink, TS_AS_ALL_SINKS); - } - This->connected = TRUE; - This->manager = manager; - return S_OK; -} - -HRESULT Context_Uninitialize(ITfContext *iface) -{ - Context *This = impl_from_ITfContext(iface); - - if (This->pITextStoreACPSink) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)This->pITextStoreACPSink); - if (ITextStoreACPSink_Release(This->pITextStoreACPSink) == 0) - This->pITextStoreACPSink = NULL; - } - This->connected = FALSE; - This->manager = NULL; - return S_OK; -} - /************************************************************************** * ITextStoreACPSink **************************************************************************/ -static void TextStoreACPSink_Destructor(TextStoreACPSink *This) -{ - TRACE("destroying %p\n", This); - HeapFree(GetProcessHeap(),0,This); -} - static HRESULT WINAPI TextStoreACPSink_QueryInterface(ITextStoreACPSink *iface, REFIID iid, LPVOID *ppvOut) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); + *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITextStoreACPSink)) { *ppvOut = &This->ITextStoreACPSink_iface; } + else if (IsEqualIID(iid, &IID_ITextStoreACPServices)) + *ppvOut = &This->ITextStoreACPServices_iface; if (*ppvOut) { @@ -890,19 +721,14 @@ static ULONG WINAPI TextStoreACPSink_AddRef(ITextStoreACPSink *iface) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); - return InterlockedIncrement(&This->refCount); + Context *This = impl_from_ITextStoreACPSink(iface); + return ITfContext_AddRef(&This->ITfContext_iface); } static ULONG WINAPI TextStoreACPSink_Release(ITextStoreACPSink *iface) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); - ULONG ret; - - ret = InterlockedDecrement(&This->refCount); - if (ret == 0) - TextStoreACPSink_Destructor(This); - return ret; + Context *This = impl_from_ITextStoreACPSink(iface); + return ITfContext_Release(&This->ITfContext_iface); } /***************************************************** @@ -912,14 +738,14 @@ static HRESULT WINAPI TextStoreACPSink_OnTextChange(ITextStoreACPSink *iface, DWORD dwFlags, const TS_TEXTCHANGE *pChange) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); return E_NOTIMPL; } static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *iface) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); return E_NOTIMPL; } @@ -927,7 +753,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLayoutChange(ITextStoreACPSink *iface, TsLayoutCode lcode, TsViewCookie vcView) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); return E_NOTIMPL; } @@ -935,27 +761,21 @@ static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface, DWORD dwFlags) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); HRESULT hr, hrSession; TRACE("(%p) %x\n",This, dwFlags); - if (!This->pContext) - { - ERR("No context?\n"); - return E_FAIL; - } - - if (!This->pContext->pITextStoreACP) + if (!This->pITextStoreACP) { FIXME("Context does not have a ITextStoreACP\n"); return E_NOTIMPL; } - hr = ITextStoreACP_RequestLock(This->pContext->pITextStoreACP, TS_LF_READ, &hrSession); + hr = ITextStoreACP_RequestLock(This->pITextStoreACP, TS_LF_READ, &hrSession); if(SUCCEEDED(hr) && SUCCEEDED(hrSession)) - This->pContext->documentStatus.dwDynamicFlags = dwFlags; + This->documentStatus.dwDynamicFlags = dwFlags; return S_OK; } @@ -963,7 +783,7 @@ static HRESULT WINAPI TextStoreACPSink_OnAttrsChange(ITextStoreACPSink *iface, LONG acpStart, LONG acpEnd, ULONG cAttrs, const TS_ATTRID *paAttrs) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); return E_NOTIMPL; } @@ -971,7 +791,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, DWORD dwLockFlags) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); HRESULT hr; EditCookie *cookie,*sinkcookie; TfEditCookie ec; @@ -979,13 +799,7 @@ TRACE("(%p) %x\n",This, dwLockFlags); - if (!This->pContext) - { - ERR("OnLockGranted called without a context\n"); - return E_FAIL; - } - - if (!This->pContext->currentEditSession) + if (!This->currentEditSession) { FIXME("OnLockGranted called for something other than an EditSession\n"); return S_OK; @@ -1003,32 +817,31 @@ } cookie->lockType = dwLockFlags; - cookie->pOwningContext = This->pContext; + cookie->pOwningContext = This; ec = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE, cookie); - hr = ITfEditSession_DoEditSession(This->pContext->currentEditSession, ec); + hr = ITfEditSession_DoEditSession(This->currentEditSession, ec); if ((dwLockFlags&TS_LF_READWRITE) == TS_LF_READWRITE) { + ITfTextEditSink *sink; TfEditCookie sc; sinkcookie->lockType = TS_LF_READ; - sinkcookie->pOwningContext = This->pContext; + sinkcookie->pOwningContext = This; sc = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE, sinkcookie); /*TODO: implement ITfEditRecord */ - LIST_FOR_EACH(cursor, &This->pContext->pTextEditSink) + SINK_FOR_EACH(cursor, &This->pTextEditSink, ITfTextEditSink, sink) { - ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); - ITfTextEditSink_OnEndEdit(sink->interfaces.pITfTextEditSink, - (ITfContext*) &This->pContext, sc, NULL); + ITfTextEditSink_OnEndEdit(sink, (ITfContext*) &This->ITfContext_iface, sc, NULL); } sinkcookie = remove_Cookie(sc); } HeapFree(GetProcessHeap(),0,sinkcookie); - ITfEditSession_Release(This->pContext->currentEditSession); - This->pContext->currentEditSession = NULL; + ITfEditSession_Release(This->currentEditSession); + This->currentEditSession = NULL; /* Edit Cookie is only valid during the edit session */ cookie = remove_Cookie(ec); @@ -1039,14 +852,14 @@ static HRESULT WINAPI TextStoreACPSink_OnStartEditTransaction(ITextStoreACPSink *iface) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); return E_NOTIMPL; } static HRESULT WINAPI TextStoreACPSink_OnEndEditTransaction(ITextStoreACPSink *iface) { - TextStoreACPSink *This = impl_from_ITextStoreACPSink(iface); + Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); return E_NOTIMPL; } @@ -1066,20 +879,154 @@ TextStoreACPSink_OnEndEditTransaction }; -static HRESULT TextStoreACPSink_Constructor(ITextStoreACPSink **ppOut, Context *pContext) -{ - TextStoreACPSink *This; - - This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(TextStoreACPSink)); +static HRESULT WINAPI TextStoreACPServices_QueryInterface(ITextStoreACPServices *iface, REFIID riid, void **obj) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + return ITextStoreACPSink_QueryInterface(&This->ITextStoreACPSink_iface, riid, obj); +} + +static ULONG WINAPI TextStoreACPServices_AddRef(ITextStoreACPServices *iface) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + return ITextStoreACPSink_AddRef(&This->ITextStoreACPSink_iface); +} + +static ULONG WINAPI TextStoreACPServices_Release(ITextStoreACPServices *iface) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + return ITextStoreACPSink_Release(&This->ITextStoreACPSink_iface); +} + +static HRESULT WINAPI TextStoreACPServices_Serialize(ITextStoreACPServices *iface, ITfProperty *prop, ITfRange *range, + TF_PERSISTENT_PROPERTY_HEADER_ACP *header, IStream *stream) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + + FIXME("stub: %p %p %p %p %p\n", This, prop, range, header, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPServices_Unserialize(ITextStoreACPServices *iface, ITfProperty *prop, + const TF_PERSISTENT_PROPERTY_HEADER_ACP *header, IStream *stream, ITfPersistentPropertyLoaderACP *loader) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + + FIXME("stub: %p %p %p %p %p\n", This, prop, header, stream, loader); + + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPServices_ForceLoadProperty(ITextStoreACPServices *iface, ITfProperty *prop) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + + FIXME("stub: %p %p\n", This, prop); + + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPServices_CreateRange(ITextStoreACPServices *iface, + LONG start, LONG end, ITfRangeACP **range) +{ + Context *This = impl_from_ITextStoreACPServices(iface); + + FIXME("stub: %p %d %d %p\n", This, start, end, range); + + return S_OK; +} + +static const ITextStoreACPServicesVtbl TextStoreACPServicesVtbl = +{ + TextStoreACPServices_QueryInterface, + TextStoreACPServices_AddRef, + TextStoreACPServices_Release, + TextStoreACPServices_Serialize, + TextStoreACPServices_Unserialize, + TextStoreACPServices_ForceLoadProperty, + TextStoreACPServices_CreateRange +}; + +HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) +{ + Context *This; + EditCookie *cookie; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(Context)); if (This == NULL) return E_OUTOFMEMORY; - This->ITextStoreACPSink_iface.lpVtbl= &TextStoreACPSinkVtbl; + cookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); + if (cookie == NULL) + { + HeapFree(GetProcessHeap(),0,This); + return E_OUTOFMEMORY; + } + + TRACE("(%p) %x %p %p %p\n",This, tidOwner, punk, ppOut, pecTextStore); + + This->ITfContext_iface.lpVtbl= &ContextVtbl; + This->ITfSource_iface.lpVtbl = &ContextSourceVtbl; + This->ITfInsertAtSelection_iface.lpVtbl = &InsertAtSelectionVtbl; + This->ITfSourceSingle_iface.lpVtbl = &ContextSourceSingleVtbl; + This->ITextStoreACPSink_iface.lpVtbl = &TextStoreACPSinkVtbl; + This->ITextStoreACPServices_iface.lpVtbl = &TextStoreACPServicesVtbl; This->refCount = 1; - - This->pContext = pContext; - - *ppOut = &This->ITextStoreACPSink_iface; + This->tidOwner = tidOwner; + This->connected = FALSE; + This->manager = mgr; + + CompartmentMgr_Constructor((IUnknown*)&This->ITfContext_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + + cookie->lockType = TF_ES_READ; + cookie->pOwningContext = This; + + if (punk) + { + IUnknown_QueryInterface(punk, &IID_ITextStoreACP, + (LPVOID*)&This->pITextStoreACP); + + IUnknown_QueryInterface(punk, &IID_ITfContextOwnerCompositionSink, + (LPVOID*)&This->pITfContextOwnerCompositionSink); + + if (!This->pITextStoreACP && !This->pITfContextOwnerCompositionSink) + FIXME("Unhandled pUnk\n"); + } + + This->defaultCookie = generate_Cookie(COOKIE_MAGIC_EDITCOOKIE,cookie); + *pecTextStore = This->defaultCookie; + + list_init(&This->pContextKeyEventSink); + list_init(&This->pEditTransactionSink); + list_init(&This->pStatusSink); + list_init(&This->pTextEditSink); + list_init(&This->pTextLayoutSink); + + *ppOut = &This->ITfContext_iface; TRACE("returning %p\n", *ppOut); + return S_OK; } + +HRESULT Context_Initialize(ITfContext *iface, ITfDocumentMgr *manager) +{ + Context *This = impl_from_ITfContext(iface); + + if (This->pITextStoreACP) + ITextStoreACP_AdviseSink(This->pITextStoreACP, &IID_ITextStoreACPSink, + (IUnknown*)&This->ITextStoreACPSink_iface, TS_AS_ALL_SINKS); + This->connected = TRUE; + This->manager = manager; + return S_OK; +} + +HRESULT Context_Uninitialize(ITfContext *iface) +{ + Context *This = impl_from_ITfContext(iface); + + if (This->pITextStoreACP) + ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); + This->connected = FALSE; + This->manager = NULL; + 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 Jun 5 19:38:23 2016 @@ -30,6 +30,8 @@ ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; + + struct list TransitoryExtensionSink; } DocumentMgr; typedef struct tagEnumTfContext { @@ -69,6 +71,7 @@ ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) ITfContext_Release(This->contextStack[1]); + free_sinks(&This->TransitoryExtensionSink); CompartmentMgr_Destructor(This->CompartmentMgr); HeapFree(GetProcessHeap(),0,This); } @@ -278,15 +281,33 @@ REFIID riid, IUnknown *punk, DWORD *pdwCookie) { DocumentMgr *This = impl_from_ITfSource(iface); - FIXME("STUB:(%p)\n",This); + + TRACE("(%p) %s %p %p\n", This, debugstr_guid(riid), punk, pdwCookie); + + if (!riid || !punk || !pdwCookie) + return E_INVALIDARG; + + if (IsEqualIID(riid, &IID_ITfTransitoryExtensionSink)) + { + WARN("semi-stub for ITfTransitoryExtensionSink: callback won't be used.\n"); + return advise_sink(&This->TransitoryExtensionSink, &IID_ITfTransitoryExtensionSink, + COOKIE_MAGIC_DMSINK, punk, pdwCookie); + } + + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); return E_NOTIMPL; } static HRESULT WINAPI DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { DocumentMgr *This = impl_from_ITfSource(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %x\n",This,pdwCookie); + + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_DMSINK) + return E_INVALIDARG; + + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl DocumentMgrSourceVtbl = @@ -310,6 +331,7 @@ This->ITfSource_iface.lpVtbl = &DocumentMgrSourceVtbl; This->refCount = 1; This->ThreadMgrSink = ThreadMgrSink; + list_init(&This->TransitoryExtensionSink); CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); 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 Jun 5 19:38:23 2016 @@ -30,15 +30,6 @@ static const WCHAR szwProfile[] = {'P','r','o','f','i','l','e',0}; static const WCHAR szwDefaultFmt[] = {'%','s','\\','%','s','\\','0','x','%','0','8','x','\\','%','s',0}; -typedef struct tagInputProcessorProfilesSink { - struct list entry; - union { - /* InputProcessorProfile Sinks */ - IUnknown *pIUnknown; - ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink; - } interfaces; -} InputProcessorProfilesSink; - typedef struct tagInputProcessorProfiles { ITfInputProcessorProfiles ITfInputProcessorProfiles_iface; ITfSource ITfSource_iface; @@ -196,25 +187,11 @@ return CONTAINING_RECORD(iface, EnumTfLanguageProfiles, IEnumTfLanguageProfiles_iface); } -static void free_sink(InputProcessorProfilesSink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); -} - static void InputProcessorProfiles_Destructor(InputProcessorProfiles *This) { - struct list *cursor, *cursor2; TRACE("destroying %p\n", This); - /* free sinks */ - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->LanguageProfileNotifySink) - { - InputProcessorProfilesSink* sink = LIST_ENTRY(cursor,InputProcessorProfilesSink,entry); - list_remove(cursor); - free_sink(sink); - } - + free_sinks(&This->LanguageProfileNotifySink); HeapFree(GetProcessHeap(),0,This); } @@ -584,18 +561,18 @@ ITfInputProcessorProfiles *iface, LANGID langid) { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfiles(iface); + ITfLanguageProfileNotifySink *sink; struct list *cursor; BOOL accept; FIXME("STUB:(%p)\n",This); - LIST_FOR_EACH(cursor, &This->LanguageProfileNotifySink) - { - InputProcessorProfilesSink* sink = LIST_ENTRY(cursor,InputProcessorProfilesSink,entry); + SINK_FOR_EACH(cursor, &This->LanguageProfileNotifySink, ITfLanguageProfileNotifySink, sink) + { accept = TRUE; - ITfLanguageProfileNotifySink_OnLanguageChange(sink->interfaces.pITfLanguageProfileNotifySink, langid, &accept); + ITfLanguageProfileNotifySink_OnLanguageChange(sink, langid, &accept); if (!accept) - return E_FAIL; + return E_FAIL; } /* TODO: On successful language change call OnLanguageChanged sink */ @@ -907,7 +884,6 @@ REFIID riid, IUnknown *punk, DWORD *pdwCookie) { InputProcessorProfiles *This = impl_from_ITfSource(iface); - InputProcessorProfilesSink *ipps; TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); @@ -915,47 +891,23 @@ return E_INVALIDARG; if (IsEqualIID(riid, &IID_ITfLanguageProfileNotifySink)) - { - ipps = HeapAlloc(GetProcessHeap(),0,sizeof(InputProcessorProfilesSink)); - if (!ipps) - return E_OUTOFMEMORY; - if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&ipps->interfaces.pITfLanguageProfileNotifySink))) - { - HeapFree(GetProcessHeap(),0,ipps); - return CONNECT_E_CANNOTCONNECT; - } - list_add_head(&This->LanguageProfileNotifySink,&ipps->entry); - *pdwCookie = generate_Cookie(COOKIE_MAGIC_IPPSINK, ipps); - } - else - { - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; - } - - TRACE("cookie %x\n",*pdwCookie); - - return S_OK; + return advise_sink(&This->LanguageProfileNotifySink, &IID_ITfLanguageProfileNotifySink, + COOKIE_MAGIC_IPPSINK, punk, pdwCookie); + + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; } static HRESULT WINAPI IPPSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { InputProcessorProfiles *This = impl_from_ITfSource(iface); - InputProcessorProfilesSink *sink; TRACE("(%p) %x\n",This,pdwCookie); if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_IPPSINK) return E_INVALIDARG; - sink = remove_Cookie(pdwCookie); - if (!sink) - return CONNECT_E_NOCONNECTION; - - list_remove(&sink->entry); - free_sink(sink); - - return S_OK; + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl InputProcessorProfilesSourceVtbl = 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 Jun 5 19:38:23 2016 @@ -266,6 +266,54 @@ return 0x0; } +HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) +{ + Sink *sink; + + sink = HeapAlloc(GetProcessHeap(), 0, sizeof(*sink)); + if (!sink) + return E_OUTOFMEMORY; + + if (FAILED(IUnknown_QueryInterface(unk, riid, (void**)&sink->interfaces.pIUnknown))) + { + HeapFree(GetProcessHeap(), 0, sink); + return CONNECT_E_CANNOTCONNECT; + } + + list_add_head(sink_list, &sink->entry); + *cookie = generate_Cookie(cookie_magic, sink); + TRACE("cookie %x\n", *cookie); + return S_OK; +} + +static void free_sink(Sink *sink) +{ + list_remove(&sink->entry); + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(), 0, sink); +} + +HRESULT unadvise_sink(DWORD cookie) +{ + Sink *sink; + + sink = remove_Cookie(cookie); + if (!sink) + return CONNECT_E_NOCONNECTION; + + free_sink(sink); + return S_OK; +} + +void free_sinks(struct list *sink_list) +{ + while(!list_empty(sink_list)) + { + Sink* sink = LIST_ENTRY(sink_list->next, Sink, entry); + free_sink(sink); + } +} + /***************************************************************************** * Active Text Service Management *****************************************************************************/ Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Sun Jun 5 19:38:23 2016 @@ -51,6 +51,7 @@ #define COOKIE_MAGIC_IPPSINK 0x0040 #define COOKIE_MAGIC_EDITCOOKIE 0x0050 #define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 +#define COOKIE_MAGIC_DMSINK 0x0070 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; @@ -89,6 +90,28 @@ 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; +typedef struct { + struct list entry; + union { + IUnknown *pIUnknown; + ITfThreadMgrEventSink *pITfThreadMgrEventSink; + ITfCompartmentEventSink *pITfCompartmentEventSink; + ITfTextEditSink *pITfTextEditSink; + ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink; + ITfTransitoryExtensionSink *pITfTransitoryExtensionSink; + } interfaces; +} Sink; + +#define SINK_ENTRY(cursor,type) (LIST_ENTRY(cursor,Sink,entry)->interfaces.p##type) +#define SINK_FOR_EACH(cursor,list,type,elem) \ + for ((cursor) = (list)->next, elem = SINK_ENTRY(cursor,type); \ + (cursor) != (list); \ + (cursor) = (cursor)->next, elem = SINK_ENTRY(cursor,type)) + +HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) DECLSPEC_HIDDEN; +HRESULT unadvise_sink(DWORD cookie) DECLSPEC_HIDDEN; +void free_sinks(struct list *sink_list) DECLSPEC_HIDDEN; + extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN; extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN; 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 Jun 5 19:38:23 2016 @@ -20,20 +20,6 @@ #include "msctf_internal.h" -typedef struct tagThreadMgrSink { - struct list entry; - union { - /* ThreadMgr Sinks */ - IUnknown *pIUnknown; - /* ITfActiveLanguageProfileNotifySink *pITfActiveLanguageProfileNotifySink; */ - /* ITfDisplayAttributeNotifySink *pITfDisplayAttributeNotifySink; */ - /* ITfKeyTraceEventSink *pITfKeyTraceEventSink; */ - /* ITfPreservedKeyNotifySink *pITfPreservedKeyNotifySink; */ - /* ITfThreadFocusSink *pITfThreadFocusSink; */ - ITfThreadMgrEventSink *pITfThreadMgrEventSink; - } interfaces; -} ThreadMgrSink; - typedef struct tagPreservedKey { struct list entry; @@ -77,8 +63,8 @@ ITfDocumentMgr *focus; LONG activationCount; - ITfKeyEventSink *forgroundKeyEventSink; - CLSID forgroundTextService; + ITfKeyEventSink *foregroundKeyEventSink; + CLSID foregroundTextService; struct list CurrentPreservedKeys; struct list CreatedDocumentMgrs; @@ -150,12 +136,6 @@ return CONTAINING_RECORD(iface, EnumTfDocumentMgr, IEnumTfDocumentMgrs_iface); } -static void free_sink(ThreadMgrSink *sink) -{ - IUnknown_Release(sink->interfaces.pIUnknown); - HeapFree(GetProcessHeap(),0,sink); -} - static void ThreadMgr_Destructor(ThreadMgr *This) { struct list *cursor, *cursor2; @@ -169,43 +149,12 @@ if (This->focus) ITfDocumentMgr_Release(This->focus); - /* free sinks */ - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ActiveLanguageProfileNotifySink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->DisplayAttributeNotifySink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->KeyTraceEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->PreservedKeyNotifySink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadFocusSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } - LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadMgrEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - list_remove(cursor); - free_sink(sink); - } + free_sinks(&This->ActiveLanguageProfileNotifySink); + free_sinks(&This->DisplayAttributeNotifySink); + free_sinks(&This->KeyTraceEventSink); + free_sinks(&This->PreservedKeyNotifySink); + free_sinks(&This->ThreadFocusSink); + free_sinks(&This->ThreadMgrEventSink); LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) { @@ -636,7 +585,6 @@ REFIID riid, IUnknown *punk, DWORD *pdwCookie) { ThreadMgr *This = impl_from_ITfSource(iface); - ThreadMgrSink *tms; TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); @@ -644,47 +592,22 @@ return E_INVALIDARG; if (IsEqualIID(riid, &IID_ITfThreadMgrEventSink)) - { - tms = HeapAlloc(GetProcessHeap(),0,sizeof(ThreadMgrSink)); - if (!tms) - return E_OUTOFMEMORY; - if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&tms->interfaces.pITfThreadMgrEventSink))) - { - HeapFree(GetProcessHeap(),0,tms); - return CONNECT_E_CANNOTCONNECT; - } - list_add_head(&This->ThreadMgrEventSink,&tms->entry); - *pdwCookie = generate_Cookie(COOKIE_MAGIC_TMSINK, tms); - } - else - { - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; - } - - TRACE("cookie %x\n",*pdwCookie); - - return S_OK; + return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; } static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ThreadMgr *This = impl_from_ITfSource(iface); - ThreadMgrSink *sink; TRACE("(%p) %x\n",This,pdwCookie); if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK) return E_INVALIDARG; - sink = remove_Cookie(pdwCookie); - if (!sink) - return CONNECT_E_NOCONNECTION; - - list_remove(&sink->entry); - free_sink(sink); - - return S_OK; + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl ThreadMgrSourceVtbl = @@ -745,15 +668,15 @@ if (fForeground) { - if (This->forgroundKeyEventSink) + if (This->foregroundKeyEventSink) { - ITfKeyEventSink_OnSetFocus(This->forgroundKeyEventSink, FALSE); - ITfKeyEventSink_Release(This->forgroundKeyEventSink); + ITfKeyEventSink_OnSetFocus(This->foregroundKeyEventSink, FALSE); + ITfKeyEventSink_Release(This->foregroundKeyEventSink); } ITfKeyEventSink_AddRef(check); ITfKeyEventSink_OnSetFocus(check, TRUE); - This->forgroundKeyEventSink = check; - This->forgroundTextService = textservice; + This->foregroundKeyEventSink = check; + This->foregroundTextService = textservice; } return S_OK; } @@ -781,11 +704,11 @@ set_textservice_sink(tid, &IID_ITfKeyEventSink, NULL); ITfKeyEventSink_Release(check); - if (This->forgroundKeyEventSink == check) - { - ITfKeyEventSink_Release(This->forgroundKeyEventSink); - This->forgroundKeyEventSink = NULL; - This->forgroundTextService = GUID_NULL; + if (This->foregroundKeyEventSink == check) + { + ITfKeyEventSink_Release(This->foregroundKeyEventSink); + This->foregroundKeyEventSink = NULL; + This->foregroundTextService = GUID_NULL; } return S_OK; } @@ -798,10 +721,10 @@ if (!pclsid) return E_INVALIDARG; - if (IsEqualCLSID(&This->forgroundTextService,&GUID_NULL)) + if (IsEqualCLSID(&This->foregroundTextService,&GUID_NULL)) return S_FALSE; - *pclsid = This->forgroundTextService; + *pclsid = This->foregroundTextService; return S_OK; } @@ -810,7 +733,8 @@ { ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + *pfEaten = FALSE; + return S_OK; } static HRESULT WINAPI KeystrokeMgr_TestKeyUp(ITfKeystrokeMgr *iface, @@ -818,7 +742,8 @@ { ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + *pfEaten = FALSE; + return S_OK; } static HRESULT WINAPI KeystrokeMgr_KeyDown(ITfKeystrokeMgr *iface, @@ -1133,15 +1058,15 @@ static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr( ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim) { + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; struct list *cursor; - ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); TRACE("(%p) %p\n",This,pdim); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - ITfThreadMgrEventSink_OnInitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) + { + ITfThreadMgrEventSink_OnInitDocumentMgr(sink, pdim); } return S_OK; @@ -1150,15 +1075,15 @@ static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr( ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) { + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; struct list *cursor; - ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); TRACE("(%p) %p\n",This,pdim); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - ITfThreadMgrEventSink_OnUninitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) + { + ITfThreadMgrEventSink_OnUninitDocumentMgr(sink, pdim); } return S_OK; @@ -1168,15 +1093,15 @@ ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) { + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; struct list *cursor; - ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); TRACE("(%p) %p %p\n",This,pdimFocus, pdimPrevFocus); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - ITfThreadMgrEventSink_OnSetFocus(sink->interfaces.pITfThreadMgrEventSink, pdimFocus, pdimPrevFocus); + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) + { + ITfThreadMgrEventSink_OnSetFocus(sink, pdimFocus, pdimPrevFocus); } return S_OK; @@ -1185,15 +1110,15 @@ static HRESULT WINAPI ThreadMgrEventSink_OnPushContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; struct list *cursor; - ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); TRACE("(%p) %p\n",This,pic); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - ITfThreadMgrEventSink_OnPushContext(sink->interfaces.pITfThreadMgrEventSink,pic); + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) + { + ITfThreadMgrEventSink_OnPushContext(sink, pic); } return S_OK; @@ -1202,15 +1127,15 @@ static HRESULT WINAPI ThreadMgrEventSink_OnPopContext( ITfThreadMgrEventSink *iface, ITfContext *pic) { + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + ITfThreadMgrEventSink *sink; struct list *cursor; - ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); TRACE("(%p) %p\n",This,pic); - LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) - { - ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); - ITfThreadMgrEventSink_OnPopContext(sink->interfaces.pITfThreadMgrEventSink,pic); + SINK_FOR_EACH(cursor, &This->ThreadMgrEventSink, ITfThreadMgrEventSink, sink) + { + ITfThreadMgrEventSink_OnPopContext(sink, pic); } return S_OK; 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 Jun 5 19:38:23 2016 @@ -108,7 +108,7 @@ reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mscms # Synced to WineStaging-1.9.4 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-1.9.4 +reactos/dll/win32/msctf # Synced to WineStaging-1.9.11 reactos/dll/win32/msftedit # Synced to WineStaging-1.9.4 reactos/dll/win32/msg711.acm # Synced to WineStaging-1.9.4 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71567: [PSDK] Update msctf.idl. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:36:59 2016 New Revision: 71567 URL: http://svn.reactos.org/svn/reactos?rev=71567&view=rev Log: [PSDK] Update msctf.idl. CORE-11368 Modified: trunk/reactos/sdk/include/psdk/msctf.idl Modified: trunk/reactos/sdk/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/msctf.idl… ============================================================================== --- trunk/reactos/sdk/include/psdk/msctf.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/msctf.idl [iso-8859-1] Sun Jun 5 19:36:59 2016 @@ -97,6 +97,8 @@ interface IEnumTfLanguageProfiles; interface ITfCompositionView; interface ITfKeyEventSink; +interface ITfPersistentPropertyLoaderACP; +interface ITfRangeACP; cpp_quote("#if 0") typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; @@ -348,6 +350,34 @@ HRESULT Restore( [in] TfEditCookie cookie, [in] ITfRange *range); +} + +[ + object, + uuid(aa80e901-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITextStoreACPServices : IUnknown +{ + HRESULT Serialize( + [in] ITfProperty *prop, + [in] ITfRange *range, + [out] TF_PERSISTENT_PROPERTY_HEADER_ACP *header, + [in] IStream *stream); + + HRESULT Unserialize( + [in] ITfProperty *prop, + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *header, + [in] IStream *stream, + [in] ITfPersistentPropertyLoaderACP *loader); + + HRESULT ForceLoadProperty( + [in] ITfProperty *prop); + + HRESULT CreateRange( + [in] LONG start, + [in] LONG end, + [out] ITfRangeACP **range); } [ @@ -1815,3 +1845,19 @@ HRESULT UnadviseMouseSink([in] DWORD dwCookie); } + +[ + object, + local, + uuid(a615096f-1c57-4813-8a15-55ee6e5a839c), + pointer_default(unique) +] +interface ITfTransitoryExtensionSink : IUnknown +{ + HRESULT OnTransitoryExtensionUpdated( + [in] ITfContext *pic, + [in] TfEditCookie ecReadOnly, + [in] ITfRange *pResultRange, + [in] ITfRange *pCompositionRange, + [out] BOOL *pfDeleteResultRange); +}

1 0

[akhaldi] 71566: [MPR_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:35:47 2016 New Revision: 71566 URL: http://svn.reactos.org/svn/reactos?rev=71566&view=rev Log: [MPR_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/mpr/mpr.c Modified: trunk/rostests/winetests/mpr/mpr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/mpr.c?rev=7… ============================================================================== --- trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] Sun Jun 5 19:35:47 2016 @@ -101,25 +101,23 @@ info_size = sizeof(buffer); ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - todo_wine{ - if(drive_type == DRIVE_REMOTE) + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); fail_size = 0; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); - todo_wine{ - if(drive_type == DRIVE_REMOTE) + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, NULL); todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); @@ -127,13 +125,13 @@ ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - todo_wine{ if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */ (drive_type == DRIVE_REMOTE)) + todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, - "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); } + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, @@ -149,13 +147,13 @@ info_size = sizeof(buffer); ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - - if(drive_type == DRIVE_REMOTE) - todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - + } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); } }

1 0

[akhaldi] 71565: [MPR] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:35:09 2016 New Revision: 71565 URL: http://svn.reactos.org/svn/reactos?rev=71565&view=rev Log: [MPR] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/mpr/wnet.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Sun Jun 5 19:35:09 2016 @@ -2101,7 +2101,7 @@ break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NO_NETWORK; + err = WN_NOT_CONNECTED; break; default: @@ -2148,7 +2148,7 @@ break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NOT_CONNECTED; + err = WN_NO_NETWORK; break; default: 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 Jun 5 19:35:09 2016 @@ -100,7 +100,7 @@ reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mlang # Synced to WineStaging-1.9.4 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/mpr # Synced to WineStaging-1.9.4 +reactos/dll/win32/mpr # Synced to WineStaging-1.9.11 reactos/dll/win32/mprapi # Synced to WineStaging-1.9.4 reactos/dll/win32/msacm32 # Synced to WineStaging-1.9.4 reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71564: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:34:02 2016 New Revision: 71564 URL: http://svn.reactos.org/svn/reactos?rev=71564&view=rev Log: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/mmdevapi/propstore.c trunk/rostests/winetests/mmdevapi/render.c Modified: trunk/rostests/winetests/mmdevapi/propstore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/propst… ============================================================================== --- trunk/rostests/winetests/mmdevapi/propstore.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/propstore.c [iso-8859-1] Sun Jun 5 19:34:02 2016 @@ -173,7 +173,7 @@ /* Note: the registry key exists even without calling IPropStore::Commit */ size = sizeof(regval); - ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); + ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)&regval, &size); ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); ok(type == REG_DWORD, "Got wrong value type: %u\n", type); ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); Modified: trunk/rostests/winetests/mmdevapi/render.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/render… ============================================================================== --- trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] Sun Jun 5 19:34:02 2016 @@ -29,16 +29,14 @@ #define COBJMACROS -#ifdef STANDALONE -#include "initguid.h" -#endif - #include "unknwn.h" #include "uuids.h" #include "mmdeviceapi.h" #include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h" +#include "initguid.h" +#include "endpointvolume.h" static const unsigned int win_formats[][4] = { { 8000, 8, 1}, { 8000, 8, 2}, { 8000, 16, 1}, { 8000, 16, 2}, @@ -729,7 +727,7 @@ ok(defp == 100000 || broken(defp == 101587) || defp == 200000, "Expected 10ms default period: %u\n", (ULONG)defp); ok(minp != 0, "Minimum period is 0\n"); - ok(minp <= defp, "Mininum period is greater than default period\n"); + ok(minp <= defp, "Minimum period is greater than default period\n"); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -951,8 +949,9 @@ ok(gbsize == bufsize, "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); else - ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, - "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); + todo_wine + ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, + "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); /* In shared mode, GetCurrentPadding decreases in multiples of * fragment size (i.e. updated only at period ticks), whereas @@ -2242,6 +2241,44 @@ } +static void test_endpointvolume(void) +{ + HRESULT hr; + IAudioEndpointVolume *aev; + float mindb, maxdb, increment, volume; + BOOL mute; + + hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, + CLSCTX_INPROC_SERVER, NULL, (void**)&aev); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + + hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, mindb - increment, NULL); + ok(hr == E_INVALIDARG, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetMasterVolumeLevel(aev, &volume); + ok(hr == S_OK, "GetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, volume, NULL); + ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetMute(aev, &mute); + ok(hr == S_OK, "GetMute failed: %08x\n", hr); + + hr = IAudioEndpointVolume_SetMute(aev, mute, NULL); + ok(hr == S_OK || hr == S_FALSE, "SetMute failed: %08x\n", hr); + + IAudioEndpointVolume_Release(aev); +} + START_TEST(render) { HRESULT hr; @@ -2283,6 +2320,7 @@ test_volume_dependence(); test_session_creation(); test_worst_case(); + test_endpointvolume(); IMMDevice_Release(dev);

1 0

[akhaldi] 71563: [MMDEVAPI] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:33:06 2016 New Revision: 71563 URL: http://svn.reactos.org/svn/reactos?rev=71563&view=rev Log: [MMDEVAPI] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c trunk/reactos/dll/win32/mmdevapi/devenum.c trunk/reactos/dll/win32/mmdevapi/main.c trunk/reactos/dll/win32/mmdevapi/mmdevapi.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/audiovo… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/audiovolume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/audiovolume.c [iso-8859-1] Sun Jun 5 19:33:06 2016 @@ -21,7 +21,7 @@ typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; - float level; + float master_vol; BOOL mute; } AEVImpl; @@ -102,9 +102,12 @@ { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); - FIXME("(%p)->(%f,%s): stub\n", iface, leveldb, debugstr_guid(ctx)); - - This->level = leveldb; + TRACE("(%p)->(%f,%s)\n", iface, leveldb, debugstr_guid(ctx)); + + if(leveldb < -100.f || leveldb > 0.f) + return E_INVALIDARG; + + This->master_vol = leveldb; return S_OK; } @@ -120,12 +123,12 @@ { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); - FIXME("(%p)->(%p): stub\n", iface, leveldb); + TRACE("(%p)->(%p)\n", iface, leveldb); if (!leveldb) return E_POINTER; - *leveldb = This->level; + *leveldb = This->master_vol; return S_OK; } @@ -174,19 +177,22 @@ static HRESULT WINAPI AEV_SetMute(IAudioEndpointVolumeEx *iface, BOOL mute, const GUID *ctx) { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); - - FIXME("(%p)->(%u,%s): stub\n", iface, mute, debugstr_guid(ctx)); + HRESULT ret; + + TRACE("(%p)->(%u,%s)\n", iface, mute, debugstr_guid(ctx)); + + ret = This->mute == mute ? S_FALSE : S_OK; This->mute = mute; - return S_OK; + return ret; } static HRESULT WINAPI AEV_GetMute(IAudioEndpointVolumeEx *iface, BOOL *mute) { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); - FIXME("(%p)->(%p): stub\n", iface, mute); + TRACE("(%p)->(%p)\n", iface, mute); if (!mute) return E_POINTER; @@ -230,14 +236,14 @@ static HRESULT WINAPI AEV_GetVolumeRange(IAudioEndpointVolumeEx *iface, float *mindb, float *maxdb, float *inc) { - FIXME("(%p)->(%p,%p,%p): stub\n", iface, mindb, maxdb, inc); + TRACE("(%p)->(%p,%p,%p)\n", iface, mindb, maxdb, inc); if (!mindb || !maxdb || !inc) return E_POINTER; - *mindb = 0.0f; - *maxdb = 1.0f; - *inc = 0.1f; + *mindb = -100.f; + *maxdb = 0.f; + *inc = 1.f; return S_OK; } @@ -276,19 +282,17 @@ AEV_GetVolumeRangeChannel }; -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) { AEVImpl *This; *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; This->ref = 1; - This->level = 1.0f; - This->mute = FALSE; - - *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; - return S_OK; -} + + *ppv = &This->IAudioEndpointVolumeEx_iface; + return S_OK; +} Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/devenum… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] Sun Jun 5 19:33:06 2016 @@ -577,8 +577,9 @@ if (IsEqualIID(riid, &IID_IAudioClient)){ hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv); - }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume)) - hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolume**)ppv); + }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) || + IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) + hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolumeEx**)ppv); else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { Modified: trunk/reactos/dll/win32/mmdevapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/main.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/main.c [iso-8859-1] Sun Jun 5 19:33:06 2016 @@ -277,7 +277,6 @@ *ppv = &MMDEVAPI_CF[i]; return S_OK; } - i++; } WARN("(%s, %s, %p): no class found.\n", debugstr_guid(rclsid), Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] Sun Jun 5 19:33:06 2016 @@ -99,7 +99,7 @@ } MMDevice; extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; 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 Jun 5 19:33:06 2016 @@ -99,7 +99,7 @@ reactos/dll/win32/mciwave # Synced to WineStaging-1.9.4 reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mlang # Synced to WineStaging-1.9.4 -reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mpr # Synced to WineStaging-1.9.4 reactos/dll/win32/mprapi # Synced to WineStaging-1.9.4 reactos/dll/win32/msacm32 # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71562: [MGMTAPI] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:32:00 2016 New Revision: 71562 URL: http://svn.reactos.org/svn/reactos?rev=71562&view=rev Log: [MGMTAPI] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/mgmtapi/mgmtapi.c trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mgmtapi/mgmtapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mgmtapi/mgmtapi.… ============================================================================== --- trunk/reactos/dll/win32/mgmtapi/mgmtapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mgmtapi/mgmtapi.c [iso-8859-1] Sun Jun 5 19:32:00 2016 @@ -38,3 +38,10 @@ } return TRUE; } + +BOOL WINAPI SnmpMgrTrapListen(HANDLE *available) +{ + FIXME("stub: %p\n", available); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Modified: trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mgmtapi/mgmtapi.… ============================================================================== --- trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec [iso-8859-1] Sun Jun 5 19:32:00 2016 @@ -6,4 +6,4 @@ @ stub SnmpMgrOpen @ stub SnmpMgrRequest @ stub SnmpMgrStrToOid -@ stub SnmpMgrTrapListen +@ stdcall SnmpMgrTrapListen(ptr) 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 Jun 5 19:32:00 2016 @@ -97,7 +97,7 @@ reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mciseq # Synced to WineStaging-1.9.4 reactos/dll/win32/mciwave # Synced to WineStaging-1.9.4 -reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mlang # Synced to WineStaging-1.9.4 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.4 reactos/dll/win32/mpr # Synced to WineStaging-1.9.4

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs