wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Rémi Bernon : hidparse.sys: Use +hid debug channel.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: e9dc0cf83a318c75b22129a4a0cda3dc754d9d4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dc0cf83a318c75b22129a4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:09 2021 +0100 hidparse.sys: Use +hid debug channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidparse.sys/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index d455049d9b1..c07389044fd 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -35,7 +35,7 @@ #include "wine/list.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(hidp); +WINE_DEFAULT_DEBUG_CHANNEL(hid); /* Flags that are defined in the document "Device Class Definition for Human Interface Devices" */ @@ -122,7 +122,7 @@ static void debug_print_preparsed( struct hid_preparsed_data *data ) { unsigned int i, end; - if (TRACE_ON( hidp )) + if (TRACE_ON(hid)) { TRACE( "usage %02x:%02x input %u-(%u)-%u, report len %u output %u-(%u)-%u, report len %u " "feature %u-(%u)-%u, report len %u collections %u\n", data->usage_page, data->usage, @@ -498,7 +498,7 @@ struct hid_preparsed_data *parse_descriptor( BYTE *descriptor, unsigned int leng BYTE *ptr, *end; int i; - if (TRACE_ON( hidp )) + if (TRACE_ON(hid)) { TRACE( "descriptor %p, length %u:\n", descriptor, length ); for (i = 0; i < length;)

1 0

Rémi Bernon : winebus.sys: Use +hid debug channel.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 5b735572c16f9a322af4611f6bd63088785fb7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b735572c16f9a322af4611f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:08 2021 +0100 winebus.sys: Use +hid debug channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/hid.c | 2 +- dlls/winebus.sys/main.c | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index eef882b52e8..735fd8c54cc 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -97,7 +97,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef HAVE_IOHIDMANAGERCREATE static pthread_mutex_t iohid_cs = PTHREAD_MUTEX_INITIALIZER; diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index c01648ce67e..49afcbaf67c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -55,7 +55,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef SONAME_LIBSDL2 diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1591f00eedf..dad5344a54c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -92,7 +92,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef HAVE_UDEV diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index a0f07f66392..893bf1cd7f6 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -39,7 +39,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); static BOOL hid_report_descriptor_append(struct hid_report_descriptor *desc, const BYTE *buffer, SIZE_T size) { diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 0e7889386dc..c9a18313853 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -40,7 +40,7 @@ #include "unixlib.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); static DRIVER_OBJECT *driver_obj; @@ -411,7 +411,7 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("read input report length %u:\n", report->length); for (i = 0; i < report->length;) @@ -1038,7 +1038,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) memcpy(packet->reportBuffer, ext->last_reports[packet->reportId], packet->reportBufferLen); irp->IoStatus.Information = packet->reportBufferLen; irp->IoStatus.Status = STATUS_SUCCESS; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("read input report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1068,7 +1068,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_WRITE_REPORT: { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("write output report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1087,7 +1087,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; unix_device_get_feature_report(device, packet, &irp->IoStatus); - if (!irp->IoStatus.Status && TRACE_ON(plugplay)) + if (!irp->IoStatus.Status && TRACE_ON(hid)) { TRACE("read feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1104,7 +1104,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("write feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;)

1 0

Nikolay Sivov : propsys/tests: Add a VT_UI4 test for PropVariantCompareEx().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 10359e17ce64f39461a7b7b54f73857e6458d1fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=10359e17ce64f39461a7b7b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 9 10:05:47 2021 +0300 propsys/tests: Add a VT_UI4 test for PropVariantCompareEx(). A test for 58eeb1a86433db1104d3a9ccf9ad7435ec81443a. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 9ffa048a8b7..6370c01dc80 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -670,6 +670,7 @@ static void test_PropVariantCompareEx(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; PROPVARIANT clsid_null, clsid, clsid2, r4_0, r4_2, r8_0, r8_2; + PROPVARIANT ui4, ui4_large; PROPVARIANT var1, var2; INT res; static const WCHAR str_2W[] = {'2', 0}; @@ -711,6 +712,10 @@ static void test_PropVariantCompareEx(void) i4_largeneg.lVal = -65536; i4_2.vt = VT_I4; i4_2.lVal = 2; + ui4.vt = VT_UI4; + ui4.ulVal = 2; + ui4_large.vt = VT_UI4; + ui4_large.ulVal = 65536; str_2.vt = VT_BSTR; str_2.bstrVal = SysAllocString(str_2W); str_02.vt = VT_BSTR; @@ -759,6 +764,12 @@ static void test_PropVariantCompareEx(void) res = PropVariantCompareEx(&i2_0, &i2_2, 0, 0); ok(res == -1, "res=%i\n", res); + res = PropVariantCompareEx(&ui4, &ui4_large, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&ui4_large, &ui4, 0, 0); + ok(res == 1, "res=%i\n", res); + /* Always return -1 if second value cannot be converted to first type */ res = PropVariantCompareEx(&i2_0, &i4_large, 0, 0); ok(res == -1, "res=%i\n", res);

1 0

Nikolay Sivov : mf/session: Expose rate control interfaces.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: d1662e4beb4c1b757423c71107f7ec115ade19f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1662e4beb4c1b757423c711… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 9 10:06:00 2021 +0300 mf/session: Expose rate control interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 19 +++++++++++++++---- dlls/mf/tests/mf.c | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index fe87b3e6584..c8ec1b5c33f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1637,23 +1637,34 @@ static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID ri TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + *out = NULL; + if (IsEqualIID(riid, &IID_IMFMediaSession) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *out = &session->IMFMediaSession_iface; - IMFMediaSession_AddRef(iface); - return S_OK; } else if (IsEqualIID(riid, &IID_IMFGetService)) { *out = &session->IMFGetService_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *out = &session->IMFRateSupport_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateControl)) + { + *out = &session->IMFRateControl_iface; + } + + if (*out) + { IMFMediaSession_AddRef(iface); return S_OK; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 623781a6ba2..eb681a8b9a7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1181,8 +1181,8 @@ static void test_media_session(void) ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); check_interface(session, &IID_IMFGetService, TRUE); - todo_wine check_interface(session, &IID_IMFRateSupport, TRUE); - todo_wine check_interface(session, &IID_IMFRateControl, TRUE); + check_interface(session, &IID_IMFRateSupport, TRUE); + check_interface(session, &IID_IMFRateControl, TRUE); check_interface(session, &IID_IMFAttributes, FALSE); check_interface(session, &IID_IMFTopologyNodeAttributeEditor, FALSE); check_interface(session, &IID_IMFLocalMFTRegistration, FALSE);

1 0

Nikolay Sivov : mf/tests: Add some more tests for session rate control.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: dab54bd849cd9f109d1a9d16cb171eddec39f2a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dab54bd849cd9f109d1a9d16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 9 10:05:59 2021 +0300 mf/tests: Add some more tests for session rate control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 200 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 122 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dab54bd849cd9f109d1a…

1 0

Zebediah Figura : winegstreamer: Implement IWMOutputMediaProps::GetType().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 3864d2355493cbadedf59f0c2ee7ad7a306fad5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3864d2355493cbadedf59f0c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 15:24:33 2021 -0600 winegstreamer: Implement IWMOutputMediaProps::GetType(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 8 ++++++-- dlls/wmvcore/tests/wmvcore.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index b9e1a1b3d03..bcae50e5d1e 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -85,8 +85,12 @@ static ULONG WINAPI output_props_Release(IWMOutputMediaProps *iface) static HRESULT WINAPI output_props_GetType(IWMOutputMediaProps *iface, GUID *major_type) { - FIXME("iface %p, major_type %p, stub!\n", iface, major_type); - return E_NOTIMPL; + const struct output_props *props = impl_from_IWMOutputMediaProps(iface); + + TRACE("iface %p, major_type %p.\n", iface, major_type); + + *major_type = props->mt.majortype; + return S_OK; } static HRESULT WINAPI output_props_GetMediaType(IWMOutputMediaProps *iface, WM_MEDIA_TYPE *mt, DWORD *size) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 591ecf209eb..ec66fb1bb74 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -861,12 +861,12 @@ static void test_sync_reader_types(void) bool got_video = false, got_audio = false; DWORD size, ret_size, output_number; WORD stream_number, stream_number2; + GUID majortype, majortype2; struct teststream stream; IWMStreamConfig *config; ULONG count, ref, i, j; IWMSyncReader *reader; IWMProfile *profile; - GUID majortype; HANDLE file; HRESULT hr; BOOL ret; @@ -923,6 +923,12 @@ static void test_sync_reader_types(void) hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); ok(hr == S_OK, "Got hr %#x.\n", hr); + memset(&majortype2, 0xcc, sizeof(majortype2)); + hr = IWMOutputMediaProps_GetType(output_props, &majortype2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", + debugstr_guid(&majortype), debugstr_guid(&majortype2)); + ref = IWMOutputMediaProps_Release(output_props); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -981,6 +987,12 @@ static void test_sync_reader_types(void) else check_video_type(mt); + memset(&majortype2, 0xcc, sizeof(majortype2)); + hr = IWMOutputMediaProps_GetType(output_props, &majortype2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", + debugstr_guid(&majortype), debugstr_guid(&majortype2)); + hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, 1 - output_number, output_props); @@ -1398,13 +1410,13 @@ static void test_async_reader_types(void) bool got_video = false, got_audio = false; DWORD size, ret_size, output_number; IWMReaderAdvanced2 *advanced; + GUID majortype, majortype2; struct teststream stream; struct callback callback; IWMStreamConfig *config; ULONG count, ref, i, j; IWMProfile *profile; IWMReader *reader; - GUID majortype; HANDLE file; HRESULT hr; BOOL ret; @@ -1458,11 +1470,17 @@ static void test_async_reader_types(void) ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); ok(hr == S_OK, "Got hr %#x.\n", hr); + majortype = mt->majortype; + + memset(&majortype2, 0xcc, sizeof(majortype2)); + hr = IWMOutputMediaProps_GetType(output_props, &majortype2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", + debugstr_guid(&majortype), debugstr_guid(&majortype2)); ref = IWMOutputMediaProps_Release(output_props); ok(!ref, "Got outstanding refcount %d.\n", ref); - majortype = mt->majortype; if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) { got_audio = true; @@ -1538,6 +1556,12 @@ static void test_async_reader_types(void) else check_video_type(mt); + memset(&majortype2, 0xcc, sizeof(majortype2)); + hr = IWMOutputMediaProps_GetType(output_props, &majortype2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", + debugstr_guid(&majortype), debugstr_guid(&majortype2)); + hr = IWMReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IWMReader_SetOutputProps(reader, 1 - output_number, output_props);

1 0

Zebediah Figura : winegstreamer: Implement IWMReader::Open().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: fca2f6c12b187763eaae23ed4932d6d049a469c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fca2f6c12b187763eaae23ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 15:24:32 2021 -0600 winegstreamer: Implement IWMReader::Open(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 19 +++++++++++--- dlls/wmvcore/tests/wmvcore.c | 49 +++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 4193d7d75de..b7b96c8b884 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -188,11 +188,22 @@ static ULONG WINAPI WMReader_Release(IWMReader *iface) return IWMProfile3_Release(&reader->reader.IWMProfile3_iface); } -static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) +static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, + IWMReaderCallback *callback, void *context) { - struct async_reader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReader(iface); + HRESULT hr; + + TRACE("reader %p, url %s, callback %p, context %p.\n", + reader, debugstr_w(url), callback, context); + + EnterCriticalSection(&reader->reader.cs); + + if (SUCCEEDED(hr = wm_reader_open_file(&reader->reader, url))) + open_stream(reader, callback, context); + + LeaveCriticalSection(&reader->reader.cs); + return hr; } static HRESULT WINAPI WMReader_Close(IWMReader *iface) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index f8962b784ac..591ecf209eb 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1613,6 +1613,54 @@ static void test_async_reader_types(void) ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); } +static void test_async_reader_file(void) +{ + const WCHAR *filename = load_resource(L"test.wmv"); + struct callback callback; + IWMReader *reader; + DWORD count; + HRESULT hr; + ULONG ref; + BOOL ret; + + callback_init(&callback); + + hr = WMCreateReader(NULL, 0, &reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IWMReader_Open(reader, filename, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ret = WaitForSingleObject(callback.got_opened, 1000); + ok(!ret, "Wait timed out.\n"); + + count = 0xdeadbeef; + hr = IWMReader_GetOutputCount(reader, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + + hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IWMReader_Close(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); + ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + callback_cleanup(&callback); + + hr = IWMReader_Close(reader); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + + ref = IWMReader_Release(reader); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); + ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + callback_cleanup(&callback); + + ret = DeleteFileW(filename); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); +} + START_TEST(wmvcore) { HRESULT hr; @@ -1634,6 +1682,7 @@ START_TEST(wmvcore) test_sync_reader_file(); test_async_reader_streaming(); test_async_reader_types(); + test_async_reader_file(); CoUninitialize(); }

1 0

Zebediah Figura : winegstreamer: Implement INSSBuffer::SetLength().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 63fb4d8270d1db7a0034100db550f54e8d9859f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63fb4d8270d1db7a0034100d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 15:24:31 2021 -0600 winegstreamer: Implement INSSBuffer::SetLength(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 17 ++++++++++++----- dlls/wmvcore/tests/wmvcore.c | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 2c0f89e29a9..b9e1a1b3d03 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -172,7 +172,7 @@ struct buffer INSSBuffer INSSBuffer_iface; LONG refcount; - DWORD size; + DWORD size, capacity; BYTE data[1]; }; @@ -231,8 +231,15 @@ static HRESULT WINAPI buffer_GetLength(INSSBuffer *iface, DWORD *size) static HRESULT WINAPI buffer_SetLength(INSSBuffer *iface, DWORD size) { - FIXME("iface %p, size %u, stub!\n", iface, size); - return E_NOTIMPL; + struct buffer *buffer = impl_from_INSSBuffer(iface); + + TRACE("iface %p, size %u.\n", buffer, size); + + if (size > buffer->capacity) + return E_INVALIDARG; + + buffer->size = size; + return S_OK; } static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) @@ -241,7 +248,7 @@ static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) TRACE("buffer %p, size %p.\n", buffer, size); - *size = buffer->size; + *size = buffer->capacity; return S_OK; } @@ -1754,7 +1761,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; object->refcount = 1; - object->size = event.u.buffer.size; + object->capacity = object->size = event.u.buffer.size; if (!wg_parser_stream_copy_buffer(wg_stream, object->data, 0, object->size)) { diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 0347195ba10..f8962b784ac 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -686,6 +686,17 @@ static void test_sync_reader_streaming(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + hr = INSSBuffer_SetLength(sample, capacity + 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = INSSBuffer_SetLength(sample, capacity - 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = INSSBuffer_GetBufferAndLength(sample, &data2, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ok(size == capacity - 1, "Expected size %u, got %u.\n", capacity - 1, size); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -1222,6 +1233,17 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + hr = INSSBuffer_SetLength(sample, capacity + 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = INSSBuffer_SetLength(sample, capacity - 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = INSSBuffer_GetBufferAndLength(sample, &data2, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ok(size == capacity - 1, "Expected size %u, got %u.\n", capacity - 1, size); + ok(callback->got_started > 0, "Got %u WMT_STARTED callbacks.\n", callback->got_started); ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); ++callback->got_sample;

1 0

Zebediah Figura : winegstreamer: Implement INSSBuffer::GetMaxLength().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 25adac6ede88d835110be20de0164d28c2187977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25adac6ede88d835110be20d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 15:24:30 2021 -0600 winegstreamer: Implement INSSBuffer::GetMaxLength(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 8 ++++++-- dlls/wmvcore/tests/wmvcore.c | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 2de0610165d..2c0f89e29a9 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -237,8 +237,12 @@ static HRESULT WINAPI buffer_SetLength(INSSBuffer *iface, DWORD size) static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) { - FIXME("iface %p, size %p, stub!\n", iface, size); - return E_NOTIMPL; + struct buffer *buffer = impl_from_INSSBuffer(iface); + + TRACE("buffer %p, size %p.\n", buffer, size); + + *size = buffer->size; + return S_OK; } static HRESULT WINAPI buffer_GetBuffer(INSSBuffer *iface, BYTE **data) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 685dd92e27e..0347195ba10 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -591,7 +591,7 @@ static void test_reader_attributes(IWMProfile *profile) static void test_sync_reader_streaming(void) { - DWORD size, flags, output_number, expect_output_number; + DWORD size, capacity, flags, output_number, expect_output_number; const WCHAR *filename = load_resource(L"test.wmv"); WORD stream_numbers[2], stream_number; IWMStreamConfig *config, *config2; @@ -682,6 +682,10 @@ static void test_sync_reader_streaming(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); + hr = INSSBuffer_GetMaxLength(sample, &capacity); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -747,6 +751,10 @@ static void test_sync_reader_streaming(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); + hr = INSSBuffer_GetMaxLength(sample, &capacity); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); } @@ -1193,9 +1201,9 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) { struct callback *callback = impl_from_IWMReaderCallback(iface); + DWORD size, capacity; BYTE *data, *data2; HRESULT hr; - DWORD size; if (winetest_debug > 1) trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", @@ -1210,6 +1218,10 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); + hr = INSSBuffer_GetMaxLength(sample, &capacity); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ok(callback->got_started > 0, "Got %u WMT_STARTED callbacks.\n", callback->got_started); ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); ++callback->got_sample;

1 0

Zebediah Figura : winegstreamer: Implement INSSBuffer::GetBuffer().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: dc1a1ae450f1119b1f5714ed99b6049343676293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc1a1ae450f1119b1f5714ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 8 15:24:29 2021 -0600 winegstreamer: Implement INSSBuffer::GetBuffer(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 8 ++++++-- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 12d1f04c270..2de0610165d 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -243,8 +243,12 @@ static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) static HRESULT WINAPI buffer_GetBuffer(INSSBuffer *iface, BYTE **data) { - FIXME("iface %p, data %p, stub!\n", iface, data); - return E_NOTIMPL; + struct buffer *buffer = impl_from_INSSBuffer(iface); + + TRACE("buffer %p, data %p.\n", buffer, data); + + *data = buffer->data; + return S_OK; } static HRESULT WINAPI buffer_GetBufferAndLength(INSSBuffer *iface, BYTE **data, DWORD *size) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 0e7c6380c92..685dd92e27e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -602,9 +602,9 @@ static void test_sync_reader_streaming(void) IWMProfile *profile; QWORD pts, duration; INSSBuffer *sample; + BYTE *data, *data2; HANDLE file; HRESULT hr; - BYTE *data; BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); @@ -677,6 +677,11 @@ static void test_sync_reader_streaming(void) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -737,6 +742,11 @@ static void test_sync_reader_streaming(void) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ref = INSSBuffer_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); } @@ -1183,9 +1193,9 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, QWORD time, QWORD duration, DWORD flags, INSSBuffer *sample, void *context) { struct callback *callback = impl_from_IWMReaderCallback(iface); + BYTE *data, *data2; HRESULT hr; DWORD size; - BYTE *data; if (winetest_debug > 1) trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", @@ -1196,6 +1206,10 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = INSSBuffer_GetBuffer(sample, &data2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(data2 == data, "Data pointers didn't match.\n"); + ok(callback->got_started > 0, "Got %u WMT_STARTED callbacks.\n", callback->got_started); ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); ++callback->got_sample;

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
96
Older →

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 November 2021