wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021