May 2022 - Wine-Commits - list.winehq.org

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder quality control.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: fb0f6b4be46032e2e38a804822eaccb772e5d9bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb0f6b4be46032e2e38a8048… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue May 17 12:04:19 2022 +0700 quartz/tests: Add tests for MPEG audio decoder quality control. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 223 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb0f6b4be46032e2e38a…

1 0

Anton Baskanov : winegstreamer: Implement IQualityControl in MPEG audio decoder.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: ea81a48259804c2ed0aa74d98e1362e5ad7f76ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea81a48259804c2ed0aa74d9… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 13 11:37:23 2022 +0700 winegstreamer: Implement IQualityControl in MPEG audio decoder. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 4 +- dlls/winegstreamer/quartz_transform.c | 127 ++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 48322d019a8..d3d5c3d76f0 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -242,7 +242,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); check_interface(pin, &IID_IUnknown, TRUE); check_interface(pin, &IID_IMediaPosition, FALSE); @@ -255,7 +255,7 @@ static void test_interfaces(void) check_interface(pin, &IID_IPin, TRUE); check_interface(pin, &IID_IMediaPosition, TRUE); check_interface(pin, &IID_IMediaSeeking, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); check_interface(pin, &IID_IUnknown, TRUE); check_interface(pin, &IID_IAsyncReader, FALSE); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 7fa18aa7673..7986997abef 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -35,6 +35,10 @@ struct transform struct strmbase_source source; struct strmbase_passthrough passthrough; + IQualityControl sink_IQualityControl_iface; + IQualityControl source_IQualityControl_iface; + IQualityControl *qc_sink; + struct wg_transform *transform; const struct transform_ops *ops; @@ -272,6 +276,8 @@ static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID i if (IsEqualGUID(iid, &IID_IMemInputPin)) *out = &filter->sink.IMemInputPin_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &filter->sink_IQualityControl_iface; else return E_NOINTERFACE; @@ -419,6 +425,8 @@ static HRESULT transform_source_query_interface(struct strmbase_pin *pin, REFIID *out = &filter->passthrough.IMediaPosition_iface; else if (IsEqualGUID(iid, &IID_IMediaSeeking)) *out = &filter->passthrough.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &filter->source_IQualityControl_iface; else return E_NOINTERFACE; @@ -443,6 +451,122 @@ static const struct strmbase_source_ops source_ops = .pfnDecideBufferSize = transform_source_DecideBufferSize, }; +static struct transform *impl_from_sink_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, struct transform, sink_IQualityControl_iface); +} + +static HRESULT WINAPI sink_quality_control_QueryInterface(IQualityControl *iface, REFIID iid, void **out) +{ + struct transform *filter = impl_from_sink_IQualityControl(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI sink_quality_control_AddRef(IQualityControl *iface) +{ + struct transform *filter = impl_from_sink_IQualityControl(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI sink_quality_control_Release(IQualityControl *iface) +{ + struct transform *filter = impl_from_sink_IQualityControl(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +static HRESULT WINAPI sink_quality_control_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) +{ + struct transform *filter = impl_from_sink_IQualityControl(iface); + + TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n", + filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + return S_OK; +} + +static HRESULT WINAPI sink_quality_control_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + struct transform *filter = impl_from_sink_IQualityControl(iface); + + TRACE("filter %p, sink %p.\n", filter, sink); + + filter->qc_sink = sink; + + return S_OK; +} + +static const IQualityControlVtbl sink_quality_control_vtbl = +{ + sink_quality_control_QueryInterface, + sink_quality_control_AddRef, + sink_quality_control_Release, + sink_quality_control_Notify, + sink_quality_control_SetSink, +}; + +static struct transform *impl_from_source_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, struct transform, source_IQualityControl_iface); +} + +static HRESULT WINAPI source_quality_control_QueryInterface(IQualityControl *iface, REFIID iid, void **out) +{ + struct transform *filter = impl_from_source_IQualityControl(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI source_quality_control_AddRef(IQualityControl *iface) +{ + struct transform *filter = impl_from_source_IQualityControl(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI source_quality_control_Release(IQualityControl *iface) +{ + struct transform *filter = impl_from_source_IQualityControl(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +static HRESULT WINAPI source_quality_control_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) +{ + struct transform *filter = impl_from_source_IQualityControl(iface); + IQualityControl *peer; + HRESULT hr = VFW_E_NOT_FOUND; + + TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n", + filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + if (filter->qc_sink) + return IQualityControl_Notify(filter->qc_sink, &filter->filter.IBaseFilter_iface, q); + + if (filter->sink.pin.peer + && SUCCEEDED(IPin_QueryInterface(filter->sink.pin.peer, &IID_IQualityControl, (void **)&peer))) + { + hr = IQualityControl_Notify(peer, &filter->filter.IBaseFilter_iface, q); + IQualityControl_Release(peer); + } + + return hr; +} + +static HRESULT WINAPI source_quality_control_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + struct transform *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sink %p.\n", filter, sink); + + return S_OK; +} + +static const IQualityControlVtbl source_quality_control_vtbl = +{ + source_quality_control_QueryInterface, + source_quality_control_AddRef, + source_quality_control_Release, + source_quality_control_Notify, + source_quality_control_SetSink, +}; + static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, const struct transform_ops *ops, struct transform **out) { struct transform *object; @@ -459,6 +583,9 @@ static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, const struc ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, &object->sink.pin.IPin_iface); + object->sink_IQualityControl_iface.lpVtbl = &sink_quality_control_vtbl; + object->source_IQualityControl_iface.lpVtbl = &source_quality_control_vtbl; + object->ops = ops; *out = object;

1 0

Anton Baskanov : winegstreamer: Add seeking passthrough to MPEG audio decoder.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 16d93a32e3dcf5013dce8d6f2fbade8c8c0a4c53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16d93a32e3dcf5013dce8d6f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 13 11:30:41 2022 +0700 winegstreamer: Add seeking passthrough to MPEG audio decoder. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 4 ++-- dlls/winegstreamer/Makefile.in | 2 +- dlls/winegstreamer/quartz_transform.c | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 48f5517336c..48322d019a8 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -253,8 +253,8 @@ static void test_interfaces(void) IBaseFilter_FindPin(filter, L"Out", &pin); check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); - todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); todo_wine check_interface(pin, &IID_IQualityControl, TRUE); check_interface(pin, &IID_IUnknown, TRUE); diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 00b7c72a5f3..e4c2636d02d 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,7 +1,7 @@ MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so IMPORTLIB = winegstreamer -IMPORTS = strmbase ole32 msdmo +IMPORTS = strmbase ole32 oleaut32 msdmo DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 447f331d474..7fa18aa7673 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -33,6 +33,7 @@ struct transform struct strmbase_sink sink; struct strmbase_source source; + struct strmbase_passthrough passthrough; struct wg_transform *transform; @@ -66,6 +67,7 @@ static void transform_destroy(struct strmbase_filter *iface) { struct transform *filter = impl_from_strmbase_filter(iface); + strmbase_passthrough_cleanup(&filter->passthrough); strmbase_source_cleanup(&filter->source); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); @@ -409,6 +411,21 @@ static HRESULT transform_source_get_media_type(struct strmbase_pin *pin, unsigne return filter->ops->source_get_media_type(filter, index, mt); } +static HRESULT transform_source_query_interface(struct strmbase_pin *pin, REFIID iid, void **out) +{ + struct transform *filter = impl_from_strmbase_filter(pin->filter); + + if (IsEqualGUID(iid, &IID_IMediaPosition)) + *out = &filter->passthrough.IMediaPosition_iface; + else if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &filter->passthrough.IMediaSeeking_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static HRESULT WINAPI transform_source_DecideBufferSize(struct strmbase_source *pin, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { struct transform *filter = impl_from_strmbase_filter(pin->pin.filter); @@ -420,6 +437,7 @@ static const struct strmbase_source_ops source_ops = { .base.pin_query_accept = transform_source_query_accept, .base.pin_get_media_type = transform_source_get_media_type, + .base.pin_query_interface = transform_source_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnDecideBufferSize = transform_source_DecideBufferSize, @@ -437,6 +455,10 @@ static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, const struc strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); + ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, + &object->sink.pin.IPin_iface); + object->ops = ops; *out = object;

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder streaming events.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 32a72b3e78b6e258eba4a325d3d750f5311921c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32a72b3e78b6e258eba4a325… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 12 14:35:15 2022 +0700 quartz/tests: Add tests for MPEG audio decoder streaming events. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 131 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 48d879cf0f3..48f5517336c 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -795,7 +795,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *mt; - unsigned int got_sample; + unsigned int got_sample, got_new_segment, got_eos, got_begin_flush, got_end_flush; REFERENCE_TIME expected_start_time; REFERENCE_TIME expected_stop_time; }; @@ -898,12 +898,48 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample return S_OK; } +static HRESULT testsink_new_segment(struct strmbase_sink *iface, + REFERENCE_TIME start, REFERENCE_TIME stop, double rate) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_new_segment; + ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop)); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return S_OK; +} + +static HRESULT testsink_eos(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_eos; + return S_OK; +} + +static HRESULT testsink_begin_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_begin_flush; + return S_OK; +} + +static HRESULT testsink_end_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_end_flush; + return S_OK; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_get_media_type = testsink_get_media_type, .sink_connect = testsink_connect, .pfnReceive = testsink_Receive, + .sink_new_segment = testsink_new_segment, + .sink_eos = testsink_eos, + .sink_begin_flush = testsink_begin_flush, + .sink_end_flush = testsink_end_flush, }; static void testfilter_init(struct testfilter *filter) @@ -1175,6 +1211,98 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, IMemAllocator_Release(allocator); } +static void test_streaming_events(IMediaControl *control, IPin *sink, + IMemInputPin *input, struct testfilter *testsink) +{ + REFERENCE_TIME start, stop; + IMemAllocator *allocator; + IMediaSample *sample; + HRESULT hr; + BYTE *data; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + memset(data, 0, 48); + data[0] = 0xff; + data[1] = 0xff; + data[2] = 0x18; + data[3] = 0xc4; + hr = IMediaSample_SetActualDataLength(sample, 48); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + start = 0; + stop = 120000; + hr = IMediaSample_SetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(!testsink->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + hr = IPin_NewSegment(sink, 10000, 20000, 1.0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + + ok(!testsink->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!testsink->got_sample, "Got %u calls to Receive().\n", testsink->got_sample); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + testsink->got_eos = 0; + + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + + testsink->expected_start_time = 0; + testsink->expected_stop_time = 120000; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_sample >= 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + hr = IPin_BeginFlush(sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_begin_flush == 1, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IPin_EndOfStream(sink); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + ok(!testsink->got_end_flush, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + hr = IPin_EndFlush(sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_end_flush == 1, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + + testsink->expected_start_time = 0; + testsink->expected_stop_time = 120000; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_sample >= 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); +} + static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_audio_codec(); @@ -1369,6 +1497,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); test_sample_processing(control, meminput, &testsink); + test_streaming_events(control, sink, meminput, &testsink); hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Eric Pouech : winedbg: Simplify character output.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 66c3b8176b74dc933e21786010bb88b789baa6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=66c3b8176b74dc933e217860… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 20 17:03:27 2022 +0200 winedbg: Simplify character output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/memory.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 16d322cd82c..aa5c32b42f2 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -500,7 +500,6 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) case btInt: case btLong: if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; - if (size == 1) goto print_char; dbg_print_hex(size, val_int); break; case btUInt: @@ -513,17 +512,18 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) dbg_printf("%f", val_real); break; case btChar: - case btWChar: - /* sometimes WCHAR is defined as btChar with size = 2, so discrimate - * Ansi/Unicode based on size, not on basetype - */ if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; - print_char: - if ((size == 1 && isprint((char)val_int)) || - (size == 2 && val_int < 127 && isprint((char)val_int))) + if (size == 1 && isprint((char)val_int)) dbg_printf("'%c'", (char)val_int); else - dbg_printf("%d", (int)val_int); + dbg_print_hex(size, val_int); + break; + case btWChar: + if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; + if (size == 2 && iswprint((WCHAR)val_int)) + dbg_printf("L'%lc'", (WCHAR)val_int); + else + dbg_print_hex(size, val_int); break; case btBool: if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; @@ -549,11 +549,11 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) char buffer[1024]; if (!val_ptr) dbg_printf("0x0"); - else if (((bt == btChar || bt == btInt) && size64 == 1) || (bt == btUInt && size64 == 2)) + else if ((bt == btChar && size64 == 1) || (bt == btWChar && size64 == 2)) { if (memory_get_string(dbg_curr_process, val_ptr, sub_lvalue.in_debuggee, - size64 == 2, buffer, sizeof(buffer))) - dbg_printf("\"%s\"", buffer); + bt == btWChar, buffer, sizeof(buffer))) + dbg_printf("%s\"%s\"", bt == btWChar ? "L" : "", buffer); else dbg_printf("*** invalid address %p ***", val_ptr); break;

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: c24ca3409913d793afc5ac0e4756f70ed672df70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c24ca3409913d793afc5ac0e… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:22 2022 -0500 wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/surface.c | 7 ++----- dlls/wined3d/texture.c | 31 +++++++++++++-------------- dlls/wined3d/utils.c | 44 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 6 +++--- 6 files changed, 45 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c24ca3409913d793afc5…

1 0

Gabriel Ivăncescu : include: Add IDOMProgressEvent interface and dispinterface.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: efe39dc5d6bcb77da16ed0f9f439e0b7e8c089ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe39dc5d6bcb77da16ed0f9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 23 18:22:06 2022 +0300 include: Add IDOMProgressEvent interface and dispinterface. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 12 +++++++++++ include/mshtml.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 31e75709db6..f56fc4d6f83 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -141,6 +141,12 @@ #define DISPID_DOMSTORAGEEVENT (DISPID_DOMMESSAGEEVENT+25) #define DISPID_DOMBEFOREUNLOADEVENT (DISPID_DOMSTORAGEEVENT+25) #define DISPID_DOMDRAGEVENT (DISPID_DOMBEFOREUNLOADEVENT+25) +#define DISPID_DOMMSPOINTEREVENT (DISPID_DOMDRAGEVENT+25) +#define DISPID_DOMMSGESTUREEVENT (DISPID_DOMMSPOINTEREVENT+25) +#define DISPID_DOMMSTRANSITIONEVENT (DISPID_DOMMSGESTUREEVENT+25) +#define DISPID_DOMMSANIMATIONEVENT (DISPID_DOMMSTRANSITIONEVENT+25) +#define DISPID_DOMMSMANIPULATIONEVENT (DISPID_DOMMSANIMATIONEVENT+25) +#define DISPID_DOMPROGRESSEVENT (DISPID_DOMMSMANIPULATIONEVENT+25) #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST @@ -4704,6 +4710,12 @@ #define DISPID_IDOMMESSAGEEVENT_SOURCE DISPID_DOMMESSAGEEVENT+3 #define DISPID_IDOMMESSAGEEVENT_INITMESSAGEEVENT DISPID_DOMMESSAGEEVENT+4 +/* IDOMProgressEvent */ +#define DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE DISPID_DOMPROGRESSEVENT+1 +#define DISPID_IDOMPROGRESSEVENT_LOADED DISPID_DOMPROGRESSEVENT+2 +#define DISPID_IDOMPROGRESSEVENT_TOTAL DISPID_DOMPROGRESSEVENT+3 +#define DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT DISPID_DOMPROGRESSEVENT+4 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 162a9691fb6..afeb44213d2 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28495,6 +28495,68 @@ methods: [in] IHTMLWindow2 *source); } +/***************************************************************************** + * IDOMProgressEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051071e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMProgressEvent : IDispatch +{ + [propget, id(DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE)] + HRESULT lengthComputable([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMPROGRESSEVENT_LOADED)] + HRESULT loaded([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IDOMPROGRESSEVENT_TOTAL)] + HRESULT total([out, retval] ULONGLONG *p); + + [id(DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT)] + HRESULT initProgressEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT_BOOL lengthComputableArg, + [in] ULONGLONG loadedArg, + [in] ULONGLONG totalArg); +}; + +/***************************************************************************** + * DispDOMProgressEvent dispinterface + */ +[ + hidden, + uuid(30590091-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMProgressEvent +{ +properties: +methods: + WINE_IDOMEVENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE)] + VARIANT_BOOL lengthComputable(); + + [propget, id(DISPID_IDOMPROGRESSEVENT_LOADED)] + ULONGLONG loaded(); + + [propget, id(DISPID_IDOMPROGRESSEVENT_TOTAL)] + ULONGLONG total(); + + [id(DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT)] + void initProgressEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT_BOOL lengthComputableArg, + [in] ULONGLONG loadedArg, + [in] ULONGLONG totalArg); +}; + /***************************************************************************** * IHTMLNamespaceCollection interface */

1 0

Chip Davis : wined3d: Rename format flags to caps.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 06b19322187e5ef8ffc06504c322ce9bcdaaa6ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=06b19322187e5ef8ffc06504… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:26 2022 -0500 wined3d: Rename format flags to caps. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 10 +- dlls/wined3d/device.c | 3 +- dlls/wined3d/directx.c | 51 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/resource.c | 10 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 6 +- dlls/wined3d/texture.c | 28 +- dlls/wined3d/utils.c | 606 +++++++++++++++++++-------------------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 48 ++-- 13 files changed, 387 insertions(+), 385 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06b19322187e5ef8ffc0…

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 16bfa3b6d2fea8b2931c22fd2b7e6dc336504e36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16bfa3b6d2fea8b2931c22fd… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:20 2022 -0500 wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/device.c | 7 +-- dlls/wined3d/resource.c | 9 ++-- dlls/wined3d/surface.c | 11 ++-- dlls/wined3d/texture.c | 8 +-- dlls/wined3d/utils.c | 115 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 6 +-- 6 files changed, 93 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=16bfa3b6d2fea8b2931c…

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: ea4de99fad4f35f33201965abe5336a416d88c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4de99fad4f35f33201965a… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:25 2022 -0500 wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/device.c | 4 +-- dlls/wined3d/utils.c | 55 +++++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 72c5167131a..33ae584f817 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4723,9 +4723,9 @@ static bool resources_format_compatible(const struct wined3d_resource *src_resou if (src_resource->device->cs->c.state->feature_level < WINED3D_FEATURE_LEVEL_10_1) return false; if ((src_resource->format_attrs & WINED3D_FORMAT_ATTR_BLOCKS) - && (dst_resource->format_flags & WINED3DFMT_FLAG_CAST_TO_BLOCK)) + && (dst_resource->format_attrs & WINED3D_FORMAT_ATTR_CAST_TO_BLOCK)) return src_resource->format->block_byte_count == dst_resource->format->byte_count; - if ((src_resource->format_flags & WINED3DFMT_FLAG_CAST_TO_BLOCK) + if ((src_resource->format_attrs & WINED3D_FORMAT_ATTR_CAST_TO_BLOCK) && (dst_resource->format_attrs & WINED3D_FORMAT_ATTR_BLOCKS)) return src_resource->format->byte_count == dst_resource->format->block_byte_count; return false; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9308848ce97..5b62ae0f542 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -328,42 +328,25 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_NVDB, WINED3D_FORMAT_ATTR_EXTENSION}, {WINED3DFMT_ATOC, WINED3D_FORMAT_ATTR_EXTENSION}, {WINED3DFMT_RESZ, WINED3D_FORMAT_ATTR_EXTENSION}, - {WINED3DFMT_R32G32B32A32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_UNORM, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_SNORM, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK | WINED3DFMT_FLAG_INDEX_BUFFER}, - {WINED3DFMT_R32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK, + WINED3DFMT_FLAG_INDEX_BUFFER}, + {WINED3DFMT_R32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, {WINED3DFMT_R16_UINT, 0, WINED3DFMT_FLAG_INDEX_BUFFER}, {WINED3DFMT_A8_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7145c0ca64b..3d9d19dd880 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6119,6 +6119,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3D_FORMAT_ATTR_BROKEN_PITCH 0x00000100 #define WINED3D_FORMAT_ATTR_HEIGHT_SCALE 0x00000200 #define WINED3D_FORMAT_ATTR_MAPPABLE 0x00000400 +#define WINED3D_FORMAT_ATTR_CAST_TO_BLOCK 0x00000800 /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 @@ -6137,7 +6138,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_BLIT 0x02000000 -#define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000 #define WINED3DFMT_FLAG_INDEX_BUFFER 0x10000000 struct wined3d_rational

1 0