November 2020 - Wine-commits

Alistair Leslie-Hughes : include: Add IRowsetChange interface.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: a4ff1cae87339cc58ed7f019d4ba50fed382dc1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ff1cae87339cc58ed7f019… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 21:32:54 2020 +1100 include: Add IRowsetChange interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/rstchg.idl | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 33aa29615c7..24439dc7522 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -612,6 +612,7 @@ SOURCES = \ rpcproxy.h \ rpcsal.h \ rstbas.idl \ + rstchg.idl \ rstinf.idl \ rstloc.idl \ rstnot.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index 5060378b351..256d5fc7917 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -74,6 +74,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cmdprp.idl" #include "cvttyp.idl" #include "cmdpre.idl" +#include "rstchg.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/rstchg.idl b/include/rstchg.idl new file mode 100644 index 00000000000..973db1aab13 --- /dev/null +++ b/include/rstchg.idl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733a05-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetChange : IUnknown +{ + HRESULT DeleteRows([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [out, size_is(count)] DBROWSTATUS status[] ); + + HRESULT SetData([in] HROW row, [in] HACCESSOR accessor, [in] void *data); + + HRESULT InsertRow([in] HCHAPTER reserved, [in] HACCESSOR accessor, [in] void *data, [out] HROW *row); +}

1 0

Alistair Leslie-Hughes : include: Add IRowsetUpdate interface.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: ec9311ebd6642d336a0567f1afca7363ec27a7ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9311ebd6642d336a0567f1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 21:32:55 2020 +1100 include: Add IRowsetUpdate interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/rstupd.idl | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 24439dc7522..3df4da64233 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -616,6 +616,7 @@ SOURCES = \ rstinf.idl \ rstloc.idl \ rstnot.idl \ + rstupd.idl \ rtutils.h \ rtworkq.idl \ sal.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 256d5fc7917..5609e219320 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -75,6 +75,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cvttyp.idl" #include "cmdpre.idl" #include "rstchg.idl" +#include "rstupd.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/rstupd.idl b/include/rstupd.idl new file mode 100644 index 00000000000..c823658edba --- /dev/null +++ b/include/rstupd.idl @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733a6d-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetUpdate : IRowsetChange +{ + typedef DWORD DBPENDINGSTATUS; + + enum DBPENDINGSTATUSENUM + { + DBPENDINGSTATUS_NEW = 0x01, + DBPENDINGSTATUS_CHANGED = 0x02, + DBPENDINGSTATUS_DELETED = 0x04, + DBPENDINGSTATUS_UNCHANGED = 0x08, + DBPENDINGSTATUS_INVALIDROW = 0x10, + }; + + HRESULT GetOriginalData([in] HROW row, [in] HACCESSOR accessor, [out] void *data ); + + HRESULT GetPendingRows([in] HCHAPTER reserved, [in] DBPENDINGSTATUS status, [in, out] DBCOUNTITEM *pending_cnt, + [out, size_is(,*pending_cnt)] HROW **rending_rows, + [out, size_is(,*pending_cnt)] DBPENDINGSTATUS **pending_status); + + HRESULT GetRowStatus([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [out, size_is(count)] DBPENDINGSTATUS status[]); + + HRESULT Undo([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [in, out] DBCOUNTITEM *undone_cnt, [out, size_is(,*undone_cnt)] HROW **undone, + [out, size_is(,*undone_cnt)] DBROWSTATUS ** status); + + HRESULT Update([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [in, out] DBCOUNTITEM *row_cnt, [out, size_is(,*row_cnt)] HROW **hrows, + [out, size_is(,*row_cnt)] DBROWSTATUS **status); +}

1 0

Nikolay Sivov : mf/evr: Handle sample requests from the mixer.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: d493ba166ecc2260d8b302c6592cab90c8680a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d493ba166ecc2260d8b302c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:46 2020 +0300 mf/evr: Handle sample requests from the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 486958f5f79..a77372977c7 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -21,6 +21,7 @@ #include "mf_private.h" #include "uuids.h" #include "evr.h" +#include "evcode.h" #include "d3d9.h" #include "initguid.h" #include "dxva2api.h" @@ -1723,9 +1724,34 @@ static ULONG WINAPI video_renderer_event_sink_Release(IMediaEventSink *iface) static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, LONG event, LONG_PTR param1, LONG_PTR param2) { - FIXME("%p, %d, %ld, %ld.\n", iface, event, param1, param2); + struct video_renderer *renderer = impl_from_IMediaEventSink(iface); + HRESULT hr = S_OK; + unsigned int idx; - return E_NOTIMPL; + TRACE("%p, %d, %ld, %ld.\n", iface, event, param1, param2); + + EnterCriticalSection(&renderer->cs); + + if (event == EC_SAMPLE_NEEDED) + { + idx = param1; + if (idx >= renderer->stream_count) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + hr = IMFMediaEventQueue_QueueEventParamVar(renderer->streams[idx]->event_queue, + MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + } + } + else + { + WARN("Unhandled event %d.\n", event); + hr = MF_E_UNEXPECTED; + } + + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMediaEventSinkVtbl media_event_sink_vtbl =

1 0

Nikolay Sivov : mf/evr: Handle user events from the presenter.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: d2ce23f4610aff53cc5992c9116c20fa146966ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ce23f4610aff53cc5992c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:47 2020 +0300 mf/evr: Handle user events from the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index a77372977c7..d01bb0f06f1 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1743,6 +1743,15 @@ static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, L MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); } } + else if (event >= EC_USER) + { + PROPVARIANT code; + + code.vt = VT_I4; + code.lVal = event; + hr = IMFMediaEventQueue_QueueEventParamVar(renderer->event_queue, MERendererEvent, + &GUID_NULL, S_OK, &code); + } else { WARN("Unhandled event %d.\n", event);

1 0

Nikolay Sivov : mf/session: Provide quality manager with presentation clock.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 61ab5b24757b447fcd2eb92ca326d7e4a85f82b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ab5b24757b447fcd2eb92c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:48 2020 +0300 mf/session: Provide quality manager with presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 29 +++++++++++++++++++++++++++-- dlls/mf/tests/mf.c | 3 +++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a1b54b7080e..0fa6b49498d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -303,6 +303,9 @@ struct quality_manager { IMFQualityManager IMFQualityManager_iface; LONG refcount; + + IMFPresentationClock *clock; + CRITICAL_SECTION cs; }; static inline struct media_session *impl_from_IMFMediaSession(IMFMediaSession *iface) @@ -3393,6 +3396,12 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses goto failed; } + if (object->quality_manager && FAILED(hr = IMFQualityManager_NotifyPresentationClock(object->quality_manager, + object->clock))) + { + goto failed; + } + *session = &object->IMFMediaSession_iface; return S_OK; @@ -4459,6 +4468,9 @@ static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface) if (!refcount) { + if (manager->clock) + IMFPresentationClock_Release(manager->clock); + DeleteCriticalSection(&manager->cs); heap_free(manager); } @@ -4475,9 +4487,21 @@ static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualityManager *iface, IMFPresentationClock *clock) { - FIXME("%p, %p stub.\n", iface, clock); + struct quality_manager *manager = impl_from_IMFQualityManager(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + if (!clock) + return E_POINTER; + + EnterCriticalSection(&manager->cs); + if (manager->clock) + IMFPresentationClock_Release(manager->clock); + manager->clock = clock; + IMFPresentationClock_AddRef(manager->clock); + LeaveCriticalSection(&manager->cs); + + return S_OK; } static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node, @@ -4536,6 +4560,7 @@ HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager) object->IMFQualityManager_iface.lpVtbl = &standard_quality_manager_vtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); *manager = &object->IMFQualityManager_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c38c817eb4b..7780bf4ea58 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2815,6 +2815,9 @@ static void test_quality_manager(void) hr = MFCreateStandardQualityManager(&manager); ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFQualityManager_Release(manager); }

1 0

Nikolay Sivov : mf/session: Notify quality manager when setting new topology.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: fd22009339383227896e771605c5e55e10ae9f00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd22009339383227896e7716… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:49 2020 +0300 mf/session: Notify quality manager when setting new topology. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0fa6b49498d..8d5ff6d5c07 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -42,7 +42,9 @@ enum session_command SESSION_CMD_START, SESSION_CMD_PAUSE, SESSION_CMD_STOP, - SESSION_CMD_END, /* Internal use only. */ + /* Internally used commands. */ + SESSION_CMD_END, + SESSION_CMD_QM_NOTIFY_TOPOLOGY, }; struct session_op @@ -62,6 +64,10 @@ struct session_op GUID time_format; PROPVARIANT start_position; } start; + struct + { + IMFTopology *topology; + } notify_topology; } u; struct list entry; }; @@ -492,6 +498,10 @@ static ULONG WINAPI session_op_Release(IUnknown *iface) case SESSION_CMD_START: PropVariantClear(&op->u.start.start_position); break; + case SESSION_CMD_QM_NOTIFY_TOPOLOGY: + if (op->u.notify_topology.topology) + IMFTopology_Release(op->u.notify_topology.topology); + break; default: ; } @@ -1301,9 +1311,21 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo DWORD caps, object_flags; struct media_sink *sink; struct topo_node *node; + struct session_op *op; IMFMediaEvent *event; HRESULT hr; + if (session->quality_manager) + { + if (SUCCEEDED(create_session_op(SESSION_CMD_QM_NOTIFY_TOPOLOGY, &op))) + { + op->u.notify_topology.topology = topology; + IMFTopology_AddRef(op->u.notify_topology.topology); + session_submit_command(session, op); + IUnknown_Release(&op->IUnknown_iface); + } + } + if (FAILED(hr = IMFTopology_CloneFrom(session->presentation.current_topology, topology))) { WARN("Failed to clone topology, hr %#x.\n", hr); @@ -1929,6 +1951,9 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, case SESSION_CMD_CLOSE: session_close(session); break; + case SESSION_CMD_QM_NOTIFY_TOPOLOGY: + IMFQualityManager_NotifyTopology(session->quality_manager, op->u.notify_topology.topology); + break; default: ; } @@ -4481,7 +4506,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager { FIXME("%p, %p stub.\n", iface, topology); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualityManager *iface,

1 0

Nikolay Sivov : mf/session: Notify quality manager on input/output processing.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: fa0beb858ec27798ad24870adb4968538d31337b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa0beb858ec27798ad24870a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:50 2020 +0300 mf/session: Notify quality manager on input/output processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8d5ff6d5c07..5bbd47b3418 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2465,7 +2465,7 @@ static struct sample *transform_create_sample(IMFSample *sample) return sample_entry; } -static HRESULT transform_node_pull_samples(struct topo_node *node) +static HRESULT transform_node_pull_samples(const struct media_session *session, struct topo_node *node) { MFT_OUTPUT_STREAM_INFO stream_info; MFT_OUTPUT_DATA_BUFFER *buffers; @@ -2518,6 +2518,9 @@ static HRESULT transform_node_pull_samples(struct topo_node *node) if (SUCCEEDED(hr) && !(buffers[i].dwStatus & MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) { + if (session->quality_manager) + IMFQualityManager_NotifyProcessOutput(session->quality_manager, node->node, i, buffers[i].pSample); + queued_sample = transform_create_sample(buffers[i].pSample); list_add_tail(&node->u.transform.outputs[i].samples, &queued_sample->entry); } @@ -2544,6 +2547,9 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop unsigned int i; HRESULT hr; + if (session->quality_manager) + IMFQualityManager_NotifyProcessInput(session->quality_manager, node, input, sample); + IMFTopologyNode_GetNodeType(node, &node_type); IMFTopologyNode_GetTopoNodeID(node, &node_id); @@ -2569,7 +2575,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop break; case MF_TOPOLOGY_TRANSFORM_NODE: - transform_node_pull_samples(topo_node); + transform_node_pull_samples(session, topo_node); sample_entry = transform_create_sample(sample); list_add_tail(&topo_node->u.transform.inputs[input].samples, &sample_entry->entry); @@ -2603,7 +2609,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop WARN("Drain command failed for transform, hr %#x.\n", hr); } - transform_node_pull_samples(topo_node); + transform_node_pull_samples(session, topo_node); /* Remaining unprocessed input has been discarded, now queue markers for every output. */ if (drain) @@ -4532,7 +4538,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualit static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node, LONG input_index, IMFSample *sample) { - FIXME("%p, %p, %d, %p stub.\n", iface, node, input_index, sample); + TRACE("%p, %p, %d, %p stub.\n", iface, node, input_index, sample); return E_NOTIMPL; } @@ -4540,7 +4546,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityMana static HRESULT WINAPI standard_quality_manager_NotifyProcessOutput(IMFQualityManager *iface, IMFTopologyNode *node, LONG output_index, IMFSample *sample) { - FIXME("%p, %p, %d, %p stub.\n", iface, node, output_index, sample); + TRACE("%p, %p, %d, %p stub.\n", iface, node, output_index, sample); return E_NOTIMPL; }

1 0

Nikolay Sivov : mf/session: Forward MEQualityNotify event to the quality manager.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 3b230b58c89aaabb567f1e47ad1494a6d48803b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b230b58c89aaabb567f1e47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:51 2020 +0300 mf/session: Forward MEQualityNotify event to the quality manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5bbd47b3418..d586f1c6be9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2910,6 +2910,7 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM IMFMediaEventGenerator *event_source; IMFMediaEvent *event = NULL; MediaEventType event_type; + IUnknown *object = NULL; IMFMediaSource *source; IMFMediaStream *stream; PROPVARIANT value; @@ -3057,6 +3058,21 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM (IMFStreamSink *)event_source); LeaveCriticalSection(&session->cs); + break; + case MEQualityNotify: + + if (session->quality_manager) + { + if (FAILED(IMFMediaEventGenerator_QueryInterface(event_source, &IID_IMFStreamSink, (void **)&object))) + IMFMediaEventGenerator_QueryInterface(event_source, &IID_IMFTransform, (void **)&object); + + if (object) + { + IMFQualityManager_NotifyQualityEvent(session->quality_manager, object, event); + IUnknown_Release(object); + } + } + break; default: ;

1 0

Paul Gofman : mshtml: Check for EVENTID_LAST in ensure_doc_nsevent_handler().
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 8ea89841964c6df98aa6230cc66ef1fd07c543eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea89841964c6df98aa6230c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 11 20:27:55 2020 +0300 mshtml: Check for EVENTID_LAST in ensure_doc_nsevent_handler(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50110 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0f041cbae6c..0bf3de54a96 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2832,6 +2832,8 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, nsIDOMNode *nsnode, ev doc->event_vector[eid] = TRUE; eid = EVENTID_BLUR; break; + case EVENTID_LAST: + return S_OK; default: break; }

1 0

Piotr Caban : ucrtbase: Add support for utf8 codepage in setlocale.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: e460b37a25226f36b973a66b613e2542b1f9cc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e460b37a25226f36b973a66b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 11 18:49:08 2020 +0100 ucrtbase: Add support for utf8 codepage in setlocale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c49439951a9..fda3d11b86d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -351,6 +351,11 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s } else if (!MSVCRT__strnicmp(cp, ".OCP", 4)) { GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&locale_cp, sizeof(DWORD)/sizeof(WCHAR)); +#if _MSVCR_VER >= 140 + } else if (!MSVCRT__strnicmp(cp, ".UTF-8", 6) + || !MSVCRT__strnicmp(cp, ".UTF8", 5)) { + locale_cp = CP_UTF8; +#endif } else { locale_cp = atoi(cp + 1); }

1 0