January 2021 - wine-commits

Zebediah Figura : ndis.sys: Avoid including ntddndis.h directly.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: ac023acce9da337c3e3532b86c73ff9da4677681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac023acce9da337c3e3532b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 19:27:34 2021 -0600 ndis.sys: Avoid including ntddndis.h directly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50426 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 1 - dlls/ndis.sys/tests/ndis.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 358dc61dc72..94c19ffca53 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -32,7 +32,6 @@ #include "ws2ipdef.h" #include "iphlpapi.h" #include "netioapi.h" -#include "ntddndis.h" #include "ddk/wdm.h" #include "ddk/ndis.h" #include "winreg.h" diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index 679d29130c0..d6a2db0fd9d 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -22,7 +22,6 @@ #define WIN32_NO_STATUS #include <windows.h> #include <winioctl.h> -#include <ntddndis.h> #include <winsock2.h> #include <ws2ipdef.h> #include <iphlpapi.h>

1 0

Zebediah Figura : include: Include ntddndis.h in ndis.h.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: d23a474f91149acab7c335e9afd25dcb271a312d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d23a474f91149acab7c335e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 19:27:33 2021 -0600 include: Include ntddndis.h in ndis.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ndis.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index a4b0e540fa1..38eec8a7ac4 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -21,6 +21,8 @@ #ifndef _NDIS_ #define _NDIS_ +#include <ntddndis.h> + typedef ULONG NDIS_AF, *PNDIS_AF; typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; typedef void *NDIS_HANDLE, *PNDIS_HANDLE, *PNDIS_PACKET_POOL;

1 0

Zebediah Figura : winegstreamer: Make push_data() into a POSIX thread.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: ed3ed4d8abbea862c990c25c87143e86bf6be85d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed3ed4d8abbea862c990c25c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 16:18:47 2021 -0600 winegstreamer: Make push_data() into a POSIX thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e73693de939..a4d49c75a1b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -74,7 +74,7 @@ struct parser pthread_cond_t init_cond; bool no_more_pads, has_duration, error; - HANDLE push_thread; + pthread_t push_thread; HANDLE read_thread; pthread_cond_t read_cond, read_done_cond; @@ -823,7 +823,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer); -static DWORD CALLBACK push_data(LPVOID iface) +static void *push_data(void *iface) { struct parser *This = iface; GstBuffer *buffer; @@ -834,7 +834,7 @@ static DWORD CALLBACK push_data(LPVOID iface) if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL))) { GST_ERROR("Failed to allocate memory."); - return 0; + return NULL; } maxlen = This->stop ? This->stop : This->filesize; @@ -869,7 +869,7 @@ static DWORD CALLBACK push_data(LPVOID iface) GST_DEBUG("Stopping push thread."); - return 0; + return NULL; } static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -1426,16 +1426,22 @@ static gboolean activate_push(GstPad *pad, gboolean activate) TRACE("Deactivating\n"); IAsyncReader_BeginFlush(This->reader); if (This->push_thread) { - WaitForSingleObject(This->push_thread, -1); - CloseHandle(This->push_thread); - This->push_thread = NULL; + pthread_join(This->push_thread, NULL); + This->push_thread = 0; } IAsyncReader_EndFlush(This->reader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) { + int ret; + TRACE("Activating\n"); - This->push_thread = CreateThread(NULL, 0, push_data, This, 0, NULL); + if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) + { + GST_ERROR("Failed to create push thread: %s", strerror(errno)); + This->push_thread = 0; + return FALSE; + } } LeaveCriticalSection(&This->filter.filter_cs); return TRUE;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in push_data().
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: f7825f81b622bcc344de9f9994b6d485c8ded6e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7825f81b622bcc344de9f99… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 16:18:46 2021 -0600 winegstreamer: Avoid using Wine debug functions in push_data(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1701bf58194..e73693de939 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -829,15 +829,16 @@ static DWORD CALLBACK push_data(LPVOID iface) GstBuffer *buffer; LONGLONG maxlen; + GST_DEBUG("Starting push thread."); + if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL))) { - ERR("Failed to allocate memory.\n"); + GST_ERROR("Failed to allocate memory."); return 0; } maxlen = This->stop ? This->stop : This->filesize; - TRACE("Starting..\n"); for (;;) { ULONG len; int ret; @@ -848,7 +849,7 @@ static DWORD CALLBACK push_data(LPVOID iface) if ((ret = request_buffer_src(This->my_src, NULL, This->nextofs, len, &buffer)) < 0) { - ERR("Failed to read data, ret %s.\n", gst_flow_get_name(ret)); + GST_ERROR("Failed to read data, ret %s.", gst_flow_get_name(ret)); break; } @@ -857,7 +858,7 @@ static DWORD CALLBACK push_data(LPVOID iface) buffer->duration = buffer->pts = -1; if ((ret = gst_pad_push(This->my_src, buffer)) < 0) { - ERR("Failed to push data, ret %s.\n", gst_flow_get_name(ret)); + GST_ERROR("Failed to push data, ret %s.", gst_flow_get_name(ret)); break; } } @@ -866,7 +867,7 @@ static DWORD CALLBACK push_data(LPVOID iface) gst_pad_push_event(This->my_src, gst_event_new_eos()); - TRACE("Stopping.\n"); + GST_DEBUG("Stopping push thread."); return 0; }

1 0

Zebediah Figura : winegstreamer: Use request_buffer_src() in push_data().
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: b5f0b7901a1cc1e1c2a0013aaa7a85e2ee62ea48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f0b7901a1cc1e1c2a0013a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 16:18:45 2021 -0600 winegstreamer: Use request_buffer_src() in push_data(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9b47bf4f88c..1701bf58194 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -821,13 +821,13 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) return TRUE; } +static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer); + static DWORD CALLBACK push_data(LPVOID iface) { struct parser *This = iface; - GstMapInfo mapping; GstBuffer *buffer; LONGLONG maxlen; - HRESULT hr; if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL))) { @@ -835,8 +835,6 @@ static DWORD CALLBACK push_data(LPVOID iface) return 0; } - IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); - maxlen = This->stop ? This->stop : This->filesize; TRACE("Starting..\n"); @@ -848,42 +846,27 @@ static DWORD CALLBACK push_data(LPVOID iface) break; len = min(16384, maxlen - This->nextofs); - if (!gst_buffer_map_range(buffer, -1, len, &mapping, GST_MAP_WRITE)) - { - ERR("Failed to map buffer.\n"); - break; - } - hr = IAsyncReader_SyncRead(This->reader, This->nextofs, len, mapping.data); - gst_buffer_unmap(buffer, &mapping); - if (hr != S_OK) + if ((ret = request_buffer_src(This->my_src, NULL, This->nextofs, len, &buffer)) < 0) { - ERR("Failed to read data, hr %#x.\n", hr); + ERR("Failed to read data, ret %s.\n", gst_flow_get_name(ret)); break; } This->nextofs += len; buffer->duration = buffer->pts = -1; - ret = gst_pad_push(This->my_src, buffer); - if (ret >= 0) - hr = S_OK; - else - ERR("Sending returned: %i\n", ret); - if (ret == GST_FLOW_ERROR) - hr = E_FAIL; - else if (ret == GST_FLOW_FLUSHING) - hr = VFW_E_WRONG_STATE; - if (hr != S_OK) + if ((ret = gst_pad_push(This->my_src, buffer)) < 0) + { + ERR("Failed to push data, ret %s.\n", gst_flow_get_name(ret)); break; + } } gst_buffer_unref(buffer); gst_pad_push_event(This->my_src, gst_event_new_eos()); - TRACE("Stopping.. %08x\n", hr); - - IBaseFilter_Release(&This->filter.IBaseFilter_iface); + TRACE("Stopping.\n"); return 0; }

1 0

Zebediah Figura : winegstreamer: Use the "filesize" field in push_data().
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 4a4ac2730e84eda5b0c10eea5ce26418fc924615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a4ac2730e84eda5b0c10eea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 16:18:44 2021 -0600 winegstreamer: Use the "filesize" field in push_data(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5c6266f4bd0..9b47bf4f88c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -823,10 +823,10 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) static DWORD CALLBACK push_data(LPVOID iface) { - LONGLONG maxlen, curlen; struct parser *This = iface; GstMapInfo mapping; GstBuffer *buffer; + LONGLONG maxlen; HRESULT hr; if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL))) @@ -837,10 +837,7 @@ static DWORD CALLBACK push_data(LPVOID iface) IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); - if (!This->stop) - IAsyncReader_Length(This->reader, &maxlen, &curlen); - else - maxlen = This->stop; + maxlen = This->stop ? This->stop : This->filesize; TRACE("Starting..\n"); for (;;) {

1 0

Rémi Bernon : include: Add VoiceInformation runtimeclass to windows.media.speechsynthesis.idl.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 1bae17c29ed042e558d846b552406784c761cdb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bae17c29ed042e558d846b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 21:20:46 2021 +0100 include: Add VoiceInformation runtimeclass to windows.media.speechsynthesis.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechsynthesis.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index 7a1de5fcba6..71c51b74c0c 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -29,6 +29,7 @@ namespace Windows { typedef enum VoiceGender VoiceGender; interface IInstalledVoicesStatic; interface IVoiceInformation; + runtimeclass VoiceInformation; } } } @@ -42,6 +43,29 @@ namespace Windows { Male = 0, Female = 1 }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), + uuid(b127d6a4-1291-4604-aa9c-83134083352c) + ] + interface IVoiceInformation : IInspectable + { + [propget] HRESULT DisplayName([out] [retval] HSTRING* value); + [propget] HRESULT Id([out] [retval] HSTRING* value); + [propget] HRESULT Language([out] [retval] HSTRING* value); + [propget] HRESULT Description([out] [retval] HSTRING* value); + [propget] HRESULT Gender([out] [retval] VoiceGender* value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass VoiceInformation + { + [default] interface IVoiceInformation; + } } } }

1 0

Rémi Bernon : widl: Support WinRT runtimeclass type parsing.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: f46c077d5e87be363ba5c8cb82fc0ca531473499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46c077d5e87be363ba5c8cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 21:20:45 2021 +0100 widl: Support WinRT runtimeclass type parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 1 + tools/widl/header.c | 44 +++++++- tools/widl/header.h | 1 - tools/widl/parser.l | 1 + tools/widl/parser.y | 269 ++++++++++++++++++++++++++++--------------------- tools/widl/typegen.c | 4 + tools/widl/typelib.c | 1 + tools/widl/typetree.c | 19 ++++ tools/widl/typetree.h | 24 +++++ tools/widl/widltypes.h | 7 ++ 10 files changed, 256 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f46c077d5e87be363ba5…

1 0

Paul Gofman : windowscodecs: Return correct error codes from BmpFrameEncode_GetMetadataQueryWriter().
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 79d143973b6ff8ab75863aab82521f903bc32926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79d143973b6ff8ab75863aab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 27 20:33:51 2021 +0300 windowscodecs: Return correct error codes from BmpFrameEncode_GetMetadataQueryWriter(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 12 +++++++++--- dlls/windowscodecs/tests/metadata.c | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 30b1f361c98..e87d66a2e63 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -397,10 +397,16 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) } static HRESULT WINAPI BmpFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, - IWICMetadataQueryWriter **ppIMetadataQueryWriter) + IWICMetadataQueryWriter **query_writer) { - FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); - return E_NOTIMPL; + BmpFrameEncode *encoder = impl_from_IWICBitmapFrameEncode(iface); + + TRACE("iface %p, query_writer %p.\n", iface, query_writer); + + if (!encoder->initialized) + return WINCODEC_ERR_NOTINITIALIZED; + + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static const IWICBitmapFrameEncodeVtbl BmpFrameEncode_Vtbl = { diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index c1339e4bd1d..e6e46c389f9 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -3106,7 +3106,7 @@ static void test_metadata_writer(void) ok(hr == (tests[i].metadata_supported ? S_OK : E_INVALIDARG), "Got unexpected hr %#x, i %u.\n", hr, i); hr = IWICBitmapFrameEncode_GetMetadataQueryWriter(frameencode, &querywriter2); - todo_wine_if(!i) ok(hr == (tests[i].succeeds_unitialized ? S_OK : WINCODEC_ERR_NOTINITIALIZED), + ok(hr == (tests[i].succeeds_unitialized ? S_OK : WINCODEC_ERR_NOTINITIALIZED), "Got unexpected hr %#x, i %u.\n", hr, i); if (hr == S_OK) IWICMetadataQueryWriter_Release(querywriter2); @@ -3115,7 +3115,7 @@ static void test_metadata_writer(void) ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); hr = IWICBitmapFrameEncode_GetMetadataQueryWriter(frameencode, &querywriter2); - todo_wine_if(!i) ok(hr == (tests[i].metadata_supported ? S_OK : WINCODEC_ERR_UNSUPPORTEDOPERATION), + ok(hr == (tests[i].metadata_supported ? S_OK : WINCODEC_ERR_UNSUPPORTEDOPERATION), "Got unexpected hr %#x, i %u.\n", hr, i); if (tests[i].metadata_supported)

1 0

Paul Gofman : windowscodecs: Implement CommonEncoderFrame_GetMetadataQueryWriter().
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 7f88d691ad4824d10fff0fd47b60949ab7447856 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f88d691ad4824d10fff0fd4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 27 20:33:50 2021 +0300 windowscodecs: Implement CommonEncoderFrame_GetMetadataQueryWriter(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/encoder.c | 16 ++++++++++++++-- dlls/windowscodecs/gifformat.c | 13 +++++++++++-- dlls/windowscodecs/tests/metadata.c | 8 +++----- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c index e72ceb0735c..a213e7d14d0 100644 --- a/dlls/windowscodecs/encoder.c +++ b/dlls/windowscodecs/encoder.c @@ -467,8 +467,20 @@ static HRESULT WINAPI CommonEncoderFrame_Commit(IWICBitmapFrameEncode *iface) static HRESULT WINAPI CommonEncoderFrame_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, IWICMetadataQueryWriter **ppIMetadataQueryWriter) { - FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); - return E_NOTIMPL; + CommonEncoderFrame *encoder = impl_from_IWICBitmapFrameEncode(iface); + + TRACE("iface, %p, ppIMetadataQueryWriter %p.\n", iface, ppIMetadataQueryWriter); + + if (!ppIMetadataQueryWriter) + return E_INVALIDARG; + + if (!encoder->initialized) + return WINCODEC_ERR_NOTINITIALIZED; + + if (!(encoder->parent->encoder_info.flags & ENCODER_FLAGS_SUPPORTS_METADATA)) + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + return MetadataQueryWriter_CreateInstance(&encoder->IWICMetadataBlockWriter_iface, NULL, ppIMetadataQueryWriter); } static const IWICBitmapFrameEncodeVtbl CommonEncoderFrame_Vtbl = { diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index c807a7ee7db..53aeaec7e8d 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -2117,8 +2117,17 @@ static HRESULT WINAPI GifFrameEncode_Commit(IWICBitmapFrameEncode *iface) static HRESULT WINAPI GifFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, IWICMetadataQueryWriter **writer) { - FIXME("%p, %p: stub\n", iface, writer); - return E_NOTIMPL; + GifFrameEncode *encode = impl_from_IWICBitmapFrameEncode(iface); + + TRACE("iface, %p, writer %p.\n", iface, writer); + + if (!writer) + return E_INVALIDARG; + + if (!encode->initialized) + return WINCODEC_ERR_NOTINITIALIZED; + + return MetadataQueryWriter_CreateInstance(&encode->IWICMetadataBlockWriter_iface, NULL, writer); } static const IWICBitmapFrameEncodeVtbl GifFrameEncode_Vtbl = diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index aaa733380fa..c1339e4bd1d 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -3106,8 +3106,7 @@ static void test_metadata_writer(void) ok(hr == (tests[i].metadata_supported ? S_OK : E_INVALIDARG), "Got unexpected hr %#x, i %u.\n", hr, i); hr = IWICBitmapFrameEncode_GetMetadataQueryWriter(frameencode, &querywriter2); - todo_wine - ok(hr == (tests[i].succeeds_unitialized ? S_OK : WINCODEC_ERR_NOTINITIALIZED), + todo_wine_if(!i) ok(hr == (tests[i].succeeds_unitialized ? S_OK : WINCODEC_ERR_NOTINITIALIZED), "Got unexpected hr %#x, i %u.\n", hr, i); if (hr == S_OK) IWICMetadataQueryWriter_Release(querywriter2); @@ -3116,7 +3115,7 @@ static void test_metadata_writer(void) ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); hr = IWICBitmapFrameEncode_GetMetadataQueryWriter(frameencode, &querywriter2); - todo_wine ok(hr == (tests[i].metadata_supported ? S_OK : WINCODEC_ERR_UNSUPPORTEDOPERATION), + todo_wine_if(!i) ok(hr == (tests[i].metadata_supported ? S_OK : WINCODEC_ERR_UNSUPPORTEDOPERATION), "Got unexpected hr %#x, i %u.\n", hr, i); if (tests[i].metadata_supported) @@ -3126,8 +3125,7 @@ static void test_metadata_writer(void) if (querywriter) { IWICMetadataQueryWriter_Release(querywriter); - if (querywriter2) - IWICMetadataQueryWriter_Release(querywriter2); + IWICMetadataQueryWriter_Release(querywriter2); IWICMetadataBlockWriter_Release(blockwriter); } IWICBitmapFrameEncode_Release(frameencode);

1 0

Paul Gofman : windowscodecs: Add IWICMetadataQueryWriter stub interface.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 82cab7bb383ca4ceaee505fc445e479847e4034c URL: https://source.winehq.org/git/wine.git/?a=commit;h=82cab7bb383ca4ceaee505fc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 27 20:33:49 2021 +0300 windowscodecs: Add IWICMetadataQueryWriter stub interface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/imgfactory.c | 8 +- dlls/windowscodecs/metadataquery.c | 140 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 7 +- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 151 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index df180681af1..7e10fc37875 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1410,8 +1410,12 @@ static HRESULT WINAPI ComponentFactory_CreateQueryReaderFromBlockReader(IWICComp static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromBlockWriter(IWICComponentFactory *iface, IWICMetadataBlockWriter *block_writer, IWICMetadataQueryWriter **query_writer) { - FIXME("%p,%p,%p: stub\n", iface, block_writer, query_writer); - return E_NOTIMPL; + TRACE("%p,%p,%p\n", iface, block_writer, query_writer); + + if (!block_writer || !query_writer) + return E_INVALIDARG; + + return MetadataQueryWriter_CreateInstance(block_writer, NULL, query_writer); } static HRESULT WINAPI ComponentFactory_CreateEncoderPropertyBag(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 2761a520083..2e3652c1f7e 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -635,6 +635,146 @@ HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const W return S_OK; } +typedef struct +{ + IWICMetadataQueryWriter IWICMetadataQueryWriter_iface; + LONG ref; + IWICMetadataBlockWriter *block; + WCHAR *root; +} +QueryWriter; + +static inline QueryWriter *impl_from_IWICMetadataQueryWriter(IWICMetadataQueryWriter *iface) +{ + return CONTAINING_RECORD(iface, QueryWriter, IWICMetadataQueryWriter_iface); +} + +static HRESULT WINAPI mqw_QueryInterface(IWICMetadataQueryWriter *iface, REFIID riid, + void **object) +{ + QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface); + + TRACE("writer %p, riid %s, object %p.\n", writer, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IWICMetadataQueryWriter) + || IsEqualGUID(riid, &IID_IWICMetadataQueryReader)) + *object = &writer->IWICMetadataQueryWriter_iface; + else + *object = NULL; + + if (*object) + { + IUnknown_AddRef((IUnknown *)*object); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI mqw_AddRef(IWICMetadataQueryWriter *iface) +{ + QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface); + ULONG ref = InterlockedIncrement(&writer->ref); + + TRACE("writer %p, refcount=%u\n", writer, ref); + + return ref; +} + +static ULONG WINAPI mqw_Release(IWICMetadataQueryWriter *iface) +{ + QueryWriter *writer = impl_from_IWICMetadataQueryWriter(iface); + ULONG ref = InterlockedDecrement(&writer->ref); + + TRACE("writer %p, refcount=%u.\n", writer, ref); + + if (!ref) + { + IWICMetadataBlockWriter_Release(writer->block); + HeapFree(GetProcessHeap(), 0, writer->root); + HeapFree(GetProcessHeap(), 0, writer); + } + return ref; +} + +static HRESULT WINAPI mqw_GetContainerFormat(IWICMetadataQueryWriter *iface, GUID *container_format) +{ + FIXME("iface %p, container_format %p stub.\n", iface, container_format); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mqw_GetEnumerator(IWICMetadataQueryWriter *iface, IEnumString **enum_string) +{ + FIXME("iface %p, enum_string %p stub.\n", iface, enum_string); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mqw_GetLocation(IWICMetadataQueryWriter *iface, UINT max_length, WCHAR *namespace, UINT *actual_length) +{ + FIXME("iface %p, max_length %u, namespace %s, actual_length %p stub.\n", + iface, max_length, debugstr_w(namespace), actual_length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mqw_GetMetadataByName(IWICMetadataQueryWriter *iface, LPCWSTR name, PROPVARIANT *value) +{ + FIXME("name %s, value %p stub.\n", debugstr_w(name), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mqw_SetMetadataByName(IWICMetadataQueryWriter *iface, LPCWSTR name, const PROPVARIANT *value) +{ + FIXME("iface %p, name %s, value %p stub.\n", iface, debugstr_w(name), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mqw_RemoveMetadataByName(IWICMetadataQueryWriter *iface, LPCWSTR name) +{ + FIXME("iface %p, name %s stub.\n", iface, debugstr_w(name)); + + return E_NOTIMPL; +} + +static const IWICMetadataQueryWriterVtbl mqw_vtbl = +{ + mqw_QueryInterface, + mqw_AddRef, + mqw_Release, + mqw_GetContainerFormat, + mqw_GetLocation, + mqw_GetMetadataByName, + mqw_GetEnumerator, + mqw_SetMetadataByName, + mqw_RemoveMetadataByName, +}; + +HRESULT MetadataQueryWriter_CreateInstance(IWICMetadataBlockWriter *mbw, const WCHAR *root, IWICMetadataQueryWriter **out) +{ + QueryWriter *obj; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + if (!obj) + return E_OUTOFMEMORY; + + obj->IWICMetadataQueryWriter_iface.lpVtbl = &mqw_vtbl; + obj->ref = 1; + + IWICMetadataBlockWriter_AddRef(mbw); + obj->block = mbw; + + obj->root = root ? heap_strdupW(root) : NULL; + + *out = &obj->IWICMetadataQueryWriter_iface; + + return S_OK; +} + static const struct { const GUID *guid; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index cc627fc195f..aaa733380fa 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -3103,7 +3103,7 @@ static void test_metadata_writer(void) ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); hr = IWICComponentFactory_CreateQueryWriterFromBlockWriter(factory, blockwriter, &querywriter); - todo_wine ok(hr == (tests[i].metadata_supported ? S_OK : E_INVALIDARG), "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == (tests[i].metadata_supported ? S_OK : E_INVALIDARG), "Got unexpected hr %#x, i %u.\n", hr, i); hr = IWICBitmapFrameEncode_GetMetadataQueryWriter(frameencode, &querywriter2); todo_wine @@ -3120,13 +3120,14 @@ static void test_metadata_writer(void) "Got unexpected hr %#x, i %u.\n", hr, i); if (tests[i].metadata_supported) - todo_wine ok(querywriter2 != querywriter, "Got unexpected interfaces %p, %p, i %u.\n", querywriter, querywriter2, i); + ok(querywriter2 != querywriter, "Got unexpected interfaces %p, %p, i %u.\n", querywriter, querywriter2, i); IWICComponentFactory_Release(factory); if (querywriter) { IWICMetadataQueryWriter_Release(querywriter); - IWICMetadataQueryWriter_Release(querywriter2); + if (querywriter2) + IWICMetadataQueryWriter_Release(querywriter2); IWICMetadataBlockWriter_Release(blockwriter); } IWICBitmapFrameEncode_Release(frameencode); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 997bdee3446..453bc58cca6 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -230,6 +230,7 @@ extern HRESULT GCEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT APEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GifCommentReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *, const WCHAR *, IWICMetadataQueryReader **) DECLSPEC_HIDDEN; +extern HRESULT MetadataQueryWriter_CreateInstance(IWICMetadataBlockWriter *, const WCHAR *, IWICMetadataQueryWriter **) DECLSPEC_HIDDEN; extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src)

1 0

Paul Gofman : windowscodecs/tests: Add test for metadata writer.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: c1b10ae3cb1ffa00153087d8efd1920871a22be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b10ae3cb1ffa00153087d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 27 20:33:48 2021 +0300 windowscodecs/tests: Add test for metadata writer. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 87 +++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index a955702c82c..cc627fc195f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -3049,6 +3049,92 @@ static void test_queryreader(void) IWICComponentFactory_Release(factory); } +static void test_metadata_writer(void) +{ + static struct + { + REFCLSID rclsid; + BOOL wine_supports_encoder; + BOOL metadata_supported; + BOOL succeeds_unitialized; + } + tests[] = + { + {&CLSID_WICBmpEncoder, TRUE, FALSE}, + {&CLSID_WICPngEncoder, TRUE, TRUE}, + {&CLSID_WICJpegEncoder, TRUE, TRUE}, + {&CLSID_WICGifEncoder, TRUE, TRUE}, + {&CLSID_WICTiffEncoder, TRUE, TRUE}, + {&CLSID_WICWmpEncoder, FALSE, TRUE, TRUE}, + }; + + IWICMetadataQueryWriter *querywriter, *querywriter2; + IWICMetadataBlockWriter *blockwriter; + IWICBitmapFrameEncode *frameencode; + IWICComponentFactory *factory; + IWICBitmapEncoder *encoder; + IStream *stream; + unsigned int i; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = CoCreateInstance(tests[i].rclsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void **)&encoder); + todo_wine_if(!tests[i].wine_supports_encoder) ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + if (FAILED(hr)) + continue; + + blockwriter = NULL; + querywriter = querywriter2 = NULL; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, NULL); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + hr = IWICBitmapFrameEncode_QueryInterface(frameencode, &IID_IWICMetadataBlockWriter, (void**)&blockwriter); + ok(hr == (tests[i].metadata_supported ? S_OK : E_NOINTERFACE), "Got unexpected hr %#x, i %u.\n", hr, i); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICComponentFactory, (void**)&factory); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + hr = IWICComponentFactory_CreateQueryWriterFromBlockWriter(factory, blockwriter, &querywriter); + todo_wine ok(hr == (tests[i].metadata_supported ? S_OK : E_INVALIDARG), "Got unexpected hr %#x, i %u.\n", hr, i); + + hr = IWICBitmapFrameEncode_GetMetadataQueryWriter(frameencode, &querywriter2); + todo_wine + ok(hr == (tests[i].succeeds_unitialized ? S_OK : WINCODEC_ERR_NOTINITIALIZED), + "Got unexpected hr %#x, i %u.\n", hr, i); + if (hr == S_OK) + IWICMetadataQueryWriter_Release(querywriter2); + + hr = IWICBitmapFrameEncode_Initialize(frameencode, NULL); + ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + + hr = IWICBitmapFrameEncode_GetMetadataQueryWriter(frameencode, &querywriter2); + todo_wine ok(hr == (tests[i].metadata_supported ? S_OK : WINCODEC_ERR_UNSUPPORTEDOPERATION), + "Got unexpected hr %#x, i %u.\n", hr, i); + + if (tests[i].metadata_supported) + todo_wine ok(querywriter2 != querywriter, "Got unexpected interfaces %p, %p, i %u.\n", querywriter, querywriter2, i); + + IWICComponentFactory_Release(factory); + if (querywriter) + { + IWICMetadataQueryWriter_Release(querywriter); + IWICMetadataQueryWriter_Release(querywriter2); + IWICMetadataBlockWriter_Release(blockwriter); + } + IWICBitmapFrameEncode_Release(frameencode); + IStream_Release(stream); + IWICBitmapEncoder_Release(encoder); + } +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -3071,6 +3157,7 @@ START_TEST(metadata) test_metadata_GCE(); test_metadata_APE(); test_metadata_GIF_comment(); + test_metadata_writer(); CoUninitialize(); }

1 0

Paul Gofman : windowscodecs: Add IWICMetadataBlockWriter stub interface for Gif encoder.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 85d8cffd305d51a90acf6f14e96baf1d5e6e4f9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d8cffd305d51a90acf6f14… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 27 20:33:47 2021 +0300 windowscodecs: Add IWICMetadataBlockWriter stub interface for Gif encoder. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 128 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 8ebba7b5a88..c807a7ee7db 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1473,6 +1473,7 @@ static inline GifEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) typedef struct GifFrameEncode { IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; + IWICMetadataBlockWriter IWICMetadataBlockWriter_iface; LONG ref; GifEncoder *encoder; BOOL initialized, interlace, committed; @@ -1488,8 +1489,15 @@ static inline GifFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEnc return CONTAINING_RECORD(iface, GifFrameEncode, IWICBitmapFrameEncode_iface); } +static inline GifFrameEncode *impl_from_IWICMetadataBlockWriter(IWICMetadataBlockWriter *iface) +{ + return CONTAINING_RECORD(iface, GifFrameEncode, IWICMetadataBlockWriter_iface); +} + static HRESULT WINAPI GifFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) { + GifFrameEncode *encoder = impl_from_IWICBitmapFrameEncode(iface); + TRACE("%p,%s,%p\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -1497,13 +1505,20 @@ static HRESULT WINAPI GifFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) { - IWICBitmapFrameEncode_AddRef(iface); *ppv = iface; - return S_OK; + } + else if (IsEqualIID(&IID_IWICMetadataBlockWriter, iid)) + { + *ppv = &encoder->IWICMetadataBlockWriter_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; } - *ppv = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; } static ULONG WINAPI GifFrameEncode_AddRef(IWICBitmapFrameEncode *iface) @@ -2259,6 +2274,109 @@ static HRESULT WINAPI GifEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmap return WINCODEC_ERR_UNSUPPORTEDOPERATION; } +static HRESULT WINAPI GifEncoderFrame_Block_QueryInterface(IWICMetadataBlockWriter *iface, REFIID iid, void **ppv) +{ + GifFrameEncode *frame_encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_QueryInterface(&frame_encoder->IWICBitmapFrameEncode_iface, iid, ppv); +} + +static ULONG WINAPI GifEncoderFrame_Block_AddRef(IWICMetadataBlockWriter *iface) +{ + GifFrameEncode *frame_encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_AddRef(&frame_encoder->IWICBitmapFrameEncode_iface); +} + +static ULONG WINAPI GifEncoderFrame_Block_Release(IWICMetadataBlockWriter *iface) +{ + GifFrameEncode *frame_encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_Release(&frame_encoder->IWICBitmapFrameEncode_iface); +} + +static HRESULT WINAPI GifEncoderFrame_Block_GetContainerFormat(IWICMetadataBlockWriter *iface, GUID *container_format) +{ + FIXME("iface %p, container_format %p stub.\n", iface, container_format); + + return E_NOTIMPL; +} + +static HRESULT WINAPI GifEncoderFrame_Block_GetCount(IWICMetadataBlockWriter *iface, UINT *count) +{ + FIXME("iface %p, count %p stub.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI GifEncoderFrame_Block_GetReaderByIndex(IWICMetadataBlockWriter *iface, + UINT index, IWICMetadataReader **metadata_reader) +{ + FIXME("iface %p, index %d, metadata_reader %p stub.\n", iface, index, metadata_reader); + + return E_NOTIMPL; +} + +static HRESULT WINAPI GifEncoderFrame_Block_GetEnumerator(IWICMetadataBlockWriter *iface, IEnumUnknown **enum_metadata) +{ + FIXME("iface %p, enum_metadata %p stub.\n", iface, enum_metadata); + + return E_NOTIMPL; +} + +static HRESULT WINAPI GifEncoderFrame_Block_InitializeFromBlockReader(IWICMetadataBlockWriter *iface, + IWICMetadataBlockReader *block_reader) +{ + FIXME("iface %p, block_reader %p stub.\n", iface, block_reader); + + return E_NOTIMPL; +} + +static HRESULT WINAPI GifEncoderFrame_Block_GetWriterByIndex(IWICMetadataBlockWriter *iface, UINT index, + IWICMetadataWriter **metadata_writer) +{ + FIXME("iface %p, index %u, metadata_writer %p stub.\n", iface, index, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI GifEncoderFrame_Block_AddWriter(IWICMetadataBlockWriter *iface, IWICMetadataWriter *metadata_writer) +{ + FIXME("iface %p, metadata_writer %p stub.\n", iface, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI GifEncoderFrame_Block_SetWriterByIndex(IWICMetadataBlockWriter *iface, UINT index, + IWICMetadataWriter *metadata_writer) +{ + FIXME("iface %p, index %u, metadata_writer %p stub.\n", iface, index, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI GifEncoderFrame_Block_RemoveWriterByIndex(IWICMetadataBlockWriter *iface, UINT index) +{ + FIXME("iface %p, index %u stub.\n", iface, index); + + return E_NOTIMPL; +} + +static const IWICMetadataBlockWriterVtbl GifFrameEncode_BlockVtbl = { + GifEncoderFrame_Block_QueryInterface, + GifEncoderFrame_Block_AddRef, + GifEncoderFrame_Block_Release, + GifEncoderFrame_Block_GetContainerFormat, + GifEncoderFrame_Block_GetCount, + GifEncoderFrame_Block_GetReaderByIndex, + GifEncoderFrame_Block_GetEnumerator, + GifEncoderFrame_Block_InitializeFromBlockReader, + GifEncoderFrame_Block_GetWriterByIndex, + GifEncoderFrame_Block_AddWriter, + GifEncoderFrame_Block_SetWriterByIndex, + GifEncoderFrame_Block_RemoveWriterByIndex, +}; + static HRESULT WINAPI GifEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **frame, IPropertyBag2 **options) { GifEncoder *This = impl_from_IWICBitmapEncoder(iface); @@ -2278,6 +2396,8 @@ static HRESULT WINAPI GifEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBi This->n_frames++; ret->IWICBitmapFrameEncode_iface.lpVtbl = &GifFrameEncode_Vtbl; + ret->IWICMetadataBlockWriter_iface.lpVtbl = &GifFrameEncode_BlockVtbl; + ret->ref = 1; ret->encoder = This; ret->initialized = FALSE;

1 0

Paul Gofman : windowscodecs: Add IWICMetadataBlockWriter stub interface.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 77422c4a82e97cbd4f0db784119eebd87794a253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77422c4a82e97cbd4f0db784… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 27 20:33:46 2021 +0300 windowscodecs: Add IWICMetadataBlockWriter stub interface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/encoder.c | 120 ++++++++++++++++++++++++++++++++- dlls/windowscodecs/libjpeg.c | 2 +- dlls/windowscodecs/libpng.c | 2 +- dlls/windowscodecs/libtiff.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 1 + 5 files changed, 122 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c index 8e05048d1df..e72ceb0735c 100644 --- a/dlls/windowscodecs/encoder.c +++ b/dlls/windowscodecs/encoder.c @@ -58,6 +58,7 @@ typedef struct CommonEncoder { typedef struct CommonEncoderFrame { IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; + IWICMetadataBlockWriter IWICMetadataBlockWriter_iface; LONG ref; CommonEncoder *parent; struct encoder_frame encoder_frame; @@ -77,10 +78,15 @@ static inline CommonEncoderFrame *impl_from_IWICBitmapFrameEncode(IWICBitmapFram return CONTAINING_RECORD(iface, CommonEncoderFrame, IWICBitmapFrameEncode_iface); } +static inline CommonEncoderFrame *impl_from_IWICMetadataBlockWriter(IWICMetadataBlockWriter *iface) +{ + return CONTAINING_RECORD(iface, CommonEncoderFrame, IWICMetadataBlockWriter_iface); +} + static HRESULT WINAPI CommonEncoderFrame_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) { - CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface); + CommonEncoderFrame *object = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -88,7 +94,12 @@ static HRESULT WINAPI CommonEncoderFrame_QueryInterface(IWICBitmapFrameEncode *i if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) { - *ppv = &This->IWICBitmapFrameEncode_iface; + *ppv = &object->IWICBitmapFrameEncode_iface; + } + else if (object->parent->encoder_info.flags & ENCODER_FLAGS_SUPPORTS_METADATA + && IsEqualIID(&IID_IWICMetadataBlockWriter, iid)) + { + *ppv = &object->IWICMetadataBlockWriter_iface; } else { @@ -628,6 +639,110 @@ static HRESULT WINAPI CommonEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBit return WINCODEC_ERR_UNSUPPORTEDOPERATION; } +static HRESULT WINAPI CommonEncoderFrame_Block_QueryInterface(IWICMetadataBlockWriter *iface, REFIID iid, void **ppv) +{ + CommonEncoderFrame *encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_QueryInterface(&encoder->IWICBitmapFrameEncode_iface, iid, ppv); +} + +static ULONG WINAPI CommonEncoderFrame_Block_AddRef(IWICMetadataBlockWriter *iface) +{ + CommonEncoderFrame *encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_AddRef(&encoder->IWICBitmapFrameEncode_iface); +} + +static ULONG WINAPI CommonEncoderFrame_Block_Release(IWICMetadataBlockWriter *iface) +{ + CommonEncoderFrame *encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_Release(&encoder->IWICBitmapFrameEncode_iface); +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetContainerFormat(IWICMetadataBlockWriter *iface, GUID *container_format) +{ + FIXME("iface %p, container_format %p stub.\n", iface, container_format); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetCount(IWICMetadataBlockWriter *iface, UINT *count) +{ + FIXME("iface %p, count %p stub.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetReaderByIndex(IWICMetadataBlockWriter *iface, + UINT index, IWICMetadataReader **metadata_reader) +{ + FIXME("iface %p, index %d, metadata_reader %p stub.\n", iface, index, metadata_reader); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetEnumerator(IWICMetadataBlockWriter *iface, IEnumUnknown **enum_metadata) +{ + FIXME("iface %p, ppIEnumMetadata %p stub.\n", iface, enum_metadata); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_InitializeFromBlockReader(IWICMetadataBlockWriter *iface, + IWICMetadataBlockReader *metadata_block_reader) +{ + FIXME("iface %p, metadata_block_reader %p stub.\n", iface, metadata_block_reader); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetWriterByIndex(IWICMetadataBlockWriter *iface, UINT index, + IWICMetadataWriter **metadata_writer) +{ + FIXME("iface %p, index %u, metadata_writer %p stub.\n", iface, index, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_AddWriter(IWICMetadataBlockWriter *iface, IWICMetadataWriter *metadata_writer) +{ + FIXME("iface %p, metadata_writer %p.\n", iface, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_SetWriterByIndex(IWICMetadataBlockWriter *iface, UINT index, + IWICMetadataWriter *metadata_writer) +{ + FIXME("iface %p, index %u, metadata_writer %p stub.\n", iface, index, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_RemoveWriterByIndex(IWICMetadataBlockWriter *iface, UINT index) +{ + FIXME("iface %p, index %u.\n", iface, index); + + return E_NOTIMPL; +} + +static const IWICMetadataBlockWriterVtbl CommonEncoderFrame_BlockVtbl = +{ + CommonEncoderFrame_Block_QueryInterface, + CommonEncoderFrame_Block_AddRef, + CommonEncoderFrame_Block_Release, + CommonEncoderFrame_Block_GetContainerFormat, + CommonEncoderFrame_Block_GetCount, + CommonEncoderFrame_Block_GetReaderByIndex, + CommonEncoderFrame_Block_GetEnumerator, + CommonEncoderFrame_Block_InitializeFromBlockReader, + CommonEncoderFrame_Block_GetWriterByIndex, + CommonEncoderFrame_Block_AddWriter, + CommonEncoderFrame_Block_SetWriterByIndex, + CommonEncoderFrame_Block_RemoveWriterByIndex, +}; + static HRESULT WINAPI CommonEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { @@ -661,6 +776,7 @@ static HRESULT WINAPI CommonEncoder_CreateNewFrame(IWICBitmapEncoder *iface, } result->IWICBitmapFrameEncode_iface.lpVtbl = &CommonEncoderFrame_Vtbl; + result->IWICMetadataBlockWriter_iface.lpVtbl = &CommonEncoderFrame_BlockVtbl; result->ref = 1; result->parent = This; diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 84e4df5e007..96a9b79f358 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -746,7 +746,7 @@ HRESULT CDECL jpeg_encoder_create(struct encoder_info *info, struct encoder **re This->cinfo_initialized = FALSE; *result = &This->encoder; - info->flags = 0; + info->flags = ENCODER_FLAGS_SUPPORTS_METADATA; info->container_format = GUID_ContainerFormatJpeg; info->clsid = CLSID_WICJpegEncoder; info->encoder_options[0] = ENCODER_OPTION_IMAGE_QUALITY; diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index a5068c20349..0571f5a2aad 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -997,7 +997,7 @@ HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **res This->data = NULL; *result = &This->encoder; - info->flags = 0; + info->flags = ENCODER_FLAGS_SUPPORTS_METADATA; info->container_format = GUID_ContainerFormatPng; info->clsid = CLSID_WICPngEncoder; info->encoder_options[0] = ENCODER_OPTION_INTERLACE; diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 6f5cfc53c62..25d8c1c6081 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -1414,7 +1414,7 @@ HRESULT CDECL tiff_encoder_create(struct encoder_info *info, struct encoder **re This->tiff = NULL; This->num_frames = 0; - info->flags = ENCODER_FLAGS_MULTI_FRAME; + info->flags = ENCODER_FLAGS_MULTI_FRAME | ENCODER_FLAGS_SUPPORTS_METADATA; info->container_format = GUID_ContainerFormatTiff; info->clsid = CLSID_WICTiffEncoder; info->encoder_options[0] = ENCODER_OPTION_COMPRESSION_METHOD; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 85d057cc278..997bdee3446 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -355,6 +355,7 @@ enum encoder_option #define ENCODER_FLAGS_MULTI_FRAME 0x1 #define ENCODER_FLAGS_ICNS_SIZE 0x2 +#define ENCODER_FLAGS_SUPPORTS_METADATA 0x4 struct encoder_info {

1 0

Francois Gouget : testbot/TestWTBS: Add support for checking timeouts.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: tools Branch: master Commit: cc359d12a2e19187aba7a30e3ffd536c86f1596b URL: https://source.winehq.org/git/tools.git/?a=commit;h=cc359d12a2e19187aba7a30… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 28 04:18:19 2021 +0100 testbot/TestWTBS: Add support for checking timeouts. Timeouts can get reported in many different ways depending on whether they are detected by TestLauncher, the WineRun* script or the Engine. That makes a simple error matching or grep impossible. So provide specific support for checking that a task timed out. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 94 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 74 insertions(+), 20 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 67b1c8f..6f78406 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -402,7 +402,10 @@ sub LoadTestInfo($) my $Status = ($TestInfo->{job}->{Status} ne 'completed' or $TestInfo->{win32}->{TestFailures} or $TestInfo->{win64}->{TestFailures} or - $TestInfo->{wine}->{TestFailures}) ? "Failed" : "OK"; + $TestInfo->{wine}->{TestFailures} or + $TestInfo->{win32}->{HasTimeout} or + $TestInfo->{win64}->{HasTimeout} or + $TestInfo->{wine}->{HasTimeout}) ? "Failed" : "OK"; SetDefault($TestInfo, "webpatch", "Status", $Status); } @@ -555,6 +558,16 @@ sub IsMailingListJob($) return $Job->Remarks =~ /^\[\Q$PatchesMailingList\E\] /; } +sub IsTimeoutError($$) +{ + my ($GroupName, $Error) = @_; + + return (($GroupName ne "" and # Test dll or Report validation errors + $Error =~ /^[_a-z0-9]+: Timeout$/) or # Test unit + ($GroupName eq "" and # testbot.log case + $Error eq "The task timed out")); +} + =pod =item <tasks.(report|log|testbot).groupname> @@ -584,17 +597,19 @@ directives, win32 will not inherit anything from the win category. =cut -sub CheckLogErrors($$$) +sub CheckLogErrors($$$$) { - my ($LogInfo, $RefInfo, $LogKey) = @_; + my ($LogInfo, $RefInfo, $LogKey, $IgnoreTimeouts) = @_; + my $HasTimeout; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; - - my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + # Prevent $RefInfo from springing into existence + my $RefGroup = $RefInfo ? $RefInfo->{ErrGroups}->{$GroupName} : undef; if ($RefGroup) { + # Match the log errors to the expected errors for this group my $Diff = Algorithm::Diff->new($LogGroup->{Errors}, $RefGroup->{Errors}, { keyGen => \&WineTestBot::LogUtils::_GetLineKey }); my ($LogIndex, $RefIndex) = (0, 0); @@ -613,6 +628,12 @@ sub CheckLogErrors($$$) foreach (1..$ExtraCount) { next if (!$LogGroup->{IsNew}->[$LogIndex]); + if ($IgnoreTimeouts and + IsTimeoutError($GroupName, $LogGroup->{Errors}->[$LogIndex])) + { + next; + } + fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$LogIndex]"); $LogIndex++; } @@ -626,27 +647,39 @@ sub CheckLogErrors($$$) } } } - else + + # Check for timeouts and new errors if no error was expected for that group + foreach my $ErrIndex (0..@{$LogGroup->{Errors}} - 1) { - # Check that the log's extra errors are old errors - foreach my $ErrIndex (0..@{$LogGroup->{Errors}} - 1) + if (IsTimeoutError($GroupName, $LogGroup->{Errors}->[$ErrIndex])) + { + $HasTimeout = 1; + next if ($IgnoreTimeouts); # ignore expected timeouts + } + if ($RefInfo and !$RefGroup and $LogGroup->{IsNew}->[$ErrIndex]) { - next if (!$LogGroup->{IsNew}->[$ErrIndex]); fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$ErrIndex]"); } } } - foreach my $GroupName (@{$RefInfo->{ErrGroupNames}}) - { - my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; - next if ($LogGroup); - my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; - foreach my $Error (@{$RefGroup->{Errors}}) + if ($RefInfo) + { + # Check for groups missing from the log file + foreach my $GroupName (@{$RefInfo->{ErrGroupNames}}) { - fail("$LogKey is missing an error in $GroupName: $Error"); + my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; + next if ($LogGroup); + + my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + foreach my $Error (@{$RefGroup->{Errors}}) + { + fail("$LogKey is missing an error in $GroupName: $Error"); + } } } + + return $HasTimeout; } sub GrepFile($$$$;$) @@ -716,6 +749,18 @@ By default the Status field should be 'completed'. Checks the value of the task's TestFailures field. By default the TestFailures field is not checked. +=item <tasks.HasTimeout> + +When true verifies that the task timed out. +This also disables reporting timeout errors as unexpected errors. + +Use this instead of looking for a specific error in the report because +timeouts can get reported in many different ways depending whether they are +detected by TestLauncher, the WineRun* script or the Engine. It can also +depend on whether the test was the last one run by the task (in the Wine case). +By default this check is skipped and timeout errors are reported like any +other unexpected error. + =item <tasks.(report|log|testbot).Grep> =item <tasks.(report|log|testbot).GrepV> @@ -754,7 +799,10 @@ sub CheckTask($$$$) $TestUnits->{$TaskType}->{"*skipped*"} = 1; } - my ($ReportCount, $NewFailures) = (0, 0); + my $CheckTimeouts = ($Task->Status eq "completed" and + CheckValue($TaskInfo->{HasTimeout})); + + my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { my $LogPath = $Task->GetDir() ."/$LogName"; @@ -777,13 +825,19 @@ sub CheckTask($$$$) $LogType = "testbot"; } - if ($TaskInfo->{"$LogType.errors"}) + if ($TaskInfo->{"$LogType.errors"} or $CheckTimeouts) { - CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, - TaskKeyStr($Task) ."/$LogName"); + my $HasTimeout = CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, + TaskKeyStr($Task) ."/$LogName", + $TaskInfo->{HasTimeout}); + $TimeoutCount++ if ($HasTimeout); } GrepTaskLog($Task, $LogName, $TaskInfo, "$LogType."); } + if ($CheckTimeouts) + { + ok($TimeoutCount >= $ReportCount, "Expecting 1+ timeout per report: $TimeoutCount timeouts, $ReportCount reports"); + } if ($Task->Status eq "completed" and CheckValue($TaskInfo->{TestFailures})) { # Scale the expected TestFailures count with the number of times the test

1 0

Francois Gouget : winetest/dissect: Improve the misplaced subtest error message.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: tools Branch: master Commit: aea9527affd292158986c81720f65af3387aaa98 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aea9527affd292158986c81… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 28 03:36:53 2021 +0100 winetest/dissect: Improve the misplaced subtest error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index c62f914..e9729db 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -624,7 +624,7 @@ while ($line = <IN>) { } else { - add_test_line("end", "Misplaced $l_subunit subtest\n"); + add_test_line("end", "$l_unit has a misplaced $l_subunit subtest line\n"); $extra_failures++; } }

1 0

Francois Gouget : testbot/LogUtils: Improve the misplaced subtest error message.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: tools Branch: master Commit: d7f11e34484a6d006a56b045ab0ecec1ee5e51e1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d7f11e34484a6d006a56b04… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 28 03:35:56 2021 +0100 testbot/LogUtils: Improve the misplaced subtest error message. A subtest line, misplaced or not, also proves this is a Wine test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d537af2..1b4ee7a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -579,8 +579,9 @@ sub ParseWineTestReport($$$) } else { - _AddExtra($LogInfo, "Misplaced $SubUnit subtest"); + _AddExtra($LogInfo, "$Unit has a misplaced $SubUnit subtest line"); } + $LogInfo->{IsWineTest} = 1; } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or

1 0

Rémi Bernon : windowscodecs: Move several helpers to new wincodecs_common.c source.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 24b9203d3544001dd51894f1c1edd99819367198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24b9203d3544001dd51894f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 25 10:20:16 2021 +0100 windowscodecs: Move several helpers to new wincodecs_common.c source. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 3 +- dlls/windowscodecs/main.c | 171 ---------------------------- dlls/windowscodecs/wincodecs_common.c | 203 ++++++++++++++++++++++++++++++++++ 3 files changed, 205 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24b9203d3544001dd518…

1 0

Rémi Bernon : windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: b44fb04759b17f60f85f395ad3ad537e423e8d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44fb04759b17f60f85f395a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 25 10:20:15 2021 +0100 windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader. Instead of MetadataQueryReader_CreateInstance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index b05d50dfea9..b0fcd34c742 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -433,6 +433,8 @@ static HRESULT WINAPI CommonDecoderFrame_GetMetadataQueryReader(IWICBitmapFrameD IWICMetadataQueryReader **ppIMetadataQueryReader) { CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + IWICComponentFactory* factory; + HRESULT hr; TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); @@ -442,7 +444,18 @@ static HRESULT WINAPI CommonDecoderFrame_GetMetadataQueryReader(IWICBitmapFrameD if (!(This->parent->file_info.flags & WICBitmapDecoderCapabilityCanEnumerateMetadata)) return WINCODEC_ERR_UNSUPPORTEDOPERATION; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + { + hr = IWICComponentFactory_CreateQueryReaderFromBlockReader(factory, &This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + IWICComponentFactory_Release(factory); + } + + if (FAILED(hr)) + *ppIMetadataQueryReader = NULL; + + return hr; } static HRESULT WINAPI CommonDecoderFrame_GetColorContexts(IWICBitmapFrameDecode *iface,

1 0

Zhiyi Zhang : gdi32: Report real VREFRESH values for GetDeviceCaps() with display DCs.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 8fad0b146d63ca9e0e800f2e676530b1b9bee92f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fad0b146d63ca9e0e800f2e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 24 12:14:32 2021 +0800 gdi32: Report real VREFRESH values for GetDeviceCaps() with display DCs. Even though MSDN says 0 and 1 are both valid and they represent the default refresh rate of display hardware. Some games rely on the value being the real refresh rate and use it to cap frame rates. Fix an issue that Sakuna: Of Rice and Ruin reports monitors of 1Hz and cap to 1fps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 25 ++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bb98c554238..e146a3a4f85 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -82,6 +82,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM); +static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); static INT (WINAPI *pGetSystemMetrics)(INT); @@ -245,6 +246,7 @@ void CDECL __wine_set_display_driver( HMODULE module ) pGetMonitorInfoW = (void *)GetProcAddress( user32, "GetMonitorInfoW" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); pEnumDisplayMonitors = (void *)GetProcAddress( user32, "EnumDisplayMonitors" ); + pEnumDisplaySettingsW = (void *)GetProcAddress( user32, "EnumDisplaySettingsW" ); pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } @@ -471,7 +473,28 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case PHYSICALOFFSETY: return 0; case SCALINGFACTORX: return 0; case SCALINGFACTORY: return 0; - case VREFRESH: return GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY ? 1 : 0; + case VREFRESH: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) != DT_RASDISPLAY) + return 0; + + if (pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + display = dc->display[0] ? dc->display : NULL; + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode )) + return devmode.dmDisplayFrequency ? devmode.dmDisplayFrequency : 1; + } + + return 1; + } case DESKTOPHORZRES: if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pGetSystemMetrics) { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 08557867566..58b3f0d5e0c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2020,7 +2020,7 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmPelsHeight, value); value = GetDeviceCaps(hdc, VREFRESH); - todo_wine_if(value != dm->dmDisplayFrequency && value == 1) + todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); }

1 0

Zhiyi Zhang : gdi32: Report correct HORZRES and VERTRES values for GetDeviceCaps() with DCs on a specific monitor.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 2006f76b5fa06b1a3456cb56dd164e3688d480f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2006f76b5fa06b1a3456cb56… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 24 12:14:20 2021 +0800 gdi32: Report correct HORZRES and VERTRES values for GetDeviceCaps() with DCs on a specific monitor. Fix DLC Quest uses the primary monitor size to render when in fullscreen mode on non-primary monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 18 +++++++++++++ dlls/gdi32/driver.c | 64 ++++++++++++++++++++++++++++++++++++++++++--- dlls/gdi32/gdi_private.h | 4 +++ dlls/user32/tests/monitor.c | 4 +-- 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a9a37d9efe7..830fabf6e78 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -623,6 +623,7 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW *initData ) { + const WCHAR *display, *p; HDC hdc; DC * dc; const struct gdi_dc_funcs *funcs; @@ -663,6 +664,23 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, } } + if (is_display_device( driver )) + display = driver; + else if (is_display_device( device )) + display = device; + else + display = NULL; + + if (display) + { + /* Copy only the display name. For example, \\.\DISPLAY1 in \\.\DISPLAY1\Monitor0 */ + p = display + 12; + while (iswdigit( *p )) + ++p; + lstrcpynW( dc->display, display, p - display + 1 ); + dc->display[p - display] = '\0'; + } + dc->vis_rect.left = 0; dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e2528ece046..bb98c554238 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -81,7 +81,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM); static HWND (WINAPI *pGetDesktopWindow)(void); +static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); static INT (WINAPI *pGetSystemMetrics)(INT); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); @@ -137,10 +139,13 @@ static const struct gdi_dc_funcs *get_display_driver(void) /********************************************************************** * is_display_device */ -static BOOL is_display_device( LPCWSTR name ) +BOOL is_display_device( LPCWSTR name ) { const WCHAR *p = name; + if (!name) + return FALSE; + if (wcsnicmp( name, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) return FALSE; p += lstrlenW(L"\\\\.\\DISPLAY"); @@ -237,10 +242,33 @@ void CDECL __wine_set_display_driver( HMODULE module ) HeapFree( GetProcessHeap(), 0, driver ); user32 = LoadLibraryA( "user32.dll" ); + pGetMonitorInfoW = (void *)GetProcAddress( user32, "GetMonitorInfoW" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); + pEnumDisplayMonitors = (void *)GetProcAddress( user32, "EnumDisplayMonitors" ); pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } +struct monitor_info +{ + const WCHAR *name; + RECT rect; +}; + +static BOOL CALLBACK monitor_enum_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam ) +{ + struct monitor_info *info = (struct monitor_info *)lparam; + MONITORINFOEXW mi; + + mi.cbSize = sizeof(mi); + pGetMonitorInfoW( monitor, (MONITORINFO *)&mi ); + if (!lstrcmpiW( info->name, mi.szDevice )) + { + info->rect = mi.rcMonitor; + return FALSE; + } + + return TRUE; +} static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) { @@ -378,8 +406,38 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) GetDeviceCaps( dev->hdc, LOGPIXELSX ) * 10 ); case VERTSIZE: return MulDiv( GetDeviceCaps( dev->hdc, VERTRES ), 254, GetDeviceCaps( dev->hdc, LOGPIXELSY ) * 10 ); - case HORZRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; - case VERTRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; + case HORZRES: + { + DC *dc = get_nulldrv_dc( dev ); + struct monitor_info info; + + if (dc->display[0] && pEnumDisplayMonitors && pGetMonitorInfoW) + { + info.name = dc->display; + SetRectEmpty( &info.rect ); + pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); + if (!IsRectEmpty( &info.rect )) + return info.rect.right - info.rect.left; + } + + return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; + } + case VERTRES: + { + DC *dc = get_nulldrv_dc( dev ); + struct monitor_info info; + + if (dc->display[0] && pEnumDisplayMonitors && pGetMonitorInfoW) + { + info.name = dc->display; + SetRectEmpty( &info.rect ); + pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); + if (!IsRectEmpty( &info.rect )) + return info.rect.bottom - info.rect.top; + } + + return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; + } case BITSPIXEL: return 32; case PLANES: return 1; case NUMBRUSHES: return -1; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8d917a795c0..2bf16e8eaf8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -84,6 +84,7 @@ typedef struct tagDC int pixel_format; /* pixel format (for memory DCs) */ UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ FLOAT miterLimit; + WCHAR display[CCHDEVICENAME]; /* Display name when created for a specific display device */ int flags; DWORD layout; @@ -487,6 +488,9 @@ typedef struct #define WMFC_MAGIC 0x43464d57 +/* driver.c */ +extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN; + /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ee435a4faf4..08557867566 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2085,7 +2085,7 @@ static void test_display_dc(void) hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); - check_display_dc(hdc, &dm, TRUE); + check_display_dc(hdc, &dm, FALSE); /* Tests after mode changes */ memset(&dm2, 0, sizeof(dm2)); @@ -2108,7 +2108,7 @@ static void test_display_dc(void) continue; } - check_display_dc(hdc, &dm2, TRUE); + check_display_dc(hdc, &dm2, FALSE); /* Tests after monitor detach */ if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE))

1 0

Zhiyi Zhang : user32/tests: Add display DC tests.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 640f7081db10e53f6d3eaf27890bcce256836bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=640f7081db10e53f6d3eaf27… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 24 12:14:05 2021 +0800 user32/tests: Add display DC tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5e4cc9d154f..ee435a4faf4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1992,6 +1992,161 @@ static void test_handles(void) ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); } +#define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) +static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) +{ + INT value; + + value = GetDeviceCaps(hdc, HORZRES); + todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsWidth, "Expected HORZRES %d, got %d.\n", + dm->dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + todo_wine_if(allow_todo && dm->dmPelsHeight != GetSystemMetrics(SM_CYSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsHeight, "Expected VERTRES %d, got %d.\n", + dm->dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm->dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsWidth, "Expected DESKTOPHORZRES %d, got %d.\n", + dm->dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm->dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsHeight, "Expected DESKTOPVERTRES %d, got %d.\n", + dm->dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm->dmDisplayFrequency && value == 1) + ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", + dm->dmDisplayFrequency, value); +} + +static void test_display_dc(void) +{ + DWORD device_idx, mode_idx; + DEVMODEA dm, dm2, dm3; + INT count, old_count; + DISPLAY_DEVICEA dd; + BOOL ret; + LONG res; + HDC hdc; + + /* Test DCs covering the entire virtual screen */ + hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + ok(!!hdc, "CreateDCA failed.\n"); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + + check_display_dc(hdc, &dm, FALSE); + + /* Tests after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution.\n"); + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + + DeleteDC(hdc); + + /* Test DCs covering a specific monitor */ + dd.cb = sizeof(dd); + for (device_idx = 0; EnumDisplayDevicesA(NULL, device_idx, &dd, 0); ++device_idx) + { + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); + ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); + + check_display_dc(hdc, &dm, TRUE); + + /* Tests after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution for %s.\n", dd.DeviceName); + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", dd.DeviceName, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", dd.DeviceName); + DeleteDC(hdc); + continue; + } + + check_display_dc(hdc, &dm2, TRUE); + + /* Tests after monitor detach */ + if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm3); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + dm3.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm3.dmPelsWidth = 0; + dm3.dmPelsHeight = 0; + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm3, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(dd.DeviceName, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count - 1, "Expected monitor count %d, got %d.\n", old_count - 1, count); + + /* Should report the same values before detach */ + check_display_dc(hdc, &dm2, TRUE); + } + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + DeleteDC(hdc); + } +} + START_TEST(monitor) { init_function_pointers(); @@ -2002,4 +2157,5 @@ START_TEST(monitor) test_work_area(); test_display_config(); test_handles(); + test_display_dc(); }

1 0

Sebastian Lackner : server: Store and notify all notification events associated with a given registry handle.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 9c29cee63843cf68ebb99d10b2464bd737127bbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c29cee63843cf68ebb99d10… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jan 26 22:41:43 2021 -0600 server: Store and notify all notification events associated with a given registry handle. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 6 +++--- server/registry.c | 41 ++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a619bc45cb8..ac1dec9f2f8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1887,7 +1887,7 @@ static void test_notify(void) pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[2], FALSE, &timeout); @@ -1917,7 +1917,7 @@ static void test_notify(void) ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[2], FALSE, &timeout); @@ -1935,7 +1935,7 @@ static void test_notify(void) pNtClose(key); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[2], FALSE, &timeout); diff --git a/server/registry.c b/server/registry.c index c937e051597..64aec1d83c9 100644 --- a/server/registry.c +++ b/server/registry.c @@ -52,7 +52,8 @@ struct notify { struct list entry; /* entry in list of notifications */ - struct event *event; /* event to set when changing this key */ + struct event **events; /* events to set when changing this key */ + unsigned int event_count; /* number of events */ int subtree; /* true if subtree notification */ unsigned int filter; /* which events to notify on */ obj_handle_t hkey; /* hkey associated with this notification */ @@ -314,12 +315,17 @@ static struct object_type *key_get_type( struct object *obj ) /* notify waiter and maybe delete the notification */ static void do_notification( struct key *key, struct notify *notify, int del ) { - if (notify->event) + unsigned int i; + + for (i = 0; i < notify->event_count; ++i) { - set_event( notify->event ); - release_object( notify->event ); - notify->event = NULL; + set_event( notify->events[i] ); + release_object( notify->events[i] ); } + free( notify->events ); + notify->events = NULL; + notify->event_count = 0; + if (del) { list_remove( &notify->entry ); @@ -2283,20 +2289,13 @@ DECL_HANDLER(set_registry_notification) if (event) { notify = find_notify( key, current->process, req->hkey ); - if (notify) - { - if (notify->event) - release_object( notify->event ); - grab_object( event ); - notify->event = event; - } - else + if (!notify) { notify = mem_alloc( sizeof(*notify) ); if (notify) { - grab_object( event ); - notify->event = event; + notify->events = NULL; + notify->event_count = 0; notify->subtree = req->subtree; notify->filter = req->filter; notify->hkey = req->hkey; @@ -2306,8 +2305,16 @@ DECL_HANDLER(set_registry_notification) } if (notify) { - reset_event( event ); - set_error( STATUS_PENDING ); + struct event **new_array; + + if ((new_array = realloc( notify->events, (notify->event_count + 1) * sizeof(*notify->events) ))) + { + notify->events = new_array; + notify->events[notify->event_count++] = (struct event *)grab_object( event ); + reset_event( event ); + set_error( STATUS_PENDING ); + } + else set_error( STATUS_NO_MEMORY ); } release_object( event ); }

1 0

Zebediah Figura : ntdll/tests: Add more tests for registry notifications.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 3c72ad33a9390c9926b29b8ea8537c70a75174ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c72ad33a9390c9926b29b8e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 22:41:42 2021 -0600 ntdll/tests: Add more tests for registry notifications. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 61 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9335d9cc927..a619bc45cb8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1853,28 +1853,30 @@ static void test_notify(void) LARGE_INTEGER timeout; IO_STATUS_BLOCK iosb; UNICODE_STRING str; - HANDLE key, events[2], subkey; + HANDLE key, key2, events[4], subkey; NTSTATUS status; + unsigned int i; InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + status = pNtOpenKey(&key2, KEY_ALL_ACCESS, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); - events[0] = CreateEventW(NULL, FALSE, TRUE, NULL); - ok(events[0] != NULL, "CreateEvent failed: %u\n", GetLastError()); - events[1] = CreateEventW(NULL, FALSE, TRUE, NULL); - ok(events[1] != NULL, "CreateEvent failed: %u\n", GetLastError()); + for (i = 0; i < ARRAY_SIZE(events); ++i) + events[i] = CreateEventW(NULL, TRUE, TRUE, NULL); status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); - status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key2, events[2], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key2, events[3], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); - timeout.QuadPart = 0; - status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); - status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); + status = WaitForMultipleObjects(4, events, FALSE, 0); + ok(status == WAIT_TIMEOUT, "got %d\n", status); attr.RootDirectory = key; attr.ObjectName = &str; @@ -1885,22 +1887,43 @@ static void test_notify(void) pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[1], FALSE, &timeout); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = WaitForMultipleObjects(4, events, FALSE, 0); + ok(status == WAIT_TIMEOUT, "got %d\n", status); + status = pNtDeleteKey(subkey); ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); pNtClose(subkey); @@ -1912,9 +1935,13 @@ static void test_notify(void) pNtClose(key); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); if (pNtNotifyChangeMultipleKeys) {

1 0

Paul Gofman : iphlpapi: Mark adapter addresses as DNS eligible when interface has a gateway.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 5d046a780c61687aae8315b3032b91a630735dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d046a780c61687aae8315b3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 27 16:26:31 2021 +0300 iphlpapi: Mark adapter addresses as DNS eligible when interface has a gateway. Fixes hang on attempt to enter a single player game in Kingdoms Reborn. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 28 ++++++++++++++-------------- dlls/iphlpapi/tests/iphlpapi.c | 6 ++++++ include/iptypes.h | 3 +++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 81c4992ac73..bd1fea02e19 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -940,16 +940,19 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index DWORD *v4addrs = NULL, *v4masks = NULL; SOCKET_ADDRESS *v6addrs = NULL, *v6masks = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; + BOOL output_gateways; + + if ((flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) || !(flags & GAA_FLAG_SKIP_UNICAST)) + { + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); + if (ret) return ret; + num_v4_gateways = count_v4_gateways(index, routeTable); + } + output_gateways = (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) && (family == WS_AF_INET || family == WS_AF_UNSPEC); if (family == WS_AF_INET) { ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - - if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) num_v4_gateways = count_v4_gateways(index, routeTable); - } } else if (family == WS_AF_INET6) { @@ -958,12 +961,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index else if (family == WS_AF_UNSPEC) { ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - - if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) num_v4_gateways = count_v4_gateways(index, routeTable); - } if (!ret) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs, &v6masks); } else @@ -996,7 +993,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; - total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; + if (output_gateways) + total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; for (i = 0; i < num_v6addrs; i++) @@ -1050,7 +1048,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->Luid.Info.NetLuidIndex = index; aa->Luid.Info.IfType = aa->IfType; - if (num_v4_gateways) + if (output_gateways && num_v4_gateways) { PMIB_IPFORWARDROW adapterRow; @@ -1089,6 +1087,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + if (num_v4_gateways) + ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = WS_AF_INET; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6cbe725bada..358084fde68 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1277,6 +1277,7 @@ static void testWin2KFunctions(void) static void test_GetAdaptersAddresses(void) { + BOOL dns_eligible_found = FALSE; ULONG ret, size, osize, i; IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; @@ -1349,6 +1350,10 @@ static void test_GetAdaptersAddresses(void) S(U(*ua)).Flags, ua->PrefixOrigin, ua->SuffixOrigin, ua->DadState, ua->ValidLifetime, ua->PreferredLifetime, ua->LeaseLifetime, S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH) ? 0 : ua->OnLinkPrefixLength); + + if (ua->Flags & IP_ADAPTER_ADDRESS_DNS_ELIGIBLE) + dns_eligible_found = TRUE; + ua = ua->Next; } for (i = 0, temp[0] = '\0'; i < ARRAY_SIZE(aa->ZoneIndices); i++) @@ -1380,6 +1385,7 @@ static void test_GetAdaptersAddresses(void) ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); } } + ok(dns_eligible_found, "Did not find any dns eligible addresses.\n"); HeapFree(GetProcessHeap(), 0, ptr); } diff --git a/include/iptypes.h b/include/iptypes.h index c1a253d7b41..c1ee7322b01 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -94,6 +94,9 @@ typedef NL_DAD_STATE IP_DAD_STATE; #ifdef _WINSOCK2API_ +#define IP_ADAPTER_ADDRESS_DNS_ELIGIBLE 0x00000001 +#define IP_ADAPTER_ADDRESS_TRANSIENT 0x00000002 + typedef struct _IP_ADAPTER_UNICAST_ADDRESS_LH { union { struct {

1 0

Nikolay Sivov : mf/sar: Handle shutdown state in rendering callback.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: ee8e83bd45d53659def21934859aac9455941737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8e83bd45d53659def21934… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 17:37:47 2021 +0300 mf/sar: Handle shutdown state in rendering callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index d839cba90f1..9030b3a81c0 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1750,9 +1750,8 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb return E_NOTIMPL; } -static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - struct audio_renderer *renderer = impl_from_render_callback_IMFAsyncCallback(iface); unsigned int src_frames, dst_frames, max_frames, src_len; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; @@ -1760,8 +1759,6 @@ static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *if BYTE *dst, *src; HRESULT hr; - EnterCriticalSection(&renderer->cs); - LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) { if (obj->type == OBJECT_TYPE_MARKER) @@ -1816,7 +1813,15 @@ static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *if if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) WARN("Failed to submit wait item, hr %#x.\n", hr); +} +static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct audio_renderer *renderer = impl_from_render_callback_IMFAsyncCallback(iface); + + EnterCriticalSection(&renderer->cs); + if (!(renderer->flags & SAR_SHUT_DOWN)) + audio_renderer_render(renderer, result); LeaveCriticalSection(&renderer->cs); return S_OK;

1 0

Nikolay Sivov : mf/sar: Release pending items when audio client is released.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 02c859e43530b06c644588c60097a4ebc4dd87af URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c859e43530b06c644588c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 17:37:46 2021 +0300 mf/sar: Release pending items when audio client is released. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index e318576e80e..d839cba90f1 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -228,7 +228,13 @@ static ULONG WINAPI audio_renderer_sink_AddRef(IMFMediaSink *iface) static void audio_renderer_release_audio_client(struct audio_renderer *renderer) { + struct queued_object *obj, *obj2; + MFCancelWorkItem(renderer->buffer_ready_key); + LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) + { + release_pending_object(obj); + } renderer->buffer_ready_key = 0; if (renderer->audio_client) { @@ -253,7 +259,6 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&renderer->refcount); - struct queued_object *obj, *obj2; TRACE("%p, refcount %u.\n", iface, refcount); @@ -273,10 +278,6 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) IMFMediaType_Release(renderer->current_media_type); audio_renderer_release_audio_client(renderer); CloseHandle(renderer->buffer_ready_event); - LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) - { - release_pending_object(obj); - } DeleteCriticalSection(&renderer->cs); heap_free(renderer); }

1 0

Nikolay Sivov : mfmediaengine: Return full presentation range in GetBuffered().
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 84b66e153d2ca78ce65126568c99b554bc3ac029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b66e153d2ca78ce6512656… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 17:37:01 2021 +0300 mfmediaengine: Return full presentation range in GetBuffered(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 17 ++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 0573ea844c1..6f6811ff9ea 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1152,11 +1152,22 @@ static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_EN return S_OK; } -static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) +static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **range) { - FIXME("(%p, %p): stub.\n", iface, buffered); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, range); + + if (FAILED(hr = create_time_range(range))) + return hr; + + EnterCriticalSection(&engine->cs); + if (!isnan(engine->duration)) + hr = IMFMediaTimeRange_AddRange(*range, 0.0, engine->duration); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_Load(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 1cc88420568..66984595d3b 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -391,13 +391,27 @@ static void test_Play(void) { struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaTimeRange *range, *range1; IMFMediaEngine *media_engine; LONGLONG pts; + DWORD count; HRESULT hr; BOOL ret; media_engine = create_media_engine(callback); + hr = IMFMediaEngine_GetBuffered(media_engine, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaEngine_GetBuffered(media_engine, &range1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range != range1, "Unexpected pointer.\n"); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected count %u.\n", count); + + IMFMediaTimeRange_Release(range); + IMFMediaTimeRange_Release(range1); + ret = IMFMediaEngine_IsPaused(media_engine); ok(ret, "Unexpected state %d.\n", ret);

1 0

Nikolay Sivov : mfmediaengine: Add partial implementation of a time range object.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: db549a680e900d28bed2ba95cb9da683e8ed9beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=db549a680e900d28bed2ba95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 17:37:00 2021 +0300 mfmediaengine: Add partial implementation of a time range object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 212 ++++++++++++++++++++++++++++++- dlls/mfmediaengine/tests/mfmediaengine.c | 98 ++++++++++++++ 2 files changed, 307 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5981548c9f8..0573ea844c1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -34,6 +34,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -106,6 +133,27 @@ struct media_engine CRITICAL_SECTION cs; }; +struct range +{ + double start; + double end; +}; + +struct time_range +{ + IMFMediaTimeRange IMFMediaTimeRange_iface; + LONG refcount; + + struct range *ranges; + size_t count; + size_t capacity; +}; + +static struct time_range *impl_from_IMFMediaTimeRange(IMFMediaTimeRange *iface) +{ + return CONTAINING_RECORD(iface, struct time_range, IMFMediaTimeRange_iface); +} + struct media_error { IMFMediaError IMFMediaError_iface; @@ -226,6 +274,164 @@ static HRESULT create_media_error(IMFMediaError **ret) return S_OK; } +static HRESULT WINAPI time_range_QueryInterface(IMFMediaTimeRange *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaTimeRange) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaTimeRange_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI time_range_AddRef(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + ULONG refcount = InterlockedIncrement(&range->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI time_range_Release(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + ULONG refcount = InterlockedDecrement(&range->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(range->ranges); + heap_free(range); + } + + return refcount; +} + +static DWORD WINAPI time_range_GetLength(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p.\n", iface); + + return range->count; +} + +static HRESULT WINAPI time_range_GetStart(IMFMediaTimeRange *iface, DWORD idx, double *start) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %u, %p.\n", iface, idx, start); + + if (idx >= range->count) + return E_INVALIDARG; + + *start = range->ranges[idx].start; + + return S_OK; +} + +static HRESULT WINAPI time_range_GetEnd(IMFMediaTimeRange *iface, DWORD idx, double *end) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %u, %p.\n", iface, idx, end); + + if (idx >= range->count) + return E_INVALIDARG; + + *end = range->ranges[idx].end; + + return S_OK; +} + +static BOOL WINAPI time_range_ContainsTime(IMFMediaTimeRange *iface, double time) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + size_t i; + + TRACE("%p, %.8e.\n", iface, time); + + for (i = 0; i < range->count; ++i) + { + if (time >= range->ranges[i].start && time <= range->ranges[i].end) + return TRUE; + } + + return FALSE; +} + +static HRESULT WINAPI time_range_AddRange(IMFMediaTimeRange *iface, double start, double end) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %.8e, %.8e.\n", iface, start, end); + + if (range->count) + { + FIXME("Range merging is not implemented.\n"); + return E_NOTIMPL; + } + + if (!mf_array_reserve((void **)&range->ranges, &range->capacity, range->count + 1, sizeof(*range->ranges))) + return E_OUTOFMEMORY; + + range->ranges[range->count].start = start; + range->ranges[range->count].end = end; + range->count++; + + return S_OK; +} + +static HRESULT WINAPI time_range_Clear(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p.\n", iface); + + range->count = 0; + + return S_OK; +} + +static const IMFMediaTimeRangeVtbl time_range_vtbl = +{ + time_range_QueryInterface, + time_range_AddRef, + time_range_Release, + time_range_GetLength, + time_range_GetStart, + time_range_GetEnd, + time_range_ContainsTime, + time_range_AddRange, + time_range_Clear, +}; + +static HRESULT create_time_range(IMFMediaTimeRange **range) +{ + struct time_range *object; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaTimeRange_iface.lpVtbl = &time_range_vtbl; + object->refcount = 1; + + *range = &object->IMFMediaTimeRange_iface; + + return S_OK; +} + static void media_engine_set_flag(struct media_engine *engine, unsigned int mask, BOOL value) { if (value) @@ -1718,11 +1924,11 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac } static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, - IMFMediaTimeRange **range) + IMFMediaTimeRange **range) { - FIXME("(%p, %p): stub.\n", iface, range); + TRACE("%p, %p.\n", iface, range); - return E_NOTIMPL; + return create_time_range(range); } static HRESULT WINAPI media_engine_factory_CreateError(IMFMediaEngineClassFactory *iface, IMFMediaError **error) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index f9f8fed4a74..1cc88420568 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -590,6 +590,103 @@ static void test_error(void) IMFMediaError_Release(eo); } +static void test_time_range(void) +{ + IMFMediaTimeRange *range; + double start, end; + DWORD count; + HRESULT hr; + BOOL ret; + + hr = IMFMediaEngineClassFactory_CreateTimeRange(factory, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Empty ranges. */ + hr = IMFMediaTimeRange_Clear(range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaTimeRange_ContainsTime(range, 10.0); + ok(!ret, "Unexpected return value %d.\n", ret); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Add a range. */ + hr = IMFMediaTimeRange_AddRange(range, 10.0, 1.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 1.0, "Unexpected end %.e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 2.0, 3.0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(end == 3.0, "Unexpected end %.8e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 10.0, 9.0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); +todo_wine + ok(count == 2, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(end == 3.0, "Unexpected end %.8e.\n", end); + + start = 0.0; + hr = IMFMediaTimeRange_GetStart(range, 1, &start); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.8e.\n", start); +} + hr = IMFMediaTimeRange_GetEnd(range, 1, &end); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 9.0, "Unexpected end %.8e.\n", end); +} + hr = IMFMediaTimeRange_Clear(range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected range count.\n"); + + IMFMediaTimeRange_Release(range); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -617,6 +714,7 @@ START_TEST(mfmediaengine) test_playback_rate(); test_mute(); test_error(); + test_time_range(); IMFMediaEngineClassFactory_Release(factory);

1 0

Jacek Caban : mshtml: Make xhr.open async argument optional in IE9+ mode.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: d7b852625852616b9cf183cc597f4752ad82dc4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b852625852616b9cf183cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 19:36:57 2021 +0100 mshtml: Make xhr.open async argument optional in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 14 ++++++++++++++ dlls/mshtml/xmlhttprequest.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d6589343dff..75ebe082ce0 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -122,6 +122,20 @@ sync_test("xhr_props", function() { test_exposed("dispatchEvent", v >= 9); }); +sync_test("xhr open", function() { + var e = false; + try { + (new XMLHttpRequest()).open("GET", "https://www.winehq.org/"); + }catch(ex) { + e = true; + } + + if(document.documentMode < 10) + ok(e, "expected exception"); + else + ok(!e, "unexpected exception"); +}); + sync_test("style_props", function() { var style = document.body.style; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index c05d5871286..8790807ce77 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -30,6 +30,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "mshtmdid.h" #include "initguid.h" #include "msxml6.h" #include "objsafe.h" @@ -475,6 +476,29 @@ static HRESULT WINAPI HTMLXMLHttpRequest_abort(IHTMLXMLHttpRequest *iface) return S_OK; } +static HRESULT HTMLXMLHttpRequest_open_hook(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + /* If only two arguments were given, implicitly set async to false */ + if((flags & DISPATCH_METHOD) && dp->cArgs == 2 && !dp->cNamedArgs) { + VARIANT args[5]; + DISPPARAMS new_dp = {args, NULL, ARRAY_SIZE(args), 0}; + V_VT(args) = VT_EMPTY; + V_VT(args+1) = VT_EMPTY; + V_VT(args+2) = VT_BOOL; + V_BOOL(args+2) = VARIANT_TRUE; + args[3] = dp->rgvarg[0]; + args[4] = dp->rgvarg[1]; + + TRACE("implicit async\n"); + + return IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IHTMLXMLHTTPREQUEST_OPEN, + lcid, flags, &new_dp, res, ei, caller); + } + + return S_FALSE; /* fallback to default */ +} + static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR bstrMethod, BSTR bstrUrl, VARIANT varAsync, VARIANT varUser, VARIANT varPassword) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); @@ -847,6 +871,17 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) This->event_listener->load_event = TRUE; } +static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) +{ + static const dispex_hook_t xhr_hooks[] = { + {DISPID_IHTMLXMLHTTPREQUEST_OPEN, HTMLXMLHttpRequest_open_hook}, + {DISPID_UNKNOWN} + }; + + EventTarget_init_dispex_info(info, compat_mode); + dispex_info_add_interface(info, IHTMLXMLHttpRequest_tid, compat_mode >= COMPAT_MODE_IE10 ? xhr_hooks : NULL); +} + static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { { NULL, @@ -858,14 +893,13 @@ static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { }; static const tid_t HTMLXMLHttpRequest_iface_tids[] = { - IHTMLXMLHttpRequest_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl, DispHTMLXMLHttpRequest_tid, HTMLXMLHttpRequest_iface_tids, - EventTarget_init_dispex_info + HTMLXMLHttpRequest_init_dispex_info };

1 0

Jacek Caban : mshtml: Implement IHTMLCSSStyleDeclaration2::animation property.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: ee611b198d8de1251486b505cffb9cac96f5cacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee611b198d8de1251486b505… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 19:36:38 2021 +0100 mshtml: Implement IHTMLCSSStyleDeclaration2::animation property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 43a71d6286c..0ae2dfe863e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -120,6 +120,12 @@ typedef struct { } style_tbl_entry_t; static const style_tbl_entry_t style_tbl[] = { + { + L"animation", + DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATION, + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 + }, { L"animation-name", DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME, @@ -9689,15 +9695,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animationIterationCount(IHTML static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_ANIMATION, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_ANIMATION, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animationFillMode(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index a21dfe88d38..25f87c802b2 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -44,6 +44,7 @@ struct HTMLStyle { /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { + STYLEID_ANIMATION, STYLEID_ANIMATION_NAME, STYLEID_BACKGROUND, STYLEID_BACKGROUND_ATTACHMENT, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 69f1e61cac1..255dc7f7900 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1106,6 +1106,36 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) ok(hres == S_OK, "get_perspective failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"100px"), "perspective = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + /* animation property */ + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str); + ok(hres == S_OK, "get_animation failed: %08x\n", hres); + ok(!str, "animation = %s\n", wine_dbgstr_w(str)); + + str = SysAllocString(L"test"); + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, str); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str); + ok(hres == S_OK, "get_animation failed: %08x\n", hres); + todo_wine + ok(!lstrcmpW(str, L"test"), "animation = %s\n", wine_dbgstr_w(str)); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str); + ok(hres == S_OK, "get_animationName failed: %08x\n", hres); + ok(!lstrcmpW(str, L"test"), "animationName = %s\n", wine_dbgstr_w(str)); + + str = SysAllocString(L"test"); + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml/tests: Use more winetest.js helpers in documentmode.js.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 44d58d35d19f3b9887f474e3528fcd874c63c7ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d58d35d19f3b9887f474e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 19:36:21 2021 +0100 mshtml/tests: Use more winetest.js helpers in documentmode.js. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 79 ++++++++++++--------------------------- dlls/mshtml/tests/winetest.js | 8 ++++ 2 files changed, 31 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 4b788c970b9..d6589343dff 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -17,8 +17,9 @@ */ var compat_version; +var tests = []; -function test_elem_props() { +sync_test("elem_props", function() { var elem = document.documentElement; function test_exposed(prop, expect) { @@ -41,11 +42,9 @@ function test_elem_props() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); +}); - next_test(); -} - -function test_doc_props() { +sync_test("doc_props", function() { function test_exposed(prop, expect) { if(expect) ok(prop in document, prop + " not found in document."); @@ -66,11 +65,9 @@ function test_doc_props() { test_exposed("parentWindow", true); if(v >= 9) ok(document.defaultView === document.parentWindow, "defaultView != parentWindow"); +}); - next_test(); -} - -function test_docfrag_props() { +sync_test("docfrag_props", function() { var docfrag = document.createDocumentFragment(); function test_exposed(prop, expect) { @@ -83,11 +80,9 @@ function test_docfrag_props() { var v = document.documentMode; test_exposed("compareDocumentPosition", v >= 9); +}); - next_test(); -} - -function test_window_props() { +sync_test("window_props", function() { function test_exposed(prop, expect) { if(expect) ok(prop in window, prop + " not found in window."); @@ -108,11 +103,9 @@ function test_window_props() { test_exposed("getComputedStyle", v >= 9); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); +}); - next_test(); -} - -function test_xhr_props() { +sync_test("xhr_props", function() { var xhr = new XMLHttpRequest(); function test_exposed(prop, expect) { @@ -127,11 +120,9 @@ function test_xhr_props() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); +}); - next_test(); -} - -function test_style_props() { +sync_test("style_props", function() { var style = document.body.style; function test_exposed(prop, expect) { @@ -186,11 +177,9 @@ function test_style_props() { test_exposed("background-clip", v >= 9); test_exposed("transform", v >= 10); } +}); - next_test(); -} - -function test_javascript() { +sync_test("JS objs", function() { var g = window; function test_exposed(func, obj, expect) { @@ -239,11 +228,9 @@ function test_javascript() { test_parses("if(false) { o.default; }", v >= 9); test_parses("if(false) { o.with; }", v >= 9); test_parses("if(false) { o.if; }", v >= 9); +}); - next_test(); -} - -function test_elem_by_id() { +sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; var id_elem = document.getElementById("testid"); @@ -254,11 +241,9 @@ function test_elem_by_id() { ok(id_elem === name_elem, "id_elem != id_elem"); else ok(name_elem === null, "name_elem != null"); +}); - next_test(); -} - -function test_doc_mode() { +sync_test("doc_mode", function() { compat_version = parseInt(document.location.search.substring(1)); trace("Testing compatibility mode " + compat_version); @@ -275,11 +260,9 @@ function test_doc_mode() { ok(document.compatMode === "CSS1Compat", "document.compatMode = " + document.compatMode); else ok(document.compatMode === "BackCompat", "document.compatMode = " + document.compatMode); +}); - next_test(); -} - -function test_iframe_doc_mode() { +async_test("iframe_doc_mode", function() { var iframe = document.createElement("iframe"); iframe.onload = function() { @@ -293,9 +276,9 @@ function test_iframe_doc_mode() { iframe.src = "about:blank"; document.body.appendChild(iframe); -} +}); -function test_conditional_comments() { +sync_test("conditional_comments", function() { var div = document.createElement("div"); document.body.appendChild(div); @@ -323,20 +306,4 @@ function test_conditional_comments() { test_version(6); test_version(7); test_version(8); - - next_test(); -} - -var tests = [ - test_doc_mode, - test_iframe_doc_mode, - test_elem_props, - test_doc_props, - test_docfrag_props, - test_window_props, - test_javascript, - test_xhr_props, - test_style_props, - test_elem_by_id, - test_conditional_comments -]; +}); diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 6d99adf12b2..ca7f2aab4c2 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -90,3 +90,11 @@ function sync_test(name, f) next_test(); }); } + +function async_test(name, f) +{ + tests.push(function() { + test_name = name; + f(); + }); +}

1 0

Martin Storsjo : msvcrt: Fix reading BOM-less files opened with ccs=unicode.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: fb0fa9aacf0d58b3fd5f26255858a744b29ee000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb0fa9aacf0d58b3fd5f2625… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 27 19:07:26 2021 +0100 msvcrt: Fix reading BOM-less files opened with ccs=unicode. This fixes a regression in running MSVC 2010 in wine, when reading .def files (regressed in b0ab1b76029eaface724a28483fe8b0ea36029dc). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ba534568119..73e1a82476f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2329,6 +2329,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm msvcrt_set_errno(GetLastError()); return *_errno(); } + oflags |= _O_U16TEXT; } } else if (access & GENERIC_READ) @@ -2346,8 +2347,9 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm return *_errno(); if (oflags & _O_WTEXT) - get_ioinfo_nolock(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; - else if (oflags & _O_U16TEXT) + get_ioinfo_nolock(*fd)->exflag |= EF_UNK_UNICODE; + + if (oflags & _O_U16TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF16; else if (oflags & _O_U8TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF8; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ecf99e38b0e..0cf8bad124f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1039,6 +1039,40 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text + 1, ARRAY_SIZE(wchar_text) - 1, + utf8_text, sizeof(utf8_text), NULL, NULL); + ok(ret > 0, "utf-8 conversion failed\n"); + utf8_text[ret] = 0; + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; utf8_text[i]; i++) + { + ch = fgetwc(tempfh); + ok(ch == (unsigned char) utf8_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, (unsigned char)utf8_text[i], i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + unlink(temppath); }

1 0

Alexandre Julliard : ntdll: Implement NtCreateDebugObject().
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 5ebc20c65609cc1b8643b427104ed386094a65c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ebc20c65609cc1b8643b427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 10:43:30 2021 +0100 ntdll: Implement NtCreateDebugObject(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/om.c | 14 +++++++++ dlls/ntdll/unix/sync.c | 25 ++++++++++++++++ include/wine/server_protocol.h | 20 ++++++++++++- include/winternl.h | 7 +++++ server/debugger.c | 66 ++++++++++++++++++++++++++++++++++++++---- server/protocol.def | 9 ++++++ server/request.h | 6 ++++ server/trace.c | 14 +++++++++ 9 files changed, 156 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ebc20c65609cc1b8643…

1 0

Alexandre Julliard : server: Rename debug_ctx to debug_obj.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: c1a042cefbc38eae6e0824a460a0657148e6745a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a042cefbc38eae6e0824a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 10:36:43 2021 +0100 server: Rename debug_ctx to debug_obj. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 134 +++++++++++++++++++++++++++--------------------------- server/thread.c | 4 +- server/thread.h | 4 +- 3 files changed, 71 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a042cefbc38eae6e08…

1 0

Piotr Caban : msvcrt: Improve memmove performance on i386 and x86_64 architectures.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 38c490496000c5852f14e9c022868c5107d9ff03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c490496000c5852f14e9c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 26 19:42:03 2021 +0100 msvcrt: Improve memmove performance on i386 and x86_64 architectures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/string.c | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=38c490496000c5852f14…

1 0

Zebediah Figura : winegstreamer: Don't force request_buffer_src() onto a Wine thread.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: ad6a3e753467a1b2006d927ede6709a5ccc41b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad6a3e753467a1b2006d927e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 17:45:32 2021 -0600 winegstreamer: Don't force request_buffer_src() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 16 ---------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 9 +-------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index ee2452987d9..5267091c5e1 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -161,22 +161,6 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, return cbdata.u.activate_mode_data.ret; } -GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, - GstBuffer **buf) -{ - struct cb_data cbdata = { REQUEST_BUFFER_SRC }; - - cbdata.u.getrange_data.pad = pad; - cbdata.u.getrange_data.parent = parent; - cbdata.u.getrange_data.ofs = ofs; - cbdata.u.getrange_data.len = len; - cbdata.u.getrange_data.buf = buf; - - call_cb(&cbdata); - - return cbdata.u.getrange_data.ret; -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index e80fcd41e4a..4afde78ba7d 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -32,7 +32,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, ACTIVATE_MODE, - REQUEST_BUFFER_SRC, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -116,7 +115,6 @@ void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; -GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fc861735cd7..5c6266f4bd0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1598,7 +1598,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_element_set_bus(This->container, This->bus); This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); - gst_pad_set_getrange_function(This->my_src, request_buffer_src_wrapper); + gst_pad_set_getrange_function(This->my_src, request_buffer_src); gst_pad_set_query_function(This->my_src, query_function); gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); gst_pad_set_event_function(This->my_src, event_src); @@ -2536,13 +2536,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) cbdata->u.activate_mode_data.ret = activate_mode(data->pad, data->parent, data->mode, data->activate); break; } - case REQUEST_BUFFER_SRC: - { - struct getrange_data *data = &cbdata->u.getrange_data; - cbdata->u.getrange_data.ret = request_buffer_src(data->pad, data->parent, - data->ofs, data->len, data->buf); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data;

1 0

Zebediah Figura : winegstreamer: Manage our own thread for read requests.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 3b885fb5f309f93bef2c4b4626d751dc9c0a6b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b885fb5f309f93bef2c4b46… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 17:45:31 2021 -0600 winegstreamer: Manage our own thread for read requests. Synchronization around flushing (on both sides) is tricky here, and the solution used by this patch means that a "kernel" thread can be blocked on a "user" thread. However, since it's not a real kernel thread and can't bring down the rest of the "kernel", I don't think this is a concern. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 116 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b2d102b528e..fc861735cd7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -63,7 +63,7 @@ struct parser /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ - bool streaming, flushing; + bool streaming, flushing, sink_connected; GstElement *container; GstPad *my_src, *their_sink; @@ -76,6 +76,17 @@ struct parser HANDLE push_thread; + HANDLE read_thread; + pthread_cond_t read_cond, read_done_cond; + struct + { + GstBuffer *buffer; + uint64_t offset; + uint32_t size; + bool done; + GstFlowReturn ret; + } read_request; + BOOL (*init_gst)(struct parser *filter); HRESULT (*source_query_accept)(struct parser_source *pin, const AM_MEDIA_TYPE *mt); HRESULT (*source_get_media_type)(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt); @@ -684,6 +695,12 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct { struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + /* Unlike request_buffer_src() [q.v.], we need to watch for GStreamer + * flushes here. The difference is that we can be blocked by the streaming + * thread not running (or itself flushing on the DirectShow side). + * request_buffer_src() can only be blocked by the upstream source, and that + * is solved by flushing the upstream source. */ + pthread_mutex_lock(&filter->mutex); while (!pin->flushing && pin->event.type != PARSER_EVENT_NONE) pthread_cond_wait(&pin->event_empty_cond, &filter->mutex); @@ -1095,14 +1112,51 @@ static DWORD CALLBACK stream_thread(void *arg) return 0; } -static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buffer) +static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { - struct parser *This = gst_pad_get_element_private(pad); + struct parser *filter = gst_pad_get_element_private(pad); GstBuffer *new_buffer = NULL; + GstFlowReturn ret; + + GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + + if (!*buffer) + *buffer = new_buffer = gst_buffer_new_and_alloc(size); + + pthread_mutex_lock(&filter->mutex); + + assert(!filter->read_request.buffer); + filter->read_request.buffer = *buffer; + filter->read_request.offset = offset; + filter->read_request.size = size; + filter->read_request.done = false; + pthread_cond_signal(&filter->read_cond); + + /* Note that we don't unblock this wait on GST_EVENT_FLUSH_START. We expect + * the upstream pin to flush if necessary. We should never be blocked on + * read_thread() not running. */ + + while (!filter->read_request.done) + pthread_cond_wait(&filter->read_done_cond, &filter->mutex); + + ret = filter->read_request.ret; + + pthread_mutex_unlock(&filter->mutex); + + GST_LOG("Request returned %s.", gst_flow_get_name(ret)); + + if (ret != GST_FLOW_OK && new_buffer) + gst_buffer_unref(new_buffer); + + return ret; +} + +static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, GstBuffer *buffer) +{ HRESULT hr; GstMapInfo info; - TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buffer); + TRACE("filter %p, offset %s, length %u, buffer %p.\n", This, wine_dbgstr_longlong(ofs), len, buffer); if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; @@ -1114,22 +1168,47 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 len = This->filesize - ofs; This->nextpullofs = ofs + len; - if (!*buffer) - *buffer = new_buffer = gst_buffer_new_and_alloc(len); - gst_buffer_map(*buffer, &info, GST_MAP_WRITE); + gst_buffer_map(buffer, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); - gst_buffer_unmap(*buffer, &info); + gst_buffer_unmap(buffer, &info); if (FAILED(hr)) { ERR("Failed to read data, hr %#x.\n", hr); - if (new_buffer) - gst_buffer_unref(new_buffer); return GST_FLOW_ERROR; } return GST_FLOW_OK; } +static DWORD CALLBACK read_thread(void *arg) +{ + struct parser *filter = arg; + + TRACE("Starting read thread for filter %p.\n", filter); + + pthread_mutex_lock(&filter->mutex); + + for (;;) + { + while (filter->sink_connected && !filter->read_request.buffer) + pthread_cond_wait(&filter->read_cond, &filter->mutex); + + if (!filter->sink_connected) + break; + + filter->read_request.done = true; + filter->read_request.ret = read_buffer(filter, filter->read_request.offset, + filter->read_request.size, filter->read_request.buffer); + filter->read_request.buffer = NULL; + pthread_cond_signal(&filter->read_done_cond); + } + + pthread_mutex_unlock(&filter->mutex); + + TRACE("Streaming stopped; exiting.\n"); + return 0; +} + static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) { struct parser *filter = user; @@ -1506,6 +1585,10 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) IAsyncReader_Length(This->reader, &This->filesize, &avail); + This->sink_connected = true; + + This->read_thread = CreateThread(NULL, 0, read_thread, This, 0, NULL); + if (!This->bus) { This->bus = gst_bus_new(); gst_bus_set_sync_handler(This->bus, watch_bus, This, NULL); @@ -1599,6 +1682,8 @@ static void parser_destroy(struct strmbase_filter *iface) gst_object_unref(filter->bus); } + pthread_cond_destroy(&filter->read_cond); + pthread_cond_destroy(&filter->read_done_cond); pthread_cond_destroy(&filter->init_cond); pthread_mutex_destroy(&filter->mutex); @@ -1895,6 +1980,8 @@ static void parser_init_common(struct parser *object) { pthread_mutex_init(&object->mutex, NULL); pthread_cond_init(&object->init_cond, NULL); + pthread_cond_init(&object->read_cond, NULL); + pthread_cond_init(&object->read_done_cond, NULL); object->flushing = true; } @@ -2411,6 +2498,15 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) gst_object_unref(This->their_sink); This->my_src = This->their_sink = NULL; + /* read_thread() needs to stay alive to service any read requests GStreamer + * sends, so we can only shut it down after GStreamer stops. */ + pthread_mutex_lock(&This->mutex); + This->sink_connected = false; + pthread_mutex_unlock(&This->mutex); + pthread_cond_signal(&This->read_cond); + WaitForSingleObject(This->read_thread, INFINITE); + CloseHandle(This->read_thread); + for (i = 0; i < This->source_count; ++i) free_source_pin(This->sources[i]);

1 0

Zebediah Figura : winegstreamer: Don't force removed_decoded_pad() onto a Wine thread.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 2e41e3be571d5be2e4d9df24208cb3d027eb9a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e41e3be571d5be2e4d9df24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 17:45:30 2021 -0600 winegstreamer: Don't force removed_decoded_pad() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 11 ----------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 10 ++-------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 6c5877ce785..ee2452987d9 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -177,17 +177,6 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 return cbdata.u.getrange_data.ret; } -void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) -{ - struct cb_data cbdata = { REMOVED_DECODED_PAD }; - - cbdata.u.pad_removed_data.element = bin; - cbdata.u.pad_removed_data.pad = pad; - cbdata.u.pad_removed_data.user = user; - - call_cb(&cbdata); -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index f063a0a2a7b..e80fcd41e4a 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -33,7 +33,6 @@ enum CB_TYPE { EXISTING_NEW_PAD, ACTIVATE_MODE, REQUEST_BUFFER_SRC, - REMOVED_DECODED_PAD, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -119,7 +118,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLS gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; -void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5c13d5e06f3..b2d102b528e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1765,7 +1765,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) gst_bin_add(GST_BIN(filter->container), element); g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); - g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); + g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); @@ -2447,12 +2447,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) data->ofs, data->len, data->buf); break; } - case REMOVED_DECODED_PAD: - { - struct pad_removed_data *data = &cbdata->u.pad_removed_data; - removed_decoded_pad(data->element, data->pad, data->user); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data; @@ -2617,7 +2611,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) gst_bin_add(GST_BIN(filter->container), element); g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); - g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); + g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); filter->their_sink = gst_element_get_static_pad(element, "sink");

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in removed_decoded_pad().
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: cfce5054ac2a412d0be6ce9cd359f467f8ec0cfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfce5054ac2a412d0be6ce9c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 17:45:29 2021 -0600 winegstreamer: Avoid using Wine debug functions in removed_decoded_pad(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5181d0951d5..5c13d5e06f3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1136,7 +1136,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) unsigned int i; char *name; - TRACE("filter %p, bin %p, pad %p.\n", filter, bin, pad); + GST_LOG("filter %p, bin %p, pad %p.", filter, bin, pad); for (i = 0; i < filter->source_count; ++i) { @@ -1155,7 +1155,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) } name = gst_pad_get_name(pad); - WARN("No pin matching pad %s found.\n", debugstr_a(name)); + GST_LOG("No pin matching pad \"%s\" found.", name); g_free(name); }

1 0

Matteo Bruni : vkd3d-compiler: Require a profile specification when compiling HLSL sources.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: vkd3d Branch: master Commit: 9d6be9530b95f7774657915b5c46dc390a736362 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9d6be9530b95f7774657915… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 20:26:36 2021 +0100 vkd3d-compiler: Require a profile specification when compiling HLSL sources. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index f1e597a..94cce20 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -496,6 +496,12 @@ static bool parse_command_line(int argc, char **argv, struct options *options) return false; } + if (!options->preprocess_only && options->source_type == VKD3D_SHADER_SOURCE_HLSL && !options->profile) + { + fprintf(stderr, "You need to specify a profile when compiling from HLSL source.\n"); + return false; + } + if (optind < argc) options->filename = argv[argc - 1];

1 0

Matteo Bruni : vkd3d-shader: Cleanup predefined macro body on allocation failure.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: vkd3d Branch: master Commit: 1e01656def355b589f0602b51b67e3aa34df10c6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e01656def355b589f0602b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 20:26:33 2021 +0100 vkd3d-shader: Cleanup predefined macro body on allocation failure. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 82b6492..bf4d669 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -743,10 +743,14 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, vkd3d_string_buffer_init(&body); vkd3d_string_buffer_printf(&body, "%s", ctx.preprocess_info->macros[i].value); if (!(name = vkd3d_strdup(ctx.preprocess_info->macros[i].name))) + { + vkd3d_string_buffer_cleanup(&body); goto fail; + } if (!preproc_add_macro(&ctx, &loc, name, NULL, 0, &loc, &body)) { vkd3d_free(name); + vkd3d_string_buffer_cleanup(&body); goto fail; } }

1 0

Matteo Bruni : vkd3d: Fix typo in WARN() message.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: vkd3d Branch: master Commit: f26eed586da97de0c71b9934a5f35f33317005ce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f26eed586da97de0c71b993… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 20:26:32 2021 +0100 vkd3d: Fix typo in WARN() message. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e5c6791..8b84451 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -195,7 +195,7 @@ static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *que { unsigned int i; - WARN("Ressetting sequence number for queue %p.\n", queue); + WARN("Resetting sequence number for queue %p.\n", queue); queue->completed_sequence_number = 0; queue->submitted_sequence_number = 1;

1 0

Francois Gouget : testbot/web: The ISO 8601 date format uses dashes rather than slashes.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: tools Branch: master Commit: d1a934f039057c826b9e19e4d9f67f0d1edeef7c URL: https://source.winehq.org/git/tools.git/?a=commit;h=d1a934f039057c826b9e19e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 04:04:34 2021 +0100 testbot/web: The ISO 8601 date format uses dashes rather than slashes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 6 +++--- testbot/web/JobDetails.pl | 2 +- testbot/web/index.pl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index f9e590c..b523d14 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -85,7 +85,7 @@ function Pad2(n) function ShowDateTime(Sec1970, Id, Attr) { var Dt = new Date(Sec1970 * 1000); - var Pretty = Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + + var Pretty = Dt.getFullYear() + '-' + Pad2(Dt.getMonth() + 1) + '-' + Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) if (Id != null) @@ -461,7 +461,7 @@ sub GetDisplayValue($$$) { $Value = "<noscript><div>" . - strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . "<script type='text/javascript'></script>\n"; @@ -487,7 +487,7 @@ sub GetEscapedDisplayValue($$$) $Value = "<script type='text/javascript'></script><noscript><div>" . - strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n"; } } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 5a484da..7a4f4fc 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -696,7 +696,7 @@ sub GenerateDataCell($$$$$) my $Duration = $StepTask->Ended - $StepTask->Started; my $TagId = "E". $StepTask->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y/%m/%d %H:%M:%S", localtime($StepTask->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($StepTask->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'><!--\n"; print " ShowDateTime(", $StepTask->Ended, ",'$TagId');\n"; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 39fea3e..088aea1 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -163,7 +163,7 @@ sub GenerateDataCell($$$$) my $Duration = $Item->Ended - $Item->Submitted; my $TagId = "E". $Item->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($Item->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'><!--\n"; print " ShowDateTime(", $Item->Ended, ",'$TagId');\n";

1 0

Francois Gouget : testbot/LogUtils: Ignore empty report lines.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: tools Branch: master Commit: 153a206d85287602ec1900aee3e620a89adbde6f URL: https://source.winehq.org/git/tools.git/?a=commit;h=153a206d85287602ec1900a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 04:03:36 2021 +0100 testbot/LogUtils: Ignore empty report lines. They have no impact on the ParseWineTestReport() result. Also this matches the winetest parser behavior. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 7786494..d537af2 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -531,6 +531,7 @@ sub ParseWineTestReport($$$) { $LineNo++; $Cur->{UnitSize} += length($Line); + next if ($Line =~ /^\s*$/); # empty lines have no impact chomp $Line; $Line =~ s/\r+$//;

1 0

Francois Gouget : testbot/PatchUtils: Run make_requests when it is modified.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: tools Branch: master Commit: 23fed17b68e5c7b8adfa603b74e0ee387004b87e URL: https://source.winehq.org/git/tools.git/?a=commit;h=23fed17b68e5c7b8adfa603… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 03:59:18 2021 +0100 testbot/PatchUtils: Run make_requests when it is modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 5588df2..b2749c4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -324,7 +324,7 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(server/protocol\.def)$=) + elsif ($Line =~ m=^--- \w+/(tools/make_requests|server/protocol\.def)$=) { $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1;

1 0

Francois Gouget : testbot/TestWTBS: Allow checking emails that don't contain a patch.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: tools Branch: master Commit: c6f00ecf6767781726a5d0d79ca1765e38105ad3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6f00ecf6767781726a5d0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 03:57:27 2021 +0100 testbot/TestWTBS: Allow checking emails that don't contain a patch. When an email contains no patch it is not saved in the patches folder, which also makes putting TestWTBS directives in the email body pointless. This patch allows telling TestWTBS this is expected by adding 'WTBS' and 'NoPatch' anywhere in the subject line. Conversely, if the subject contains 'WTBS' but not 'NoPatch', TestWTBS expects to find a file in the patches folder. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index d0e7cab..67b1c8f 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1152,9 +1152,19 @@ sub CheckPatches() foreach my $Patch (sort { $b->Id <=> $a->Id } @{$Patches->GetItems()}) { my $PatchFileName = "$DataDir/patches/". $Patch->Id; - next if (!-f $PatchFileName); - my $TestInfo = LoadTestInfo($PatchFileName); - CheckPatch($Jobs, $Patch, $TestInfo) if ($TestInfo); + if (-f $PatchFileName) + { + ok($Patch->Subject !~ /NoPatch/, "Found a file for patch ". $Patch->Id .": ". $Patch->Subject) + or diag("Disposition=". $Patch->Disposition); + my $TestInfo = LoadTestInfo($PatchFileName); + CheckPatch($Jobs, $Patch, $TestInfo) if ($TestInfo); + } + elsif ($Patch->Subject =~ /\bWTBS\b/) + { + ok(($Patch->Subject =~ /NoPatch/ or $Patch->Disposition eq "Reply to a patch series"), + "Found no file for patch ". $Patch->Id .": ". $Patch->Subject) + or diag("Disposition=". $Patch->Disposition); + } } }

1 0

Georg Lehmann : winevulkan: Fix surface functions if they aren't called by winevulkan.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: c1824d578ac514d29e79a5a00d6759f11dbe4813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1824d578ac514d29e79a5a0… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jan 26 13:32:24 2021 +0100 winevulkan: Fix surface functions if they aren't called by winevulkan. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50549 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 15 ++++++++-- dlls/winevulkan/make_vulkan | 60 ++++++++++++++-------------------------- dlls/winevulkan/vulkan.c | 45 +++++++++++++++++++++++++----- dlls/winevulkan/vulkan_private.h | 3 +- dlls/winevulkan/vulkan_thunks.c | 24 ++++++---------- dlls/winevulkan/vulkan_thunks.h | 4 +++ dlls/winex11.drv/vulkan.c | 15 ++++++++-- include/wine/vulkan_driver.h | 31 +++------------------ 8 files changed, 103 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1824d578ac514d29e79…

1 0

Georg Lehmann : winevulkan: Don't advertise VK_EXT_headless_surface.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 88eb322830af566a83c3d55592cf7898c506a27b URL: https://source.winehq.org/git/wine.git/?a=commit;h=88eb322830af566a83c3d555… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jan 26 13:32:23 2021 +0100 winevulkan: Don't advertise VK_EXT_headless_surface. This extension never worked. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan_thunks.c | 8 -------- dlls/winevulkan/vulkan_thunks.h | 2 -- include/wine/vulkan.h | 12 ------------ 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6aa126c7169..9cce96aefd3 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -86,6 +86,7 @@ EXT_BLOCK_SIZE = 1000 UNSUPPORTED_EXTENSIONS = [ # Instance extensions + "VK_EXT_headless_surface", # Needs WSI work. "VK_KHR_display", # Needs WSI work. "VK_KHR_surface_protected_capabilities", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 9aec8b1e856..763d75143b8 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5053,12 +5053,6 @@ VkResult WINAPI wine_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache #endif } -static VkResult WINAPI wine_vkCreateHeadlessSurfaceEXT(VkInstance instance, const VkHeadlessSurfaceCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) -{ - TRACE("%p, %p, %p, %p\n", instance, pCreateInfo, pAllocator, pSurface); - return instance->funcs.p_vkCreateHeadlessSurfaceEXT(instance->instance, pCreateInfo, NULL, pSurface); -} - VkResult WINAPI wine_vkCreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImage *pImage) { TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pImage); @@ -6993,7 +6987,6 @@ static const struct vulkan_func vk_instance_dispatch_table[] = {"vkCreateDebugReportCallbackEXT", &wine_vkCreateDebugReportCallbackEXT}, {"vkCreateDebugUtilsMessengerEXT", &wine_vkCreateDebugUtilsMessengerEXT}, {"vkCreateDevice", &wine_vkCreateDevice}, - {"vkCreateHeadlessSurfaceEXT", &wine_vkCreateHeadlessSurfaceEXT}, {"vkCreateWin32SurfaceKHR", &wine_vkCreateWin32SurfaceKHR}, {"vkDebugReportMessageEXT", &wine_vkDebugReportMessageEXT}, {"vkDestroyDebugReportCallbackEXT", &wine_vkDestroyDebugReportCallbackEXT}, @@ -7253,7 +7246,6 @@ static const char * const vk_instance_extensions[] = { "VK_EXT_debug_report", "VK_EXT_debug_utils", - "VK_EXT_headless_surface", "VK_EXT_swapchain_colorspace", "VK_EXT_validation_features", "VK_EXT_validation_flags", diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f42b845dcb0..3fae2979752 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1936,7 +1936,6 @@ struct vulkan_instance_funcs VkResult (*p_vkCreateDebugReportCallbackEXT)(VkInstance, const VkDebugReportCallbackCreateInfoEXT *, const VkAllocationCallbacks *, VkDebugReportCallbackEXT *); VkResult (*p_vkCreateDebugUtilsMessengerEXT)(VkInstance, const VkDebugUtilsMessengerCreateInfoEXT *, const VkAllocationCallbacks *, VkDebugUtilsMessengerEXT *); VkResult (*p_vkCreateDevice)(VkPhysicalDevice, const VkDeviceCreateInfo *, const VkAllocationCallbacks *, VkDevice *); - VkResult (*p_vkCreateHeadlessSurfaceEXT)(VkInstance, const VkHeadlessSurfaceCreateInfoEXT *, const VkAllocationCallbacks *, VkSurfaceKHR *); VkResult (*p_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); void (*p_vkDebugReportMessageEXT)(VkInstance, VkDebugReportFlagsEXT, VkDebugReportObjectTypeEXT, uint64_t, size_t, int32_t, const char *, const char *); void (*p_vkDestroyDebugReportCallbackEXT)(VkInstance, VkDebugReportCallbackEXT, const VkAllocationCallbacks *); @@ -2357,7 +2356,6 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCreateDebugReportCallbackEXT) \ USE_VK_FUNC(vkCreateDebugUtilsMessengerEXT) \ USE_VK_FUNC(vkCreateDevice) \ - USE_VK_FUNC(vkCreateHeadlessSurfaceEXT) \ USE_VK_FUNC(vkCreateWin32SurfaceKHR) \ USE_VK_FUNC(vkDebugReportMessageEXT) \ USE_VK_FUNC(vkDestroyDebugReportCallbackEXT) \ diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index dedfb3f2984..aed07e7c1e5 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -353,8 +353,6 @@ #define VK_EXT_YCBCR_IMAGE_ARRAYS_EXTENSION_NAME "VK_EXT_ycbcr_image_arrays" #define VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_SPEC_VERSION 1 #define VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_EXTENSION_NAME "VK_KHR_uniform_buffer_standard_layout" -#define VK_EXT_HEADLESS_SURFACE_SPEC_VERSION 1 -#define VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME "VK_EXT_headless_surface" #define VK_KHR_BUFFER_DEVICE_ADDRESS_SPEC_VERSION 1 #define VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME "VK_KHR_buffer_device_address" #define VK_EXT_LINE_RASTERIZATION_SPEC_VERSION 1 @@ -3094,7 +3092,6 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT = 1000251000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT = 1000252000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES = 1000253000, - VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES = 1000257000, VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002, VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO = 1000257003, @@ -5712,13 +5709,6 @@ typedef struct VkGeometryAABBNV VkDeviceSize WINE_VK_ALIGN(8) offset; } VkGeometryAABBNV; -typedef struct VkHeadlessSurfaceCreateInfoEXT -{ - VkStructureType sType; - const void *pNext; - VkHeadlessSurfaceCreateFlagsEXT flags; -} VkHeadlessSurfaceCreateInfoEXT; - typedef struct VkImageMemoryBarrier { VkStructureType sType; @@ -8504,7 +8494,6 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateEvent)(VkDevice, const VkEventCreateInf typedef VkResult (VKAPI_PTR *PFN_vkCreateFence)(VkDevice, const VkFenceCreateInfo *, const VkAllocationCallbacks *, VkFence *); typedef VkResult (VKAPI_PTR *PFN_vkCreateFramebuffer)(VkDevice, const VkFramebufferCreateInfo *, const VkAllocationCallbacks *, VkFramebuffer *); typedef VkResult (VKAPI_PTR *PFN_vkCreateGraphicsPipelines)(VkDevice, VkPipelineCache, uint32_t, const VkGraphicsPipelineCreateInfo *, const VkAllocationCallbacks *, VkPipeline *); -typedef VkResult (VKAPI_PTR *PFN_vkCreateHeadlessSurfaceEXT)(VkInstance, const VkHeadlessSurfaceCreateInfoEXT *, const VkAllocationCallbacks *, VkSurfaceKHR *); typedef VkResult (VKAPI_PTR *PFN_vkCreateImage)(VkDevice, const VkImageCreateInfo *, const VkAllocationCallbacks *, VkImage *); typedef VkResult (VKAPI_PTR *PFN_vkCreateImageView)(VkDevice, const VkImageViewCreateInfo *, const VkAllocationCallbacks *, VkImageView *); typedef VkResult (VKAPI_PTR *PFN_vkCreateIndirectCommandsLayoutNV)(VkDevice, const VkIndirectCommandsLayoutCreateInfoNV *, const VkAllocationCallbacks *, VkIndirectCommandsLayoutNV *); @@ -8887,7 +8876,6 @@ VkResult VKAPI_CALL vkCreateEvent(VkDevice device, const VkEventCreateInfo *pCre VkResult VKAPI_CALL vkCreateFence(VkDevice device, const VkFenceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkFence *pFence); VkResult VKAPI_CALL vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkFramebuffer *pFramebuffer); VkResult VKAPI_CALL vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines); -VkResult VKAPI_CALL vkCreateHeadlessSurfaceEXT(VkInstance instance, const VkHeadlessSurfaceCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface); VkResult VKAPI_CALL vkCreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImage *pImage); VkResult VKAPI_CALL vkCreateImageView(VkDevice device, const VkImageViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImageView *pView); VkResult VKAPI_CALL vkCreateIndirectCommandsLayoutNV(VkDevice device, const VkIndirectCommandsLayoutCreateInfoNV *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkIndirectCommandsLayoutNV *pIndirectCommandsLayout);

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 0174f7072e64652f6d0e5d0a312f0917211feb63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0174f7072e64652f6d0e5d0a… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Jan 26 13:15:00 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 3136 ++++++++++++++++++++++++-------------------------------------- 1 file changed, 1191 insertions(+), 1945 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0174f7072e64652f6d0e…

1 0

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 January 2021