April 2020 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Make the adapter responsible for draws.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 95b66030bbf044f0b1d4efb71e645580957b3244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95b66030bbf044f0b1d4efb7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 02:46:25 2020 +0430 wined3d: Make the adapter responsible for draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 7 +++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 343dfff0ee..29496f2556 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5101,6 +5101,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = .adapter_create_query = adapter_gl_create_query, .adapter_destroy_query = adapter_gl_destroy_query, .adapter_flush_context = adapter_gl_flush_context, + .adapter_draw_primitive = draw_primitive, .adapter_dispatch_compute = dispatch_compute, .adapter_clear_uav = adapter_gl_clear_uav, }; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7c63562086..b6a0eea785 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1414,6 +1414,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_vk_draw_primitive(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) +{ + FIXME("device %p, state %p, parameters %p.\n", device, state, parameters); +} + static void adapter_vk_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { @@ -1457,6 +1463,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = .adapter_create_query = adapter_vk_create_query, .adapter_destroy_query = adapter_vk_destroy_query, .adapter_flush_context = adapter_vk_flush_context, + .adapter_draw_primitive = adapter_vk_draw_primitive, .adapter_dispatch_compute = adapter_vk_dispatch_compute, .adapter_clear_uav = adapter_vk_clear_uav, }; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 930351d092..85e696d4d1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -888,7 +888,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } state->gl_patch_vertices = op->patch_vertex_count; - draw_primitive(cs->device, state, &op->parameters); + cs->device->adapter->adapter_ops->adapter_draw_primitive(cs->device, state, &op->parameters); if (op->parameters.indirect) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 40221ab7de..b6a9b502d8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2843,6 +2843,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_no3d_draw_primitive(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) +{ + ERR("device %p, state %p, parameters %p.\n", device, state, parameters); +} + static void adapter_no3d_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { @@ -2886,6 +2892,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = .adapter_create_query = adapter_no3d_create_query, .adapter_destroy_query = adapter_no3d_destroy_query, .adapter_flush_context = adapter_no3d_flush_context, + .adapter_draw_primitive = adapter_no3d_draw_primitive, .adapter_dispatch_compute = adapter_no3d_dispatch_compute, .adapter_clear_uav = adapter_no3d_clear_uav, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5d2260001..a7983b31b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3031,6 +3031,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_draw_primitive)(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_draw_parameters *parameters); void (*adapter_dispatch_compute)(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters); void (*adapter_clear_uav)(struct wined3d_context *context,

1 0

Zebediah Figura : quartz: Don't register the audio renderer as a filter for autoplugging.
by Alexandre Julliard April 28, 2020

April 28, 2020

Module: wine Branch: master Commit: 406459ea9c8511717adab9885f1efeb92eb78b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=406459ea9c8511717adab988… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 27 18:17:06 2020 -0500 quartz: Don't register the audio renderer as a filter for autoplugging. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/regsvr.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index a5b52425b0..7bae46cb84 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -222,19 +222,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_AudioRender, - &CLSID_LegacyAmFilterCategory, - L"Audio Renderer", - 0x800000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }, -/* { &MEDIATYPE_Audio, &MEDIASUBTYPE_IEEE_FLOAT }, */ - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_AVIDec, &CLSID_LegacyAmFilterCategory, L"AVI Decompressor",

1 0

Gabriel Ivăncescu : qedit: Retrieve the pin media type using a helper function.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: ef00425a9c73e92da7bd1129d0c188243eba3c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef00425a9c73e92da7bd1129… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 14:14:03 2020 -0500 qedit: Retrieve the pin media type using a helper function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 392320560b..3c00a85b9e 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -103,6 +103,24 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) return hr; } +static HRESULT get_pin_media_type(IPin *pin, AM_MEDIA_TYPE *out) +{ + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE *pmt; + HRESULT hr; + + if (FAILED(hr = IPin_EnumMediaTypes(pin, &enummt))) + return hr; + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + IEnumMediaTypes_Release(enummt); + if (hr != S_OK) + return E_NOINTERFACE; + + *out = *pmt; + CoTaskMemFree(pmt); + return S_OK; +} + static HRESULT find_splitter(MediaDetImpl *detector) { IPin *source_pin, *splitter_pin; @@ -611,9 +629,6 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, AM_MEDIA_TYPE *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - IEnumMediaTypes *types; - AM_MEDIA_TYPE *pmt; - HRESULT hr; TRACE("(%p)\n", This); @@ -623,22 +638,7 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, if (!This->cur_pin) return E_INVALIDARG; - hr = IPin_EnumMediaTypes(This->cur_pin, &types); - if (SUCCEEDED(hr)) - { - hr = (IEnumMediaTypes_Next(types, 1, &pmt, NULL) == S_OK - ? S_OK - : E_NOINTERFACE); - IEnumMediaTypes_Release(types); - } - - if (SUCCEEDED(hr)) - { - *pVal = *pmt; - CoTaskMemFree(pmt); - } - - return hr; + return get_pin_media_type(This->cur_pin, pVal); } static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface,

1 0

Dmitry Timoshkov : windowscodecs: Fix IWICBitmapDecoder::CopyPalette for a not initialized case in the GIF decoder.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 18a915ef3ca9cd9ad76b97f2646bf32651e045d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18a915ef3ca9cd9ad76b97f2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 27 10:32:38 2020 +0800 windowscodecs: Fix IWICBitmapDecoder::CopyPalette for a not initialized case in the GIF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index fc8f4b1c3e..5d5a3a07a2 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1187,6 +1187,9 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet TRACE("(%p,%p)\n", iface, palette); + if (!This->gif) + return WINCODEC_ERR_WRONGSTATE; + cm = This->gif->SColorMap; if (cm) {

1 0

Dmitry Timoshkov : windowscodecs: Add initial implementation of the GIF encoder.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 7eb1f5d6ad4205c22d933d0bb417fb4ef6a035ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb1f5d6ad4205c22d933d0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 27 10:32:36 2020 +0800 windowscodecs: Add initial implementation of the GIF encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 14 +- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/gifformat.c | 1012 ++++++++++++++++++++++++- dlls/windowscodecs/regsvr.c | 10 + dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 6 files changed, 1003 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7eb1f5d6ad4205c22d93…

1 0

Michael Müller : ddraw: Make ddraw1_vtbl and ddraw_surface1_vtbl writable.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 100ca518055c0e9edb68aa370f15a2768cf2c74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=100ca518055c0e9edb68aa37… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 26 22:58:27 2020 -0500 ddraw: Make ddraw1_vtbl and ddraw_surface1_vtbl writable. Wine-Bug: <https://bugs.winehq.org/show_bug.cgi?id=39534> Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 3 ++- dlls/ddraw/surface.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7cfb56f45c..b7e7e6514a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4661,7 +4661,8 @@ static const struct IDirectDraw2Vtbl ddraw2_vtbl = ddraw2_GetAvailableVidMem, }; -static const struct IDirectDrawVtbl ddraw1_vtbl = +/* Bad Mojo Redux expects this vtbl to be writable. */ +static struct IDirectDrawVtbl ddraw1_vtbl = { /* IUnknown */ ddraw1_QueryInterface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c418bb7b2b..4423083835 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5613,7 +5613,8 @@ static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = ddraw_surface2_PageUnlock, }; -static const struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = +/* Bad Mojo Redux expects this vtbl to be writable. */ +static struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = { /* IUnknown */ ddraw_surface1_QueryInterface,

1 0

Gabriel Ivăncescu : qedit: Check for S_OK when enumerating the splitter pin.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 317d5c96886886f7193df06caf80246ec9a3b719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=317d5c96886886f7193df06c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 16:07:41 2020 +0300 qedit: Check for S_OK when enumerating the splitter pin. The splitter may return S_FALSE (no pins) and this caused a crash when it somehow matched with the File Source (Async). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index eb7a51928b..c3891c5cd3 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -197,7 +197,7 @@ static HRESULT find_splitter(MediaDetImpl *detector) hr = IEnumPins_Next(enum_pins, 1, &splitter_pin, NULL); IEnumPins_Release(enum_pins); - if (FAILED(hr)) + if (hr != S_OK) goto next; hr = IPin_Connect(source_pin, splitter_pin, NULL);

1 0

Zebediah Figura : ddraw/tests: Test vtbl protection.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: b95fe88ff5606df702ccd1048621bd2e13e8d574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95fe88ff5606df702ccd104… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 27 11:29:04 2020 -0500 ddraw/tests: Test vtbl protection. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 0e1f4ce85c..4e27ecfb79 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13410,6 +13410,75 @@ done: DestroyWindow(window); } +static void check_vtbl_protection_(int line, const void *vtbl, SIZE_T size) +{ + MEMORY_BASIC_INFORMATION info; + SIZE_T ret = VirtualQuery(vtbl, &info, size); + ok_(__FILE__, line)(ret == sizeof(info), "Failed to query memory.\n"); + ok_(__FILE__, line)(info.Protect & (PAGE_READWRITE | PAGE_WRITECOPY), "Got protection %#x.\n", info.Protect); +} +#define check_vtbl_protection(a) check_vtbl_protection_(__LINE__, a, sizeof(*(a))) + +static void test_vtbl_protection(void) +{ + PALETTEENTRY palette_entries[256]; + IDirectDrawSurface7 *surface7; + IDirectDrawSurface4 *surface4; + IDirectDrawSurface3 *surface3; + IDirectDrawSurface2 *surface2; + IDirectDrawSurface *surface1; + IDirectDrawPalette *palette; + DDSURFACEDESC surface_desc; + IDirectDraw *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface1, &IID_IDirectDrawSurface2, (void **)&surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface1, &IID_IDirectDrawSurface3, (void **)&surface3); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface1, &IID_IDirectDrawSurface4, (void **)&surface4); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface1, &IID_IDirectDrawSurface7, (void **)&surface7); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(palette_entries, 0, sizeof(palette_entries)); + hr = IDirectDraw_CreatePalette(ddraw, DDPCAPS_8BIT | DDPCAPS_ALLOW256, + palette_entries, &palette, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + check_vtbl_protection(ddraw->lpVtbl); + check_vtbl_protection(palette->lpVtbl); + check_vtbl_protection(surface1->lpVtbl); + check_vtbl_protection(surface2->lpVtbl); + check_vtbl_protection(surface3->lpVtbl); + check_vtbl_protection(surface4->lpVtbl); + check_vtbl_protection(surface7->lpVtbl); + + IDirectDrawPalette_Release(palette); + IDirectDrawSurface_Release(surface1); + IDirectDrawSurface2_Release(surface2); + IDirectDrawSurface3_Release(surface3); + IDirectDrawSurface4_Release(surface4); + IDirectDrawSurface7_Release(surface7); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -13523,4 +13592,5 @@ START_TEST(ddraw1) test_caps(); test_d32_support(); test_cursor_clipping(); + test_vtbl_protection(); }

1 0

Gabriel Ivăncescu : qedit: Use the pin's media type instead of querying for IFileSourceFilter.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: 11fd2092054a7af57382dc465ac416b3db779516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fd2092054a7af57382dc46… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 14:14:04 2020 -0500 qedit: Use the pin's media type instead of querying for IFileSourceFilter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 3c00a85b9e..5a19268985 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -124,12 +124,10 @@ static HRESULT get_pin_media_type(IPin *pin, AM_MEDIA_TYPE *out) static HRESULT find_splitter(MediaDetImpl *detector) { IPin *source_pin, *splitter_pin; - IFileSourceFilter *file_source; IEnumMoniker *enum_moniker; IFilterMapper2 *mapper; IBaseFilter *splitter; IEnumPins *enum_pins; - LPOLESTR filename; AM_MEDIA_TYPE mt; IMoniker *mon; GUID type[2]; @@ -137,25 +135,6 @@ static HRESULT find_splitter(MediaDetImpl *detector) HRESULT hr; GUID clsid; - if (FAILED(hr = IBaseFilter_QueryInterface(detector->source, - &IID_IFileSourceFilter, (void **)&file_source))) - { - ERR("Failed to get file source interface.\n"); - return hr; - } - - hr = IFileSourceFilter_GetCurFile(file_source, &filename, &mt); - IFileSourceFilter_Release(file_source); - CoTaskMemFree(filename); - if (FAILED(hr)) - { - ERR("Failed to get current file, hr %#x.\n", hr); - return hr; - } - type[0] = mt.majortype; - type[1] = mt.subtype; - FreeMediaType(&mt); - if (FAILED(hr = IBaseFilter_EnumPins(detector->source, &enum_pins))) { ERR("Failed to enumerate source pins, hr %#x.\n", hr); @@ -169,6 +148,17 @@ static HRESULT find_splitter(MediaDetImpl *detector) return hr; } + if (FAILED(hr = get_pin_media_type(source_pin, &mt))) + { + ERR("Failed to get media type, hr %#x.\n", hr); + IPin_Release(source_pin); + return hr; + } + + type[0] = mt.majortype; + type[1] = mt.subtype; + FreeMediaType(&mt); + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (void **)&mapper))) {

1 0

Dmitry Timoshkov : windowscodecs/tests: Add the tests for GIF encoder and decoder.
by Alexandre Julliard April 27, 2020

April 27, 2020

Module: wine Branch: master Commit: c1d02a5fdf8995dba607530df0f79ef502d24185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1d02a5fdf8995dba607530d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 27 10:32:40 2020 +0800 windowscodecs/tests: Add the tests for GIF encoder and decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 61 +++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 0a7e7238aa..7936c5e653 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1132,6 +1132,40 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } +static void check_gif_format(IStream *stream, const WICPixelFormatGUID *format) +{ +#include "pshpack1.h" + struct logical_screen_descriptor + { + char signature[6]; + USHORT width; + USHORT height; + BYTE packed; + /* global_color_table_flag : 1; + * color_resolution : 3; + * sort_flag : 1; + * global_color_table_size : 3; + */ + BYTE background_color_index; + BYTE pixel_aspect_ratio; + } lsd; +#include "poppack.h" + UINT color_resolution; + HRESULT hr; + + memset(&lsd, 0, sizeof(lsd)); + hr = IStream_Read(stream, &lsd, sizeof(lsd), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(!memcmp(lsd.signature, "GIF89a", 6), "wrong GIF signature %.6s\n", lsd.signature); + + ok(lsd.width == 32, "wrong width %u\n", lsd.width); + ok(lsd.height == 2, "wrong height %u\n", lsd.height); + color_resolution = 1 << (((lsd.packed >> 4) & 0x07) + 1); + ok(color_resolution == 256, "wrong color resolution %u\n", color_resolution); + ok(lsd.pixel_aspect_ratio == 0, "wrong pixel_aspect_ratio %u\n", lsd.pixel_aspect_ratio); +} + static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; @@ -1147,6 +1181,8 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WIC check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) check_tiff_format(stream, format); + else if (IsEqualGUID(encoder, &CLSID_WICGifEncoder)) + check_gif_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -1241,6 +1277,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls container_format = &GUID_ContainerFormatTiff; else if (IsEqualGUID(clsid_encoder, &CLSID_WICJpegEncoder)) container_format = &GUID_ContainerFormatJpeg; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICGifEncoder)) + container_format = &GUID_ContainerFormatGif; else ok(0, "Unknown encoder %s.\n", wine_dbgstr_guid(clsid_encoder)); @@ -1265,7 +1303,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + ok(SUCCEEDED(hr), "CoCreateInstance(%s) failed, hr=%x\n", wine_dbgstr_guid(clsid_encoder), hr); if (SUCCEEDED(hr)) { hglobal = GlobalAlloc(GMEM_MOVEABLE, 0); @@ -1290,7 +1328,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls if (palette) { hr = IWICBitmapEncoder_SetPalette(encoder, palette); - ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_encoder, &CLSID_WICGifEncoder)) + ok(hr == S_OK, "SetPalette failed, hr=%#x\n", hr); + else + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "wrong error %#x\n", hr); hr = S_OK; } @@ -1429,13 +1470,19 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, frame_palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) + ok(hr == WINCODEC_ERR_WRONGSTATE, "wrong error %#x\n", hr); + else + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, frame_palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) + ok(hr == S_OK || broken(hr == WINCODEC_ERR_FRAMEMISSING) /* XP */, "CopyPalette failed, hr=%#x\n", hr); + else + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); hr = S_OK; i=0; @@ -1495,7 +1542,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || - IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder)) + IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder) || + IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) { if (IsEqualGUID(&pixelformat, &GUID_WICPixelFormatBlackWhite) || IsEqualGUID(&pixelformat, &GUID_WICPixelFormat8bppIndexed)) @@ -1845,6 +1893,9 @@ START_TEST(converter) test_default_converter(); test_converter_8bppIndexed(); + test_encoder(&testdata_8bppIndexed, &CLSID_WICGifEncoder, + &testdata_8bppIndexed, &CLSID_WICGifDecoder, "GIF encoder 8bppIndexed"); + test_encoder(&testdata_BlackWhite, &CLSID_WICPngEncoder, &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder,

1 0