November 2020 - Wine-devel - list.winehq.org

[PATCH] mshtml: Update to Wine Gecko 2.47.2.
by Jacek Caban 30 Nov '20

30 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 6 +++--- dlls/mshtml/nsiface.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH v5 3/4] mf/topoloader: Implement source node to sink node branch resolver.
by Derek Lesho 30 Nov '20

30 Nov '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v5: Correct connect method handling. In v4, the MF_CONNECT_ALLOW_DECODER path is only triggered if the conidtion for sink_method & MF_CONNECT_ALLOW_CONVERTER is not satisfied. This is never true, effectively making MF_CONNECT_ALLOW_DECODER a noop. Instead of using else here, just check for FAILED(hr). --- dlls/mf/topology.c | 273 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 5 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index a09f6ef0ef4..e3a4dfd5141 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1992,15 +1992,278 @@ static HRESULT topology_loader_clone_node(struct topoloader_context *context, IM return hr; } +struct transform_output_type +{ + IMFMediaType *type; + IMFTransform *transform; +}; + +struct connect_context +{ + struct topoloader_context *context; + IMFTopologyNode *upstream_node; + IMFTopologyNode *sink; + IMFMediaTypeHandler *sink_handler; + const GUID *converter_category; +}; + +typedef HRESULT (*p_connect_func)(struct transform_output_type *output_type, struct connect_context *context); + +static void topology_loader_release_transforms(IMFActivate **activates, unsigned int count) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + IMFActivate_Release(activates[i]); + CoTaskMemFree(activates); +} + +static HRESULT topology_loader_enumerate_output_types(const GUID *category, IMFMediaType *input_type, + p_connect_func connect_func, struct connect_context *context) +{ + MFT_REGISTER_TYPE_INFO mft_typeinfo; + IMFActivate **activates; + unsigned int i, count; + HRESULT hr; + + if (FAILED(hr = IMFMediaType_GetMajorType(input_type, &mft_typeinfo.guidMajorType))) + return hr; + + if (FAILED(hr = IMFMediaType_GetGUID(input_type, &MF_MT_SUBTYPE, &mft_typeinfo.guidSubtype))) + return hr; + + if (FAILED(hr = MFTEnumEx(*category, MFT_ENUM_FLAG_ALL, &mft_typeinfo, NULL, &activates, &count))) + return hr; + + hr = E_FAIL; + + for (i = 0; i < count; ++i) + { + IMFTransform *transform; + + if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) + { + WARN("Failed to create a transform.\n"); + continue; + } + + if (SUCCEEDED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0))) + { + struct transform_output_type output_type; + unsigned int output_count = 0; + + output_type.transform = transform; + while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, output_count++, &output_type.type))) + { + hr = connect_func(&output_type, context); + IMFMediaType_Release(output_type.type); + if (SUCCEEDED(hr)) + { + topology_loader_release_transforms(activates, count); + return hr; + } + } + } + + IMFActivate_ShutdownObject(activates[i]); + } + + topology_loader_release_transforms(activates, count); + + return hr; +} + +static HRESULT connect_to_sink(struct transform_output_type *output_type, struct connect_context *context) +{ + IMFTopologyNode *node; + HRESULT hr; + + if (FAILED(IMFMediaTypeHandler_IsMediaTypeSupported(context->sink_handler, output_type->type, NULL))) + return MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) + return hr; + + IMFTopologyNode_SetObject(node, (IUnknown *)output_type->transform); + IMFTopology_AddNode(context->context->output_topology, node); + IMFTopologyNode_ConnectOutput(context->upstream_node, 0, node, 0); + IMFTopologyNode_ConnectOutput(node, 0, context->sink, 0); + + IMFTopologyNode_Release(node); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(context->sink_handler, output_type->type); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(output_type->transform, 0, output_type->type, 0); + + return S_OK; +} + +static HRESULT connect_to_converter(struct transform_output_type *output_type, struct connect_context *context) +{ + struct connect_context sink_ctx; + IMFTopologyNode *node; + HRESULT hr; + + if (SUCCEEDED(connect_to_sink(output_type, context))) + return S_OK; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) + return hr; + + IMFTopologyNode_SetObject(node, (IUnknown *)output_type->transform); + + sink_ctx = *context; + sink_ctx.upstream_node = node; + + if (SUCCEEDED(hr = topology_loader_enumerate_output_types(context->converter_category, output_type->type, + connect_to_sink, &sink_ctx))) + { + hr = IMFTopology_AddNode(context->context->output_topology, node); + } + IMFTopologyNode_Release(node); + + if (SUCCEEDED(hr)) + { + IMFTopology_AddNode(context->context->output_topology, node); + IMFTopologyNode_ConnectOutput(context->upstream_node, 0, node, 0); + + hr = IMFTransform_SetOutputType(output_type->transform, 0, output_type->type, 0); + } + + return hr; +} + typedef HRESULT (*p_topology_loader_connect_func)(struct topoloader_context *context, IMFTopologyNode *upstream_node, unsigned int output_index, IMFTopologyNode *downstream_node, unsigned int input_index); -static HRESULT topology_loader_connect_source_node(struct topoloader_context *context, IMFTopologyNode *upstream_node, - unsigned int output_index, IMFTopologyNode *downstream_node, unsigned int input_index) +static HRESULT topology_loader_get_node_type_handler(IMFTopologyNode *node, IMFMediaTypeHandler **handler) { - FIXME("Unimplemented.\n"); + MF_TOPOLOGY_TYPE node_type; + IMFStreamSink *stream_sink; + IMFStreamDescriptor *sd; + IUnknown *object; + HRESULT hr; - return E_NOTIMPL; + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + return hr; + + switch (node_type) + { + case MF_TOPOLOGY_OUTPUT_NODE: + if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, (IUnknown **)&object))) + { + if (SUCCEEDED(hr = IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + { + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); + IMFStreamSink_Release(stream_sink); + } + IUnknown_Release(object); + } + break; + case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (SUCCEEDED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, + &IID_IMFStreamDescriptor, (void **)&sd))) + { + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, handler); + IMFStreamDescriptor_Release(sd); + } + break; + default: + WARN("Unexpected node type %u.\n", node_type); + return MF_E_UNEXPECTED; + } + + return hr; +} + +static HRESULT topology_loader_get_mft_categories(IMFMediaTypeHandler *handler, GUID *decode_cat, GUID *convert_cat) +{ + GUID major; + HRESULT hr; + + if (FAILED(hr = IMFMediaTypeHandler_GetMajorType(handler, &major))) + return hr; + + if (IsEqualGUID(&major, &MFMediaType_Audio)) + { + *decode_cat = MFT_CATEGORY_AUDIO_DECODER; + *convert_cat = MFT_CATEGORY_AUDIO_EFFECT; + } + else if (IsEqualGUID(&major, &MFMediaType_Video)) + { + *decode_cat = MFT_CATEGORY_VIDEO_DECODER; + *convert_cat = MFT_CATEGORY_VIDEO_EFFECT; + } + else + { + WARN("Unexpected major type %s.\n", debugstr_guid(&major)); + return MF_E_INVALIDTYPE; + } + + return S_OK; +} + +static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context *context, IMFTopologyNode *source, + unsigned int output_index, IMFTopologyNode *sink, unsigned int input_index) +{ + IMFMediaTypeHandler *source_handler = NULL, *sink_handler = NULL; + struct connect_context convert_ctx, sink_ctx; + MF_CONNECT_METHOD source_method, sink_method; + GUID decode_cat, convert_cat; + IMFMediaType *media_type; + HRESULT hr; + + TRACE("attempting to connect %p:%u to %p:%u\n", source, output_index, sink, input_index); + + if (FAILED(hr = topology_loader_get_node_type_handler(source, &source_handler))) + goto done; + + if (FAILED(hr = topology_loader_get_node_type_handler(sink, &sink_handler))) + goto done; + + if (FAILED(IMFTopologyNode_GetUINT32(source, &MF_TOPONODE_CONNECT_METHOD, &source_method))) + source_method = MF_CONNECT_DIRECT; + if (FAILED(IMFTopologyNode_GetUINT32(sink, &MF_TOPONODE_CONNECT_METHOD, &sink_method))) + sink_method = MF_CONNECT_ALLOW_DECODER; + + if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &decode_cat, &convert_cat))) + goto done; + + sink_ctx.context = context; + sink_ctx.upstream_node = source; + sink_ctx.sink = sink; + sink_ctx.sink_handler = sink_handler; + + convert_ctx = sink_ctx; + convert_ctx.converter_category = &convert_cat; + + if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) + { + /* Direct connection. */ + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) + && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + { + hr = IMFTopologyNode_ConnectOutput(source, output_index, sink, input_index); + } + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + { + hr = topology_loader_enumerate_output_types(&convert_cat, media_type, connect_to_sink, &sink_ctx); + } + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + { + hr = topology_loader_enumerate_output_types(&decode_cat, media_type, connect_to_converter, &convert_ctx); + } + + IMFMediaType_Release(media_type); + } + +done: + if (source_handler) + IMFMediaTypeHandler_Release(source_handler); + if (sink_handler) + IMFMediaTypeHandler_Release(sink_handler); + + return hr; } static HRESULT topology_loader_resolve_branch(struct topoloader_context *context, IMFTopologyNode *upstream_node, @@ -2009,7 +2272,7 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context static const p_topology_loader_connect_func connectors[MF_TOPOLOGY_TEE_NODE+1][MF_TOPOLOGY_TEE_NODE+1] = { /* OUTPUT */ { NULL }, - /* SOURCESTREAM */ { topology_loader_connect_source_node, NULL, NULL, NULL }, + /* SOURCESTREAM */ { topology_loader_connect_source_to_sink, NULL, NULL, NULL }, /* TRANSFORM */ { NULL }, /* TEE */ { NULL }, }; -- 2.29.2

2 1

RFC ntoskrnl.exe:ntoskrnl crashes 32-bit Vista
by Francois Gouget 30 Nov '20

30 Nov '20

ntoskrnl.exe:ntoskrnl causes the wvista VM to crash. More specifically it happens in test_driver4() on this line: device = CreateFileA("\\\\.\\WineTestDriver4", 0, 0, NULL, OPEN_EXISTING, 0, NULL); which presumably is what triggers loading our driver so that makes sense (the patch below can be used to confirm this). The BSOD says: *** STOP: 0x0000008E (0xC000005,0x956E4AA0,0x922E0AAC,0x00000000) *** dri19512.tmp - Address 956E4AA0 bqse at 956E3000, DateStamp 5fc03305 So likely a NULL pointer dereference. Could this be because of a bug in our test driver? For now I've set the TestBot so wvista runs WineTest wihout elevated privileges which causes it to skip this test: that's the wvistaadm variant. The other datapoint is that the wvistau64 VM does not crash when running the 64-bit test but I don't know if that's because of the bitness or some other subtle Windows version difference. wvista crash (truncated report, network connection loss, screenshot): https://testbot.winehq.org/JobDetails.pl?Key=82678#k101 wvistau64 not crashing: https://testbot.winehq.org/JobDetails.pl?Key=82680#k101 diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c2285aef6fc..00b845dcb0e 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -702,6 +702,7 @@ static void test_driver4(void) DeleteFileA(filename); return; } + exit(0); device = CreateFileA("\\\\.\\WineTestDriver4", 0, 0, NULL, OPEN_EXISTING, 0, NULL); ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); -- Francois Gouget <fgouget(a)codeweavers.com>

4 4

RFC mfplat:mfplat crash on Windows 7
by Francois Gouget 30 Nov '20

30 Nov '20

So mfplat:mfplat crashes on Windows 7 (all available VMs): https://test.winehq.org/data/tests/mfplat:mfplat.html The culprit is this line: 615 get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); which calls 429 hr = IMFMediaEventGenerator_GetEvent(mediasource, 0, &event); which crashes. I applied the patch below to confirm the location of the crash and also to confirm that the mediasource object does support the IID_IMFMediaEventGenerator interface which it does. https://testbot.winehq.org/JobDetails.pl?Key=82748 So that crash is pretty strange. The only theory I have is that this API was new in Windows 7 and that it was still somewhat buggy. This theory is based on the test.winehq.org website which says 'n/a' for mfplat:mfplat which should mean the dll is 'missing'. That's confirmed for Windows 2008 and also mostly for Vista since it is missing MFCreateVideoMediaType() which prevents mfplat_test.exe from running. In Windows 8 and 10 the test works... mostly (Windows 10 has timeouts). Is the test doing something wron to cause this crah? Should we skip this test on Windows 7? Should that be based on the Windows version or some other characteristic? diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 474d6281f5f..6899f41b230 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -426,8 +426,10 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected HRESULT hr, event_status; IMFMediaEvent *event; + trace("generator=%p\n", generator); hr = IMFMediaEventGenerator_GetEvent(generator, 0, &event); ok(hr == S_OK, "Failed to get event, hr %#x.\n", hr); + trace("event=%p\n", event); /* (not reached on win7) */ hr = IMFMediaEvent_GetStatus(event, &event_status); ok(hr == S_OK, "Failed to get status code, hr %#x.\n", hr); @@ -477,6 +479,7 @@ static void test_source_resolver(void) PROPVARIANT var; HRESULT hr; GUID guid; + IUnknown *unk; if (!pMFCreateSourceResolver) { @@ -612,15 +615,25 @@ todo_wine hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(mediasource, &IID_IMFMediaEventGenerator, (void **)&unk); + trace("QueryInterface(IID_IMFMediaEventGenerator): hr = %#x\n", hr); + ok(hr == S_OK, "Got hr %#x\n", hr); + + trace("\n"); get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); + trace("\n"); /* not reached on win7 */ ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); video_stream = (IMFMediaStream *)var.punkVal; - get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, NULL); + get_event((IMFMediaEventGenerator *)unk, MESourceStarted, NULL); /* Request samples, our file is 10 frames at 25fps */ get_event((IMFMediaEventGenerator *)video_stream, MEStreamStarted, NULL); sample_count = 10; + trace("\n"); + + if (SUCCEEDED(hr)) + IUnknown_Release(unk); for (i = 0; i < sample_count; ++i) { -- 2.20.1

2 1

[PATCH] msxml3/tests: Fix the spelling of a test string.
by Francois Gouget 30 Nov '20

30 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e27754d457a..e94a2c88a81 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5877,7 +5877,7 @@ static void test_xmlTypes(void) } /* CData Section */ - str = SysAllocString(L"[1]*2=3; &gee thats not right!"); + str = SysAllocString(L"[1]*2=3; &gee that is not right!"); hr = IXMLDOMDocument_createCDATASection(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); @@ -5904,7 +5904,7 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_xml(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, L"<![CDATA[[1]*2=3; &gee thats not right!]]>" ), "incorrect cdata xml\n"); + ok( !lstrcmpW( str, L"<![CDATA[[1]*2=3; &gee that is not right!]]>" ), "incorrect cdata xml\n"); SysFreeString(str); /* test lastChild */ -- 2.20.1

1 0

[PATCH] evr/tests: Skip unsupported interface tests for Vista.
by Francois Gouget 30 Nov '20

30 Nov '20

Vista does not support the IID_IMFQualityAdvise and IID_IMFQualityAdviseLimits interfaces. This fixes crashes on Vista. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/evr/tests/evr.c | 351 +++++++++++++++++++++++-------------------- 1 file changed, 189 insertions(+), 162 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 31434bde43a..908d0844c7f 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -216,32 +216,49 @@ static void test_aggregation(void) IUnknown_Release(unk); } +#define I_MISSING 1 +#define I_MAYBE 2 +#define I_SUPPORTED 3 + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, int present) { IUnknown *iface = iface_ptr; - HRESULT hr, expected_hr; + HRESULT hr; IUnknown *unk; - expected_hr = supported ? S_OK : E_NOINTERFACE; - hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (present == I_MAYBE) + ok_(__FILE__, line)(hr == S_OK || + broken(hr == E_NOINTERFACE), /* Vista */ + "Got unexpected hr %#x\n", hr); + else + { + HRESULT expected_hr = (present == I_SUPPORTED) ? S_OK : E_NOINTERFACE; + ok_(__FILE__, line)(hr == expected_hr, + "Got hr %#x, expected %#x.\n", hr, expected_hr); + } if (SUCCEEDED(hr)) IUnknown_Release(unk); } #define check_service_interface(a, b, c, d) check_service_interface_(__LINE__, a, b, c, d) -static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID service, REFIID iid, BOOL supported) +static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID service, REFIID iid, int present) { IUnknown *iface = iface_ptr; - HRESULT hr, expected_hr; + HRESULT hr; IUnknown *unk; - expected_hr = supported ? S_OK : E_NOINTERFACE; - hr = MFGetService(iface, service, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (present == I_MAYBE) + ok_(__FILE__, line)(hr == S_OK || broken(hr == E_NOINTERFACE), + "Got unexpected hr %#x\n", hr); + else + { + HRESULT expected_hr = (present == I_SUPPORTED) ? S_OK : E_NOINTERFACE; + ok_(__FILE__, line)(hr == expected_hr, + "Got hr %#x, expected %#x.\n", hr, expected_hr); + } if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -251,22 +268,22 @@ static void test_interfaces(void) IBaseFilter *filter = create_evr(); ULONG ref; - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); - check_interface(filter, &IID_IBaseFilter, TRUE); - check_interface(filter, &IID_IMediaFilter, TRUE); - check_interface(filter, &IID_IMediaPosition, TRUE); - check_interface(filter, &IID_IMediaSeeking, TRUE); - check_interface(filter, &IID_IPersist, TRUE); - check_interface(filter, &IID_IUnknown, TRUE); - - check_interface(filter, &IID_IBasicAudio, FALSE); - check_interface(filter, &IID_IBasicVideo, FALSE); - check_interface(filter, &IID_IDirectXVideoMemoryConfiguration, FALSE); - check_interface(filter, &IID_IMemInputPin, FALSE); - check_interface(filter, &IID_IPersistPropertyBag, FALSE); - check_interface(filter, &IID_IPin, FALSE); - check_interface(filter, &IID_IReferenceClock, FALSE); - check_interface(filter, &IID_IVideoWindow, FALSE); + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, I_SUPPORTED); + check_interface(filter, &IID_IBaseFilter, I_SUPPORTED); + check_interface(filter, &IID_IMediaFilter, I_SUPPORTED); + check_interface(filter, &IID_IMediaPosition, I_SUPPORTED); + check_interface(filter, &IID_IMediaSeeking, I_SUPPORTED); + check_interface(filter, &IID_IPersist, I_SUPPORTED); + check_interface(filter, &IID_IUnknown, I_SUPPORTED); + + check_interface(filter, &IID_IBasicAudio, I_MISSING); + check_interface(filter, &IID_IBasicVideo, I_MISSING); + check_interface(filter, &IID_IDirectXVideoMemoryConfiguration, I_MISSING); + check_interface(filter, &IID_IMemInputPin, I_MISSING); + check_interface(filter, &IID_IPersistPropertyBag, I_MISSING); + check_interface(filter, &IID_IPin, I_MISSING); + check_interface(filter, &IID_IReferenceClock, I_MISSING); + check_interface(filter, &IID_IVideoWindow, I_MISSING); ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %d.\n", ref); @@ -475,21 +492,21 @@ static void test_default_mixer(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); - check_interface(transform, &IID_IMFQualityAdvise, TRUE); - check_interface(transform, &IID_IMFClockStateSink, TRUE); - check_interface(transform, &IID_IMFTopologyServiceLookupClient, TRUE); - check_interface(transform, &IID_IMFGetService, TRUE); - check_interface(transform, &IID_IMFAttributes, TRUE); - check_interface(transform, &IID_IMFVideoMixerBitmap, TRUE); - check_interface(transform, &IID_IMFVideoPositionMapper, TRUE); - check_interface(transform, &IID_IMFVideoProcessor, TRUE); - check_interface(transform, &IID_IMFVideoMixerControl, TRUE); - check_interface(transform, &IID_IMFVideoDeviceID, TRUE); - check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, TRUE); - check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); - check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); - check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); - check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, FALSE); + check_interface(transform, &IID_IMFQualityAdvise, I_SUPPORTED); + check_interface(transform, &IID_IMFClockStateSink, I_SUPPORTED); + check_interface(transform, &IID_IMFTopologyServiceLookupClient, I_SUPPORTED); + check_interface(transform, &IID_IMFGetService, I_SUPPORTED); + check_interface(transform, &IID_IMFAttributes, I_SUPPORTED); + check_interface(transform, &IID_IMFVideoMixerBitmap, I_SUPPORTED); + check_interface(transform, &IID_IMFVideoPositionMapper, I_SUPPORTED); + check_interface(transform, &IID_IMFVideoProcessor, I_SUPPORTED); + check_interface(transform, &IID_IMFVideoMixerControl, I_SUPPORTED); + check_interface(transform, &IID_IMFVideoDeviceID, I_SUPPORTED); + check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, I_SUPPORTED); + check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, I_SUPPORTED); + check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, I_SUPPORTED); + check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, I_SUPPORTED); + check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, I_MISSING); hr = MFGetService((IUnknown *)transform, &MR_VIDEO_RENDER_SERVICE, &IID_IUnknown, (void **)&unk); ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr); @@ -1143,32 +1160,32 @@ static void test_default_presenter(void) if (FAILED(hr)) return; - check_interface(presenter, &IID_IQualProp, TRUE); - check_interface(presenter, &IID_IMFVideoPositionMapper, TRUE); - check_interface(presenter, &IID_IMFTopologyServiceLookupClient, TRUE); - check_interface(presenter, &IID_IMFVideoDisplayControl, TRUE); - check_interface(presenter, &IID_IMFRateSupport, TRUE); - check_interface(presenter, &IID_IMFGetService, TRUE); - check_interface(presenter, &IID_IMFClockStateSink, TRUE); - check_interface(presenter, &IID_IMFVideoPresenter, TRUE); - 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_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); - check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClockStateSink, TRUE); - check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTopologyServiceLookupClient, TRUE); - check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IQualProp, TRUE); - check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFRateSupport, TRUE); - 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_IMFTransform, FALSE); - check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); - check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + check_interface(presenter, &IID_IQualProp, I_SUPPORTED); + check_interface(presenter, &IID_IMFVideoPositionMapper, I_SUPPORTED); + check_interface(presenter, &IID_IMFTopologyServiceLookupClient, I_SUPPORTED); + check_interface(presenter, &IID_IMFVideoDisplayControl, I_SUPPORTED); + check_interface(presenter, &IID_IMFRateSupport, I_SUPPORTED); + check_interface(presenter, &IID_IMFGetService, I_SUPPORTED); + check_interface(presenter, &IID_IMFClockStateSink, I_SUPPORTED); + check_interface(presenter, &IID_IMFVideoPresenter, I_SUPPORTED); + check_interface(presenter, &IID_IMFVideoDeviceID, I_SUPPORTED); + check_interface(presenter, &IID_IMFQualityAdvise, I_MAYBE); /* Vista */ + check_interface(presenter, &IID_IDirect3DDeviceManager9, I_SUPPORTED); + todo_wine check_interface(presenter, &IID_IMFQualityAdviseLimits, I_MAYBE); /* Vista */ + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClockStateSink, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTopologyServiceLookupClient, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IQualProp, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFRateSupport, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, I_MAYBE); /* Vista */ + todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, I_MAYBE); /* Vista */ + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, I_MISSING); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, I_SUPPORTED); + check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, I_SUPPORTED); /* Query arbitrary supported interface back from device manager wrapper. */ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IDirect3DDeviceManager9, (void **)&dm); @@ -1346,6 +1363,8 @@ static void test_MFCreateVideoSampleAllocator(void) HRESULT hr; BYTE *data; + video_type = create_video_type(&MFVideoFormat_RGB32); + hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); @@ -1354,111 +1373,116 @@ static void test_MFCreateVideoSampleAllocator(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoSampleAllocator_QueryInterface(allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - - hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - - hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, &test_notify); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - - hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (hr == E_NOINTERFACE) /* Vista */ + win_skip("IID_IMFVideoSampleAllocatorCallback is not supported\n"); + else + { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - count = 10; - hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!count, "Unexpected count %d.\n", count); + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, &test_notify); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); - ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + count = 10; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); - hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* It expects IMFVideoMediaType aka video major type. Exact return code is E_NOINTERFACE, - likely coming from querying for IMFVideoMediaType. Does not seem valuable to match it. */ - hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); - video_type = create_video_type(&MFVideoFormat_RGB32); + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); - ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Frame size is required. */ - hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* It expects IMFVideoMediaType aka video major type. Exact return + * code is E_NOINTERFACE, likely coming from querying for + * IMFVideoMediaType. Does not seem valuable to match it. + */ + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count == 1, "Unexpected count %d.\n", count); + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); - sample = NULL; - hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - refcount = get_refcount(sample); + /* Frame size is required. */ + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); - ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %d.\n", count); - /* Reinitialize with active sample. */ - hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 4, video_type); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(refcount == get_refcount(sample), "Unexpected refcount %u.\n", get_refcount(sample)); + sample = NULL; + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + refcount = get_refcount(sample); - hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count == 4, "Unexpected count %d.\n", count); + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); - hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + /* Reinitialize with active sample. */ + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 4, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(refcount == get_refcount(sample), "Unexpected refcount %u.\n", get_refcount(sample)); - hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 4, "Unexpected count %d.\n", count); - hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); + hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - /* Device manager wasn't set, sample gets regular memory buffers. */ - if (SUCCEEDED(hr)) - { - hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); - IMFGetService_Release(gs); - } + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); - IMFMediaBuffer_Release(buffer); + /* Device manager wasn't set, sample gets regular memory buffers. */ + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + } - IMFSample_Release(sample); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - IMFVideoSampleAllocatorCallback_Release(allocator_cb); + IMFMediaBuffer_Release(buffer); + IMFSample_Release(sample); + IMFVideoSampleAllocatorCallback_Release(allocator_cb); + } IMFVideoSampleAllocator_Release(allocator); hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocatorCallback, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, + "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); /* Using device manager */ window = create_window(); @@ -1492,7 +1516,7 @@ static void test_MFCreateVideoSampleAllocator(void) hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - check_service_interface(buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, TRUE); + check_service_interface(buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, I_SUPPORTED); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2025,10 +2049,12 @@ static void test_presenter_quality_control(void) hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdviseLimits, (void **)&qa_limits); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, + "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdvise, (void **)&advise); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, + "Unexpected hr %#x.\n", hr); if (qa_limits) { @@ -2049,25 +2075,26 @@ if (qa_limits) IMFQualityAdviseLimits_Release(qa_limits); } -todo_wine { - mode = 1; - hr = IMFQualityAdvise_GetDropMode(advise, &mode); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + if (advise) + todo_wine { + mode = 1; + hr = IMFQualityAdvise_GetDropMode(advise, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); - level = 1; - hr = IMFQualityAdvise_GetQualityLevel(advise, &level); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(level == MF_QUALITY_NORMAL, "Unexpected mode %d.\n", level); + level = 1; + hr = IMFQualityAdvise_GetQualityLevel(advise, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected mode %d.\n", level); - hr = IMFQualityAdvise_SetDropMode(advise, MF_DROP_MODE_1); - ok(hr == MF_E_NO_MORE_DROP_MODES, "Unexpected hr %#x.\n", hr); + hr = IMFQualityAdvise_SetDropMode(advise, MF_DROP_MODE_1); + ok(hr == MF_E_NO_MORE_DROP_MODES, "Unexpected hr %#x.\n", hr); - hr = IMFQualityAdvise_SetQualityLevel(advise, MF_QUALITY_NORMAL_MINUS_1); - ok(hr == MF_E_NO_MORE_QUALITY_LEVELS, "Unexpected hr %#x.\n", hr); -} + hr = IMFQualityAdvise_SetQualityLevel(advise, MF_QUALITY_NORMAL_MINUS_1); + ok(hr == MF_E_NO_MORE_QUALITY_LEVELS, "Unexpected hr %#x.\n", hr); - IMFQualityAdvise_Release(advise); + IMFQualityAdvise_Release(advise); + } IMFVideoPresenter_Release(presenter); } -- 2.20.1

3 9

[PATCH] advapi32/tests: Don't check the display name if not in an English locale.
by Francois Gouget 30 Nov '20

30 Nov '20

Service display names are often translated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For instance: service.c:2718: Test failed: got Windows-Ereignisprotokoll service.c:2718: Test failed: got Journal dévénements Windows dlls/advapi32/tests/service.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index d216e096207..cbe7fffbc7a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2678,6 +2678,26 @@ static void test_refcount(void) CloseServiceHandle(scm_handle); } +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void test_EventLog(void) { SC_HANDLE scm_handle, svc_handle; @@ -2715,7 +2735,8 @@ todo_wine ok(!strcmp(config->lpServiceStartName, "LocalSystem") /* XP */ || !strcmp(config->lpServiceStartName, "NT AUTHORITY\\LocalService"), "got %s\n", config->lpServiceStartName); - ok(!strcmp(config->lpDisplayName, "Event Log") /* XP */ || + ok(!is_lang_english() || /* DisplayName is often translated */ + !strcmp(config->lpDisplayName, "Event Log") /* XP */ || !strcmp(config->lpDisplayName, "Windows Event Log") /* Vista+ */, "got %s\n", config->lpDisplayName); HeapFree(GetProcessHeap(), 0, config); -- 2.20.1

1 0

[PATCH] bcrypt: BCryptCreateHash is no longer a stub.
by Andrey Gusev 30 Nov '20

30 Nov '20

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 380d9105e48..1b7881d4910 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -799,7 +799,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL struct hash *hash; NTSTATUS status; - TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, object_len, + TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) { -- 2.28.0

2 1

[PATCH 11/11] msvcrt: Use locale category definiotion from public header.
by Piotr Caban 30 Nov '20

30 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 7 +- dlls/msvcrt/locale.c | 226 +++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.h | 9 -- dlls/msvcrt/string.c | 28 +++--- dlls/msvcrt/wcs.c | 30 +++--- 5 files changed, 146 insertions(+), 154 deletions(-)

1 0

[PATCH 10/11] msvcrt: Use _exception definiotion from public header.
by Piotr Caban 30 Nov '20

30 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 6 +++--- dlls/msvcrt/msvcrt.h | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-)

1 0