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

[PATCH v5 1/5] winegstreamer: Insert videoconvert into decoded-video streams.
by Derek Lesho 26 Oct '20

26 Oct '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v5: Revert a small change. --- dlls/winegstreamer/media_source.c | 125 ++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..3371585328d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,43 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + 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); + const gchar *stream_type; + + if (!source_caps) + return E_FAIL; + + stream_type = gst_structure_get_name(gst_caps_get_structure(source_caps, 0)); + gst_caps_unref(source_caps); + + if (!strcmp(stream_type, "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + if (!gst_element_link(videoconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(videoconvert); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + } + + if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK) + return E_FAIL; + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +451,8 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + if (FAILED(hr = media_stream_connect_to_sink(object))) + goto fail; gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +472,88 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + const gchar *major_type; + unsigned int i; HRESULT hr; - stream_type = mf_media_type_from_caps(current_caps); - gst_caps_unref(current_caps); - if (!stream_type) - return E_FAIL; + major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0)); + + if (!strcmp(major_type, "video/x-raw")) + { + /* These are the most common native output types of decoders: + https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-… */ + static const GUID *const video_types[] = + { + &MFVideoFormat_NV12, + &MFVideoFormat_YV12, + &MFVideoFormat_YUY2, + &MFVideoFormat_IYUV, + &MFVideoFormat_I420, + }; - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); + IMFMediaType *base_type = mf_media_type_from_caps(current_caps); + GUID base_subtype; - IMFMediaType_Release(stream_type); + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - if (FAILED(hr)) - return hr; + stream_types = heap_alloc( sizeof(IMFMediaType *) * ARRAY_SIZE(video_types) + 1); - if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; + stream_types[0] = base_type; + type_count = 1; - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); + for (i = 0; i < ARRAY_SIZE(video_types); i++) + { + IMFMediaType *new_type; - IMFMediaTypeHandler_Release(type_handler); + if (IsEqualGUID(&base_subtype, video_types[i])) + continue; + if (FAILED(hr = MFCreateMediaType(&new_type))) + goto done; + stream_types[type_count++] = new_type; + + if (FAILED(hr = IMFMediaType_CopyAllItems(base_type, (IMFAttributes *) new_type))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(new_type, &MF_MT_SUBTYPE, video_types[i]))) + goto done; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } + + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); + return E_FAIL; + } + + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + gst_caps_unref(current_caps); + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; } -- 2.28.0

3 2

[PATCH resend 1/2] ntdll: Allow renaming a file/directory to a different capitalization of itself.
by Gabriel Ivăncescu 26 Oct '20

26 Oct '20

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ntdll/unix/file.c | 48 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index afb552b..639ea6c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4326,9 +4326,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, if (len >= sizeof(FILE_RENAME_INFORMATION)) { FILE_RENAME_INFORMATION *info = ptr; + char *unix_name, *src_unix; UNICODE_STRING name_str; OBJECT_ATTRIBUTES attr; - char *unix_name; + size_t unix_name_len; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4343,13 +4344,56 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, if (io->u.Status != STATUS_SUCCESS && io->u.Status != STATUS_NO_SUCH_FILE) break; + unix_name_len = strlen(unix_name); + + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly. */ + if (io->u.Status != STATUS_NO_SUCH_FILE && !server_get_unix_name(handle, &src_unix)) + { + char *name = realpath(unix_name, NULL); + + if (name && !strcmp(name, src_unix)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + char *tmp; + INT maxsz; + + for (pathlen = name_str.Length / sizeof(WCHAR); pathlen; pathlen--) + if (name_str.Buffer[pathlen - 1] == '\\') + break; + + nt_filename = name_str.Buffer + pathlen; + nt_filename_len = name_str.Length / sizeof(WCHAR) - pathlen; + + /* Build it from path + filename (the latter converted from nt_filename) */ + for (pathlen = unix_name_len; pathlen; pathlen--) + if (unix_name[pathlen - 1] == '/') + break; + + tmp = unix_name; + maxsz = pathlen + nt_filename_len * 3 + 1; + if (unix_name_len + 1 < maxsz) tmp = realloc(tmp, maxsz); + if (tmp) + { + unix_name = tmp; + unix_name_len = pathlen; + unix_name_len += ntdll_wcstoumbs(nt_filename, nt_filename_len, + unix_name + pathlen, maxsz - pathlen, TRUE); + unix_name[unix_name_len] = '\0'; + } + } + free(src_unix); + free(name); + } + SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->link = FALSE; req->replace = info->ReplaceIfExists; - wine_server_add_data( req, unix_name, strlen(unix_name) ); + wine_server_add_data( req, unix_name, unix_name_len ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; -- 2.21.0

2 6

[PATCH 3/3] d2d1: Implement D2D1Vec3Length().
by Henri Verbeet 26 Oct '20

26 Oct '20

From: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Minor style fixes. dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 27 ++++++++++++++++++++++++++- include/d2d1_1.idl | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 7b624c7096e..0ae894109fb 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -8,4 +8,4 @@ @ stub D2D1CreateDeviceContext @ stdcall D2D1SinCos(float ptr ptr) @ stdcall D2D1Tan(float) -@ stub D2D1Vec3Length +@ stdcall D2D1Vec3Length(float float float) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9c5337590cd..6b6eab766c7 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -728,6 +728,13 @@ float WINAPI D2D1Tan(float angle) return tanf(angle); } +float WINAPI D2D1Vec3Length(float x, float y, float z) +{ + TRACE("x %.8e, y %.8e, z %.8e.\n", x, y, z); + + return sqrtf(x * x + y * y + z * z); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b269770365f..d571cfe8d15 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9427,8 +9427,8 @@ static void test_wic_bitmap_format(void) static void test_math(void) { + float s, c, t, l; unsigned int i; - float s, c, t; static const struct { @@ -9459,6 +9459,24 @@ static void test_math(void) {M_PI, 8.74227766e-008f}, }; + static const struct + { + float x; + float y; + float z; + float l; + } + l_data[] = + { + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 1.0f, 1.0f, 1.73205078f}, + {1.0f, 2.0f, 2.0f, 3.0f}, + {1.0f, 2.0f, 3.0f, 3.74165750f}, + }; + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) { D2D1SinCos(sc_data[i].x, &s, &c); @@ -9474,6 +9492,13 @@ static void test_math(void) ok(compare_float(t, t_data[i].t, 1), "Test %u: Got unexpected tan %.8e, expected %.8e.\n", i, t, t_data[i].t); } + + for (i = 0; i < ARRAY_SIZE(l_data); ++i) + { + l = D2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); + ok(compare_float(l, l_data[i].l, 0), + "Test %u: Got unexpected length %.8e, expected %.8e.\n", i, l, l_data[i].l); + } } START_TEST(d2d1) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index bd111bd6628..6eab3959cd1 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -796,3 +796,4 @@ interface ID2D1Factory1 : ID2D1Factory const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); [local] void __stdcall D2D1SinCos(float angle, float *s, float *c); [local] float __stdcall D2D1Tan(float angle); +[local] float __stdcall D2D1Vec3Length(float x, float y, float z); -- 2.20.1

2 1

[PATCH 1/3] d2d1: Implement D2D1SinCos().
by Henri Verbeet 26 Oct '20

26 Oct '20

From: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Minor style fixes. dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 8 ++++++++ dlls/d2d1/tests/d2d1.c | 31 +++++++++++++++++++++++++++++++ include/d2d1_1.idl | 1 + 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..410abfa5de6 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos +@ stdcall D2D1SinCos(float ptr ptr) @ stub D2D1Tan @ stub D2D1Vec3Length diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..943347d7884 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,14 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(float angle, float *s, float *c) +{ + TRACE("angle %.8e, s %p, c %p.\n", angle, s, c); + + *s = sinf(angle); + *c = cosf(angle); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 166cdfccda6..df1df01c051 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,36 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static void test_math(void) +{ + unsigned int i; + float s, c; + + static const struct + { + float x; + float s; + float c; + } + sc_data[] = + { + {0.0f, 0.0f, 1.0f}, + {1.0f, 8.41470957e-001f, 5.40302277e-001f}, + {2.0f, 9.09297407e-001f, -4.16146845e-001f}, + {M_PI / 2.0f, 1.0f, -4.37113883e-008f}, + {M_PI, -8.74227766e-008f, -1.0f}, + }; + + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) + { + D2D1SinCos(sc_data[i].x, &s, &c); + ok(compare_float(s, sc_data[i].s, 0), + "Test %u: Got unexpected sin %.8e, expected %.8e.\n", i, s, sc_data[i].s); + ok(compare_float(c, sc_data[i].c, 0), + "Test %u: Got unexpected cos %.8e, expected %.8e.\n", i, c, sc_data[i].c); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9507,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..6fa893edbda 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,4 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(float angle, float *s, float *c); -- 2.20.1

2 1

[PATCH 1/5] quartz/vmr9: Don't expose IVMRFilterConfig9 from the VMR7.
by Gijs Vermeulen 26 Oct '20

26 Oct '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d7eafe53be8..9c70926330e 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -253,7 +253,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVMRAspectRatioControl9, FALSE); check_interface(filter, &IID_IVMRDeinterlaceControl9, FALSE); - todo_wine check_interface(filter, &IID_IVMRFilterConfig9, FALSE); + check_interface(filter, &IID_IVMRFilterConfig9, FALSE); check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5f95f547e33..aa4187404c6 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -605,7 +605,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMFilterMiscFlags_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig)) *out = &filter->IVMRFilterConfig_iface; - else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9)) + else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) *out = &filter->IVMRFilterConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRMixerBitmap9) && is_vmr9(filter)) *out = &filter->IVMRMixerBitmap9_iface; -- 2.29.1

3 14

[PATCH 1/3] evr/mixer: Add IMFClockStateSink stub.
by Nikolay Sivov 26 Oct '20

26 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ 2 files changed, 86 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 59d75c0476b..20b5e3b2bba 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -74,6 +74,7 @@ struct video_mixer IMFVideoProcessor IMFVideoProcessor_iface; IMFAttributes IMFAttributes_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IMFClockStateSink IMFClockStateSink_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -153,6 +154,11 @@ static struct video_mixer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFQualityAdvise_iface); } +static struct video_mixer *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFClockStateSink_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -251,6 +257,10 @@ static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID r { *obj = &mixer->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &mixer->IMFClockStateSink_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -2181,6 +2191,77 @@ static const IMFQualityAdviseVtbl video_mixer_quality_advise_vtbl = video_mixer_quality_advise_DropTime, }; +static HRESULT WINAPI video_mixer_clock_state_sink_QueryInterface(IMFClockStateSink *iface, + REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, out); +} + +static ULONG WINAPI video_mixer_clock_state_sink_AddRef(IMFClockStateSink *iface) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_clock_state_sink_Release(IMFClockStateSink *iface) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockStart(IMFClockStateSink *iface, + MFTIME systime, LONGLONG offset) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockStop(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockPause(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockRestart(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockSetRate(IMFClockStateSink *iface, + MFTIME systime, float rate) +{ + FIXME("%p, %f.\n", iface, rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl video_mixer_clock_state_sink_vtbl = +{ + video_mixer_clock_state_sink_QueryInterface, + video_mixer_clock_state_sink_AddRef, + video_mixer_clock_state_sink_Release, + video_mixer_clock_state_sink_OnClockStart, + video_mixer_clock_state_sink_OnClockStop, + video_mixer_clock_state_sink_OnClockPause, + video_mixer_clock_state_sink_OnClockRestart, + video_mixer_clock_state_sink_OnClockSetRate, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -2212,6 +2293,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->IMFAttributes_iface.lpVtbl = &video_mixer_attributes_vtbl; object->IMFQualityAdvise_iface.lpVtbl = &video_mixer_quality_advise_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &video_mixer_clock_state_sink_vtbl; object->IUnknown_inner.lpVtbl = &video_mixer_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 0158a0320a7..8c82ae34f8d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -465,6 +465,10 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFClockStateSink, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); -- 2.28.0

1 2

[PATCH] include: Add INetworkEvents and some enums to netlistmgr.idl.
by Gijs Vermeulen 26 Oct '20

26 Oct '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/netlistmgr.idl | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index e098f7225ab..d12b4a5f4b7 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -27,10 +27,26 @@ interface IEnumNetworks; interface IEnumNetworkConnections; interface INetwork; interface INetworkConnection; +interface INetworkConnectionEvents; interface INetworkCostManager; +interface INetworkEvents; interface INetworkListManager; interface INetworkListManagerEvents; +typedef [v1_enum] enum NLM_NETWORK_CLASS +{ + NLM_NETWORK_IDENTIFYING = 0x01, + NLM_NETWORK_IDENTIFIED = 0x02, + NLM_NETWORK_UNIDENTIFIED = 0x03 +} NLM_NETWORK_CLASS; + +typedef [v1_enum] enum NLM_INTERNET_CONNECTIVITY +{ + NLM_INTERNET_CONNECTIVITY_WEBHIJACK = 0x01, + NLM_INTERNET_CONNECTIVITY_PROXIED = 0x02, + NLM_INTERNET_CONNECTIVITY_CORPORATE = 0x04 +} NLM_INTERNET_CONNECTIVITY; + typedef [v1_enum] enum NLM_CONNECTIVITY { NLM_CONNECTIVITY_DISCONNECTED = 0x0000, @@ -390,3 +406,35 @@ interface INetwork : IDispatch HRESULT SetCategory( [in] NLM_NETWORK_CATEGORY NewCategory); } + +[ + object, + oleautomation, + pointer_default(unique), + uuid(dcb00004-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkEvents : IUnknown +{ + typedef enum NLM_NETWORK_PROPERTY_CHANGE + { + NLM_NETWORK_PROPERTY_CHANGE_CONNECTION = 0x01, + NLM_NETWORK_PROPERTY_CHANGE_DESCRIPTION = 0x02, + NLM_NETWORK_PROPERTY_CHANGE_NAME = 0x04, + NLM_NETWORK_PROPERTY_CHANGE_ICON = 0x08, + NLM_NETWORK_PROPERTY_CHANGE_CATEGORY_VALUE = 0x10 + } NLM_NETWORK_PROPERTY_CHANGE; + + HRESULT NetworkAdded ( + [in] GUID networkId); + + HRESULT NetworkDeleted ( + [in] GUID networkId); + + HRESULT NetworkConnectivityChanged ( + [in] GUID networkId, + [in] NLM_CONNECTIVITY newConnectivity); + + HRESULT NetworkPropertyChanged( + [in] GUID networkId, + [in] NLM_NETWORK_PROPERTY_CHANGE flags); +} -- 2.29.1

1 0

[PATCH 5/5] riched20: Use row ptrs in the cursor to co-ordinates function.
by Huw Davies 26 Oct '20

26 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 24 +++++++++++------------- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 49ae1b2769a..834f9fd3afe 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -218,31 +218,29 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to) } -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height) +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, + int *x, int *y, int *height ) { - ME_DisplayItem *row; - ME_Run *run = &pCursor->pRun->member.run; - ME_Paragraph *para = &pCursor->pPara->member.para; + ME_Row *row; + ME_Run *run = &cursor->pRun->member.run; + ME_Paragraph *para = &cursor->pPara->member.para; ME_Run *size_run = run, *prev; ME_Context c; int run_x; - assert(height && x && y); assert(~para->nFlags & MEPF_REWRAP); - row = ME_FindItemBack( run_get_di( run ), diStartRowOrParagraph ); - assert(row && row->type == diStartRow); + row = row_from_cursor( cursor ); ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - if (!pCursor->nOffset && (prev = run_prev( run ))) size_run = prev; + if (!cursor->nOffset && (prev = run_prev( run ))) size_run = prev; - run_x = ME_PointFromCharContext( &c, run, pCursor->nOffset, TRUE ); + run_x = ME_PointFromCharContext( &c, run, cursor->nOffset, TRUE ); *height = size_run->nAscent + size_run->nDescent; *x = c.rcView.left + run->pt.x + run_x - editor->horz_si.nPos; - *y = c.rcView.top + para->pt.y + row->member.row.nBaseline + *y = c.rcView.top + para->pt.y + row->nBaseline + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); return; @@ -252,7 +250,7 @@ void create_caret(ME_TextEditor *editor) { int x, y, height; - ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + cursor_coords( editor, &editor->pCursors[0], &x, &y, &height ); ITextHost_TxCreateCaret(editor->texthost, NULL, 0, height); editor->caret_height = height; editor->caret_hidden = TRUE; @@ -281,7 +279,7 @@ void update_caret(ME_TextEditor *editor) if (!editor->bHaveFocus) return; if (!ME_IsSelection(editor)) { - ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + cursor_coords( editor, &editor->pCursors[0], &x, &y, &height ); if (height != editor->caret_height) create_caret(editor); x = min(x, editor->rcFormat.right-1); ITextHost_TxSetCaretPos(editor->texthost, x, y); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e197e3e9a9b..f4484f57d39 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -164,6 +164,7 @@ static inline ME_DisplayItem *run_get_di( ME_Run *run ) } /* caret.c */ +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, int *x, int *y, int *height ) DECLSPEC_HIDDEN; void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; @@ -192,7 +193,6 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) DECLSPEC_HIDDEN; /* context.c */ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 2f2e5e09d1f..21b63911954 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2734,11 +2734,11 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) { case tomStart: cursor_from_char_ofs( editor, This->start, &cursor ); - ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + cursor_coords( editor, &cursor, &x, &y, &height ); break; case tomEnd: cursor_from_char_ofs( editor, This->end, &cursor ); - ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + cursor_coords( editor, &cursor, &x, &y, &height ); break; default: FIXME("bStart value %d not handled\n", value); -- 2.23.0

1 0

[PATCH 4/5] riched20: Use row helpers for Home/End key handling.
by Huw Davies 26 Oct '20

26 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 650c065dbe0..49ae1b2769a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1375,19 +1375,11 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) assert(pCursor->pRun->type == diRun); } -static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowHome( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); - if (pRow) { - ME_DisplayItem *pRun; - - pRun = ME_FindItemFwd(pRow, diRun); - if (pRun) { - pCursor->pRun = pRun; - assert(pCursor->pPara == ME_GetParagraph(pRun)); - pCursor->nOffset = 0; - } - } + ME_Row *row = row_from_cursor( cursor ); + + row_first_cursor( row, cursor ); } static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) @@ -1395,14 +1387,11 @@ static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) ME_SetCursorToStart(editor, pCursor); } -static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowEnd( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pRow; + ME_Row *row = row_from_cursor( cursor ); - pRow = ME_FindItemFwd(pCursor->pRun, diStartRowOrParagraphOrEnd); - assert(pRow); - pCursor->pRun = ME_FindItemBack(pRow, diRun); - pCursor->nOffset = (pRow->type == diStartRow) ? pCursor->pRun->member.run.len : 0; + row_end_cursor( row, cursor, FALSE ); } static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) -- 2.23.0

1 0

[PATCH 3/5] riched20: Use row and para helpers for the selection function.
by Huw Davies 26 Oct '20

26 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 38 ++++++++++++++------------------------ dlls/riched20/editor.h | 3 +++ dlls/riched20/row.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5af4cd04d55..650c065dbe0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -818,38 +818,28 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) editor->pCursors[1] = editor->pCursors[0]; ME_MoveCursorWords(editor, &editor->pCursors[1], -1); break; - case stLine: case stParagraph: - { - ME_DisplayItem *pItem; - ME_DIType fwdSearchType, backSearchType; - if (selectionType == stParagraph) { - backSearchType = diParagraph; - fwdSearchType = diParagraphOrEnd; - } else { - backSearchType = diStartRow; - fwdSearchType = diStartRowOrParagraphOrEnd; - } - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, fwdSearchType); - assert(pItem); - if (pItem->type == diTextEnd) - editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); - editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; - pItem = ME_FindItemBack(pItem, backSearchType); - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); + editor->pCursors[0].pPara = para_get_di( editor->pCursors[0].pRun->member.run.para ); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; break; + case stLine: + { + ME_Row *row = row_from_cursor( editor->pCursors ); + + row_first_cursor( row, editor->pCursors + 1 ); + row_end_cursor( row, editor->pCursors, TRUE ); + break; } case stDocument: /* Select everything with cursor anchored from the start of the text */ - editor->nSelectionType = stDocument; ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); + ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); break; default: assert(0); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7025ddceea7..e197e3e9a9b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -111,7 +111,10 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; /* row.c */ +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) DECLSPEC_HIDDEN; +void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index ce8de935a19..ba082244cfc 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -53,6 +53,35 @@ ME_Run *row_next_run( ME_Row *row, ME_Run *run ) return &item->member.run; } +ME_Row *row_from_cursor( ME_Cursor *cursor ) +{ + ME_DisplayItem *item; + + item = ME_FindItemBack( cursor->pRun, diStartRow ); + return &item->member.row; +} + +void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diRun ); + cursor->pRun = item; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = 0; +} + +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) +{ + ME_DisplayItem *item, *run; + + item = ME_FindItemFwd( row_get_di( row ), diStartRowOrParagraphOrEnd ); + run = ME_FindItemBack( item, diRun ); + cursor->pRun = run; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->pRun->member.run.len : 0; +} + /* I'm sure these functions would simplify some code in caret ops etc, * I just didn't remember them when I wrote that code */ -- 2.23.0

1 0