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

[PATCH 4/4] ucrtbase/tests: Use ucrtbase functions directly in string.c.
by Jacek Caban 18 Mar '20

18 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/string.c | 168 ++++++++++++----------------------- 1 file changed, 56 insertions(+), 112 deletions(-)

2 1

[PATCH 3/4] memory.h: Add _memicmp_l declaration.
by Jacek Caban 18 Mar '20

18 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wstring.h | 1 + include/msvcrt/memory.h | 1 + 2 files changed, 2 insertions(+)

2 1

[PATCH 2/4] string.h: Add __strncnt declaration.
by Jacek Caban 18 Mar '20

18 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/string.h | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH v2] ntdll: Pad heap structure to fix offset of flag fields.
by Brendan Shanks 18 Mar '20

18 Mar '20

Needed for Red Dead Redemption 2 to pass anti-debugger checks, it accesses 'flags' and 'force_flags' at a fixed offset of the ProcessHeap. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index af2a489b72..cce3c44e04 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -151,7 +151,13 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { DWORD_PTR unknown1[2]; - DWORD unknown2; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */ -- 2.24.1

2 1

[PATCH] ntdll: Pad heap structure to fix offset of flag fields.
by Brendan Shanks 18 Mar '20

18 Mar '20

Needed for Red Dead Redemption 2 to pass anti-debugger checks, it accesses 'flags' and 'force_flags' at a fixed offset of the ProcessHeap. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index af2a489b72..eee25e5086 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -151,7 +151,13 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { DWORD_PTR unknown1[2]; - DWORD unknown2; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + /* Since Vista, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */ -- 2.24.1

3 3

[PATCH] winecfg: don't trash app names
by Rafał Mużyło 18 Mar '20

18 Mar '20

Currently, if app name isn't representable in CP_ACP, it gets trashed during creation. There's no reason for it - the name is originally retrived as widechar string. This isn't the cleanest way, but still one that works. gothas: enumerate_values is no longer usable for other maens, yet this was its only use; reg_key_exists becomes unused; {g,s}et_app_reg_key copy a lot of existing code, instead of reusing minor note: winecfg could use a better check for KEY_WOW64_32KEY case - in my experience, it's quite often that key created by winecfg should actually under Wow6432Node, otherwise it has no effect.

2 2

[PATCH v1 1/3] mfreadwrite: Find a decoder in IMFSourceReader::SetCurrentMediaType.
by Derek Lesho 18 Mar '20

18 Mar '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 192 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 188 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 56ec036089..bc5bf0fde9 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -94,6 +94,7 @@ struct media_stream { IMFMediaStream *stream; IMFMediaType *current; + IMFTransform *decoder; DWORD id; CRITICAL_SECTION cs; CONDITION_VARIABLE sample_event; @@ -576,6 +577,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaStream_Release(stream->stream); if (stream->current) IMFMediaType_Release(stream->current); + if (stream->decoder) + IMFTransform_Release(stream->decoder); DeleteCriticalSection(&stream->cs); LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->samples, struct sample, entry) @@ -755,6 +758,15 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO IMFMediaType *type) { struct source_reader *reader = impl_from_IMFSourceReader(iface); + DWORD equal_flags; + GUID major_type, target_subtype, decoder_category; + IMFStreamDescriptor *stream_descriptor = NULL; + BOOL selected; + IMFMediaTypeHandler *stream_type_handler = NULL; + IMFMediaType *in_stream_type = NULL, *potential_out_stream_type = NULL; + CLSID decoder_id; + BOOL decoder_found = FALSE; + IMFTransform *decoder = NULL; HRESULT hr; TRACE("%p, %#x, %p, %p.\n", iface, index, reserved, type); @@ -774,14 +786,186 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO if (index >= reader->stream_count) return MF_E_INVALIDSTREAMNUMBER; - /* FIXME: validate passed type and current presentation state. */ - EnterCriticalSection(&reader->cs); - hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current); + if (FAILED(hr = IMFMediaType_IsEqual(type, reader->streams[index].current, &equal_flags))) + goto done; - LeaveCriticalSection(&reader->cs); + if (!(equal_flags & MF_MEDIATYPE_EQUAL_MAJOR_TYPES)) + { + /* Not gonna happen */ + hr = MF_E_INVALIDMEDIATYPE; + goto done; + } + + if (equal_flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES) + { + /* Similar enough not to need to refind a decoder */ + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current); + goto done; + } + + if (FAILED(hr = IMFMediaType_GetMajorType(type, &major_type))) + goto done; + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &target_subtype))) + goto done; + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, &selected, &stream_descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream_descriptor, &stream_type_handler))) + goto done; + + /* first, check if it's a native type */ + for (unsigned int i = 0; hr != MF_E_NO_MORE_TYPES; i++) + { + if (FAILED(hr = IMFSourceReader_GetNativeMediaType(iface, index, i, &in_stream_type))) + continue; + + if (FAILED(hr = IMFMediaType_IsEqual(type, in_stream_type, &equal_flags))) + goto done; + + if (equal_flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES) + { + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(stream_type_handler, in_stream_type))) + goto done; + hr = IMFMediaType_CopyAllItems(in_stream_type, (IMFAttributes *)reader->streams[index].current); + goto done; + } + + IMFMediaType_Release(in_stream_type); + in_stream_type = NULL; + } + + /* TODO: should we check if the source type is compressed? */ + + if (IsEqualGUID(&major_type, &MFMediaType_Video)) + { + decoder_category = MFT_CATEGORY_VIDEO_DECODER; + } + else if (IsEqualGUID(&major_type, &MFMediaType_Audio)) + { + decoder_category = MFT_CATEGORY_AUDIO_DECODER; + } + else + { + hr = MF_E_TOPO_CODEC_NOT_FOUND; + goto done; + } + + hr = S_OK; + for (unsigned int i = 0; hr != MF_E_NO_MORE_TYPES; i++) + { + GUID source_subtype; + MFT_REGISTER_TYPE_INFO in_type, out_type; + CLSID *decoder_ids; + ULONG decoder_count; + + if (FAILED(hr = IMFSourceReader_GetNativeMediaType(iface, index, i, &in_stream_type))) + continue; + + if (FAILED(hr = IMFMediaType_GetGUID(in_stream_type, &MF_MT_SUBTYPE, &source_subtype))) + goto done; + + in_type.guidMajorType = major_type; + in_type.guidSubtype = source_subtype; + + out_type.guidMajorType = major_type; + out_type.guidSubtype = target_subtype; + if (FAILED(hr = MFTEnum(decoder_category, 0, &in_type, &out_type, NULL, &decoder_ids, &decoder_count)) || decoder_count == 0) + { + if (!(decoder_found)) + { + /* see if there are other decoders for this stream */ + if (SUCCEEDED(MFTEnum(decoder_category, 0, &in_type, NULL, NULL, &decoder_ids, &decoder_count)) && decoder_count > 0) + { + decoder_found = TRUE; + CoTaskMemFree(decoder_ids); + } + } + + IMFMediaType_Release(in_stream_type); + in_stream_type = NULL; + continue; + } + + if (decoder_count > 1) + FIXME("Just using the first decoder.\n"); + decoder_id = decoder_ids[0]; + CoTaskMemFree(decoder_ids); + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(stream_type_handler, in_stream_type))) + goto done; + + break; + } + + if (!in_stream_type) + { + ERR("Failed to find decoder matching request, source has decoder: %u.\n", decoder_found); + hr = decoder_found ? MF_E_INVALIDREQUEST : MF_E_TOPO_CODEC_NOT_FOUND; + goto done; + } + + /* we have the decoder id at this point */ + if (FAILED(hr = CoCreateInstance(&decoder_id, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void**)&decoder))) + goto done; + + { + DWORD in_min, in_max, out_min, out_max; + + if (FAILED(hr = IMFTransform_GetStreamLimits(decoder, &in_min, &in_max, &out_min, &out_max))) + goto done; + if (in_min != 1 || in_max != 1 || out_min != 1 || out_max != 1) + { + hr = ERROR_INTERNAL_ERROR; + goto done; + } + } + + if (FAILED(hr = IMFTransform_SetInputType(decoder, 0, in_stream_type, 0))) + goto done; + + /* find the relevant output type */ + for (unsigned int i = 0;;i++) + { + if (FAILED(hr = IMFTransform_GetOutputAvailableType(decoder, 0, i, &potential_out_stream_type))) + goto done; + + if (FAILED(hr = IMFMediaType_IsEqual(type, potential_out_stream_type, &equal_flags))) + goto done; + + if (equal_flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES) + { + if (FAILED(hr = IMFTransform_SetOutputType(decoder, 0, potential_out_stream_type, 0))) + goto done; + + if (FAILED(hr = IMFMediaType_CopyAllItems(potential_out_stream_type, (IMFAttributes *)reader->streams[index].current))) + goto done; + + break; + } + IMFMediaType_Release(potential_out_stream_type); + potential_out_stream_type = NULL; + } + + reader->streams[index].decoder = decoder; + decoder = NULL; + + done: + LeaveCriticalSection(&reader->cs); + if (stream_descriptor) + IMFStreamDescriptor_Release(stream_descriptor); + if (stream_type_handler) + IMFMediaTypeHandler_Release(stream_type_handler); + if (in_stream_type) + IMFMediaType_Release(in_stream_type); + if (decoder) + IMFTransform_Release(decoder); + if (potential_out_stream_type) + IMFMediaType_Release(potential_out_stream_type); return hr; } -- 2.25.1

2 8

[PATCH 1/3] d3d10: Implement matrix effect variable set methods.
by Connor McAdams 18 Mar '20

18 Mar '20

Implement SetMatrix/SetMatrixArray and SetMatrixTranspose/SetMatrixTransposeArray methods for the matrix effect variable interface. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 5 ++ dlls/d3d10/effect.c | 110 ++++++++++++++++++++++++++++++++++--- 2 files changed, 107 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f83ff0d4c9..e02ea376bb 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -61,6 +61,11 @@ enum d3d10_effect_object_operation D3D10_EOO_ANONYMOUS_SHADER = 7, }; +struct d3d10_matrix +{ + float m[4][4]; +}; + struct d3d10_effect_object { struct d3d10_effect_pass *pass; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9f92b590bc..f49c5d656f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5073,8 +5073,90 @@ static const struct ID3D10EffectVectorVariableVtbl d3d10_effect_vector_variable_ d3d10_effect_vector_variable_GetFloatVectorArray, }; +static void write_matrix_to_buffer(struct d3d10_effect_variable *variable, float *dst, + struct d3d10_matrix *src, BOOL transpose) +{ + int row, col; + int col_count = !transpose ? variable->type->column_count : variable->type->row_count; + int row_count = !transpose ? variable->type->row_count : variable->type->column_count; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + + if (transpose) + major = !major; + + if (major) + { + for (col = 0; col < col_count; ++col) + { + for (row = 0; row < row_count; ++row) + dst[(col * 4) + row] = src->m[row][col]; + } + } + else + { + for (row = 0; row < row_count; ++row) + { + for (col = 0; col < col_count; ++col) + dst[(row * 4) + col] = src->m[row][col]; + } + } +} + +static void write_matrix_variable_to_buffer(struct d3d10_effect_variable *variable, void *src_data, BOOL transpose) +{ + BYTE *dst = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + + write_matrix_to_buffer(variable, (float *)dst, src_data, transpose); + + variable->buffer->u.buffer.changed = TRUE; +} + +static void write_matrix_variable_array_to_buffer(struct d3d10_effect_variable *variable, void *src_data, UINT offset, + UINT count, BOOL transpose) +{ + BYTE *dst = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + struct d3d10_matrix *src = src_data; + unsigned int i; + + if (!variable->type->element_count) + { + write_matrix_variable_to_buffer(variable, src_data, transpose); + return; + } + + if (offset >= variable->type->element_count) + { + WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + return; + } + + if (count > variable->type->element_count - offset) + { + WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + offset, count, variable->type->element_count); + count = variable->type->element_count - offset; + } + + if (offset) + dst += variable->type->stride * offset; + + for (i = 0; i < count; ++i) + { + write_matrix_to_buffer(variable, (float *)dst, &src[i], transpose); + + dst += variable->type->stride; + } + + variable->buffer->u.buffer.changed = TRUE; +} + /* ID3D10EffectVariable methods */ +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectMatrixVariable(ID3D10EffectMatrixVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_matrix_variable_IsValid(ID3D10EffectMatrixVariable *iface) { TRACE("iface %p\n", iface); @@ -5231,9 +5313,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrix(ID3D10EffectMatrixVariable *iface, float *data) { - FIXME("iface %p, data %p stub!\n", iface, data); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p.\n", iface, data); + write_matrix_variable_to_buffer(effect_var, data, FALSE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrix(ID3D10EffectMatrixVariable *iface, @@ -5247,9 +5332,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrix(ID3D10Ef static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixArray(ID3D10EffectMatrixVariable *iface, float *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); + write_matrix_variable_array_to_buffer(effect_var, data, offset, count, FALSE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixArray(ID3D10EffectMatrixVariable *iface, @@ -5263,9 +5351,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixArray(ID3 static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTranspose(ID3D10EffectMatrixVariable *iface, float *data) { - FIXME("iface %p, data %p stub!\n", iface, data); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p.\n", iface, data); + write_matrix_variable_to_buffer(effect_var, data, TRUE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTranspose(ID3D10EffectMatrixVariable *iface, @@ -5279,9 +5370,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTranspose static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_SetMatrixTransposeArray(ID3D10EffectMatrixVariable *iface, float *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectMatrixVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); + write_matrix_variable_array_to_buffer(effect_var, data, offset, count, TRUE); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_matrix_variable_GetMatrixTransposeArray(ID3D10EffectMatrixVariable *iface, -- 2.20.1

1 2

[PATCH v2 1/2] mfreadwrite: Find a decoder in IMFSourceReader::SetCurrentMediaType.
by Derek Lesho 18 Mar '20

18 Mar '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 167 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 56ec036089..34b394f77d 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -81,6 +81,7 @@ struct sample enum media_stream_state { STREAM_STATE_READY = 0, + STREAM_STATE_PLAYING, STREAM_STATE_EOS, }; @@ -94,6 +95,7 @@ struct media_stream { IMFMediaStream *stream; IMFMediaType *current; + IMFTransform *decoder; DWORD id; CRITICAL_SECTION cs; CONDITION_VARIABLE sample_event; @@ -404,6 +406,7 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, IMFSample_AddRef(pending_sample->sample); EnterCriticalSection(&reader->streams[i].cs); + reader->streams[i].state = STREAM_STATE_PLAYING; list_add_tail(&reader->streams[i].samples, &pending_sample->entry); LeaveCriticalSection(&reader->streams[i].cs); @@ -576,6 +579,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaStream_Release(stream->stream); if (stream->current) IMFMediaType_Release(stream->current); + if (stream->decoder) + IMFTransform_Release(stream->decoder); DeleteCriticalSection(&stream->cs); LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->samples, struct sample, entry) @@ -755,6 +760,14 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO IMFMediaType *type) { struct source_reader *reader = impl_from_IMFSourceReader(iface); + DWORD equal_flags; + GUID major_type, target_subtype, decoder_category; + IMFStreamDescriptor *stream_descriptor = NULL; + BOOL selected; + IMFMediaTypeHandler *stream_type_handler = NULL; + IMFMediaType *native_stream_type = NULL, *potential_out_stream_type = NULL; + CLSID decoder_id; + IMFTransform *decoder = NULL; HRESULT hr; TRACE("%p, %#x, %p, %p.\n", iface, index, reserved, type); @@ -773,15 +786,161 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO if (index >= reader->stream_count) return MF_E_INVALIDSTREAMNUMBER; - - /* FIXME: validate passed type and current presentation state. */ + /* FIXME: validate current presentation state. */ EnterCriticalSection(&reader->cs); - hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current); + if (FAILED(hr = IMFMediaType_IsEqual(type, reader->streams[index].current, &equal_flags))) + goto done; - LeaveCriticalSection(&reader->cs); + if (!(equal_flags & MF_MEDIATYPE_EQUAL_MAJOR_TYPES)) + { + hr = MF_E_INVALIDMEDIATYPE; + goto done; + } + + /* Testing reveals that setting the output type while streaming triggers a flush */ + if (reader->streams[index].state != STREAM_STATE_READY) + { + if (FAILED(hr = IMFSourceReader_Flush(iface, index))) + goto done; + } + + if (equal_flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES) + { + /* Similar enough not to need to refind a decoder */ + goto done; + } + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, &selected, &stream_descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream_descriptor, &stream_type_handler))) + goto done; + + /* first, check if it's a native type */ + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(stream_type_handler, type, &native_stream_type))) + { + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(stream_type_handler, native_stream_type))) + goto done; + hr = IMFMediaType_CopyAllItems(native_stream_type, (IMFAttributes *)reader->streams[index].current); + goto done; + + IMFMediaType_Release(native_stream_type); + } + + /* TODO: should we check if the source type is compressed? */ + + if (IsEqualGUID(&major_type, &MFMediaType_Video)) + { + decoder_category = MFT_CATEGORY_VIDEO_DECODER; + } + else if (IsEqualGUID(&major_type, &MFMediaType_Audio)) + { + decoder_category = MFT_CATEGORY_AUDIO_DECODER; + } + else + { + hr = MF_E_TOPO_CODEC_NOT_FOUND; + goto done; + } + + if (FAILED(hr = IMFMediaType_GetMajorType(type, &major_type))) + goto done; + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &target_subtype))) + goto done; + + for (unsigned int i = 0; hr != MF_E_NO_MORE_TYPES; i++) + { + GUID source_subtype; + MFT_REGISTER_TYPE_INFO in_type, out_type; + CLSID *decoder_ids; + ULONG decoder_count; + + if (FAILED(hr = IMFSourceReader_GetNativeMediaType(iface, index, i, &native_stream_type))) + continue; + if (FAILED(hr = IMFMediaType_GetGUID(native_stream_type, &MF_MT_SUBTYPE, &source_subtype))) + goto done; + + in_type.guidMajorType = major_type; + in_type.guidSubtype = source_subtype; + + out_type.guidMajorType = major_type; + out_type.guidSubtype = target_subtype; + + if (FAILED(hr = MFTEnum(decoder_category, 0, &in_type, &out_type, NULL, &decoder_ids, &decoder_count)) || decoder_count == 0) + { + IMFMediaType_Release(native_stream_type); + native_stream_type = NULL; + continue; + } + + decoder_id = decoder_ids[0]; + CoTaskMemFree(decoder_ids); + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(stream_type_handler, native_stream_type))) + goto done; + + break; + } + + if (!native_stream_type) + { + ERR("Failed to find decoder matching request\n"); + hr = MF_E_INVALIDREQUEST; + goto done; + } + + if (FAILED(hr = CoCreateInstance(&decoder_id, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void**)&decoder))) + goto done; + + if (FAILED(hr = IMFTransform_SetInputType(decoder, 0, native_stream_type, 0))) + goto done; + + /* find the relevant output type */ + for (unsigned int i = 0;;i++) + { + if (FAILED(hr = IMFTransform_GetOutputAvailableType(decoder, 0, i, &potential_out_stream_type))) + goto done; + + if (FAILED(hr = IMFMediaType_IsEqual(type, potential_out_stream_type, &equal_flags))) + goto done; + + if (equal_flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES) + { + if (FAILED(hr = IMFTransform_SetOutputType(decoder, 0, potential_out_stream_type, 0))) + goto done; + + if (FAILED(hr = IMFMediaType_CopyAllItems(potential_out_stream_type, (IMFAttributes *)reader->streams[index].current))) + goto done; + + break; + } + IMFMediaType_Release(potential_out_stream_type); + potential_out_stream_type = NULL; + } + + if (reader->streams[index].decoder) + { + IMFTransform_Release(reader->streams[index].decoder); + } + reader->streams[index].decoder = decoder; + decoder = NULL; + + done: + LeaveCriticalSection(&reader->cs); + if (stream_descriptor) + IMFStreamDescriptor_Release(stream_descriptor); + if (stream_type_handler) + IMFMediaTypeHandler_Release(stream_type_handler); + if (native_stream_type) + IMFMediaType_Release(native_stream_type); + if (decoder) + IMFTransform_Release(decoder); + if (potential_out_stream_type) + IMFMediaType_Release(potential_out_stream_type); return hr; } -- 2.25.1

1 1

[PATCH] winex11: Don't unmap the clip window more than once
by Myah Caron 18 Mar '20

18 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48772 Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- dlls/winex11.drv/mouse.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7f0edd9be6..28c4296784 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -129,6 +129,7 @@ static RECT last_clip_rect; static HWND last_clip_foreground_window; static BOOL last_clip_refused; static RECT clip_rect; +static BOOL clip_window_mapped = FALSE; static Cursor create_cursor( HANDLE handle ); #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H @@ -426,6 +427,7 @@ static BOOL grab_clipping_window( const RECT *clip ) XMoveResizeWindow( data->display, clip_window, pos.x, pos.y, max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) ); XMapWindow( data->display, clip_window ); + clip_window_mapped = TRUE; /* if the rectangle is shrinking we may get a pointer warp */ if (!data->clip_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top || @@ -464,7 +466,8 @@ void ungrab_clipping_window(void) if (!clip_window) return; TRACE( "no longer clipping\n" ); - XUnmapWindow( display, clip_window ); + if (clip_window_mapped) XUnmapWindow( display, clip_window ); + clip_window_mapped = FALSE; if (clipping_cursor) XUngrabPointer( display, CurrentTime ); clipping_cursor = FALSE; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); -- 2.25.1

2 1