February 2021 - Wine-commits

Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetPairKerning().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 7129b3e14dbd59d9ece355830c2003f5135be12f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7129b3e14dbd59d9ece35583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:46 2021 +0300 dwrite/layout: Remove unnecessary argument check from GetPairKerning(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 --- dlls/dwrite/tests/layout.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5dcf62d4690..7b9d521c29a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4062,9 +4062,6 @@ static HRESULT WINAPI dwritetextlayout1_GetPairKerning(IDWriteTextLayout4 *iface TRACE("%p, %u, %p, %p.\n", iface, position, is_pairkerning_enabled, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *is_pairkerning_enabled = range->pair_kerning; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index bff95ca3bb6..8d74056af2f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6337,11 +6337,10 @@ todo_wine value = FALSE; hr = IDWriteTextLayout1_GetPairKerning(layout1, 10, &value, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - todo_wine { ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); ok(!!value, "Unexpected value %d.\n", value); - } + range.startPosition = 0; range.length = ~0u; hr = IDWriteTextLayout1_SetPairKerning(layout1, FALSE, range);

1 0

Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetInlineObject().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 352df1151636e580113171b4bbd79a4b761556f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=352df1151636e580113171b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:47 2021 +0300 dwrite/layout: Remove unnecessary argument check from GetInlineObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 --- dlls/dwrite/tests/layout.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7b9d521c29a..3793f1ed8cb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3542,9 +3542,6 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout4 *iface TRACE("%p, %u, %p, %p.\n", iface, position, object, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *object = range->object; if (*object) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8d74056af2f..b37cdfbf5ba 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6224,11 +6224,9 @@ todo_wine object = NULL; hr = IDWriteTextLayout_GetInlineObject(layout, 10, &object, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); - if (object) - IDWriteInlineObject_Release(object); + IDWriteInlineObject_Release(object); range.startPosition = 0; range.length = ~0u;

1 0

Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetFontWeight().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 68cfa3a4117fdf52498c7d22b3c0d10d7ff05c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68cfa3a4117fdf52498c7d22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:48 2021 +0300 dwrite/layout: Remove unnecessary argument check from GetFontWeight(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 5 +---- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3793f1ed8cb..482fcc733db 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1,7 +1,7 @@ /* * Text format and layout * - * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2021 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3442,9 +3442,6 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontWeight(IDWriteTextLayout4 * TRACE("%p, %u, %p, %p.\n", iface, position, weight, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *weight = range->weight; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b37cdfbf5ba..b96ff2f0289 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6022,7 +6022,6 @@ static void test_layout_range_length(void) range.startPosition = range.length = 0; hr = IDWriteTextLayout_GetFontWeight(layout, 10, &weight, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length);

1 0

Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetFontCollection().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 4b0f2eb6e5f5efd7e7cc296cc2f58a0dbe6c9c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b0f2eb6e5f5efd7e7cc296c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 12:03:49 2021 +0300 dwrite/layout: Remove unnecessary argument check from GetFontCollection(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 --- dlls/dwrite/tests/layout.c | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 482fcc733db..fc874541d74 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3403,9 +3403,6 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayou TRACE("%p, %u, %p, %p.\n", iface, position, collection, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *collection = range->collection; if (*collection) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b96ff2f0289..adc9503ffd9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5973,8 +5973,8 @@ if (SUCCEEDED(hr)) static void test_layout_range_length(void) { + IDWriteFontCollection *collection, *collection2; IDWriteInlineObject *sign, *object; - IDWriteFontCollection *collection; IDWriteTypography *typography; DWRITE_FONT_STRETCH stretch; IDWriteTextLayout1 *layout1; @@ -6305,6 +6305,14 @@ static void test_layout_range_length(void) hr = IDWriteTextLayout_SetFontCollection(layout, NULL, range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + range.startPosition = range.length = 0; + collection2 = NULL; + hr = IDWriteTextLayout_GetFontCollection(layout, 10, &collection2, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range.length == ~0u, "Unexpected range length %u.\n", range.length); + if (collection2) + IDWriteFontCollection_Release(collection2); + IDWriteFontCollection_Release(collection); if (SUCCEEDED(IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout1, (void **)&layout1)))

1 0

Alexandre Julliard : ntdll: Print the version mismatch error from the Unix side.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 3f3f673c29937e8bdec2de590b21b18a1747f398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3f673c29937e8bdec2de59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 15:24:49 2021 +0100 ntdll: Print the version mismatch error from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/unix/process.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index abc2c3f828c..3ea315d83da 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4108,7 +4108,7 @@ static NTSTATUS process_init(void) */ NTSTATUS CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ) { - assert( version == NTDLL_UNIXLIB_VERSION ); + if (version != NTDLL_UNIXLIB_VERSION) return STATUS_REVISION_MISMATCH; unix_funcs = funcs; return process_init(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6b7cbcd9c1a..083a3a82a1d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -701,6 +701,9 @@ done: case STATUS_INVALID_IMAGE_NOT_MZ: ERR( "%s not supported on this system\n", debugstr_us(&params->ImagePathName) ); break; + case STATUS_REVISION_MISMATCH: + ERR( "ntdll library version mismatch\n" ); + break; default: ERR( "failed to load %s error %x\n", debugstr_us(&params->ImagePathName), status ); break;

1 0

Alexandre Julliard : ntdll: Avoid sign conversion warnings in Thumb-2 relocation processing.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: d89b304eb703a7eb0eefb3b759497a7747f5cc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d89b304eb703a7eb0eefb3b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 17:20:02 2021 +0100 ntdll: Avoid sign conversion warnings in Thumb-2 relocation processing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 53 +++++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3ea315d83da..a166a6cc071 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2898,41 +2898,26 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count #elif defined(__arm__) case IMAGE_REL_BASED_THUMB_MOV32: { - DWORD inst = *(INT_PTR *)((char *)page + offset); - DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); - DWORD hi_delta; - - if ((inst & 0x8000fbf0) != 0x0000f240) - ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); - - imm16 += LOWORD(delta); - hi_delta = HIWORD(delta) + HIWORD(imm16); - *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + - ((imm16 >> 12) & 0x000f) + - ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0xff0000); - - if (hi_delta != 0) - { - inst = *(INT_PTR *)((char *)page + offset + 4); - imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); - - if ((inst & 0x8000fbf0) != 0x0000f2c0) - ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); - - imm16 += hi_delta; - if (imm16 > 0xffff) - ERR("resulting immediate value won't fit: %08x\n", imm16); - *(INT_PTR *)((char *)page + offset + 4) = (inst & 0x8f00fbf0) + - ((imm16 >> 1) & 0x0400) + - ((imm16 >> 12) & 0x000f) + - ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0xff0000); - } - } + DWORD *inst = (DWORD *)((char *)page + offset); + WORD lo = ((inst[0] << 1) & 0x0800) + ((inst[0] << 12) & 0xf000) + + ((inst[0] >> 20) & 0x0700) + ((inst[0] >> 16) & 0x00ff); + WORD hi = ((inst[1] << 1) & 0x0800) + ((inst[1] << 12) & 0xf000) + + ((inst[1] >> 20) & 0x0700) + ((inst[1] >> 16) & 0x00ff); + DWORD imm = MAKELONG( lo, hi ) + delta; + + lo = LOWORD( imm ); + hi = HIWORD( imm ); + + if ((inst[0] & 0x8000fbf0) != 0x0000f240 || (inst[1] & 0x8000fbf0) != 0x0000f2c0) + ERR("wrong Thumb2 instruction @%p %08x:%08x, expected MOVW/MOVT\n", + inst, inst[0], inst[1] ); + + inst[0] = (inst[0] & 0x8f00fbf0) + ((lo >> 1) & 0x0400) + ((lo >> 12) & 0x000f) + + ((lo << 20) & 0x70000000) + ((lo << 16) & 0xff0000); + inst[1] = (inst[1] & 0x8f00fbf0) + ((hi >> 1) & 0x0400) + ((hi >> 12) & 0x000f) + + ((hi << 20) & 0x70000000) + ((hi << 16) & 0xff0000); break; + } #endif default: FIXME("Unknown/unsupported fixup type %x.\n", type);

1 0

Zebediah Figura : winegstreamer: Reimplement the media source on top of the wg_parser object.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: f9c43fc9fa6e68ac0b886fd03e0425c8862aaa68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9c43fc9fa6e68ac0b886fd0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:27 2021 -0600 winegstreamer: Reimplement the media source on top of the wg_parser object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/audioconvert.c | 12 - dlls/winegstreamer/gst_cbs.c | 235 ------------- dlls/winegstreamer/gst_cbs.h | 110 ------ dlls/winegstreamer/gst_private.h | 8 +- dlls/winegstreamer/gstdemux.c | 19 -- dlls/winegstreamer/main.c | 2 - dlls/winegstreamer/media_source.c | 699 +++++++++----------------------------- dlls/winegstreamer/mfplat.c | 460 +++++++++---------------- dlls/winegstreamer/wg_parser.c | 12 +- 10 files changed, 337 insertions(+), 1221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c43fc9fa6e68ac0b88…

1 0

Zebediah Figura : quartz/tests: Add more tests for media events.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 5b0b78b6f0cb47dd87b353d1c4bf20bd7677e517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b0b78b6f0cb47dd87b353d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:08 2021 -0600 quartz/tests: Add more tests for media events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 86 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 55c70702e47..6288e3095dd 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5156,12 +5156,12 @@ static void test_set_notify_flags(void) IMediaEventEx *media_event; struct testfilter filter; LONG_PTR param1, param2; + LONG code, flags; HANDLE event; HWND window; BSTR status; HRESULT hr; ULONG ref; - LONG code; MSG msg; window = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, @@ -5196,9 +5196,25 @@ static void test_set_notify_flags(void) while (PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE)); + hr = IMediaEventEx_SetNotifyFlags(media_event, 2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_GetNotifyFlags(media_event, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x\n", flags); + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); ok(hr == S_OK, "Got hr %#x.\n", hr); + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == AM_MEDIAEVENT_NONOTIFY, "Got flags %#x\n", flags); + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); @@ -5249,6 +5265,11 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_SetNotifyFlags(media_event, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x\n", flags); + hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Run(media_control); @@ -5295,6 +5316,8 @@ static void check_events_(unsigned int line, IMediaEventEx *media_event, ++ec_complete_count; if (code == EC_STATUS) ++ec_status_count; + hr = IMediaEventEx_FreeEventParams(media_event, code, param1, param2); + ok(hr == S_OK, "Got hr %#x.\n", hr); } ok(hr == E_ABORT, "Got hr %#x.\n", hr); todo_wine_if(todo) ok_(__FILE__, line)(ec_complete_count == expected_ec_complete_count, @@ -5336,9 +5359,51 @@ static void test_events(void) hr = IMediaEventEx_GetEventHandle(media_event, (OAEVENT *)&event); ok(hr == S_OK, "Got hr %#x.\n", hr); + code = 0xdeadbeef; + param1 = 0xdeadbeef; + param2 = 0xdeadbeef; + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 0); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(!code, "Got code %#x.\n", code); + todo_wine ok(!param1, "Got param1 %#Ix.\n", param1); + todo_wine ok(!param2, "Got param2 %#Ix.\n", param2); + + /* EC_COMPLETE is ignored while in stopped or paused state. */ + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, FALSE); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, FALSE); + hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); + check_events(media_event, 0, 0, FALSE); + + /* Pausing and then running the graph clears pending EC_COMPLETE events. + * This remains true even with default handling canceled. */ + + hr = IMediaEventEx_CancelDefaultHandling(media_event, EC_COMPLETE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, @@ -5385,6 +5450,25 @@ static void test_events(void) check_events(media_event, 1, 2, FALSE); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, TRUE); + + /* GetEvent() resets the event object if there are no events available. */ + SetEvent(event); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50);

1 0

Zebediah Figura : quartz: Use the graph critical section to synchronize media event methods.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: dc836b85c1458c916c5ad3b86ff8df59ce634dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc836b85c1458c916c5ad3b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:09 2021 -0600 quartz: Use the graph critical section to synchronize media event methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8c1cd6232e4..681893a1e11 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -62,7 +62,6 @@ typedef struct { int ring_buffer_size; int msg_tosave; int msg_toget; - CRITICAL_SECTION msg_crst; HANDLE msg_event; /* Signaled for no empty queue */ } EventsQueue; @@ -75,8 +74,6 @@ static int EventsQueue_Init(EventsQueue* omr) omr->messages = CoTaskMemAlloc(omr->ring_buffer_size * sizeof(Event)); ZeroMemory(omr->messages, omr->ring_buffer_size * sizeof(Event)); - InitializeCriticalSection(&omr->msg_crst); - omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": EventsQueue.msg_crst"); return TRUE; } @@ -84,14 +81,11 @@ static int EventsQueue_Destroy(EventsQueue* omr) { CloseHandle(omr->msg_event); CoTaskMemFree(omr->messages); - omr->msg_crst.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&omr->msg_crst); return TRUE; } static BOOL EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) { - EnterCriticalSection(&omr->msg_crst); if (omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)) { int old_ring_buffer_size = omr->ring_buffer_size; @@ -114,22 +108,13 @@ static BOOL EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) omr->messages[omr->msg_tosave] = *evt; SetEvent(omr->msg_event); omr->msg_tosave = (omr->msg_tosave + 1) % omr->ring_buffer_size; - LeaveCriticalSection(&omr->msg_crst); return TRUE; } -static BOOL EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) +static BOOL EventsQueue_GetEvent(EventsQueue* omr, Event* evt) { - if (WaitForSingleObject(omr->msg_event, msTimeOut) != WAIT_OBJECT_0) - return FALSE; - - EnterCriticalSection(&omr->msg_crst); - if (omr->msg_toget == omr->msg_tosave) /* buffer empty ? */ - { - LeaveCriticalSection(&omr->msg_crst); return FALSE; - } *evt = omr->messages[omr->msg_toget]; omr->msg_toget = (omr->msg_toget + 1) % omr->ring_buffer_size; @@ -138,7 +123,6 @@ static BOOL EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) if (omr->msg_toget == omr->msg_tosave) /* buffer empty ? */ ResetEvent(omr->msg_event); - LeaveCriticalSection(&omr->msg_crst); return TRUE; } @@ -4786,14 +4770,24 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *lEventCode TRACE("(%p/%p)->(%p, %p, %p, %d)\n", This, iface, lEventCode, lParam1, lParam2, msTimeout); - if (EventsQueue_GetEvent(&This->evqueue, &evt, msTimeout)) + if (WaitForSingleObject(This->evqueue.msg_event, msTimeout)) + { + *lEventCode = 0; + return E_ABORT; + } + + EnterCriticalSection(&This->cs); + + if (EventsQueue_GetEvent(&This->evqueue, &evt)) { *lEventCode = evt.lEventCode; *lParam1 = evt.lParam1; *lParam2 = evt.lParam2; + LeaveCriticalSection(&This->cs); return S_OK; } + LeaveCriticalSection(&This->cs); *lEventCode = 0; return E_ABORT; } @@ -5280,8 +5274,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCo TRACE("(%p/%p)->(%d, %ld, %ld)\n", This, iface, EventCode, EventParam1, EventParam2); - /* We need thread safety here, let's use the events queue's one */ - EnterCriticalSection(&This->evqueue.msg_crst); + EnterCriticalSection(&This->cs); if ((EventCode == EC_COMPLETE) && This->HandleEcComplete) { @@ -5324,7 +5317,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCo PostMessageW(This->notif.hWnd, This->notif.msg, 0, This->notif.instance); } - LeaveCriticalSection(&This->evqueue.msg_crst); + LeaveCriticalSection(&This->cs); return S_OK; }

1 0

Zebediah Figura : quartz: Use a linked list to store media events.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: d40bc6dc3751fd30cb3808f6d2ceaa1ea198a77f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d40bc6dc3751fd30cb3808f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:10 2021 -0600 quartz: Use a linked list to store media events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 236 ++++++++++++++++++---------------------------- 1 file changed, 93 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d40bc6dc3751fd30cb38…

1 0