November 2020 - Wine-Commits

Vijay Kiran Kamuju : include: Add related ASN1encoding_s and ASN1decoding_s structs.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 4ff95ee8825e9922fbfa010decad56be2b1c6e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ff95ee8825e9922fbfa010d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:38:33 2020 +0200 include: Add related ASN1encoding_s and ASN1decoding_s structs. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7e9bee3a8dc145426d97271e99e689af81fb30a6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msasn1.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/include/msasn1.h b/include/msasn1.h index 89a6255a5fe..dd0bcb5b3df 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -43,6 +43,11 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +#define ASN1_MAKE_VERSION(major,minor) (((major) << 16) | (minor)) +#define ASN1_THIS_VERSION ASN1_MAKE_VERSION(1,0) + +#define ASN1DECFREE_NON_PDU_ID ((ASN1uint32_t)-1) + typedef void (WINAPI *ASN1FreeFun_t)(void *data); typedef void (WINAPI *ASN1GenericFun_t)(void); @@ -64,6 +69,30 @@ typedef struct tagASN1BerFunArr_t { const ASN1BerDecFun_t *apfnDecoder; } ASN1BerFunArr_t; +enum +{ + ASN1FLAGS_NONE = 0x00000000, + ASN1FLAGS_NOASSERT = 0x00001000 +}; + +enum +{ + ASN1ENCODE_APPEND = 0x00000001, + ASN1ENCODE_REUSEBUFFER = 0x00000004, + ASN1ENCODE_SETBUFFER = 0x00000008, + ASN1ENCODE_ALLOCATEBUFFER = 0x00000010, + ASN1ENCODE_NOASSERT = ASN1FLAGS_NOASSERT +}; + +enum +{ + ASN1DECODE_APPENDED = 0x00000001, + ASN1DECODE_REWINDBUFFER = 0x00000004, + ASN1DECODE_SETBUFFER = 0x00000008, + ASN1DECODE_AUTOFREEBUFFER = 0x00000010, + ASN1DECODE_NOASSERT = ASN1FLAGS_NOASSERT +}; + typedef struct tagASN1bitstring_t { ASN1uint32_t length; @@ -128,6 +157,9 @@ typedef enum tagASN1error_e ASN1_WRN_NOEOD = 1002, } ASN1error_e; +#define ASN1_SUCCEEDED(ret) (((int)(ret)) >= 0) +#define ASN1_FAILED(ret) (((int)(ret)) < 0) + typedef struct tagASN1generalizedtime_t { ASN1uint16_t year; @@ -147,19 +179,52 @@ typedef struct tagASN1intx_t ASN1octet_t *value; } ASN1intx_t; -typedef struct tagASN1module_t { +typedef struct tagASN1module_t +{ ASN1magic_t nModuleName; ASN1encodingrule_e eRule; ASN1uint32_t dwFlags; ASN1uint32_t cPDUs; const ASN1FreeFun_t *apfnFreeMemory; const ASN1uint32_t *acbStructSize; - union { - ASN1PerFunArr_t PER; - ASN1BerFunArr_t BER; + union + { + ASN1PerFunArr_t PER; + ASN1BerFunArr_t BER; }; } *ASN1module_t; +struct ASN1encoding_s +{ + ASN1magic_t magic; + ASN1uint32_t version; + ASN1module_t module; + ASN1octet_t *buf; + ASN1uint32_t size; + ASN1uint32_t len; + ASN1error_e err; + ASN1uint32_t bit; + ASN1octet_t *pos; + ASN1uint32_t cbExtraHeader; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; +}; + +struct ASN1decoding_s +{ + ASN1magic_t magic; + ASN1uint32_t version; + ASN1module_t module; + ASN1octet_t *buf; + ASN1uint32_t size; + ASN1uint32_t len; + ASN1error_e err; + ASN1uint32_t bit; + ASN1octet_t *pos; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; +}; + typedef struct ASN1objectidentifier_s { struct ASN1objectidentifier_s *next;

1 0

Vijay Kiran Kamuju : ole2.dll16: Add stub OleIsCurrentClipboard function.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 1c66b0065107fc97c938e986dce3957315ebb33a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c66b0065107fc97c938e986… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Jun 2 18:02:50 2020 +0200 ole2.dll16: Add stub OleIsCurrentClipboard function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7102 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9c95434095630aa1ed4f1ae3763424f09f423575) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 9 +++++++++ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 5e6142fc96a..04b40b08635 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -272,6 +272,15 @@ HRESULT WINAPI OleFlushClipboard16(void) return OleFlushClipboard(); } +/*********************************************************************** + * OleIsCurrentClipboard [OLE2.77] + */ +HRESULT WINAPI OleIsCurrentClipboard16(IDataObject* pDataObj) +{ + FIXME("(%p): stub\n", pDataObj); + return S_OK; +} + #define GET_SEGPTR_METHOD_ADDR(ifacename,segptr,methodname) \ ((SEGPTR)((const ifacename##Vtbl*)MapSL((SEGPTR)((ifacename*)MapSL(segptr))->lpVtbl))->methodname) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 108c3ee8f31..7aac6864e56 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -72,7 +72,7 @@ 74 stub READFMTUSERTYPESTG 75 stub WRITEFMTUSERTYPESTG 76 pascal -ret16 OleFlushClipboard() OleFlushClipboard16 -77 stub OLEISCURRENTCLIPBOARD +77 pascal OleIsCurrentClipboard(ptr) OleIsCurrentClipboard16 78 stub OLETRANSLATEACCELERATOR 79 pascal OleDoAutoConvert(ptr ptr) OleDoAutoConvert16 80 stub OLEGETAUTOCONVERT

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::GetCharacteristics.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: e12b7d210422311a562ff830535054f740ab3257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e12b7d210422311a562ff830… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 13:34:53 2020 -0600 winegstreamer: Implement IMFMediaSource::GetCharacteristics. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e69eeba4294..9d7df347dab 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1035,12 +1035,14 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, characteristics); + TRACE("(%p)->(%p)\n", source, characteristics); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + *characteristics = MFMEDIASOURCE_CAN_SEEK; + + return S_OK; } static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor)

1 0

Alexandre Julliard : crypt32: List allowed characters instead of relying on wctype properties.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: d202e02f792901038888c35efaaaa147a7413dea URL: https://source.winehq.org/git/wine.git/?a=commit;h=d202e02f792901038888c35e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 9 11:44:20 2020 +0100 crypt32: List allowed characters instead of relying on wctype properties. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 2e3f976bded..46f4b8f25e7 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2074,9 +2074,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, static inline BOOL isprintableW(WCHAR wc) { - return iswalnum(wc) || iswspace(wc) || wc == '\'' || wc == '(' || - wc == ')' || wc == '+' || wc == ',' || wc == '-' || wc == '.' || - wc == '/' || wc == ':' || wc == '=' || wc == '?'; + return wc && wcschr( L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 '()+,-./:=?", wc ); } static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value,

1 0

Kevin Puetz : ole32/tests: Fix flaky test in cowait_unmarshal_thread.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 54f04370ebd11abfd305fbc23ca0200cc329d278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f04370ebd11abfd305fbc2… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Nov 5 17:09:11 2020 -0600 ole32/tests: Fix flaky test in cowait_unmarshal_thread. When run with runtest -q (WINETEST_DEBUG=0) it passed within the first 50ms, but with any verbose logging it sometimes failed. Use CoWaitForMultipleHandles (which keeps pumping the STA) since cowait_unmarshal_thread only releases its marshaled unk at the end, so it needs to be able to call back in order to exit cleanly. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5ed3f9638b1..0d7f3d8adee 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2772,8 +2772,9 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); hr = CoWaitForMultipleHandles(0, 50, 1, &event, &index); ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - index = WaitForSingleObject(thread, 200); - ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + hr = CoWaitForMultipleHandles(0, 200, 1, &thread, &index); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish"); CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL);

1 0

Derek Lesho : winegstreamer: Require media source's IMFByteStream to be seekable.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 964cf9cfce5c4eec804db0294dfdb33a76488168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964cf9cfce5c4eec804db029… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 15:48:33 2020 -0600 winegstreamer: Require media source's IMFByteStream to be seekable. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 06f35ce24b6..e69eeba4294 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1235,6 +1235,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + DWORD bytestream_caps; unsigned int i; HRESULT hr; int ret; @@ -1242,6 +1243,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (!object) return E_OUTOFMEMORY; + if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) + return hr; + + if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) + { + FIXME("Non-seekable bytestreams not supported.\n"); + return MF_E_BYTESTREAM_NOT_SEEKABLE; + } + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1;

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.160.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 572aa09de1b0e3ba0e8b19f48d5e96539625bb0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=572aa09de1b0e3ba0e8b19f4… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Nov 9 10:11:35 2020 -0800 winevulkan: Update to VK spec version 1.2.160. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 27 ++ dlls/winevulkan/vulkan_thunks.h | 2 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 1014 +++++++++++++++++++++------------------ 5 files changed, 572 insertions(+), 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=572aa09de1b0e3ba0e8b…

1 0

Derek Lesho : winegstreamer: Set MF_PD_DURATION on source's presentation descriptor.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 59c55e96f5d925c58f96de8766b1501f4c431d35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c55e96f5d925c58f96de87… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 13:34:55 2020 -0600 winegstreamer: Set MF_PD_DURATION on source's presentation descriptor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9d7df347dab..66bdf64a669 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1237,6 +1237,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + gint64 total_pres_time = 0; DWORD bytestream_caps; unsigned int i; HRESULT hr; @@ -1357,6 +1358,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ heap_free(descriptors); descriptors = NULL; + for (i = 0; i < object->stream_count; i++) + { + gint64 stream_pres_time; + if (gst_pad_query_duration(object->streams[i]->their_src, GST_FORMAT_TIME, &stream_pres_time)) + { + TRACE("Stream %u has duration %llu\n", i, (unsigned long long int) stream_pres_time); + + if (stream_pres_time > total_pres_time) + total_pres_time = stream_pres_time; + } + else + { + WARN("Unable to get presentation time of stream %u\n", i); + } + } + + if (object->stream_count) + IMFPresentationDescriptor_SetUINT64(object->pres_desc, &MF_PD_DURATION, total_pres_time / 100); + object->state = SOURCE_STOPPED; *out_media_source = object;

1 0

Nikolay Sivov : evr/mixer: Add partial implementation of sample processing.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 409392dfb778e018d49f11aabf827a6c5214e287 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409392dfb778e018d49f11aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:43 2020 +0300 evr/mixer: Add partial implementation of sample processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a60da623f64..8eba3e3611b 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1163,6 +1163,65 @@ static HRESULT video_mixer_get_d3d_device(struct video_mixer *mixer, IDirect3DDe return hr; } +static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int height, + const MFVideoNormalizedRect *scale) +{ + if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) + { + SetRect(rect, 0, 0, width, height); + } + else + { + rect->left = width * scale->left; + rect->right = width * scale->right; + rect->top = height * scale->top; + rect->bottom = height * scale->bottom; + } +} + +static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) +{ + DXVA2_VideoSample samples[1] = {{ 0 }}; + DXVA2_VideoProcessBltParams params = { 0 }; + MFVideoNormalizedRect zoom_rect; + struct input_stream *stream; + IDirect3DSurface9 *surface; + D3DSURFACE_DESC desc; + HRESULT hr; + + IDirect3DSurface9_GetDesc(rt, &desc); + + if (FAILED(IMFAttributes_GetBlob(mixer->attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&zoom_rect, + sizeof(zoom_rect), NULL))) + { + zoom_rect.left = zoom_rect.top = 0.0f; + zoom_rect.right = zoom_rect.bottom = 1.0f; + } + + video_mixer_scale_rect(&params.TargetRect, desc.Width, desc.Height, &zoom_rect); + + /* FIXME: for now only handle reference stream. */ + + video_mixer_get_input(mixer, 0, &stream); + + if (FAILED(hr = video_mixer_get_sample_surface(stream->sample, &surface))) + { + WARN("Failed to get source surface, hr %#x.\n", hr); + return; + } + + IDirect3DSurface9_GetDesc(surface, &desc); + + samples[0].SrcSurface = surface; + SetRect(&samples[0].SrcRect, 0, 0, desc.Width, desc.Height); + video_mixer_scale_rect(&samples[0].DstRect, desc.Width, desc.Height, &stream->rect); + + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, 1, NULL))) + WARN("Failed to process samples, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); +} + static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { @@ -1197,13 +1256,15 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D } } - /* FIXME: for now discard input */ + if (SUCCEEDED(hr)) + video_mixer_render(mixer, surface); if (SUCCEEDED(hr)) { for (i = 0; i < mixer->input_count; ++i) { - IMFSample_Release(mixer->inputs[i].sample); + if (mixer->inputs[i].sample) + IMFSample_Release(mixer->inputs[i].sample); mixer->inputs[i].sample = NULL; video_mixer_request_sample(mixer, i); }

1 0

Nikolay Sivov : evr/mixer: Reuse full set of type attributes for output types.
by Alexandre Julliard Nov. 9, 2020

Nov. 9, 2020

Module: wine Branch: master Commit: 292b54f3ae4725f287fe587e3420fd5a7b59f03a URL: https://source.winehq.org/git/wine.git/?a=commit;h=292b54f3ae4725f287fe587e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:42 2020 +0300 evr/mixer: Reuse full set of type attributes for output types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 16 ++++++++++++---- dlls/evr/tests/evr.c | 21 ++++++++++++++++++++- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 20b5e3b2bba..a60da623f64 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -653,7 +653,8 @@ static int rt_formats_sort_compare(const void *left, const void *right) } static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, - IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) + IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, + const GUID *devices, unsigned int flags) { unsigned int i, j, format_count, count; struct rt_format *rt_formats = NULL, *ptr; @@ -706,9 +707,16 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const { for (i = 0; i < count; ++i) { + IMFMediaType *rt_media_type; + subtype.Data1 = rt_formats[i].format; mixer->output.rt_formats[i] = rt_formats[i]; - MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.rt_formats[i].media_type); + + MFCreateMediaType(&rt_media_type); + IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); + IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + + mixer->output.rt_formats[i].media_type = rt_media_type; } mixer->output.rt_formats_count = count; } @@ -785,8 +793,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, &count, &guids))) { - if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, - guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) + if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, media_type, + service, count, guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { if (mixer->inputs[0].media_type) IMFMediaType_Release(mixer->inputs[0].media_type); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index a711be7ad21..a1d7b7109d9 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -915,11 +915,11 @@ static void test_default_mixer_type_negotiation(void) IDirect3DDevice9 *device; IMFMediaType *video_type; IMFTransform *transform; + DWORD index, count; GUID guid, *guids; IDirect3D9 *d3d; IUnknown *unk; HWND window; - DWORD count; HRESULT hr; UINT token; @@ -1013,6 +1013,25 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); + /* Check attributes on available output types. */ + index = 0; + while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) + { + UINT64 frame_size; + GUID subtype; + UINT32 value; + + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + } + ok(index > 1, "Unexpected number of available types.\n"); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0