February 2018 - Wine-Commits

Józef Kucia : wined3d: Limit number of supported render targets to 8.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 1075b4615bfcd2aed7b5d80d52860d9ce557a5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1075b4615bfcd2aed7b5d80d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:33 2018 +0100 wined3d: Limit number of supported render targets to 8. Virtually all relatively modern GPUs support 8 render targets. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/cs.c | 24 +++++------------------- dlls/wined3d/device.c | 28 +++++++++------------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 19 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index da5496d..04853c9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3039,7 +3039,7 @@ static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarge BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) { - struct wined3d_rendertarget_view **rts = fb->render_targets; + struct wined3d_rendertarget_view * const *rts = fb->render_targets; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD rt_mask = 0, *cur_mask; @@ -3148,7 +3148,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { - struct wined3d_rendertarget_view **rts = state->fb->render_targets; + struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; DWORD rt_mask, rt_mask_bits; unsigned int i; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2f77c7b..9f3ff46 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -563,17 +563,11 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { struct wined3d_cs_clear *op; - struct - { - struct wined3d_rendertarget_view *rt; - struct wined3d_fb_state fb; - } *extra; + size_t size; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(*extra), - WINED3D_CS_QUEUE_DEFAULT); - extra = (void *)&op->rects[1]; - extra->fb.render_targets = &extra->rt; - op->fb = &extra->fb; + size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); + op = cs->ops->require_space(cs, size, WINED3D_CS_QUEUE_DEFAULT); + op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; @@ -994,7 +988,7 @@ static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const v { const struct wined3d_cs_set_rendertarget_view *op = data; - cs->state.fb->render_targets[op->view_idx] = op->view; + cs->fb.render_targets[op->view_idx] = op->view; device_invalidate_state(cs->device, STATE_FRAMEBUFFER); } @@ -2734,12 +2728,6 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; - if (!(cs->fb.render_targets = heap_calloc(gl_info->limits.buffers, sizeof(*cs->fb.render_targets)))) - { - heap_free(cs); - return NULL; - } - state_init(&cs->state, &cs->fb, gl_info, &device->adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); @@ -2782,7 +2770,6 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) fail: state_cleanup(&cs->state); - heap_free(cs->fb.render_targets); heap_free(cs); return NULL; } @@ -2798,7 +2785,6 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) } state_cleanup(&cs->state); - heap_free(cs->fb.render_targets); heap_free(cs->data); heap_free(cs); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 18b39b8..5ec0705 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1050,7 +1050,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; DWORD clear_flags = 0; HRESULT hr; @@ -1062,16 +1061,14 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->wined3d->flags & WINED3D_NO3D) return WINED3DERR_INVALIDCALL; - if (!(device->fb.render_targets = heap_calloc(gl_info->limits.buffers, sizeof(*device->fb.render_targets)))) - return E_OUTOFMEMORY; + memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); /* Setup the implicit swapchain. This also initializes a context. */ - TRACE("Creating implicit swapchain\n"); - hr = device->device_parent->ops->create_swapchain(device->device_parent, - swapchain_desc, &swapchain); - if (FAILED(hr)) + TRACE("Creating implicit swapchain.\n"); + if (FAILED(hr = device->device_parent->ops->create_swapchain(device->device_parent, + swapchain_desc, &swapchain))) { - WARN("Failed to create implicit swapchain\n"); + WARN("Failed to create implicit swapchain.\n"); goto err_out; } @@ -1108,7 +1105,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up, leaving 3D init.\n"); + TRACE("All defaults now set up.\n"); /* Clear the screen */ if (swapchain->back_buffers && swapchain->back_buffers[0]) @@ -1131,7 +1128,6 @@ err_out: wined3d_rendertarget_view_decref(device->back_buffer_view); if (swapchain) wined3d_swapchain_decref(swapchain); - heap_free(device->fb.render_targets); return hr; } @@ -1186,7 +1182,7 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { - UINT i; + unsigned int i; TRACE("device %p.\n", device); @@ -1246,9 +1242,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->swapchains = NULL; device->swapchain_count = 0; - heap_free(device->fb.render_targets); - device->fb.render_targets = NULL; - device->d3d_initialized = FALSE; return WINED3D_OK; @@ -4758,12 +4751,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_unbind_resources(&device->state); } - if (device->fb.render_targets) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) - { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); - } + wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } wined3d_device_set_depth_stencil_view(device, NULL); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f7f6452..a1577c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3521,7 +3521,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_DRAW_BUFFERS] && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &gl_max); - gl_info->limits.buffers = gl_max; + gl_info->limits.buffers = min(MAX_RENDER_TARGET_VIEWS, gl_max); TRACE("Max draw buffers: %u.\n", gl_max); } if (gl_info->supported[ARB_MULTITEXTURE]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07c7c02..7813df5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -271,6 +271,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 +#define MAX_RENDER_TARGET_VIEWS 8 #define MAX_UNORDERED_ACCESS_VIEWS 8 #define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 @@ -1993,7 +1994,7 @@ struct wined3d_context struct wined3d_fb_state { - struct wined3d_rendertarget_view **render_targets; + struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS]; struct wined3d_rendertarget_view *depth_stencil; };

1 0

Alexandre Julliard : winebus.sys: Define SYN_DROPPED if missing.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

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 : ntdll: Print a diagnostic when mscoree cannot be loaded.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

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 Feb. 26, 2018

Feb. 26, 2018

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 Feb. 26, 2018

Feb. 26, 2018

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

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

Feb. 26, 2018

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

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

Feb. 26, 2018

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

Michael Stefaniuc : quartz: Don' t create the advise thread during the clock teardown.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 9d704afd93ebd36a3d9e486354451684b575f9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d704afd93ebd36a3d9e4863… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 23 23:34:49 2018 +0100 quartz: Don't create the advise thread during the clock teardown. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index a3e1504..1638e11 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -229,7 +229,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { + if (This->adviseThreadActive && SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { WaitForSingleObject(This->adviseThread, INFINITE); CloseHandle(This->adviseThread); }

1 0

Józef Kucia : wined3d: Merge drawprim.c into context.c.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 6eb562210cb154749b1da5c399a69320d87365e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb562210cb154749b1da5c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:31 2018 +0100 wined3d: Merge drawprim.c into context.c. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/context.c | 699 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/drawprim.c | 725 ----------------------------------------- dlls/wined3d/wined3d_private.h | 2 - 4 files changed, 698 insertions(+), 729 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6eb562210cb154749b1d…

1 0

Józef Kucia : wined3d: Drop d3d_draw debug channel.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 66cd87106025f6cd27a403fec4ac97460a71ca83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66cd87106025f6cd27a403fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:30 2018 +0100 wined3d: Drop d3d_draw debug channel. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2f3390b..19a578a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -29,9 +29,8 @@ #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -WINE_DECLARE_DEBUG_CHANNEL(d3d); /* Context activation is done by the caller. */ static void draw_primitive_arrays(struct wined3d_context *context, const struct wined3d_state *state, @@ -391,7 +390,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const } gl_info->gl_ops.gl.p_glEnd(); - checkGLcall("glEnd and previous calls"); + checkGLcall("draw immediate mode"); } static void draw_indirect(struct wined3d_context *context, const struct wined3d_state *state, @@ -399,6 +398,7 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer = parameters->buffer; + const void *offset; if (!gl_info->supported[ARB_DRAW_INDIRECT]) { @@ -408,18 +408,17 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); + offset = (void *)(GLintptr)parameters->offset; if (idx_size) { GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (state->index_offset) FIXME("Ignoring index offset %u.\n", state->index_offset); - GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, - (void *)(GLintptr)parameters->offset)); + GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, offset)); } else { - GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, - (void *)(GLintptr)parameters->offset)); + GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, offset)); } GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); @@ -723,6 +722,4 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); - - TRACE("Done all gl drawing.\n"); }

1 0