wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Damjan Jovanovic : mshtml: Fix handling res protocol resource type ids without leading '#'.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: f9da9675f001ab5731212e8bd2b9d17c19adb16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9da9675f001ab5731212e8b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 24 18:37:27 2020 +0200 mshtml: Fix handling res protocol resource type ids without leading '#'. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/protocol.c | 5 +++++ dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 0f06896c49..8677030c35 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -585,7 +585,12 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, *res_type++ = 0; if ((url_file = wcschr(res_type, '/'))) { + DWORD res_type_id; + WCHAR *endpoint; *url_file++ = 0; + res_type_id = wcstol(res_type, &endpoint, 10); + if(!*endpoint) + res_type = MAKEINTRESOURCEW(res_type_id); }else { url_file = res_type; res_type = (LPWSTR)RT_HTML; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index ba767d21c6..75063f5ecf 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -596,6 +596,13 @@ static void test_res_protocol(void) IUnknown_Release(unk); + test_res_url("/blank.html"); + test_res_url("/123"); + test_res_url("/#23/blank.html"); + test_res_url("/#23/123"); + test_res_url("/23/blank.html"); + test_res_url("/23/123"); + test_res_url("/jstest.html"); test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html");

1 0

Nikolay Sivov : mf: Make sure to request another sample for sample grabber after current timed sample.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 7948b2519250f7b6eb732ff2fa1d9526cc28696e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7948b2519250f7b6eb732ff2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 17:47:04 2020 +0300 mf: Make sure to request another sample for sample grabber after current timed sample. Based on patch by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 2167b5001e..7d9fa78732 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -739,14 +739,22 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) WARN("Failed to report a sample, hr %#x.\n", hr); stream_release_pending_item(item); - item = stream_get_next_item(grabber); - if (item && item->type == ITEM_TYPE_SAMPLE) + + /* Schedule next sample, skipping markers. */ + LIST_FOR_EACH_ENTRY(item, &grabber->items, struct scheduled_item, entry) { - if (FAILED(hr = stream_schedule_sample(grabber, item))) - WARN("Failed to schedule a sample, hr %#x.\n", hr); - sample_grabber_stream_request_sample(grabber); - item = NULL; + if (item->type == ITEM_TYPE_SAMPLE) + { + if (FAILED(hr = stream_schedule_sample(grabber, item))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); + break; + } } + + if (sample_delivered) + sample_grabber_stream_request_sample(grabber); + + item = NULL; break; case ITEM_TYPE_MARKER: sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK);

1 0

Nikolay Sivov : mf: Handle null marker context for sample grabber stream.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: a12b5fe084510fab7f5b0e3a6665160becb59511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a12b5fe084510fab7f5b0e3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 17:47:03 2020 +0300 mf: Handle null marker context for sample grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 21f89c0ad0..2167b5001e 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -446,7 +446,7 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ const PROPVARIANT *context_value) { struct scheduled_item *item; - HRESULT hr; + HRESULT hr = S_OK; if (list_empty(&grabber->items)) { @@ -460,7 +460,9 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ item->type = ITEM_TYPE_MARKER; item->u.marker.type = marker_type; list_init(&item->entry); - hr = PropVariantCopy(&item->u.marker.context, context_value); + PropVariantInit(&item->u.marker.context); + if (context_value) + hr = PropVariantCopy(&item->u.marker.context, context_value); if (SUCCEEDED(hr)) list_add_tail(&grabber->items, &item->entry); else

1 0

Nikolay Sivov : dwrite: Use unsigned types for single-bit fields.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 73a6470d866df837b4fee13bb4644a03956940f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a6470d866df837b4fee13b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 11:56:57 2020 +0300 dwrite: Use unsigned types for single-bit fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bd969a8fa6..ee52c3e321 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -100,8 +100,8 @@ struct dwrite_font_data LOGFONTW lf; /* used to mark font as tested when scanning for simulation candidate */ - BOOL bold_sim_tested : 1; - BOOL oblique_sim_tested : 1; + unsigned int bold_sim_tested : 1; + unsigned int oblique_sim_tested : 1; }; struct dwrite_fontfamily_data @@ -114,9 +114,9 @@ struct dwrite_fontfamily_data size_t size; size_t count; - BOOL has_normal_face : 1; - BOOL has_oblique_face : 1; - BOOL has_italic_face : 1; + unsigned int has_normal_face : 1; + unsigned int has_oblique_face : 1; + unsigned int has_italic_face : 1; }; struct dwrite_fontcollection

1 0

Nikolay Sivov : comctl32/listview: Only apply horizontal offset when setting header position.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: d92906249fd4abd75d5d2ee2fba966855fac2e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d92906249fd4abd75d5d2ee2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 11:43:39 2020 +0300 comctl32/listview: Only apply horizontal offset when setting header position. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2dd25908db..f1f09d201e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11086,7 +11086,6 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) rect = infoPtr->rcList; rect.left += origin.x; - rect.top += origin.y; hl.prc = &rect; hl.pwpos = &wp;

1 0

Brendan Shanks : dinput: Fix IDirectInputEffect::SetParameters() when called with flags=0.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 1832dc3df32f0133e695457401f6961d8d40532d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1832dc3df32f0133e6954574… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 23 22:40:17 2020 -0700 dinput: Fix IDirectInputEffect::SetParameters() when called with flags=0. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 10 +++------- dlls/dinput/joystick_linuxinput.c | 5 ++++- dlls/dinput/tests/joystick.c | 2 -- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index ef21ecaa30..ec4b00b873 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -489,15 +489,11 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags); - if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) { - /* set everything */ - dwFlags = DIEP_AXES | DIEP_DIRECTION | DIEP_DURATION | DIEP_ENVELOPE | - DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | DIEP_TRIGGERBUTTON | - DIEP_TRIGGERREPEATINTERVAL | DIEP_TYPESPECIFICPARAMS; - } - dump_DIEFFECT(peff, &This->guid, dwFlags); + if (!dwFlags) + return DI_NOEFFECT; + if (dwFlags & DIEP_AXES) { if (!(peff->rgdwAxes)) return DIERR_INVALIDPARAM; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b5418d805c..b61913119c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1097,7 +1097,10 @@ static HRESULT WINAPI JoystickWImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface, RE if (lpeff != NULL) { - retval = IDirectInputEffect_SetParameters(new_effect->ref, lpeff, 0); + retval = IDirectInputEffect_SetParameters(new_effect->ref, lpeff, + DIEP_AXES | DIEP_DIRECTION | DIEP_DURATION | DIEP_ENVELOPE | + DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | DIEP_TRIGGERBUTTON | + DIEP_TRIGGERREPEATINTERVAL | DIEP_TYPESPECIFICPARAMS); if (retval != DI_OK && retval != DI_DOWNLOADSKIPPED) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 810707c02a..f082c612b0 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -663,11 +663,9 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) memset(&effect_empty, 0, sizeof(effect_empty)); effect_empty.dwSize = sizeof(effect_empty); hr = IDirectInputEffect_SetParameters(effect, &effect_empty, 0); - todo_wine ok(hr==DI_NOEFFECT,"IDirectInputEffect_SetParameters failed: %08x\n", hr); /* Start effect with SetParameters and a zeroed-out DIEFFECT. */ hr = IDirectInputEffect_SetParameters(effect, &effect_empty, DIEP_START); - todo_wine ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr);

1 0

Brendan Shanks : dinput/tests: Test IDirectInputEffect::SetParameters() with a zeroed DIEFFECT and flags=0.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 23a55927af29db5a9634b98c388f09cf383ad39d URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a55927af29db5a9634b98c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 23 22:40:16 2020 -0700 dinput/tests: Test IDirectInputEffect::SetParameters() with a zeroed DIEFFECT and flags=0. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index a3d7440367..810707c02a 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -600,6 +600,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) struct DIPROPDWORD diprop_word; void *tmp; GUID guid = {0}; + DIEFFECT effect_empty; hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &effect_data.guid); @@ -658,7 +659,15 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); - hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_START); + /* SetParameters with a zeroed-out DIEFFECT and flags=0 should do nothing. */ + memset(&effect_empty, 0, sizeof(effect_empty)); + effect_empty.dwSize = sizeof(effect_empty); + hr = IDirectInputEffect_SetParameters(effect, &effect_empty, 0); + todo_wine + ok(hr==DI_NOEFFECT,"IDirectInputEffect_SetParameters failed: %08x\n", hr); + /* Start effect with SetParameters and a zeroed-out DIEFFECT. */ + hr = IDirectInputEffect_SetParameters(effect, &effect_empty, DIEP_START); + todo_wine ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr);

1 0

Brendan Shanks : dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: cf40880c69a3095c0c7f0e8a30b72e53ccbb5648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf40880c69a3095c0c7f0e8a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 23 22:31:12 2020 -0700 dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 19dd9ad736..2eab4d3a33 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -241,34 +241,42 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) if (type == DIEFT_CONSTANTFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) { WARN("Effect claims to be a constant force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DICONSTANTFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_PERIODIC) { if (eff->cbTypeSpecificParams != sizeof(DIPERIODIC)) { WARN("Effect claims to be a periodic force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DIPERIODIC(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_RAMPFORCE) { if (eff->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) { WARN("Effect claims to be a ramp force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DIRAMPFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_CONDITION) { - if (eff->cbTypeSpecificParams == sizeof(DICONDITION)) { + if (eff->cbTypeSpecificParams == sizeof(DICONDITION) && eff->lpvTypeSpecificParams) { _dump_DICONDITION(eff->lpvTypeSpecificParams); - } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION)) { + } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION) && eff->lpvTypeSpecificParams) { DICONDITION *condition = eff->lpvTypeSpecificParams; _dump_DICONDITION(&condition[0]); _dump_DICONDITION(&condition[1]); } else { - WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n"); + WARN("Effect claims to be a condition but the type-specific params are the wrong size or NULL!\n"); } } else if (type == DIEFT_CUSTOMFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICUSTOMFORCE)) { WARN("Effect claims to be a custom force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DICUSTOMFORCE(eff->lpvTypeSpecificParams); }

1 0

Zebediah Figura : qcap/filewriter: Post EC_COMPLETE on receiving EOS.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: dc78a97c30e872dac3083a09ec728ba42fda09d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc78a97c30e872dac3083a09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 23 20:47:07 2020 -0500 qcap/filewriter: Post EC_COMPLETE on receiving EOS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 42 +++++++++++++++++++++++++++++++++++ dlls/qcap/tests/filewriter.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 4d9262e757..5e63facf7b 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -36,6 +36,8 @@ struct file_writer WCHAR *filename; HANDLE file; + + BOOL eos; }; static inline struct file_writer *impl_from_strmbase_pin(struct strmbase_pin *iface) @@ -90,11 +92,40 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed return S_OK; } +static void deliver_ec_complete(struct file_writer *filter) +{ + IMediaEventSink *event_sink; + + if (SUCCEEDED(IFilterGraph_QueryInterface(filter->filter.graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } +} + +static HRESULT file_writer_sink_eos(struct strmbase_sink *iface) +{ + struct file_writer *filter = impl_from_strmbase_pin(&iface->pin); + + EnterCriticalSection(&filter->filter.csFilter); + + if (filter->filter.state == State_Running) + deliver_ec_complete(filter); + else + filter->eos = TRUE; + + LeaveCriticalSection(&filter->filter.csFilter); + return S_OK; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = file_writer_sink_query_interface, .base.pin_query_accept = file_writer_sink_query_accept, .pfnReceive = file_writer_sink_receive, + .sink_eos = file_writer_sink_eos, }; static inline struct file_writer *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -151,6 +182,16 @@ static HRESULT file_writer_init_stream(struct strmbase_filter *iface) return S_OK; } +static HRESULT file_writer_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start) +{ + struct file_writer *filter = impl_from_strmbase_filter(iface); + + if (filter->eos) + deliver_ec_complete(filter); + filter->eos = FALSE; + return S_OK; +} + static HRESULT file_writer_cleanup_stream(struct strmbase_filter *iface) { struct file_writer *filter = impl_from_strmbase_filter(iface); @@ -165,6 +206,7 @@ static struct strmbase_filter_ops filter_ops = .filter_get_pin = file_writer_get_pin, .filter_destroy = file_writer_destroy, .filter_init_stream = file_writer_init_stream, + .filter_start_stream = file_writer_start_stream, .filter_cleanup_stream = file_writer_cleanup_stream, }; diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index 7e8a91d3fb..e3bdcb7656 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -678,6 +678,57 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, IMediaSample_Release(sample); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IFilterGraph2 *graph, IMediaControl *control, IPin *pin) +{ + IMediaEvent *eventsrc; + HRESULT hr; + BOOL ret; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaEvent_Release(eventsrc); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -738,6 +789,7 @@ static void test_connect_pin(void) test_allocator(meminput, allocator); test_filter_state(control); test_sample_processing(control, meminput, allocator, filename); + test_eos(graph, control, pin); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : qcap: Register the file writer.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 0eaa43357e22bcc6350c8d78426b0d5f1fd43af7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eaa43357e22bcc6350c8d78… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 23 20:47:08 2020 -0500 qcap: Register the file writer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_main.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 2f45e2f469..00e0a9671f 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -224,12 +224,32 @@ static const REGFILTER2 reg_smart_tee = .u.s2.rgPins2 = reg_smart_tee_pins, }; +static const REGPINTYPES reg_file_writer_sink_mt = {&GUID_NULL, &GUID_NULL}; + +static const REGFILTERPINS2 reg_file_writer_pins[1] = +{ + { + .cInstances = 1, + .nMediaTypes = 1, + .lpMediaType = &reg_file_writer_sink_mt, + }, +}; + +static const REGFILTER2 reg_file_writer = +{ + .dwVersion = 2, + .dwMerit = MERIT_DO_NOT_USE, + .u.s2.cPins2 = 1, + .u.s2.rgPins2 = reg_file_writer_pins, +}; + /*********************************************************************** * DllRegisterServer (QCAP.@) */ HRESULT WINAPI DllRegisterServer(void) { static const WCHAR avi_muxW[] = {'A','V','I',' ','M','u','x',0}; + static const WCHAR file_writerW[] = {'F','i','l','e',' ','w','r','i','t','e','r',0}; static const WCHAR smart_teeW[] = {'S','m','a','r','t',' ','T','e','e',0}; IFilterMapper2 *mapper; HRESULT hr; @@ -243,6 +263,8 @@ HRESULT WINAPI DllRegisterServer(void) IFilterMapper2_RegisterFilter(mapper, &CLSID_AviDest, avi_muxW, NULL, NULL, NULL, &reg_avi_mux); + IFilterMapper2_RegisterFilter(mapper, &CLSID_FileWriter, file_writerW, + NULL, NULL, NULL, &reg_file_writer); IFilterMapper2_RegisterFilter(mapper, &CLSID_SmartTee, smart_teeW, NULL, NULL, NULL, &reg_smart_tee); @@ -266,6 +288,7 @@ HRESULT WINAPI DllUnregisterServer(void) return hr; IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_AviDest); + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_FileWriter); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_SmartTee); IFilterMapper2_Release(mapper);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020