April 2021 - Wine-devel - list.winehq.org

[PATCH 1/5] hidclass.sys: Pass a KEVENT to IoBuildDeviceIoControlRequest() in hid_device_thread().
by Zebediah Figura 16 Apr '21

16 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hidclass.sys/device.c | 55 +++++++++++--------------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 7d198b99b34..11d3936ad07 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -290,13 +290,6 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) HeapFree(GetProcessHeap(), 0, packet); } -static NTSTATUS WINAPI read_Completion(DEVICE_OBJECT *deviceObject, IRP *irp, void *context) -{ - HANDLE event = context; - SetEvent(event); - return STATUS_MORE_PROCESSING_REQUIRED; -} - static DWORD CALLBACK hid_device_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; @@ -305,11 +298,8 @@ static DWORD CALLBACK hid_device_thread(void *args) IO_STATUS_BLOCK irp_status; HID_XFER_PACKET *packet; DWORD rc; - HANDLE event; - NTSTATUS ntrc; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - event = CreateEventA(NULL, TRUE, FALSE, NULL); packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet) + ext->preparseData->caps.InputReportByteLength); packet->reportBuffer = (BYTE *)packet + sizeof(*packet); @@ -318,29 +308,25 @@ static DWORD CALLBACK hid_device_thread(void *args) { while(1) { - ResetEvent(event); + KEVENT event; + + KeInitializeEvent(&event, NotificationEvent, FALSE); packet->reportBufferLen = ext->preparseData->caps.InputReportByteLength; packet->reportId = 0; - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, - device, NULL, 0, packet, sizeof(*packet), TRUE, NULL, - &irp_status); + irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, device, + NULL, 0, packet, sizeof(*packet), TRUE, &event, &irp_status); - IoSetCompletionRoutine(irp, read_Completion, event, TRUE, TRUE, TRUE); - ntrc = IoCallDriver(device, irp); + if (IoCallDriver(device, irp) == STATUS_PENDING) + KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - if (ntrc == STATUS_PENDING) - WaitForSingleObject(event, INFINITE); - - if (irp->IoStatus.u.Status == STATUS_SUCCESS) + if (irp_status.u.Status == STATUS_SUCCESS) { RingBuffer_Write(ext->ring_buffer, packet); HID_Device_processQueue(device); } - IoCompleteRequest(irp, IO_NO_INCREMENT ); - rc = WaitForSingleObject(ext->halt_event, ext->poll_interval ? ext->poll_interval : DEFAULT_POLL_INTERVAL); if (rc == WAIT_OBJECT_0) @@ -355,28 +341,23 @@ static DWORD CALLBACK hid_device_thread(void *args) while(1) { - ResetEvent(event); + KEVENT event; - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, - device, NULL, 0, packet->reportBuffer, - ext->preparseData->caps.InputReportByteLength, TRUE, NULL, - &irp_status); + KeInitializeEvent(&event, NotificationEvent, FALSE); - IoSetCompletionRoutine(irp, read_Completion, event, TRUE, TRUE, TRUE); - ntrc = IoCallDriver(device, irp); + irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, device, NULL, 0, packet->reportBuffer, + ext->preparseData->caps.InputReportByteLength, TRUE, &event, &irp_status); - if (ntrc == STATUS_PENDING) - { - WaitForSingleObject(event, INFINITE); - } + if (IoCallDriver(device, irp) == STATUS_PENDING) + KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); rc = WaitForSingleObject(ext->halt_event, 0); if (rc == WAIT_OBJECT_0) exit_now = TRUE; - if (!exit_now && irp->IoStatus.u.Status == STATUS_SUCCESS) + if (!exit_now && irp_status.u.Status == STATUS_SUCCESS) { - packet->reportBufferLen = irp->IoStatus.Information; + packet->reportBufferLen = irp_status.Information; if (ext->preparseData->reports[0].reportID) packet->reportId = packet->reportBuffer[0]; else @@ -385,15 +366,11 @@ static DWORD CALLBACK hid_device_thread(void *args) HID_Device_processQueue(device); } - IoCompleteRequest(irp, IO_NO_INCREMENT ); - if (exit_now) break; } } - CloseHandle(event); - TRACE("Device thread exiting\n"); return 1; } -- 2.30.2

4 7

[PATCH] winebus.sys: Do not print a FIXME for IRP_MN_QUERY_DEVICE_RELATIONS in pdo_pnp_dispatch().
by Zebediah Figura 16 Apr '21

16 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winebus.sys/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 01e839f02d8..97a333dc8c3 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -643,6 +643,9 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) default: FIXME("Unhandled function %08x\n", irpsp->MinorFunction); + /* fall through */ + + case IRP_MN_QUERY_DEVICE_RELATIONS: break; } -- 2.30.2

1 0

[PATCH vkd3d 1/6] vkd3d-shader: "reg_size" is tracked in whole registers.
by Zebediah Figura 16 Apr '21

16 Apr '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e254cede..81e60101 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -717,7 +717,7 @@ static struct hlsl_reg allocate_range(struct liveness *liveness, static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) { - if (type->reg_size > 4) + if (type->reg_size > 1) return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, reg.id + type->reg_size - 1); return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask)); -- 2.31.1

6 14

[PATCH 1/2] mf/evr: Reinitialize presenter on clock change.
by Nikolay Sivov 16 Apr '21

16 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 55 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 3479bade251..6c71741436b 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -169,18 +169,31 @@ static struct video_stream *impl_from_stream_IMFAttributes(IMFAttributes *iface) return CONTAINING_RECORD(iface, struct video_stream, IMFAttributes_iface); } -static void video_renderer_release_services(struct video_renderer *renderer) +static HRESULT video_renderer_init_presenter_services(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; + HRESULT hr; - if (renderer->flags & EVR_MIXER_INITED_SERVICES && SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, - &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) + if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) { - IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) + { + renderer->flags |= EVR_PRESENTER_INITED_SERVICES; + } + renderer->flags &= ~EVR_INIT_SERVICES; IMFTopologyServiceLookupClient_Release(lookup_client); - renderer->flags &= ~EVR_MIXER_INITED_SERVICES; } + return hr; +} + +static void video_renderer_release_presenter_services(struct video_renderer *renderer) +{ + IMFTopologyServiceLookupClient *lookup_client; + if (renderer->flags & EVR_PRESENTER_INITED_SERVICES && SUCCEEDED(IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) { @@ -190,6 +203,21 @@ static void video_renderer_release_services(struct video_renderer *renderer) } } +static void video_renderer_release_services(struct video_renderer *renderer) +{ + IMFTopologyServiceLookupClient *lookup_client; + + if (renderer->flags & EVR_MIXER_INITED_SERVICES && SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, + &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) + { + IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + IMFTopologyServiceLookupClient_Release(lookup_client); + renderer->flags &= ~EVR_MIXER_INITED_SERVICES; + } + + video_renderer_release_presenter_services(renderer); +} + static HRESULT WINAPI video_stream_sink_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { struct video_stream *stream = impl_from_IMFStreamSink(iface); @@ -1280,12 +1308,15 @@ static void video_renderer_set_presentation_clock(struct video_renderer *rendere IMFPresentationClock_RemoveClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); IMFPresentationClock_Release(renderer->clock); } + video_renderer_release_presenter_services(renderer); + renderer->clock = clock; if (renderer->clock) { IMFPresentationClock_AddRef(renderer->clock); IMFPresentationClock_AddClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); } + video_renderer_init_presenter_services(renderer); } static HRESULT WINAPI video_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) @@ -1579,7 +1610,6 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) static HRESULT video_renderer_configure_presenter(struct video_renderer *renderer) { - IMFTopologyServiceLookupClient *lookup_client; IMFVideoDisplayControl *control; HRESULT hr; @@ -1589,18 +1619,7 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere IMFVideoDisplayControl_Release(control); } - if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, - (void **)&lookup_client))) - { - renderer->flags |= EVR_INIT_SERVICES; - if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, - &renderer->IMFTopologyServiceLookup_iface))) - { - renderer->flags |= EVR_PRESENTER_INITED_SERVICES; - } - renderer->flags &= ~EVR_INIT_SERVICES; - IMFTopologyServiceLookupClient_Release(lookup_client); - } + hr = video_renderer_init_presenter_services(renderer); if (FAILED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IUnknown, (void **)&renderer->device_manager))) -- 2.30.2

1 1

[PATCH 4/4] winevulkan: Move Vulkan calls to Unix lib.
by Jacek Caban 16 Apr '21

16 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 11 +++++------ dlls/winevulkan/make_vulkan | 5 +++++ dlls/winevulkan/vulkan.c | 13 +++++++++++-- 3 files changed, 21 insertions(+), 8 deletions(-)

1 0

[PATCH 3/4] winevulkan: Don't use heap.h.
by Jacek Caban 16 Apr '21

16 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 14 ++++++++------ dlls/winevulkan/vulkan_private.h | 1 - 2 files changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 2/4] winevulkan: Implement Vulkan entry points as wrappers around unix_funcs.
by Jacek Caban 16 Apr '21

16 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/loader.c | 4 +- dlls/winevulkan/make_vulkan | 200 +++++++++++++++++++------------ dlls/winevulkan/vulkan.c | 92 +++++++------- dlls/winevulkan/vulkan_private.h | 7 +- 5 files changed, 175 insertions(+), 129 deletions(-)

1 0

[PATCH 1/4] winevulkan: Introduce unix_funcs struct.
by Jacek Caban 16 Apr '21

16 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 4 ++- dlls/winevulkan/make_vulkan | 43 +++++++++++++++++++++++++++++--- dlls/winevulkan/vulkan.c | 3 ++- dlls/winevulkan/vulkan_private.h | 5 +++- 4 files changed, 49 insertions(+), 6 deletions(-)

1 0

[PATCH] make_specfiles: Add a few api-ms-win-core-* to kernel32 group.
by Andrey Gusev 16 Apr '21

16 Apr '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- tools/make_specfiles | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/make_specfiles b/tools/make_specfiles index 04109775928..7486bd57647 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -256,6 +256,7 @@ my @dll_groups = "api-ms-win-core-largeinteger-l1-1-0", "api-ms-win-core-libraryloader-l1-2-1", "api-ms-win-core-libraryloader-l1-2-2", + "api-ms-win-core-libraryloader-l2-1-0", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-l2-1-0", @@ -267,6 +268,7 @@ my @dll_groups = "api-ms-win-core-memory-l1-1-1", "api-ms-win-core-memory-l1-1-2", "api-ms-win-core-memory-l1-1-3", + "api-ms-win-core-memory-l1-1-4", "api-ms-win-core-namespace-l1-1-0", "api-ms-win-core-normalization-l1-1-0", "api-ms-win-core-privateprofile-l1-1-1", @@ -285,6 +287,7 @@ my @dll_groups = "api-ms-win-core-fibers-l1-1-0", "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-localization-l1-2-1", + "api-ms-win-core-localization-l1-2-2", "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", "api-ms-win-core-windowserrorreporting-l1-1-0", @@ -308,6 +311,7 @@ my @dll_groups = [ "kernel32", "advapi32", + "api-ms-win-core-namedpipe-ansi-l1-1-0", "api-ms-win-core-namedpipe-l1-1-0", "api-ms-win-core-namedpipe-l1-2-0", "api-ms-win-core-processthreads-l1-1-0", -- 2.30.2

1 0

[PATCH 1/2] evr/presenter: Add IMFQualityAdviseLimits stub.
by Nikolay Sivov 16 Apr '21

16 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 18 ++++++++------- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8d633124db2..4614fa5eed2 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -79,6 +79,7 @@ struct video_presenter IMFVideoPositionMapper IMFVideoPositionMapper_iface; IQualProp IQualProp_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IMFQualityAdviseLimits IMFQualityAdviseLimits_iface; IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; @@ -166,6 +167,11 @@ static struct video_presenter *impl_from_IMFQualityAdvise(IMFQualityAdvise *ifac return CONTAINING_RECORD(iface, struct video_presenter, IMFQualityAdvise_iface); } +static struct video_presenter *impl_from_IMFQualityAdviseLimits(IMFQualityAdviseLimits *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFQualityAdviseLimits_iface); +} + static struct video_presenter *impl_from_IDirect3DDeviceManager9(IDirect3DDeviceManager9 *iface) { return CONTAINING_RECORD(iface, struct video_presenter, IDirect3DDeviceManager9_iface); @@ -775,6 +781,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IMFQualityAdviseLimits)) + { + *obj = &presenter->IMFQualityAdviseLimits_iface; + } else if (IsEqualIID(riid, &IID_IDirect3DDeviceManager9)) { *obj = &presenter->IDirect3DDeviceManager9_iface; @@ -1870,6 +1880,47 @@ static const IDirect3DDeviceManager9Vtbl video_presenter_device_manager_vtbl = video_presenter_device_manager_GetVideoService, }; +static HRESULT WINAPI video_presenter_qa_limits_QueryInterface(IMFQualityAdviseLimits *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdviseLimits(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_qa_limits_AddRef(IMFQualityAdviseLimits *iface) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdviseLimits(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_qa_limits_Release(IMFQualityAdviseLimits *iface) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdviseLimits(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_qa_limits_GetMaximumDropMode(IMFQualityAdviseLimits *iface, MF_QUALITY_DROP_MODE *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qa_limits_GetMinimumQualityLevel(IMFQualityAdviseLimits *iface, MF_QUALITY_LEVEL *level) +{ + FIXME("%p, %p.\n", iface, level); + + return E_NOTIMPL; +} + +static const IMFQualityAdviseLimitsVtbl video_presenter_qa_limits_vtbl = +{ + video_presenter_qa_limits_QueryInterface, + video_presenter_qa_limits_AddRef, + video_presenter_qa_limits_Release, + video_presenter_qa_limits_GetMaximumDropMode, + video_presenter_qa_limits_GetMinimumQualityLevel, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1940,6 +1991,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; object->IQualProp_iface.lpVtbl = &video_presenter_qualprop_vtbl; object->IMFQualityAdvise_iface.lpVtbl = &video_presenter_quality_advise_vtbl; + object->IMFQualityAdviseLimits_iface.lpVtbl = &video_presenter_qa_limits_vtbl; object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->IDirect3DDeviceManager9_iface.lpVtbl = &video_presenter_device_manager_vtbl; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 94bf327dd92..fb4a2130f37 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1154,7 +1154,7 @@ static void test_default_presenter(void) check_interface(presenter, &IID_IMFVideoDeviceID, TRUE); check_interface(presenter, &IID_IMFQualityAdvise, TRUE); check_interface(presenter, &IID_IDirect3DDeviceManager9, TRUE); - todo_wine check_interface(presenter, &IID_IMFQualityAdviseLimits, TRUE); + check_interface(presenter, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE); @@ -1165,7 +1165,7 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); - todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); @@ -2018,30 +2018,32 @@ static void test_presenter_quality_control(void) ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdviseLimits, (void **)&qa_limits); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdvise, (void **)&advise); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (qa_limits) -{ hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); +todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); +todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + if (SUCCEEDED(hr)) + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); +todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); +todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); + if (SUCCEEDED(hr)) + ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); IMFQualityAdviseLimits_Release(qa_limits); -} todo_wine { mode = 1; -- 2.30.2

1 1