February 2018 - Wine-commits

Alexandre Julliard : winebus.sys: Define SYN_DROPPED if missing.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: f1c344bc626874930e6bcd80c14fb4e5a95197b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1c344bc626874930e6bcd80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 12:50:54 2018 +0100 winebus.sys: Define SYN_DROPPED if missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 7e26493..d34e18c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -49,6 +49,9 @@ # if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) # define HAS_PROPER_INPUT_HEADER # endif +# ifndef SYN_DROPPED +# define SYN_DROPPED 3 +# endif #endif #define NONAMELESSUNION

1 0

Alexandre Julliard : makefiles: Add intermediate test target to propagate test failures status properly.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 5aa0144ec6969b42563af449847edf6c447de0d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aa0144ec6969b42563af449… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 16:38:59 2018 +0100 makefiles: Add intermediate test target to propagate test failures status properly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index bba25e0..470a495 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3494,7 +3494,7 @@ static void output_subdirs( struct makefile *make ) } else if (submake->testdll) { - output( "check test::\n" ); + output( "%s/test: dummy\n", subdir ); output( "\t(a)cd %s && $(MAKE) test\n", subdir ); strarray_add( &winetest_deps, subdir ); strarray_add( &builddeps_deps, subdir ); @@ -3536,6 +3536,14 @@ static void output_subdirs( struct makefile *make ) output( "programs/winetest:" ); output_filenames( winetest_deps ); output( "\n" ); + output( "check test:" ); + for (i = 0; i < winetest_deps.count; i++) + { + char *target = strmake( "%s/test", winetest_deps.str[i] ); + output_filename( target ); + strarray_add( &make->phony_targets, target ); + } + output( "\n" ); strarray_add( &make->phony_targets, "check" ); strarray_add( &make->phony_targets, "test" ); }

1 0

Alexandre Julliard : makefiles: Shared library and import library are not exclusive for PE builds.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: dfc829ceb84f01fd76bffe9659adf0882ccb5f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfc829ceb84f01fd76bffe96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 18:46:50 2018 +0100 makefiles: Shared library and import library are not exclusive for PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 470a495..caaa50f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3624,11 +3624,13 @@ static void output_sources( struct makefile *make ) if (make->staticlib) output_static_lib( make ); else if (make->module) output_module( make ); - else if (make->importlib) output_import_lib( make ); - else if (make->sharedlib) output_shared_lib( make ); else if (make->testdll) output_test_module( make ); - - if (make->programs.count) output_programs( make ); + else + { + if (make->importlib) output_import_lib( make ); + if (make->sharedlib) output_shared_lib( make ); + if (make->programs.count) output_programs( make ); + } for (i = 0; i < make->scripts.count; i++) add_install_rule( make, make->scripts.str[i], make->scripts.str[i],

1 0

Alexandre Julliard : ntdll: Print a diagnostic when mscoree cannot be loaded.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 8b35892b159f5bd97185782387722f0454fdc245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b35892b159f5bd971857823… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 17:04:30 2018 +0100 ntdll: Print a diagnostic when mscoree cannot be loaded. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 51aa334..d707397 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -911,7 +911,12 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * current_modref = wm; if (!(status = load_dll( load_path, mscoreeW, 0, &imp ))) wm->deps[0] = imp; current_modref = prev; - if (status) return status; + if (status) + { + ERR( "mscoree.dll not found, IL-only binary %s cannot be loaded\n", + debugstr_w(wm->ldr.BaseDllName.Buffer) ); + return status; + } TRACE( "loaded mscoree for %s\n", debugstr_w(wm->ldr.FullDllName.Buffer) );

1 0

Zebediah Figura : winegstreamer: Avoid using the same event for multiple purposes.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: c907d69cf00a56813e0d9b121ca52ff180b8bec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c907d69cf00a56813e0d9b12… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 15:31:17 2018 -0600 winegstreamer: Avoid using the same event for multiple purposes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0ce92a4..42c455b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -69,7 +69,7 @@ typedef struct GSTImpl { GstBus *bus; guint64 start, nextofs, nextpullofs, stop; ALLOCATOR_PROPERTIES props; - HANDLE event, changed_ofs; + HANDLE no_more_pads_event, push_event; HANDLE push_thread; } GSTImpl; @@ -519,7 +519,7 @@ static DWORD CALLBACK push_data(LPVOID iface) TRACE("Waiting..\n"); - WaitForSingleObject(This->event, INFINITE); + WaitForSingleObject(This->push_event, INFINITE); TRACE("Starting..\n"); for (;;) { @@ -1050,7 +1050,7 @@ static void no_more_pads(GstElement *decodebin, gpointer user) { GSTImpl *This = (GSTImpl*)user; TRACE("%p %p\n", This, decodebin); - SetEvent(This->event); + SetEvent(This->no_more_pads_event); } static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) @@ -1156,7 +1156,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI /* Add initial pins */ This->initial = This->discont = TRUE; - ResetEvent(This->event); + ResetEvent(This->no_more_pads_event); gst_element_set_state(This->container, GST_STATE_PLAYING); ret = gst_element_get_state(This->container, NULL, NULL, -1); @@ -1166,7 +1166,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI return E_FAIL; } - WaitForSingleObject(This->event, INFINITE); + WaitForSingleObject(This->no_more_pads_event, INFINITE); gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < This->cStreams; ++i) @@ -1259,7 +1259,8 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) This->cStreams = 0; This->ppPins = NULL; This->push_thread = NULL; - This->event = CreateEventW(NULL, 0, 0, NULL); + This->no_more_pads_event = CreateEventW(NULL, 0, 0, NULL); + This->push_event = CreateEventW(NULL, 0, 0, NULL); This->bus = NULL; piInput = &This->pInputPin.pin.pinInfo; @@ -1286,7 +1287,8 @@ static void GST_Destroy(GSTImpl *This) TRACE("Destroying %p\n", This); - CloseHandle(This->event); + CloseHandle(This->no_more_pads_event); + CloseHandle(This->push_event); /* Don't need to clean up output pins, disconnecting input pin will do that */ IPin_ConnectedTo((IPin *)&This->pInputPin, &connected); @@ -1994,6 +1996,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, This->pReader = NULL; This->pAlloc = NULL; + ResetEvent(((GSTImpl *)This->pin.pinInfo.pFilter)->push_event); if (SUCCEEDED(hr)) hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader); if (SUCCEEDED(hr)) @@ -2016,7 +2019,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); hr = IMemAllocator_Commit(This->pAlloc); - SetEvent(((GSTImpl*)This->pin.pinInfo.pFilter)->event); + SetEvent(((GSTImpl*)This->pin.pinInfo.pFilter)->push_event); } else { GST_RemoveOutputPins((GSTImpl *)This->pin.pinInfo.pFilter); if (This->pReader)

1 0

Zebediah Figura : winegstreamer: Zero-initialize the GstImpl filter.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 7ae35a04f4dbc4284a69cfc1fef9dfbeb225e2b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ae35a04f4dbc4284a69cfc1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 15:31:18 2018 -0600 winegstreamer: Zero-initialize the GstImpl filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 42c455b..b6b02a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1252,6 +1252,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) *phr = E_OUTOFMEMORY; return NULL; } + memset(This, 0, sizeof(*This)); obj = (IUnknown*)&This->filter.IBaseFilter_iface; BaseFilter_Init(&This->filter, &GST_Vtbl, &CLSID_Gstreamer_Splitter, (DWORD_PTR)(__FILE__ ": GSTImpl.csFilter"), &BaseFuncTable);

1 0

Zebediah Figura : winegstreamer: Wait for GST_EVENT_CAPS instead of data.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 999c862f4f5838f0a4e3d98f52bcc1668835e25f URL: https://source.winehq.org/git/wine.git/?a=commit;h=999c862f4f5838f0a4e3d98f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 15:31:19 2018 -0600 winegstreamer: Wait for GST_EVENT_CAPS instead of data. Some decoders and files fail to find any valid frames during test-play, so don't wait for data we might never receive. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b6b02a1..9e35e3d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -321,6 +321,7 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) return FALSE; FreeMediaType(pin->pmt); *pin->pmt = amt; + SetEvent(pin->caps_event); return TRUE; } @@ -617,8 +618,6 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu if (This->initial) { gst_buffer_unref(buf); - TRACE("Triggering %p %p\n", pad, pin->caps_event); - SetEvent(pin->caps_event); return GST_FLOW_OK; }

1 0

Zebediah Figura : winegstreamer: Remove unused callbacks.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 577fd012496b5f6f44f337371286c7ed24552bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=577fd012496b5f6f44f33737… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 15:31:20 2018 -0600 winegstreamer: Remove unused callbacks. These were left behind in the transition to 1.0. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 24 ------------------------ dlls/winegstreamer/gst_cbs.h | 14 -------------- dlls/winegstreamer/gstdemux.c | 12 ------------ 3 files changed, 50 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 96325d0..c8ba812 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -175,30 +175,6 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) return cbdata.u.event_sink_data.ret; } -gboolean accept_caps_sink_wrapper(GstPad *pad, GstCaps *caps) -{ - struct cb_data cbdata = { ACCEPT_CAPS_SINK }; - - cbdata.u.accept_caps_sink_data.pad = pad; - cbdata.u.accept_caps_sink_data.caps = caps; - - call_cb(&cbdata); - - return cbdata.u.accept_caps_sink_data.ret; -} - -gboolean setcaps_sink_wrapper(GstPad *pad, GstCaps *caps) -{ - struct cb_data cbdata = { SETCAPS_SINK }; - - cbdata.u.setcaps_sink_data.pad = pad; - cbdata.u.setcaps_sink_data.caps = caps; - - call_cb(&cbdata); - - return cbdata.u.setcaps_sink_data.ret; -} - GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) { struct cb_data cbdata = { GOT_DATA_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index e52d1ba..100a8de 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -38,8 +38,6 @@ enum CB_TYPE { REQUEST_BUFFER_SRC, EVENT_SRC, EVENT_SINK, - ACCEPT_CAPS_SINK, - SETCAPS_SINK, GOT_DATA_SINK, GOT_DATA, REMOVED_DECODED_PAD, @@ -101,16 +99,6 @@ struct cb_data { GstEvent *event; gboolean ret; } event_sink_data; - struct accept_caps_sink_data { - GstPad *pad; - GstCaps *caps; - gboolean ret; - } accept_caps_sink_data; - struct setcaps_sink_data { - GstPad *pad; - GstCaps *caps; - gboolean ret; - } setcaps_sink_data; struct got_data_sink_data { GstPad *pad; GstObject *parent; @@ -179,8 +167,6 @@ void no_more_pads_wrapper(GstElement *decodebin, gpointer user) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; -gboolean accept_caps_sink_wrapper(GstPad *pad, GstCaps *caps) DECLSPEC_HIDDEN; -gboolean setcaps_sink_wrapper(GstPad *pad, GstCaps *caps) DECLSPEC_HIDDEN; GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, 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; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9e35e3d..3ce7873 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2233,18 +2233,6 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) cbdata->u.event_sink_data.ret = event_sink(data->pad, data->parent, data->event); break; } - case ACCEPT_CAPS_SINK: - { - struct accept_caps_sink_data *data = &cbdata->u.accept_caps_sink_data; - cbdata->u.accept_caps_sink_data.ret = accept_caps_sink(data->pad, data->caps); - break; - } - case SETCAPS_SINK: - { - struct setcaps_sink_data *data = &cbdata->u.setcaps_sink_data; - cbdata->u.setcaps_sink_data.ret = setcaps_sink(data->pad, data->caps); - break; - } case GOT_DATA_SINK: { struct got_data_sink_data *data = &cbdata->u.got_data_sink_data;

1 0

Anton Romanov : windowscodecs: Fix data corruption for Adobe CMYK JPEGs.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 343c58890b1b150586dd06818383cdcfe1be18d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=343c58890b1b150586dd0681… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Fri Feb 16 23:32:01 2018 -0800 windowscodecs: Fix data corruption for Adobe CMYK JPEGs. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 10 ++- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/jpegformat.c | 145 ++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 433a031..08f1ee7 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -680,9 +680,15 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + DWORD *pDwordData = (DWORD*) (This->image_data + stride * first_scanline); + DWORD *pDwordDataEnd = (DWORD*) (This->image_data + This->cinfo.output_scanline * stride); + /* Adobe JPEG's have inverted CMYK data. */ - for (i=0; i<data_size; i++) - This->image_data[i] ^= 0xff; + while(pDwordData < pDwordDataEnd) + *pDwordData++ ^= 0xffffffff; + } + } LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index b1e78f9..3f9c918 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ gifformat.c \ icoformat.c \ info.c \ + jpegformat.c \ metadata.c \ palette.c \ pngformat.c \ diff --git a/dlls/windowscodecs/tests/jpegformat.c b/dlls/windowscodecs/tests/jpegformat.c new file mode 100644 index 0000000..c1e46c4 --- /dev/null +++ b/dlls/windowscodecs/tests/jpegformat.c @@ -0,0 +1,145 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static const char jpeg_adobe_cmyk_1x5[] = + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x01\x2c" + "\x01\x2c\x00\x00\xff\xee\x00\x0e\x41\x64\x6f\x62\x65\x00\x64\x00" + "\x00\x00\x00\x02\xff\xfe\x00\x13\x43\x72\x65\x61\x74\x65\x64\x20" + "\x77\x69\x74\x68\x20\x47\x49\x4d\x50\xff\xdb\x00\x43\x00\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xff\xdb" + "\x00\x43\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" + "\x01\x01\x01\xff\xc0\x00\x14\x08\x00\x05\x00\x01\x04\x01\x11\x00" + "\x02\x11\x01\x03\x11\x01\x04\x11\x00\xff\xc4\x00\x15\x00\x01\x01" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x08" + "\xff\xc4\x00\x14\x10\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\xff\xc4\x00\x14\x01\x01\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\xff\xc4\x00\x14" + "\x11\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\xff\xda\x00\x0e\x04\x01\x00\x02\x11\x03\x11\x04\x00\x00" + "\x3f\x00\x40\x44\x02\x1e\xa4\x1f\xff\xd9"; + +static void test_decode_adobe_cmyk(void) +{ + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hjpegdata; + char *jpegdata; + IStream *jpegstream; + GUID guidresult; + UINT count=0, width=0, height=0; + BYTE imagedata[5 * 4] = {1}; + UINT i; + + const BYTE expected_imagedata[5 * 4] = { + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + 0x00, 0xb0, 0xfc, 0x6d, + }; + + const BYTE expected_imagedata_24bpp[5 * 4] = { + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + 0x0d, 0x4b, 0x94, 0x00, + }; + + hr = CoCreateInstance(&CLSID_WICJpegDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hjpegdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(jpeg_adobe_cmyk_1x5)); + ok(hjpegdata != 0, "GlobalAlloc failed\n"); + if (hjpegdata) + { + jpegdata = GlobalLock(hjpegdata); + memcpy(jpegdata, jpeg_adobe_cmyk_1x5, sizeof(jpeg_adobe_cmyk_1x5)); + GlobalUnlock(hjpegdata); + + hr = CreateStreamOnHGlobal(hjpegdata, FALSE, &jpegstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, jpegstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatJpeg), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 1, "expected width=1, got %u\n", width); + ok(height == 5, "expected height=5, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat32bppCMYK) || + broken(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR)), /* xp/2003 */ + "unexpected pixel format: %s\n", wine_dbgstr_guid(&guidresult)); + + /* We want to be sure our state tracking will not impact output + * data on subsequent calls */ + for(i=2; i>0; --i) + { + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, NULL, 4, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)) || + broken(!memcmp(imagedata, expected_imagedata_24bpp, sizeof(expected_imagedata))), /* xp/2003 */ + "unexpected image data\n"); + } + IWICBitmapFrameDecode_Release(framedecode); + } + IStream_Release(jpegstream); + } + GlobalFree(hjpegdata); + } + IWICBitmapDecoder_Release(decoder); +} + + +START_TEST(jpegformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_decode_adobe_cmyk(); + + CoUninitialize(); +}

1 0

Nikolay Sivov : wincodecs/tests: Run decoder info tests for all decoders.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: d3e9c92ed652cef7e8c7d20161d8f9e8bdd1e00d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e9c92ed652cef7e8c7d201… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 20 09:38:43 2018 +0300 wincodecs/tests: Run decoder info tests for all decoders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/info.c | 291 ++++++++++++++++++++++++---------------- 1 file changed, 179 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3e9c92ed652cef7e8c7…

1 0