wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Alexandre Julliard : gdi32: Move the GSUB table support out of freetype.c.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 8631506270ab116c6aecabe8a3159ba7d23edd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8631506270ab116c6aecabe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 11:10:30 2020 +0100 gdi32: Move the GSUB table support out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 336 +++++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 388 ++--------------------------------------------- dlls/gdi32/gdi_private.h | 5 + 3 files changed, 353 insertions(+), 376 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8631506270ab116c6aec…

1 0

Daniel Lehman : wine.inf: Fix SA Eastern Standard Time Zone info.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 0bc752f30d79ac40b7c2588c72257ed06499cd24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bc752f30d79ac40b7c2588c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Oct 28 21:44:44 2020 -0700 wine.inf: Fix SA Eastern Standard Time Zone info. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fba071fe0d8..72b10d354e0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3491,7 +3491,7 @@ HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Dlt",,"SA Eastern D HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-40657" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Std",,"@tzres.dll,-40656" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Std",,"SA Eastern Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Display",,"America/Bogota" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Dlt",,"SA Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-49425"

1 0

Georg Lehmann : winevulkan: Remove comment from VkEnumValue.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 4a213cae61ddb16123f94dc1b8c79e45969c4c5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a213cae61ddb16123f94dc1… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 22:02:47 2020 +0100 winevulkan: Remove comment from VkEnumValue. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 771efe8f5bb..edd56526d58 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -380,21 +380,20 @@ class VkEnum(object): # Value is either a value or a bitpos, only one can exist. value = v.attrib.get("value") alias_name = v.attrib.get("alias") - comment = v.attrib.get("comment") if alias_name: alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) elif value: # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) else: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) else: # bitmask value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect @@ -445,12 +444,11 @@ class VkEnum(object): class VkEnumValue(object): - def __init__(self, name, value=None, hex=False, alias=None, comment=None): + def __init__(self, name, value=None, hex=False, alias=None): self.name = name self.value = value self.hex = hex self.alias = alias - self.comment = comment def __repr__(self): if self.is_alias(): @@ -2845,12 +2843,10 @@ class VkRegistry(object): if only_aliased and not aliased: return - comment = enum_elem.attrib.get("comment") - if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True, comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part @@ -2867,12 +2863,12 @@ class VkRegistry(object): if direction is not None: value = -value - enum.add(VkEnumValue(enum_elem.attrib["name"], value=value, comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=value)) elif "value" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]), comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]))) elif "alias" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"], comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) elif "value" in enum_elem.keys(): # Constants are not aliased, no need to add them here, they'll get added later on.

1 0

Georg Lehmann : winevulkan: Don't use comments for object types.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 44500d3cfc288fb5afb14061cae58cc9c32de867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44500d3cfc288fb5afb14061… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 22:02:46 2020 +0100 winevulkan: Don't use comments for object types. We shouldn't do that according to the Vulkan xml maintainer. https://github.com/KhronosGroup/Vulkan-Docs/pull/1379 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7e5bd030867..771efe8f5bb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2739,21 +2739,16 @@ class VkRegistry(object): def _match_object_types(self): """ Matches each handle with the correct object type. """ - for handle in self.handles: - if not handle.is_required() or handle.is_alias(): - continue - for value in self.enums["VkObjectType"].values: - if value.comment == handle.name: - handle.object_type = value.name - break - else: - LOGGER.warning("No object type found for {}".format(handle.name)) + # Use upper case comparison for simplicity. + object_types = {} + for value in self.enums["VkObjectType"].values: + object_name = "VK" + value.name[len("VK_OBJECT_TYPE"):].replace("_", "") + object_types[object_name] = value.name for handle in self.handles: - if not handle.is_required() or not handle.is_alias(): + if not handle.is_required(): continue - # Use the object type of the alias - handle.object_type = handle.alias.object_type + handle.object_type = object_types.get(handle.name.upper()) if not handle.object_type: LOGGER.warning("No object type found for {}".format(handle.name))

1 0

Georg Lehmann : winevulkan: Implement VK_EXT_debug_report.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 28d75542b728fdc44e4bd4e4ab6bd74e9f9ffd23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d75542b728fdc44e4bd4e4… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 21:18:54 2020 +0100 winevulkan: Implement VK_EXT_debug_report. Messages from the driver/layers won't be reported twice. Messages during instance creation by the host loader won't be reported, since the information is partly wrong and the windows loader reports the correct information. Other messages by the loader will be reported twice if lunarg's vulkan-1.dll is used. This shouldn't be a problem because the messages are just used for logging/debugging. Needed for Quake2RTX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49813 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 14 +++--- dlls/winevulkan/vulkan.c | 105 ++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 26 ++++++++++ dlls/winevulkan/vulkan_thunks.c | 25 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 9 ++++ include/wine/vulkan.h | 86 ++++++++++++++++++++++++++++++++ 6 files changed, 258 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28d75542b728fdc44e4b…

1 0

Nikolay Sivov : include: Remove confusing comment.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 03395fdf71b606b589b917eab5d4766842188b91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03395fdf71b606b589b917ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 22:58:01 2020 +0300 include: Remove confusing comment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mlang.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mlang.idl b/include/mlang.idl index 5867648b04f..7c4398feafd 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -708,7 +708,7 @@ interface IMultiLanguage2 : IUnknown [in] LANGID LangId, [out] IEnumScript **ppEnumScript); - HRESULT ValidateCodePageEx( /* undocumented on MSDN */ + HRESULT ValidateCodePageEx( [in] UINT uiCodePage, [in] HWND hwnd, [in] DWORD dwfIODControl);

1 0

Alistair Leslie-Hughes : include: Add more DBGUID_* defines.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: da9f165acb9ba92dfd2a5c7c203c7ae9980320b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9f165acb9ba92dfd2a5c7c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 28 20:46:20 2020 +1100 include: Add more DBGUID_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 63617c88c00..19f92b3c05f 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -500,6 +500,8 @@ cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") cpp_quote("#endif") cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") +cpp_quote("DEFINE_DBGUID(DBGUID_SQL, 0xc8b522d7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);")

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: e2893c34524ae45f69f7bc183fa409a4049b9533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2893c34524ae45f69f7bc18… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 27 11:12:05 2020 -0500 winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor. 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/mf/tests/mf.c | 1 - dlls/mfplat/tests/mfplat.c | 10 +++++----- dlls/mfreadwrite/tests/mfplat.c | 15 ++++++++++----- dlls/winegstreamer/media_source.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8c49a483f74..d304a62f08a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1452,7 +1452,6 @@ todo_wine return; hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); -todo_wine ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); if (FAILED(hr)) return; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 906454851a8..8c6cbf74661 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -574,10 +574,7 @@ static void test_source_resolver(void) ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); -todo_wine ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -597,6 +594,7 @@ todo_wine ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); +todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); IMFMediaType_Release(media_type); @@ -605,7 +603,10 @@ todo_wine var.vt = VT_EMPTY; hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); +todo_wine ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); @@ -668,11 +669,10 @@ todo_wine get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); +skip_source_tests: IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); -skip_source_tests: - hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 84581f9be9a..cfe68cb6736 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -627,14 +627,13 @@ static void test_source_reader(void) stream = get_resource_stream("test.wav"); hr = MFCreateSourceReaderFromByteStream(stream, NULL, &reader); -todo_wine - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); - if (FAILED(hr)) { + skip("MFCreateSourceReaderFromByteStream() failed, is G-Streamer missing?\n"); IMFByteStream_Release(stream); return; } + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); /* Access underlying media source object. */ hr = IMFSourceReader_GetServiceForStream(reader, MF_SOURCE_READER_MEDIASOURCE, &GUID_NULL, &IID_IMFMediaSource, @@ -723,7 +722,10 @@ todo_wine hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); +todo_wine ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + if (hr != S_OK) + goto skip_read_sample; ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); IMFSample_Release(sample); @@ -784,6 +786,8 @@ todo_wine ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); +skip_read_sample: + /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); @@ -814,10 +818,11 @@ todo_wine IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); +todo_wine ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); IMFAttributes_Release(attributes); - - IMFSourceReader_Release(reader); + if (hr == S_OK) + IMFSourceReader_Release(reader); IMFByteStream_Release(stream); } diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index d6c7837e544..9b2c2174318 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -67,6 +67,7 @@ struct media_source IMFByteStream *byte_stream; struct media_stream **streams; ULONG stream_count; + IMFPresentationDescriptor *pres_desc; GstBus *bus; GstElement *container; GstElement *decodebin; @@ -673,12 +674,12 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, descriptor); + TRACE("(%p)->(%p)\n", source, descriptor); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + return IMFPresentationDescriptor_Clone(source->pres_desc, descriptor); } static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, @@ -741,6 +742,8 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) if (source->their_sink) gst_object_unref(GST_OBJECT(source->their_sink)); + if (source->pres_desc) + IMFPresentationDescriptor_Release(source->pres_desc); if (source->event_queue) IMFMediaEventQueue_Shutdown(source->event_queue); if (source->byte_stream) @@ -841,6 +844,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); struct media_source *object = heap_alloc_zero(sizeof(*object)); + IMFStreamDescriptor **descriptors = NULL; unsigned int i; HRESULT hr; int ret; @@ -928,6 +932,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ gst_sample_unref(preroll); } + /* init presentation descriptor */ + + descriptors = heap_alloc(object->stream_count * sizeof(IMFStreamDescriptor*)); + for (i = 0; i < object->stream_count; i++) + { + IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]); + } + + if (FAILED(hr = MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc))) + goto fail; + + for (i = 0; i < object->stream_count; i++) + { + IMFPresentationDescriptor_SelectStream(object->pres_desc, i); + IMFStreamDescriptor_Release(descriptors[i]); + } + heap_free(descriptors); + descriptors = NULL; + object->state = SOURCE_STOPPED; *out_media_source = object; @@ -936,6 +959,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + heap_free(descriptors); IMFMediaSource_Release(&object->IMFMediaSource_iface); return hr; }

1 0

Derek Lesho : winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: f26e81cf38b2bf0305581522d3d980d3508a43ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26e81cf38b2bf0305581522… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 27 11:12:04 2020 -0500 winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 0991710755c..d6c7837e544 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -388,7 +388,7 @@ static const IMFMediaStreamVtbl media_stream_vtbl = the user throws at us through gstreamer's caps negotiation. */ static HRESULT media_stream_connect_to_sink(struct media_stream *stream) { - GstCaps *source_caps = gst_pad_get_current_caps(stream->their_src); + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); const gchar *stream_type; if (!source_caps)

1 0

Michael Stefaniuc : msxml3/tests: Use wide-char string literals.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 21ca8e16485c41d21544065c211eaffd10252ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ca8e16485c41d21544065c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 27 00:06:36 2020 +0100 msxml3/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 13 +++---------- dlls/msxml3/tests/saxreader.c | 14 +++++++------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c19dd6c430e..02e31b4aafb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -733,11 +733,7 @@ static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_to IXMLDOMParseError_Release(error); } -static const WCHAR szComplete1[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 -}; +static const WCHAR szComplete1[] = L"<?xml version='1.0'?>\n<open></open>\n"; static const char complete4A[] = "<?xml version=\'1.0\'?>\n" "<lc dl=\'str1\'>\n" @@ -1148,10 +1144,7 @@ static const char attributes_map[] = { static const WCHAR nonexistent_fileW[] = L"c:\\Nonexistent.xml"; -static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', - '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; - -static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; +static const WCHAR szStrangeChars[] = L"&x \x2103"; #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ @@ -5872,7 +5865,7 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML4 ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest Attr=\"\">&x \x2103</EleTest>" ), "incorrect element xml\n"); SysFreeString(str); hr = IXMLDOMElement_get_text(pElement, &str); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 47d158ab3ea..ab814c5f764 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1518,9 +1518,9 @@ static HRESULT WINAPI isaxattributes_getQName( const WCHAR **QName, int *QNameLength) { - static const WCHAR attrqnamesW[][15] = {{'a',':','a','t','t','r','1','j','u','n','k',0}, - {'a','t','t','r','2','j','u','n','k',0}, - {'a','t','t','r','3',0}}; + static const WCHAR attrqnamesW[][15] = {L"a:attr1junk", + L"attr2junk", + L"attr3"}; static const int attrqnamelen[] = {7, 5, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -1609,9 +1609,9 @@ static HRESULT WINAPI isaxattributes_getTypeFromQName( static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index, const WCHAR **value, int *nValue) { - static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0}, - {'a','2','j','u','n','k',0}, - {'<','&','"','>','\'',0}}; + static const WCHAR attrvaluesW[][10] = {L"a1junk", + L"a2junk", + L"<&\">'"}; static const int attrvalueslen[] = {2, 2, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -3960,7 +3960,7 @@ static const struct writer_characters_t writer_characters[] = { static void test_mxwriter_characters(void) { - static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0}; + static const WCHAR embedded_nullbytes[] = L"a\0b\0\0\0c"; const struct writer_characters_t *table = writer_characters; IVBSAXContentHandler *vb_content; ISAXContentHandler *content;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020