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

Józef Kucia : wined3d: Cleanup draw_primitive_arrays( ) a bit.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: f8c8498f490d4a06941a31f1d4ee3314fcc0f397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8c8498f490d4a06941a31f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:29 2018 +0100 wined3d: Cleanup draw_primitive_arrays() a bit. 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 | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f87f091..2f3390b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -44,27 +44,29 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct unsigned int instanced_elements[ARRAY_SIZE(si->elements)]; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int instanced_element_count = 0; + GLenum mode = state->gl_primitive_type; + const void *indices; unsigned int i, j; + indices = (const char *)idx_data + idx_size * start_idx; + if (!instance_count) { if (!idx_size) { - gl_info->gl_ops.gl.p_glDrawArrays(state->gl_primitive_type, start_idx, count); + gl_info->gl_ops.gl.p_glDrawArrays(mode, start_idx, count); checkGLcall("glDrawArrays"); return; } if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { - GL_EXTCALL(glDrawElementsBaseVertex(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), base_vertex_idx)); + GL_EXTCALL(glDrawElementsBaseVertex(mode, count, idx_type, indices, base_vertex_idx)); checkGLcall("glDrawElementsBaseVertex"); return; } - gl_info->gl_ops.gl.p_glDrawElements(state->gl_primitive_type, count, - idx_type, (const char *)idx_data + (idx_size * start_idx)); + gl_info->gl_ops.gl.p_glDrawElements(mode, count, idx_type, indices); checkGLcall("glDrawElements"); return; } @@ -78,33 +80,32 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct { if (gl_info->supported[ARB_BASE_INSTANCE]) { - GL_EXTCALL(glDrawArraysInstancedBaseInstance(state->gl_primitive_type, start_idx, count, instance_count, start_instance)); + GL_EXTCALL(glDrawArraysInstancedBaseInstance(mode, start_idx, count, instance_count, start_instance)); checkGLcall("glDrawArraysInstancedBaseInstance"); return; } - GL_EXTCALL(glDrawArraysInstanced(state->gl_primitive_type, start_idx, count, instance_count)); + GL_EXTCALL(glDrawArraysInstanced(mode, start_idx, count, instance_count)); checkGLcall("glDrawArraysInstanced"); return; } if (gl_info->supported[ARB_BASE_INSTANCE]) { - GL_EXTCALL(glDrawElementsInstancedBaseVertexBaseInstance(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_idx, start_instance)); + GL_EXTCALL(glDrawElementsInstancedBaseVertexBaseInstance(mode, count, idx_type, + indices, instance_count, base_vertex_idx, start_instance)); checkGLcall("glDrawElementsInstancedBaseVertexBaseInstance"); return; } if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { - GL_EXTCALL(glDrawElementsInstancedBaseVertex(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_idx)); + GL_EXTCALL(glDrawElementsInstancedBaseVertex(mode, count, idx_type, + indices, instance_count, base_vertex_idx)); checkGLcall("glDrawElementsInstancedBaseVertex"); return; } - GL_EXTCALL(glDrawElementsInstanced(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), instance_count)); + GL_EXTCALL(glDrawElementsInstanced(mode, count, idx_type, indices, instance_count)); checkGLcall("glDrawElementsInstanced"); return; } @@ -120,7 +121,7 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct * has a different meaning in that situation. */ if (!idx_size) { - FIXME("Non-indexed instanced drawing is not supported\n"); + FIXME("Non-indexed instanced drawing is not supported.\n"); return; } @@ -152,14 +153,12 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { - GL_EXTCALL(glDrawElementsBaseVertex(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), base_vertex_idx)); + GL_EXTCALL(glDrawElementsBaseVertex(mode, count, idx_type, indices, base_vertex_idx)); checkGLcall("glDrawElementsBaseVertex"); } else { - gl_info->gl_ops.gl.p_glDrawElements(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx)); + gl_info->gl_ops.gl.p_glDrawElements(mode, count, idx_type, indices); checkGLcall("glDrawElements"); } }

1 0

Henri Verbeet : usp10/tests: Cleanup test_ScriptString().
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 5438ea99237ef88e47b8ac335523990a30057e71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5438ea99237ef88e47b8ac33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:52 2018 +0330 usp10/tests: Cleanup test_ScriptString(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 87 ++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cfa51b3..c6ae57e 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3099,22 +3099,19 @@ static void test_ScriptXtoX(void) win_skip("Uniscribe version too old to test Hebrew clusters\n"); } +/* This set of tests is for the string functions of Uniscribe. The + * ScriptStringAnalyse() function allocates memory pointed to by the + * SCRIPT_STRING_ANALYSIS ssa pointer. This memory is freed by + * ScriptStringFree(). There needs to be a valid hdc for this as + * ScriptStringAnalyse() calls ScriptItemize(), ScriptShape() and + * ScriptPlace() which require it. */ static void test_ScriptString(HDC hdc) { -/******************************************************************************************* - * - * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse - * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This - * memory is freed by ScriptStringFree. There needs to be a valid hdc for this as - * ScriptStringAnalyse calls ScriptItemize, ScriptShape and ScriptPlace which require it. - * - */ HRESULT hr; WCHAR teststr[] = {'T','e','s','t','1',' ','a','2','b','3', '\0'}; int len = ARRAY_SIZE(teststr) - 1; int Glyphs = len * 2 + 16; - int Charset; DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; static const int Dx[ARRAY_SIZE(teststr) - 1]; @@ -3129,55 +3126,49 @@ static void test_ScriptString(HDC hdc) int MaxSel = 0; BOOL Disabled = FALSE; const int *clip_len; - int i; UINT *order; + unsigned int i; + /* Test without hdc to get E_PENDING. */ + hr = ScriptStringAnalyse(NULL, teststr, len, Glyphs, -1, + Flags, ReqWidth, NULL, NULL, Dx, NULL, InClass, &ssa); + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); - Charset = -1; /* this flag indicates unicode input */ - /* Test without hdc to get E_PENDING */ - hr = ScriptStringAnalyse( NULL, teststr, len, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, Dx, NULL, - InClass, &ssa); - ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); - - /* Test that 0 length string returns E_INVALIDARG */ - hr = ScriptStringAnalyse( hdc, teststr, 0, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, Dx, NULL, - InClass, &ssa); - ok(hr == E_INVALIDARG, "ScriptStringAnalyse should return E_INVALIDARG not %08x\n", hr); - - /* test with hdc, this should be a valid test */ - hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, Dx, NULL, - InClass, &ssa); - ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + /* Test that 0 length string returns E_INVALIDARG. */ + hr = ScriptStringAnalyse(hdc, teststr, 0, Glyphs, -1, + Flags, ReqWidth, NULL, NULL, Dx, NULL, InClass, &ssa); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* Test with hdc, this should be a valid test. */ + hr = ScriptStringAnalyse(hdc, teststr, len, Glyphs, -1, + Flags, ReqWidth, NULL, NULL, Dx, NULL, InClass, &ssa); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ScriptStringFree(&ssa); - /* test makes sure that a call with a valid pssa still works */ - hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, - ReqWidth, NULL, NULL, Dx, NULL, - InClass, &ssa); - ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); - ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); + /* Test makes sure that a call with a valid pssa still works. */ + hr = ScriptStringAnalyse(hdc, teststr, len, Glyphs, -1, + Flags, ReqWidth, NULL, NULL, Dx, NULL, InClass, &ssa); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!ssa, "Got unexpected ssa %p.\n", ssa); - if (hr == S_OK) - { - hr = ScriptStringOut(ssa, X, Y, Options, &rc, MinSel, MaxSel, Disabled); - ok(hr == S_OK, "ScriptStringOut should return S_OK not %08x\n", hr); - } + hr = ScriptStringOut(ssa, X, Y, Options, &rc, MinSel, MaxSel, Disabled); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - clip_len = ScriptString_pcOutChars(ssa); - ok(*clip_len == len, "ScriptString_pcOutChars failed, got %d, expected %d\n", *clip_len, len); + clip_len = ScriptString_pcOutChars(ssa); + ok(*clip_len == len, "Got unexpected *clip_len %d, expected %d.\n", *clip_len, len); - order = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *clip_len * sizeof(UINT)); - hr = ScriptStringGetOrder(ssa, order); - ok(hr == S_OK, "ScriptStringGetOrder failed, got %08x, expected S_OK\n", hr); + order = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *clip_len * sizeof(*order)); + hr = ScriptStringGetOrder(ssa, order); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < *clip_len; i++) ok(order[i] == i, "%d: got %d expected %d\n", i, order[i], i); - HeapFree(GetProcessHeap(), 0, order); + for (i = 0; i < *clip_len; ++i) + { + ok(order[i] == i, "Got unexpected order[%u] %u.\n", i, order[i]); + } + HeapFree(GetProcessHeap(), 0, order); - hr = ScriptStringFree(&ssa); - ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); + hr = ScriptStringFree(&ssa); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } static void test_ScriptStringXtoCP_CPtoX(HDC hdc)

1 0

Andrey Gusev : mshtml/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 80690ecf4da076a98032b9292024973e489b3c65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80690ecf4da076a98032b929… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Feb 23 12:08:03 2018 +0200 mshtml/tests: Use GetModuleHandleA instead of LoadLibraryA. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 6376f3f..ebaa630 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -603,7 +603,7 @@ static void test_res_protocol(void) test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html"); - if(GetProcAddress(LoadLibraryA("urlmon.dll"), "CreateUri")) { + if(GetProcAddress(GetModuleHandleA("urlmon.dll"), "CreateUri")) { test_res_url("/test/dir/dir2/res.html?query_part"); test_res_url("/test/dir/dir2/res.html#hash_part"); test_res_url("/#123");

1 0

Marcin Mikołajczak : po: Update Polish translation.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: f16e7e4478e7b69ab836464930ce7d9cdc254363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f16e7e4478e7b69ab8364649… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Sat Feb 24 13:48:03 2018 +0100 po: Update Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 174 +++++++++++++++------------------------------------------------ 1 file changed, 40 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f16e7e4478e7b69ab836…

1 0

Józef Kucia : wined3d: Move dispatch_compute() to context.c file.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 41717a148e48544811a5eefcb7e49c8433d5f90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=41717a148e48544811a5eefc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:28 2018 +0100 wined3d: Move dispatch_compute() to context.c file. 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 | 61 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/drawprim.c | 59 ---------------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 60 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d552c8c..1c39f0a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4023,7 +4023,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, return TRUE; } -void context_apply_compute_state(struct wined3d_context *context, +static void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct StateEntry *state_table = context->state_table; @@ -4247,3 +4247,62 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, ERR("Acquired context %p instead of %p.\n", current_context, context); return current_context; } + +void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_dispatch_parameters *parameters) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(device, NULL, 0); + if (!context->valid) + { + context_release(context); + WARN("Invalid context, skipping dispatch.\n"); + return; + } + gl_info = context->gl_info; + + if (!gl_info->supported[ARB_COMPUTE_SHADER]) + { + context_release(context); + FIXME("OpenGL implementation does not support compute shaders.\n"); + return; + } + + if (parameters->indirect) + wined3d_buffer_load(parameters->u.indirect.buffer, context, state); + + context_apply_compute_state(context, device, state); + + if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) + { + context_release(context); + WARN("No compute shader bound, skipping dispatch.\n"); + return; + } + + if (parameters->indirect) + { + const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; + struct wined3d_buffer *buffer = indirect->buffer; + + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); + GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); + } + else + { + const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; + GL_EXTCALL(glDispatchCompute(direct->group_count_x, direct->group_count_y, direct->group_count_z)); + } + checkGLcall("dispatch compute"); + + GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); + checkGLcall("glMemoryBarrier"); + + if (wined3d_settings.strict_draw_ordering) + gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + + context_release(context); +} diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 7eccc8f..f87f091 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -727,62 +727,3 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s TRACE("Done all gl drawing.\n"); } - -void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, - const struct wined3d_dispatch_parameters *parameters) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(device, NULL, 0); - if (!context->valid) - { - context_release(context); - WARN("Invalid context, skipping dispatch.\n"); - return; - } - gl_info = context->gl_info; - - if (!gl_info->supported[ARB_COMPUTE_SHADER]) - { - context_release(context); - FIXME("OpenGL implementation does not support compute shaders.\n"); - return; - } - - if (parameters->indirect) - wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - - context_apply_compute_state(context, device, state); - - if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) - { - context_release(context); - WARN("No compute shader bound, skipping dispatch.\n"); - return; - } - - if (parameters->indirect) - { - const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; - struct wined3d_buffer *buffer = indirect->buffer; - - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); - GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); - } - else - { - const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; - GL_EXTCALL(glDispatchCompute(direct->group_count_x, direct->group_count_y, direct->group_count_z)); - } - checkGLcall("dispatch compute"); - - GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); - checkGLcall("glMemoryBarrier"); - - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); -} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4d15c5..650c1a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2135,8 +2135,6 @@ void context_alloc_occlusion_query(struct wined3d_context *context, void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; -void context_apply_compute_state(struct wined3d_context *context, - const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,

1 0

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

Feb. 26, 2018

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

Józef Kucia : d3d9: Get rid of D3D9_MAX_SIMULTANEOUS_RENDERTARGETS.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 7e2e47295531ca683ceecc661a8bcf7c3387f63b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e2e47295531ca683ceecc66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:32 2018 +0100 d3d9: Get rid of D3D9_MAX_SIMULTANEOUS_RENDERTARGETS. D3D_MAX_SIMULTANEOUS_RENDERTARGETS is defined in d3d9types.h. 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/d3d9/d3d9_private.h | 3 +-- dlls/d3d9/device.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index ee385d9..ba19e5f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -42,7 +42,6 @@ #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_TEXTURE_UNITS 20 -#define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 #define D3DPRESENTFLAGS_MASK 0x00000fffu @@ -103,7 +102,7 @@ struct d3d9_device UINT index_buffer_pos; struct d3d9_texture *textures[D3D9_MAX_TEXTURE_UNITS]; - struct d3d9_surface *render_targets[D3D9_MAX_SIMULTANEOUS_RENDERTARGETS]; + struct d3d9_surface *render_targets[D3D_MAX_SIMULTANEOUS_RENDERTARGETS]; LONG device_state; BOOL in_destruction; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1c9a625..e8798a7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -453,7 +453,7 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps) D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2| D3DPTEXTURECAPS_NOPROJECTEDBUMPENV; caps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); - caps->NumSimultaneousRTs = min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, caps->NumSimultaneousRTs); + caps->NumSimultaneousRTs = min(D3D_MAX_SIMULTANEOUS_RENDERTARGETS, caps->NumSimultaneousRTs); if (caps->PixelShaderVersion > 3) { @@ -1784,7 +1784,7 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO TRACE("iface %p, idx %u, surface %p.\n", iface, idx, surface); - if (idx >= D3D9_MAX_SIMULTANEOUS_RENDERTARGETS) + if (idx >= D3D_MAX_SIMULTANEOUS_RENDERTARGETS) { WARN("Invalid index %u specified.\n", idx); return D3DERR_INVALIDCALL; @@ -1825,7 +1825,7 @@ static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWO if (!surface) return D3DERR_INVALIDCALL; - if (idx >= D3D9_MAX_SIMULTANEOUS_RENDERTARGETS) + if (idx >= D3D_MAX_SIMULTANEOUS_RENDERTARGETS) { WARN("Invalid index %u specified.\n", idx); return D3DERR_INVALIDCALL;

1 0

Nikolay Sivov : wincodecs/tests: Add a test for GetDecoderInfo() returned instance.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 44f787ed9265d9c1f86eb750a81a1e47243ac427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f787ed9265d9c1f86eb750… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 20 09:38:44 2018 +0300 wincodecs/tests: Add a test for GetDecoderInfo() returned instance. 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 | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 5d0dc44..4a9c9c6 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -109,8 +109,8 @@ static void test_decoder_info(void) 1 }, }; + IWICBitmapDecoderInfo *decoder_info, *decoder_info2; IWICComponentInfo *info; - IWICBitmapDecoderInfo *decoder_info; HRESULT hr; ULONG len; WCHAR value[256]; @@ -122,9 +122,34 @@ static void test_decoder_info(void) for (i = 0; i < sizeof(decoder_info_tests)/sizeof(decoder_info_tests[0]); i++) { struct decoder_info_test *test = &decoder_info_tests[i]; + IWICBitmapDecoder *decoder, *decoder2; WCHAR extensionsW[64]; WCHAR mimetypeW[64]; + hr = CoCreateInstance(test->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void **)&decoder); + ok(SUCCEEDED(hr), "Failed to create decoder, hr %#x.\n", hr); + + decoder_info = NULL; + hr = IWICBitmapDecoder_GetDecoderInfo(decoder, &decoder_info); + ok(hr == S_OK || broken(IsEqualCLSID(&CLSID_WICBmpDecoder, test->clsid) && FAILED(hr)) /* Fails on Windows */, + "%u: failed to get decoder info, hr %#x.\n", i, hr); + + if (hr == S_OK) + { + decoder_info2 = NULL; + hr = IWICBitmapDecoder_GetDecoderInfo(decoder, &decoder_info2); + ok(hr == S_OK, "Failed to get decoder info, hr %#x.\n", hr); + todo_wine + ok(decoder_info == decoder_info2, "Unexpected decoder info instance.\n"); + + hr = IWICBitmapDecoderInfo_QueryInterface(decoder_info, &IID_IWICBitmapDecoder, (void **)&decoder2); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + IWICBitmapDecoderInfo_Release(decoder_info); + IWICBitmapDecoderInfo_Release(decoder_info2); + } + IWICBitmapDecoder_Release(decoder); + MultiByteToWideChar(CP_ACP, 0, test->mimetype, -1, mimetypeW, sizeof(mimetypeW)/sizeof(mimetypeW[0])); MultiByteToWideChar(CP_ACP, 0, test->extensions, -1, extensionsW, sizeof(extensionsW)/sizeof(extensionsW[0]));

1 0

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

Feb. 26, 2018

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

Zebediah Figura : winegstreamer: Remove unused callbacks.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

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

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

Feb. 26, 2018

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

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in arbfp_blit_set().
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: c86467bdadb4abb94ffa3527c4f0eff2a1c664c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c86467bdadb4abb94ffa3527… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:49 2018 +0330 wined3d: Explicitly calculate the sub-resource level in arbfp_blit_set(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 36e69a9..9823de2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7567,9 +7567,9 @@ static GLuint arbfp_gen_plain_shader(const struct wined3d_gl_info *gl_info, cons /* Context activation is done by the caller. */ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context *context, - const struct wined3d_surface *surface, const struct wined3d_color_key *color_key) + const struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_color_key *color_key) { - const struct wined3d_texture *texture = surface->container; enum complex_fixup fixup; const struct wined3d_gl_info *gl_info = context->gl_info; struct wine_rb_entry *entry; @@ -7577,10 +7577,12 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine struct arbfp_blit_desc *desc; struct wined3d_color float_color_key[2]; struct wined3d_vec4 size; + unsigned int level; GLuint shader; - size.x = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); - size.y = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); + level = sub_resource_idx % texture->level_count; + size.x = wined3d_texture_get_level_pow2_width(texture, level); + size.y = wined3d_texture_get_level_pow2_height(texture, level); size.z = 1.0f; size.w = 1.0f; @@ -7875,7 +7877,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl color_key = &alpha_test_key; } - arbfp_blit_set(arbfp_blitter, context, src_surface, color_key); + arbfp_blit_set(arbfp_blitter, context, src_texture, src_sub_resource_idx, color_key); /* Draw a textured quad */ draw_textured_quad(src_texture, src_sub_resource_idx, context, src_rect, dst_rect, filter);

1 0

Michael Müller : w2_32: Ignore setting several port assignment related socket options.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 6fa715c2709c5418a21bd50d9f3a6fed229b032f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fa715c2709c5418a21bd50d… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Feb 26 03:06:36 2018 +0000 w2_32: Ignore setting several port assignment related socket options. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 16 ++++++++++++++++ include/winsock.h | 9 +++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e39901d..d983633 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5886,6 +5886,22 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, break; #endif + case WS_SO_RANDOMIZE_PORT: + FIXME("Ignoring WS_SO_RANDOMIZE_PORT\n"); + return 0; + + case WS_SO_PORT_SCALABILITY: + FIXME("Ignoring WS_SO_PORT_SCALABILITY\n"); + return 0; + + case WS_SO_REUSE_UNICASTPORT: + FIXME("Ignoring WS_SO_REUSE_UNICASTPORT\n"); + return 0; + + case WS_SO_REUSE_MULTICASTPORT: + FIXME("Ignoring WS_SO_REUSE_MULTICASTPORT\n"); + return 0; + default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/include/winsock.h b/include/winsock.h index 8bb067f..891fa9d 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -672,6 +672,10 @@ typedef struct WS(WSAData) #define SO_TYPE 0x1008 #define SO_BSP_STATE 0x1009 +#define SO_RANDOMIZE_PORT 0x3005 +#define SO_PORT_SCALABILITY 0x3006 +#define SO_REUSE_UNICASTPORT 0x3007 +#define SO_REUSE_MULTICASTPORT 0x3008 #define IOCPARM_MASK 0x7f #define IOC_VOID 0x20000000 @@ -707,6 +711,11 @@ typedef struct WS(WSAData) #define WS_SO_TYPE 0x1008 #define WS_SO_BSP_STATE 0x1009 +#define WS_SO_RANDOMIZE_PORT 0x3005 +#define WS_SO_PORT_SCALABILITY 0x3006 +#define WS_SO_REUSE_UNICASTPORT 0x3007 +#define WS_SO_REUSE_MULTICASTPORT 0x3008 + #define WS_IOCPARM_MASK 0x7f #define WS_IOC_VOID 0x20000000 #define WS_IOC_OUT 0x40000000

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in arbfp_blitter_blit().
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: a9678a1a8c0a160b0e1378ef0581f1cdff322cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9678a1a8c0a160b0e1378ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:50 2018 +0330 wined3d: Explicitly calculate the sub-resource level in arbfp_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9823de2..f86c167 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7825,6 +7825,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl == WINED3D_LOCATION_DRAWABLE && !wined3d_resource_is_offscreen(&src_texture->resource)) { + unsigned int src_level = src_sub_resource_idx % src_texture->level_count; + /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can * flip in the blitter, we don't actually need that flip anyway. So we @@ -7833,8 +7835,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl surface_load_fb_texture(src_surface, FALSE, context); s = *src_rect; - s.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.top; - s.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.bottom; + s.top = wined3d_texture_get_level_height(src_texture, src_level) - s.top; + s.bottom = wined3d_texture_get_level_height(src_texture, src_level) - s.bottom; src_rect = &s; } else

1 0

Louis Lenders : kernel32: Add message resource for TRUST_E_NOSIGNATURE.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 1ae2036f24b92464610589ece5ed070625e8d276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae2036f24b92464610589ec… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Feb 26 00:34:25 2018 +0000 kernel32: Add message resource for TRUST_E_NOSIGNATURE. Based on a patch by Austin English. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 4 + dlls/kernel32/winerror.mc | 9 + po/ar.po | 1486 ++++++++++++++++++------------------- po/bg.po | 1484 ++++++++++++++++++------------------- po/ca.po | 1486 ++++++++++++++++++------------------- po/cs.po | 1484 ++++++++++++++++++------------------- po/da.po | 1486 ++++++++++++++++++------------------- po/de.po | 1486 ++++++++++++++++++------------------- po/el.po | 1484 ++++++++++++++++++------------------- po/en.po | 1484 ++++++++++++++++++------------------- po/en_US.po | 1484 ++++++++++++++++++------------------- po/eo.po | 1484 ++++++++++++++++++------------------- po/es.po | 1486 ++++++++++++++++++------------------- po/fa.po | 1484 ++++++++++++++++++------------------- po/fi.po | 1486 ++++++++++++++++++------------------- po/fr.po | 1486 ++++++++++++++++++------------------- po/he.po | 1484 ++++++++++++++++++------------------- po/hi.po | 1484 ++++++++++++++++++------------------- po/hr.po | 1486 ++++++++++++++++++------------------- po/hu.po | 1486 ++++++++++++++++++------------------- po/it.po | 1486 ++++++++++++++++++------------------- po/ja.po | 1486 ++++++++++++++++++------------------- po/ko.po | 1486 ++++++++++++++++++------------------- po/lt.po | 1486 ++++++++++++++++++------------------- po/ml.po | 1484 ++++++++++++++++++------------------- po/nb_NO.po | 1486 ++++++++++++++++++------------------- po/nl.po | 1486 ++++++++++++++++++------------------- po/or.po | 1484 ++++++++++++++++++------------------- po/pa.po | 1484 ++++++++++++++++++------------------- po/pl.po | 1486 ++++++++++++++++++------------------- po/pt_BR.po | 1486 ++++++++++++++++++------------------- po/pt_PT.po | 1486 ++++++++++++++++++------------------- po/rm.po | 1484 ++++++++++++++++++------------------- po/ro.po | 1486 ++++++++++++++++++------------------- po/ru.po | 1486 ++++++++++++++++++------------------- po/sk.po | 1484 ++++++++++++++++++------------------- po/sl.po | 1486 ++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 1484 ++++++++++++++++++------------------- po/sr_RS(a)latin.po | 1484 ++++++++++++++++++------------------- po/sv.po | 1486 ++++++++++++++++++------------------- po/te.po | 1484 ++++++++++++++++++------------------- po/th.po | 1484 ++++++++++++++++++------------------- po/tr.po | 1486 ++++++++++++++++++------------------- po/uk.po | 1488 +++++++++++++++++++------------------- po/wa.po | 1484 ++++++++++++++++++------------------- po/wine.pot | 1484 ++++++++++++++++++------------------- po/zh_CN.po | 1486 ++++++++++++++++++------------------- po/zh_TW.po | 1486 ++++++++++++++++++------------------- 48 files changed, 34289 insertions(+), 34042 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ae2036f24b924646105…

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in is_full_clear().
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 6e1606253264cdb7205e0ee6fb03212fe75ee14a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e1606253264cdb7205e0ee6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:51 2018 +0330 wined3d: Explicitly calculate the sub-resource level in is_full_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e275e1..18b39b8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -200,10 +200,14 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context device->contexts = new_array; } -static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) +static BOOL is_full_clear(const struct wined3d_texture *texture, unsigned int sub_resource_idx, + const RECT *draw_rect, const RECT *clear_rect) { - unsigned int height = wined3d_texture_get_level_height(target->container, target->texture_level); - unsigned int width = wined3d_texture_get_level_width(target->container, target->texture_level); + unsigned int width, height, level; + + level = sub_resource_idx % texture->level_count; + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); /* partial draw rect */ if (draw_rect->left || draw_rect->top || draw_rect->right < width || draw_rect->bottom < height) @@ -262,7 +266,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource); - if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, rect_count ? clear_rect : NULL)) + if (flags & WINED3DCLEAR_TARGET && !is_full_clear(rt, rtv->sub_resource_idx, + draw_rect, rect_count ? clear_rect : NULL)) wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); else wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); @@ -289,7 +294,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) - && !is_full_clear(depth_stencil, draw_rect, rect_count ? clear_rect : NULL)) + && !is_full_clear(ds, dsv->sub_resource_idx, draw_rect, rect_count ? clear_rect : NULL)) wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); else wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location);

1 0

Henri Verbeet : wined3d: Pass a wined3d_rendertarget_info structure to context_find_fbo_entry().
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: b574fab087ed2903093b9c8263cb9c116e8f1fdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b574fab087ed2903093b9c82… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 10:39:48 2018 +0330 wined3d: Pass a wined3d_rendertarget_info structure to context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 122 ++++++++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b574fab087ed2903093b…

1 0

Nikolay Sivov : explorerframe/tests: Use global memory allocation helpers.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 4f35819843da7ce3f8a36faa2c44f5af25018768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f35819843da7ce3f8a36faa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:34:09 2018 +0300 explorerframe/tests: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/msg.h | 12 +++++------- dlls/explorerframe/tests/nstc.c | 7 ++++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/explorerframe/tests/msg.h b/dlls/explorerframe/tests/msg.h index f5e20f7..857278e 100644 --- a/dlls/explorerframe/tests/msg.h +++ b/dlls/explorerframe/tests/msg.h @@ -20,6 +20,7 @@ #include <assert.h> #include <windows.h> +#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -66,16 +67,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = HeapAlloc(GetProcessHeap(), 0, - msg_seq->size * sizeof (struct message)); + msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - msg_seq->sequence, - msg_seq->size * sizeof (struct message)); + msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); } assert(msg_seq->sequence); @@ -92,7 +90,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, msg_seq->sequence); + heap_free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -112,5 +110,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct msg_sequence)); + seq[i] = heap_alloc_zero(sizeof(struct msg_sequence)); } diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 1d1673c..44bdf31 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -363,7 +363,8 @@ static const INameSpaceTreeControlEventsVtbl vt_NSTCEvents = { static INameSpaceTreeControlEventsImpl *create_nstc_events(void) { INameSpaceTreeControlEventsImpl *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(INameSpaceTreeControlEventsImpl)); + + This = heap_alloc(sizeof(*This)); This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents; This->ref = 1; @@ -2377,8 +2378,8 @@ static void test_events(void) if(!res) { /* Freeing these prematurely causes a crash. */ - HeapFree(GetProcessHeap(), 0, pnstceimpl); - HeapFree(GetProcessHeap(), 0, pnstceimpl2); + heap_free(pnstceimpl); + heap_free(pnstceimpl2); } IShellItem_Release(psi);

1 0

Nikolay Sivov : uxtheme: Use global memory allocation helpers.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: d4cc71c5dbf033b59672da3d6bddda597fc86761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4cc71c5dbf033b59672da3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:35:15 2018 +0300 uxtheme: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 5 +++-- dlls/uxtheme/msstyles.c | 23 ++++++++++++----------- dlls/uxtheme/uxini.c | 5 +++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 664515c..32d341c 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -32,6 +32,7 @@ #include "uxtheme.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -48,7 +49,7 @@ static void free_paintbuffer(struct paintbuffer *buffer) { DeleteObject(buffer->bitmap); DeleteDC(buffer->memorydc); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) @@ -98,7 +99,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, if (params) FIXME("painting parameters are ignored\n"); - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer)); + buffer = heap_alloc(sizeof(*buffer)); buffer->targetdc = targetdc; buffer->rect = *rect; buffer->memorydc = CreateCompatibleDC(targetdc); diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index e471c3c..fe91494 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -36,6 +36,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -175,7 +176,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST goto invalid_theme; } - *tf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(THEME_FILE)); + *tf = heap_alloc_zero(sizeof(THEME_FILE)); (*tf)->hTheme = hTheme; GetFullPathNameW(lpThemeFile, MAX_PATH, (*tf)->szThemeFile, NULL); @@ -214,13 +215,13 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) while(ps->properties) { PTHEME_PROPERTY prop = ps->properties; ps->properties = prop->next; - HeapFree(GetProcessHeap(), 0, prop); + heap_free(prop); } pcls->partstate = ps->next; - HeapFree(GetProcessHeap(), 0, ps); + heap_free(ps); } - HeapFree(GetProcessHeap(), 0, pcls); + heap_free(pcls); } } while (tf->images) @@ -228,9 +229,9 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) PTHEME_IMAGE img = tf->images; tf->images = img->next; DeleteObject (img->image); - HeapFree (GetProcessHeap(), 0, img); + heap_free(img); } - HeapFree(GetProcessHeap(), 0, tf); + heap_free(tf); } } } @@ -450,7 +451,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST PTHEME_CLASS cur = MSSTYLES_FindClass(tf, pszAppName, pszClassName); if(cur) return cur; - cur = HeapAlloc(GetProcessHeap(), 0, sizeof(THEME_CLASS)); + cur = heap_alloc(sizeof(*cur)); cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -507,7 +508,7 @@ static PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int PTHEME_PARTSTATE cur = MSSTYLES_FindPartState(tc, iPartId, iStateId, NULL); if(cur) return cur; - cur = HeapAlloc(GetProcessHeap(), 0, sizeof(THEME_PARTSTATE)); + cur = heap_alloc(sizeof(*cur)); cur->iPartId = iPartId; cur->iStateId = iStateId; cur->properties = NULL; @@ -624,7 +625,7 @@ static PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPr /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; - cur = HeapAlloc(GetProcessHeap(), 0, sizeof(THEME_PROPERTY)); + cur = heap_alloc(sizeof(*cur)); cur->iPrimitiveType = iPropertyPrimitive; cur->iPropertyId = iPropertyId; cur->lpValue = lpValue; @@ -665,7 +666,7 @@ static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; - cur = HeapAlloc(GetProcessHeap(), 0, sizeof(THEME_PROPERTY)); + cur = heap_alloc(sizeof(*cur)); cur->iPrimitiveType = iPropertyPrimitive; cur->iPropertyId = iPropertyId; cur->lpValue = lpValue; @@ -1140,7 +1141,7 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha img = img->next; } /* Not found? Load from resources */ - img = HeapAlloc (GetProcessHeap(), 0, sizeof (THEME_IMAGE)); + img = heap_alloc(sizeof(*img)); img->image = LoadImageW(tc->hTheme, szFile, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); prepare_alpha (img->image, hasAlpha); img->hasAlpha = *hasAlpha; diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index a2dfabf..1581ff4 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -27,6 +27,7 @@ #include "winnls.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -75,7 +76,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { } dwIniSize = SizeofResource(hTheme, hrsc) / sizeof(WCHAR); - uf = HeapAlloc(GetProcessHeap(), 0, sizeof(UXINI_FILE)); + uf = heap_alloc(sizeof(*uf)); uf->lpIni = lpThemesIni; uf->lpCurLoc = lpThemesIni; uf->lpEnd = lpThemesIni + dwIniSize; @@ -92,7 +93,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { */ void UXINI_CloseINI(PUXINI_FILE uf) { - HeapFree(GetProcessHeap(), 0, uf); + heap_free(uf); } /**********************************************************************

1 0

Nikolay Sivov : kernel32: Add CreateRemoteThreadEx().
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 32617e814a717af69a03604fceebb0b9693ed4df URL: https://source.winehq.org/git/wine.git/?a=commit;h=32617e814a717af69a03604f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:36:43 2018 +0300 kernel32: Add CreateRemoteThreadEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 20 ++++++++++++++++---- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index 77414bc..ff13d48 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -2,7 +2,7 @@ @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread -@ stub CreateRemoteThreadEx +@ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx @ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread @ stdcall DeleteProcThreadAttributeList(ptr) kernel32.DeleteProcThreadAttributeList @ stdcall ExitProcess(long) kernel32.ExitProcess diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 1496789..381db8a 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -2,7 +2,7 @@ @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread -@ stub CreateRemoteThreadEx +@ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx @ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread @ stdcall DeleteProcThreadAttributeList(ptr) kernel32.DeleteProcThreadAttributeList @ stdcall ExitProcess(long) kernel32.ExitProcess diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 7bfbe72..fc2feec 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -2,7 +2,7 @@ @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread -@ stub CreateRemoteThreadEx +@ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx @ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread @ stdcall DeleteProcThreadAttributeList(ptr) kernel32.DeleteProcThreadAttributeList @ stdcall ExitProcess(long) kernel32.ExitProcess diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c431ecb..ee11c42 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -319,7 +319,7 @@ # @ stub CreateProcessInternalWSecure @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) -# @ stub CreateRemoteThreadEx +@ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) @ stdcall CreateSemaphoreA(ptr long long str) @ stdcall CreateSemaphoreExA(ptr long long str long long) @ stdcall CreateSemaphoreExW(ptr long long wstr long long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 6a89993..b6ca9f260 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -55,9 +55,18 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateThread( SECURITY_ATTRIBUTES *sa, SIZE_T st sa, stack, start, param, flags, id ); } - /*************************************************************************** * CreateRemoteThread (KERNEL32.@) + */ +HANDLE WINAPI CreateRemoteThread( HANDLE hProcess, SECURITY_ATTRIBUTES *sa, SIZE_T stack, + LPTHREAD_START_ROUTINE start, LPVOID param, + DWORD flags, DWORD *id ) +{ + return CreateRemoteThreadEx( hProcess, sa, stack, start, param, flags, NULL, id ); +} + +/*************************************************************************** + * CreateRemoteThreadEx (KERNEL32.@) * * Creates a thread that runs in the address space of another process * @@ -73,15 +82,18 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateThread( SECURITY_ATTRIBUTES *sa, SIZE_T st * Bad start address for RtlCreateUserThread because the library * may be loaded at different address in other process. */ -HANDLE WINAPI CreateRemoteThread( HANDLE hProcess, SECURITY_ATTRIBUTES *sa, SIZE_T stack, - LPTHREAD_START_ROUTINE start, LPVOID param, - DWORD flags, LPDWORD id ) +HANDLE WINAPI CreateRemoteThreadEx( HANDLE hProcess, SECURITY_ATTRIBUTES *sa, SIZE_T stack, + LPTHREAD_START_ROUTINE start, LPVOID param, DWORD flags, + LPPROC_THREAD_ATTRIBUTE_LIST attributes, DWORD *id ) { HANDLE handle; CLIENT_ID client_id; NTSTATUS status; SIZE_T stack_reserve = 0, stack_commit = 0; + if (attributes) + FIXME("thread attributes ignored\n"); + if (flags & STACK_SIZE_PARAM_IS_A_RESERVATION) stack_reserve = stack; else stack_commit = stack; diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a834bbe..1a6f1ff 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -212,7 +212,7 @@ # @ stub CreateProcessInternalW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread -@ stub CreateRemoteThreadEx +@ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW @ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW diff --git a/include/winbase.h b/include/winbase.h index cc719c6..e47c87a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1844,6 +1844,7 @@ WINADVAPI BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECUR #define CreateProcessAsUser WINELIB_NAME_AW(CreateProcessAsUser) WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); +WINBASEAPI HANDLE WINAPI CreateRemoteThreadEx(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPPROC_THREAD_ATTRIBUTE_LIST,LPDWORD); WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE); WINBASEAPI HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR); WINBASEAPI HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR);

1 0

Michael Stefaniuc : dmstyle/tests: Add IDirectMusicObject::ParseDescriptor () tests.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: ff4a81b47a19aaa32f828d5a7ac1ba6acb730651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff4a81b47a19aaa32f828d5a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 26 01:02:58 2018 +0100 dmstyle/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 200 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 664b208..a9a89a7 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -22,10 +22,14 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static BOOL missing_dmstyle(void) { IDirectMusicStyle *dms; @@ -339,6 +343,201 @@ static void test_track(void) } } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + LARGE_INTEGER zero = {0}; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + DWORD valid; + const WCHAR s_inam[] = {'I','N','A','M','\0'}; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_GUID_CHUNK, + DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, 0, + FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || + broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ + "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + + /* All desc chunks, DMUS_OBJ_CATEGORY not supported */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), + "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -354,6 +553,7 @@ START_TEST(dmstyle) test_COM_track(); test_dmstyle(); test_track(); + test_parsedescriptor(); CoUninitialize(); }

1 0

Nikolay Sivov : avifil32: Remove some redundant statements.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 7675ce7550f20a5f6b2150b0c20211e2092be528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7675ce7550f20a5f6b2150b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:33:25 2018 +0300 avifil32: Remove some redundant statements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/editstream.c | 1 - dlls/avifil32/getframe.c | 1 - dlls/avifil32/tmpfile.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 2e0fa2f..a4df628 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -282,7 +282,6 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; } diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index c8580a8..be4a2a9 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -134,7 +134,6 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) } HeapFree(GetProcessHeap(), 0, iface); - return 0; } return ref; diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index ee7e772..6d199c7 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -94,7 +94,6 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref;

1 0

Nikolay Sivov : explorerframe: Use global memory allocation helpers.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 9e8f152dc9adf6bacd961c507da908c1aa184105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8f152dc9adf6bacd961c50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:34:08 2018 +0300 explorerframe: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 15d2f26..37e1a55 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -33,6 +33,7 @@ #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" #include "explorerframe_main.h" @@ -861,9 +862,8 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) if(!ref) { TRACE("Freeing.\n"); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); EFRAME_UnlockModule(); - return 0; } return ref; @@ -1001,7 +1001,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, TRACE("%p, %d, %p, %x, %x, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); - new_root = HeapAlloc(GetProcessHeap(), 0, sizeof(nstc_root)); + new_root = heap_alloc(sizeof(*new_root)); if(!new_root) return E_OUTOFMEMORY; @@ -1025,7 +1025,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, if(!new_root->htreeitem) { WARN("Failed to add the root.\n"); - HeapFree(GetProcessHeap(), 0, new_root); + heap_free(new_root); return E_FAIL; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, events_OnItemDeleted(This, root->psi, TRUE); SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); - HeapFree(GetProcessHeap(), 0, root); + heap_free(root); return S_OK; } else @@ -1135,7 +1135,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST)*count); + array = heap_alloc(sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) @@ -1149,7 +1149,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, for(i = 0; i < count; i++) ILFree(array[i]); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return hr; } @@ -1610,7 +1610,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); - nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); + nstc = heap_alloc_zero(sizeof(*nstc)); if (!nstc) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : kernel32/tests: Remove workarounds for older versions.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: e01909755689dc91c02a353d4ecc3f853bc5d11a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e01909755689dc91c02a353d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:37:49 2018 +0300 kernel32/tests: Remove workarounds for older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 8360994..49a9357 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -26,8 +26,6 @@ #include "winternl.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); -static BOOL (WINAPI * pVerifyVersionInfoA)(LPOSVERSIONINFOEXA, DWORD, DWORDLONG); -static ULONGLONG (WINAPI * pVerSetConditionMask)(ULONGLONG, DWORD, BYTE); static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); #define GET_PROC(func) \ @@ -40,8 +38,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("kernel32.dll"); GET_PROC(GetProductInfo); - GET_PROC(VerifyVersionInfoA); - GET_PROC(VerSetConditionMask); hmod = GetModuleHandleA("ntdll.dll"); @@ -153,9 +149,7 @@ static void test_GetVersionEx(void) SetLastError(0xdeadbeef); infoExA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); ret = GetVersionExA((OSVERSIONINFOA *)&infoExA); - ok(ret || - broken(ret == 0), /* win95 */ - "Expected GetVersionExA to succeed\n"); + ok(ret, "GetVersionExA failed.\n"); if (!infoExA.wServicePackMajor && !infoExA.wServicePackMinor) ok(!infoExA.szCSDVersion[0], "got '%s'\n", infoExA.szCSDVersion); @@ -689,22 +683,22 @@ static void test_VerifyVersionInfo(void) * if the minor version is tested */ info.dwMajorVersion = 3; info.dwMinorVersion = 10; - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + ret = VerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); info.dwMinorVersion = 0; info.wServicePackMajor = 10; - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + ret = VerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); info.wServicePackMajor = 0; info.wServicePackMinor = 10; - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + ret = VerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); @@ -712,8 +706,8 @@ static void test_VerifyVersionInfo(void) info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); GetVersionExA((OSVERSIONINFOA *)&info); info.dwOSVersionInfoSize = 0; - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); + ret = VerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); }

1 0

Nikolay Sivov : kernel32/tests: Add more tests for VerifyVersionInfo().
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: 60a5ee6560a2048d31e694dee147465bd89a366f URL: https://source.winehq.org/git/wine.git/?a=commit;h=60a5ee6560a2048d31e694de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:37:48 2018 +0300 kernel32/tests: Add more tests for VerifyVersionInfo(). New tests cases by Sebastian Lackner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 634 ++++++++++++++++++++++++++++++++---------- 1 file changed, 493 insertions(+), 141 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60a5ee6560a2048d31e6…

1 0

Nikolay Sivov : kernel32: Add GetEnabledXStateFeatures() stub.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: wine Branch: master Commit: cb05be7bff142b0ee7b3b070a452d2b7bf04b55a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb05be7bff142b0ee7b3b070… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 19:36:42 2018 +0300 kernel32: Add GetEnabledXStateFeatures() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-xstate-l2-1-0.spec | 2 +- dlls/kernel32/cpu.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec index 0f9438d..f051097 100644 --- a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec @@ -1,5 +1,5 @@ @ stub CopyContext -@ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() kernel32.GetEnabledXStateFeatures @ stub GetXStateFeaturesMask @ stub InitializeContext @ stub LocateXStateFeature diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 2e0e79f..ec1fd0f 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -327,3 +327,12 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) FIXME("semi-stub, returning %u\n", cpus); return cpus; } + +/*********************************************************************** + * GetEnabledXStateFeatures (KERNEL32.@) + */ +DWORD64 WINAPI GetEnabledXStateFeatures(void) +{ + FIXME("\n"); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1137920..c431ecb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -657,7 +657,7 @@ # @ stub GetDurationFormat # @ stub GetDurationFormatEx @ stdcall GetDynamicTimeZoneInformation(ptr) -# @ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() @ stdcall GetEnvironmentStrings() GetEnvironmentStringsA @ stdcall GetEnvironmentStringsA() @ stdcall GetEnvironmentStringsW() diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index eb6edbe..a834bbe 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -491,7 +491,7 @@ # @ stub GetEffectivePackageStatusForUser # @ stub GetEightBitStringToUnicodeSizeRoutine # @ stub GetEightBitStringToUnicodeStringRoutine -# @ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() kernel32.GetEnabledXStateFeatures @ stdcall GetEnvironmentStrings() kernel32.GetEnvironmentStrings @ stdcall GetEnvironmentStringsA() kernel32.GetEnvironmentStringsA @ stdcall GetEnvironmentStringsW() kernel32.GetEnvironmentStringsW

1 0

김건우 : Add Korean translation of News in 2016
by Jeremy Newman Feb. 26, 2018

Feb. 26, 2018

Module: website Branch: master Commit: ecefe7842e5c1363e26e5ecd38f7711f9c392399 URL: https://source.winehq.org/git/website.git/?a=commit;h=ecefe7842e5c1363e26e5… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Mon Feb 26 03:46:24 2018 +0900 Add Korean translation of News in 2016 Signed-off-by: rlarjsdn122 <rlarjsdn122(a)naver.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/ko/2016010901.xml | 16 ++++++++++++++++ news/ko/2016012201.xml | 17 +++++++++++++++++ news/ko/2016020301.xml | 13 +++++++++++++ news/ko/2016020501.xml | 17 +++++++++++++++++ news/ko/2016021901.xml | 16 ++++++++++++++++ news/ko/2016030501.xml | 16 ++++++++++++++++ news/ko/2016031801.xml | 15 +++++++++++++++ news/ko/2016040201.xml | 17 +++++++++++++++++ news/ko/2016041201.xml | 13 +++++++++++++ news/ko/2016041601.xml | 18 ++++++++++++++++++ news/ko/2016043001.xml | 16 ++++++++++++++++ news/ko/2016051701.xml | 16 ++++++++++++++++ news/ko/2016052701.xml | 16 ++++++++++++++++ news/ko/2016061001.xml | 17 +++++++++++++++++ news/ko/2016061601.xml | 14 ++++++++++++++ news/ko/2016062401.xml | 18 ++++++++++++++++++ news/ko/2016070901.xml | 16 ++++++++++++++++ news/ko/2016072201.xml | 17 +++++++++++++++++ news/ko/2016080501.xml | 17 +++++++++++++++++ news/ko/2016081901.xml | 17 +++++++++++++++++ news/ko/2016082201.xml | 13 +++++++++++++ news/ko/2016090301.xml | 19 +++++++++++++++++++ news/ko/2016091701.xml | 16 ++++++++++++++++ news/ko/2016100101.xml | 15 +++++++++++++++ news/ko/2016100701.xml | 12 ++++++++++++ news/ko/2016101401.xml | 15 +++++++++++++++ news/ko/2016102801.xml | 16 ++++++++++++++++ news/ko/2016111101.xml | 16 ++++++++++++++++ news/ko/2016112501.xml | 15 +++++++++++++++ news/ko/2016120201.xml | 11 +++++++++++ news/ko/2016120901.xml | 17 +++++++++++++++++ news/ko/2016121201.xml | 16 ++++++++++++++++ news/ko/2016121601.xml | 12 ++++++++++++ news/ko/2016121901.xml | 14 ++++++++++++++ news/ko/2016122301.xml | 12 ++++++++++++ 35 files changed, 541 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=ecefe7842e5c1363e…

1 0

김건우 : Add Korean translation of News in 2018
by Jeremy Newman Feb. 26, 2018

Feb. 26, 2018

Module: website Branch: master Commit: 82566a3919d9cd49a3548b4a95376819dc567f90 URL: https://source.winehq.org/git/website.git/?a=commit;h=82566a3919d9cd49a3548… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Mon Feb 26 03:45:09 2018 +0900 Add Korean translation of News in 2018 Signed-off-by: rlarjsdn122 <rlarjsdn122(a)naver.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/ko/2018010201.xml | 14 ++++++++++++++ news/ko/2018010501.xml | 12 ++++++++++++ news/ko/2018011201.xml | 12 ++++++++++++ news/ko/2018011801.xml | 16 ++++++++++++++++ news/ko/2018020201.xml | 16 ++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/news/ko/2018010201.xml b/news/ko/2018010201.xml new file mode 100644 index 0000000..8fa8d72 --- /dev/null +++ b/news/ko/2018010201.xml @@ -0,0 +1,14 @@ +<news> +<date>1월 2일 2018</date> +<title>와인 2.0.4 배포</title> +<body> + The Wine maintenance release 2.0.4(을)를 내려받을 수 있습니다. + <a href="{$root}/announce/2.0.4">이 판</a>의 변경 및 개선점: +<ul> + <li>여러 오류 고침</li> + <li>Updates to the National Language Support files</li> + <li>Documentation updates</li> +</ul> +원시 부호는 <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.4.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news> diff --git a/news/ko/2018010501.xml b/news/ko/2018010501.xml new file mode 100644 index 0000000..b85c6f7 --- /dev/null +++ b/news/ko/2018010501.xml @@ -0,0 +1,12 @@ +<news> +<date>1월 5일 2018</date> +<title>와인 3.0-rc5 배포</title> +<body> + 와인 개발자판 3.0-rc5(을)를 내려받을 수 있습니다. + <a href="{$root}/announce/3.0-rc5">이 판</a>의 변경 및 개선점: +<ul> + <li>오류만 고쳐졌으며, 원시 부호는 변하지 않았습니다..</li> +</ul> +원시 부호는 <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc5.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news> diff --git a/news/ko/2018011201.xml b/news/ko/2018011201.xml new file mode 100644 index 0000000..b854991 --- /dev/null +++ b/news/ko/2018011201.xml @@ -0,0 +1,12 @@ +<news> +<date>1월 12일 2018</date> +<title>와인 3.0-rc6 배포</title> +<body> + 와인 개발자판 3.0-rc6(을)를 내려받을 수 있습니다. + <a href="{$root}/announce/3.0-rc6">이 판</a>의 변경 및 개선점: +<ul> + <li>오류만 고쳐졌으며, 원시 부호는 변하지 않았습니다..</li> +</ul> +원시 부호는 <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc6.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news> diff --git a/news/ko/2018011801.xml b/news/ko/2018011801.xml new file mode 100644 index 0000000..bc97b4f --- /dev/null +++ b/news/ko/2018011801.xml @@ -0,0 +1,16 @@ +<news> +<date>1월 18일 2018</date> +<title>와인 3.0 배포</title> +<body> + 와인 제작진이 자랑스럽게 공개하는 새 안정판인 와인 3.0(을)를 내려받을 수 있습니다. + This release represents a year of development effort and over 6,000 individual changes. It contains a large number of improvements that are listed in the <a href="{$root}/announce/3.0">release notes</a>. The main highlights are: +<ul> + <li>Direct3D 10 and 11 support.</li> + <li>The Direct3D command stream.</li> + <li>The Android graphics driver.</li> + <li>Improved DirectWrite and Direct2D support.</li> +</ul> + Once again, because of the annual release schedule, a number of features that are being worked on have been deferred to the next development cycle. This includes in particular Direct3D 12 and Vulkan support, as well as OpenGL ES support to enable Direct3D on Android. +원시 부호는 <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news> diff --git a/news/ko/2018020201.xml b/news/ko/2018020201.xml new file mode 100644 index 0000000..91db858 --- /dev/null +++ b/news/ko/2018020201.xml @@ -0,0 +1,16 @@ +<news> +<date>February 2일 2018</date> +<title>와인 3.1 배포</title> +<body> + 와인 개발자판 3.1(을)를 내려받을 수 있습니다. + <a href="{$root}/announce/3.1">이 판</a>의 변경 및 개선점: +<ul> + <li>Kerberos authentication support.</li> + <li>Window class redirection for Common Controls 6.</li> + <li>다이렉트X11 ARGB 지원.</li> + <li>도스 파일을 실행시키기 위해서는 도스박스가 필요합니다.</li> + <li>여러 오류 고침.</li> +</ul> +원시 부호는 <a href="//dl.winehq.org/wine/source/3.x/wine-3.1.tar.xz">에서 받을 수 있습니다.</a> +실행 파일이 빌드되는 중이며, 곧 <a href="{$root}/download">여기</a>에서 내려받을 수 있습니다. +</body></news>

1 0

김건우 : Add Korean translation of News in 2017
by Jeremy Newman Feb. 26, 2018

Feb. 26, 2018

Module: website Branch: master Commit: 74883a4abb6d4675ce4e576a07ff1de8bb75f8ef URL: https://source.winehq.org/git/website.git/?a=commit;h=74883a4abb6d4675ce4e5… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Mon Feb 26 03:45:56 2018 +0900 Add Korean translation of News in 2017 Signed-off-by: rlarjsdn122 <rlarjsdn122(a)naver.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/ko/2017010601.xml | 12 ++++++++++++ news/ko/2017010801.xml | 12 ++++++++++++ news/ko/2017011301.xml | 12 ++++++++++++ news/ko/2017012001.xml | 13 +++++++++++++ news/ko/2017012401.xml | 11 +++++++++++ news/ko/2017020301.xml | 19 +++++++++++++++++++ news/ko/2017021701.xml | 16 ++++++++++++++++ news/ko/2017022801.xml | 14 ++++++++++++++ news/ko/2017030301.xml | 17 +++++++++++++++++ news/ko/2017031701.xml | 17 +++++++++++++++++ news/ko/2017033101.xml | 18 ++++++++++++++++++ news/ko/2017041301.xml | 16 ++++++++++++++++ news/ko/2017042001.xml | 13 +++++++++++++ news/ko/2017042801.xml | 18 ++++++++++++++++++ news/ko/2017051201.xml | 16 ++++++++++++++++ news/ko/2017052601.xml | 16 ++++++++++++++++ news/ko/2017060901.xml | 17 +++++++++++++++++ news/ko/2017062301.xml | 17 +++++++++++++++++ news/ko/2017070701.xml | 16 ++++++++++++++++ news/ko/2017072001.xml | 12 ++++++++++++ news/ko/2017072101.xml | 19 +++++++++++++++++++ news/ko/2017080301.xml | 16 ++++++++++++++++ news/ko/2017082001.xml | 15 +++++++++++++++ news/ko/2017090101.xml | 17 +++++++++++++++++ news/ko/2017091501.xml | 17 +++++++++++++++++ news/ko/2017092901.xml | 16 ++++++++++++++++ news/ko/2017101401.xml | 17 +++++++++++++++++ news/ko/2017102001.xml | 13 +++++++++++++ news/ko/2017103101.xml | 18 ++++++++++++++++++ news/ko/2017111101.xml | 18 ++++++++++++++++++ news/ko/2017112401.xml | 17 +++++++++++++++++ news/ko/2017120801.xml | 21 +++++++++++++++++++++ news/ko/2017121501.xml | 12 ++++++++++++ news/ko/2017122201.xml | 12 ++++++++++++ news/ko/2017122901.xml | 12 ++++++++++++ 35 files changed, 542 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=74883a4abb6d4675c…

1 0

김건우 : Add Korean translation of News in 2015
by Jeremy Newman Feb. 26, 2018

Feb. 26, 2018

Module: website Branch: master Commit: 41d2176638ac0c675c0be2d833a16dc4b31b1353 URL: https://source.winehq.org/git/website.git/?a=commit;h=41d2176638ac0c675c0be… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Mon Feb 26 03:46:54 2018 +0900 Add Korean translation of News in 2015 Signed-off-by: rlarjsdn122 <rlarjsdn122(a)naver.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/ko/2015010901.xml | 17 +++++++++++++++++ news/ko/2015011601.xml | 12 ++++++++++++ news/ko/2015012301.xml | 15 +++++++++++++++ news/ko/2015013001.xml | 11 +++++++++++ news/ko/2015020701.xml | 16 ++++++++++++++++ news/ko/2015021301.xml | 10 ++++++++++ news/ko/2015022001.xml | 16 ++++++++++++++++ news/ko/2015022701.xml | 10 ++++++++++ news/ko/2015030601.xml | 18 ++++++++++++++++++ news/ko/2015031401.xml | 11 +++++++++++ news/ko/2015032001.xml | 17 +++++++++++++++++ news/ko/2015032701.xml | 10 ++++++++++ news/ko/2015040301.xml | 18 ++++++++++++++++++ news/ko/2015041701.xml | 16 ++++++++++++++++ news/ko/2015042501.xml | 10 ++++++++++ news/ko/2015050101.xml | 15 +++++++++++++++ news/ko/2015050901.xml | 11 +++++++++++ news/ko/2015051501.xml | 17 +++++++++++++++++ news/ko/2015052201.xml | 10 ++++++++++ news/ko/2015052901.xml | 16 ++++++++++++++++ news/ko/2015060701.xml | 15 +++++++++++++++ news/ko/2015061201.xml | 16 ++++++++++++++++ news/ko/2015062301.xml | 10 ++++++++++ news/ko/2015062601.xml | 17 +++++++++++++++++ news/ko/2015070301.xml | 10 ++++++++++ news/ko/2015071001.xml | 17 +++++++++++++++++ news/ko/2015071701.xml | 10 ++++++++++ news/ko/2015072801.xml | 16 ++++++++++++++++ news/ko/2015073101.xml | 10 ++++++++++ news/ko/2015080801.xml | 16 ++++++++++++++++ news/ko/2015082101.xml | 16 ++++++++++++++++ news/ko/2015082801.xml | 10 ++++++++++ news/ko/2015090401.xml | 16 ++++++++++++++++ news/ko/2015091401.xml | 12 ++++++++++++ news/ko/2015092401.xml | 11 +++++++++++ news/ko/2015100201.xml | 17 +++++++++++++++++ news/ko/2015100401.xml | 12 ++++++++++++ news/ko/2015101401.xml | 10 ++++++++++ news/ko/2015101601.xml | 17 +++++++++++++++++ news/ko/2015103001.xml | 17 +++++++++++++++++ news/ko/2015111301.xml | 17 +++++++++++++++++ news/ko/2015111801.xml | 11 +++++++++++ news/ko/2015112001.xml | 13 +++++++++++++ news/ko/2015112701.xml | 12 ++++++++++++ news/ko/2015112901.xml | 18 ++++++++++++++++++ news/ko/2015120401.xml | 12 ++++++++++++ news/ko/2015121201.xml | 12 ++++++++++++ news/ko/2015121901.xml | 10 ++++++++++ news/ko/2015122501.xml | 16 ++++++++++++++++ 49 files changed, 672 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=41d2176638ac0c675…

1 0

Francois Gouget : testbot: Allow explicitly specifying a Step' s dependency.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: tools Branch: master Commit: 4080be2cabb39f70019785ed4e49db68d6b5b310 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4080be2cabb39f70019785e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 26 01:40:25 2018 +0100 testbot: Allow explicitly specifying a Step's dependency. This allows the TestBot to start running the 64 bit tests even if there are still some 32 bit tests to run. It also lets the TestBot more freely schedule the tasks when a job involves many test units (and thus many steps). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update31.sql | 10 +++++ testbot/ddl/winetestbot.sql | 4 +- testbot/doc/winetestbot-schema.dia | 87 +++++++++++++++++++++++++++++++++++++- testbot/lib/WineTestBot/Jobs.pm | 82 +++++++++++++++++++++++++++-------- testbot/lib/WineTestBot/Patches.pm | 13 +++++- testbot/lib/WineTestBot/Steps.pm | 29 +++++++++++++ testbot/web/Submit.pl | 13 +++++- 7 files changed, 214 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=4080be2cabb39f70019…

1 0

Francois Gouget : testbot: Remove a debug trace from the Munin plugin.
by Alexandre Julliard Feb. 26, 2018

Feb. 26, 2018

Module: tools Branch: master Commit: c4ad4cff70015fbe212c7efddfa026f00f8161c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4ad4cff70015fbe212c7ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 26 01:36:12 2018 +0100 testbot: Remove a debug trace from the Munin plugin. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Munin.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index 9e65421..91155b7 100755 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -132,7 +132,6 @@ sub GetOutput($) my $Stats = GetStatistics($VMs, $Period * 60); my @SortedHosts = sort keys %{$Stats->{hosts}->{items}}; - print sorted keys %{$Stats->{hosts}->{items}}, "\n"; my %HostDisplayNames; foreach my $Host (@SortedHosts) {

1 0

Katayama Hirofumi MZ : shlwapi: Don' t attempt to un-expand ComputerName in PathUnExpandEnvStrings.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 7be8beab68c5074e78c899acac7ccb6eb2f7e22e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7be8beab68c5074e78c899ac… Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> Date: Fri Feb 23 18:33:12 2018 +0100 shlwapi: Don't attempt to un-expand ComputerName in PathUnExpandEnvStrings. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 2 -- dlls/shlwapi/tests/path.c | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 89a3572..ae05381 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -4105,7 +4105,6 @@ BOOL WINAPI PathUnExpandEnvStringsA(LPCSTR path, LPSTR buffer, UINT buf_len) static const WCHAR allusersprofileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%',0}; static const WCHAR appdataW[] = {'%','A','P','P','D','A','T','A','%',0}; -static const WCHAR computernameW[] = {'%','C','O','M','P','U','T','E','R','N','A','M','E','%',0}; static const WCHAR programfilesW[] = {'%','P','r','o','g','r','a','m','F','i','l','e','s','%',0}; static const WCHAR systemrootW[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; static const WCHAR systemdriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%',0}; @@ -4142,7 +4141,6 @@ BOOL WINAPI PathUnExpandEnvStringsW(LPCWSTR path, LPWSTR buffer, UINT buf_len) struct envvars_map envvars[] = { { allusersprofileW, sizeof(allusersprofileW)/sizeof(WCHAR) }, { appdataW, sizeof(appdataW)/sizeof(WCHAR) }, - { computernameW, sizeof(computernameW)/sizeof(WCHAR) }, { programfilesW, sizeof(programfilesW)/sizeof(WCHAR) }, { systemrootW, sizeof(systemrootW)/sizeof(WCHAR) }, { systemdriveW, sizeof(systemdriveW)/sizeof(WCHAR) }, diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 57fdfdd..91c66b7 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1463,10 +1463,11 @@ static void test_PathUnExpandEnvStrings(void) static const WCHAR sysrootW[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; static const WCHAR sysdriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%',0}; static const WCHAR nonpathW[] = {'p','a','t','h',0}; + static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const char sysrootA[] = "%SystemRoot%"; static const char sysdriveA[] = "%SystemDrive%"; - WCHAR pathW[MAX_PATH], buffW[MAX_PATH], sysdrvW[3]; - char path[MAX_PATH], buff[MAX_PATH], sysdrvA[3], envvarA[10]; + WCHAR pathW[MAX_PATH], buffW[MAX_PATH], sysdrvW[3], envvarW[30]; + char path[MAX_PATH], buff[MAX_PATH], sysdrvA[3], envvarA[30]; BOOL ret; UINT len; @@ -1476,6 +1477,19 @@ static void test_PathUnExpandEnvStrings(void) return; } + /* The value of ComputerName is not a path */ + ret = GetEnvironmentVariableA("COMPUTERNAME", envvarA, sizeof(envvarA)); + ok(ret, "got %d\n", ret); + SetLastError(0xdeadbeef); + ret = pPathUnExpandEnvStringsA(envvarA, buff, sizeof(buff)); + ok(!ret && GetLastError() == 0xdeadbeef, "got %d, error %d\n", ret, GetLastError()); + + ret = GetEnvironmentVariableW(computernameW, envvarW, sizeof(envvarW)/sizeof(WCHAR)); + ok(ret, "got %d\n", ret); + SetLastError(0xdeadbeef); + ret = pPathUnExpandEnvStringsW(envvarW, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(!ret && GetLastError() == 0xdeadbeef, "got %d, error %d\n", ret, GetLastError()); + /* something that can't be represented with env var */ strcpy(path, "somepath_name"); strcpy(buff, "xx");

1 0

Józef Kucia : wined3d: Implement loading system memory from multisample textures.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: bd1688af5575e29aa586bfaaa4a7c258971804a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd1688af5575e29aa586bfaa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 22 16:43:13 2018 +0100 wined3d: Implement loading system memory from multisample textures. 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/surface.c | 71 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9c0d039..9ef917f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1412,21 +1412,21 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } static void read_from_framebuffer(struct wined3d_surface *surface, - struct wined3d_context *old_ctx, DWORD dst_location) + struct wined3d_context *old_ctx, DWORD src_location, DWORD dst_location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; + const struct wined3d_gl_info *gl_info; unsigned int row_pitch, slice_pitch; + struct wined3d_bo_address data; unsigned int width, height; - BYTE *mem; BYTE *row, *top, *bottom; - int i; - BOOL srcIsUpsideDown; - struct wined3d_bo_address data; + BOOL src_is_upside_down; + unsigned int i; + BYTE *mem; wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); @@ -1435,21 +1435,30 @@ static void read_from_framebuffer(struct wined3d_surface *surface, context = context_acquire(device, texture, sub_resource_idx); else restore_rt = NULL; - - context_apply_blit_state(context, device); gl_info = context->gl_info; + if (src_location != texture->resource.draw_binding) + { + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, surface, NULL, src_location); + context_check_fbo_status(context, GL_READ_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); + } + else + { + context_apply_blit_state(context, device); + } + /* Select the correct read buffer, and give some debug output. - * There is no need to keep track of the current read buffer or reset it, every part of the code - * that reads sets the read buffer as desired. + * There is no need to keep track of the current read buffer or reset it, + * every part of the code that reads sets the read buffer as desired. */ - if (wined3d_resource_is_offscreen(&texture->resource)) + if (src_location != WINED3D_LOCATION_DRAWABLE || wined3d_resource_is_offscreen(&texture->resource)) { /* Mapping the primary render target which is not on a swapchain. * Read from the back buffer. */ TRACE("Mapping offscreen render target.\n"); gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); - srcIsUpsideDown = TRUE; + src_is_upside_down = TRUE; } else { @@ -1457,9 +1466,9 @@ static void read_from_framebuffer(struct wined3d_surface *surface, GLenum buffer = wined3d_texture_get_gl_buffer(texture); TRACE("Mapping %#x buffer.\n", buffer); gl_info->gl_ops.gl.p_glReadBuffer(buffer); - checkGLcall("glReadBuffer"); - srcIsUpsideDown = FALSE; + src_is_upside_down = FALSE; } + checkGLcall("glReadBuffer"); if (data.buffer_object) { @@ -1484,7 +1493,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, 0); checkGLcall("glPixelStorei"); - if (!srcIsUpsideDown) + if (!src_is_upside_down) { /* glReadPixels returns the image upside down, and there is no way to * prevent this. Flip the lines in software. */ @@ -2153,24 +2162,34 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, sub_resource = &texture->sub_resources[sub_resource_idx]; wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - - /* Download the surface to system memory. */ - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + /* We cannot download data from multisample textures directly. */ + if (is_multisample_location(texture, WINED3D_LOCATION_TEXTURE_RGB)) { - wined3d_texture_bind_and_dirtify(texture, context, - !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - surface_download_data(surface, gl_info, dst_location); - ++texture->download_count; - + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); + read_from_framebuffer(surface, context, WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } + else + { + if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); + + /* Download the surface to system memory. */ + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + { + wined3d_texture_bind_and_dirtify(texture, context, + !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); + surface_download_data(surface, gl_info, dst_location); + ++texture->download_count; + + return TRUE; + } + } if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - read_from_framebuffer(surface, context, dst_location); + read_from_framebuffer(surface, context, texture->resource.draw_binding, dst_location); return TRUE; }

1 0

Józef Kucia : d3d9: Reject blits to regular textures.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 1f676a96664ca1bc725667c0336e3cf652cfc86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f676a96664ca1bc725667c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 22 16:43:12 2018 +0100 d3d9: Reject blits to regular textures. 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/d3d9/device.c | 6 ++++++ dlls/d3d9/tests/device.c | 3 --- dlls/d3d9/tests/visual.c | 16 ++++++++-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3d3d273..1c9a625 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1623,6 +1623,12 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect goto done; } + if (dst->texture && !(dst_desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + { + WARN("Destination is a texture.\n"); + goto done; + } + if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { if (device->in_scene) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0f3abf3..6084fd2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12342,7 +12342,6 @@ static void test_stretch_rect(void) IDirect3DTexture9_Release(dst_texture); hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst, NULL, D3DTEXF_NONE); - todo_wine_if(src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", hr, src_format, dst_format, src_pool, dst_pool); @@ -12355,7 +12354,6 @@ static void test_stretch_rect(void) ok(hr == expected_hr, "Got hr %#x, expected hr %#x (formats %#x/%#x, pool %#x).\n", hr, expected_hr, src_format, dst_format, src_pool); hr = IDirect3DDevice9_StretchRect(device, src_rt, NULL, dst, NULL, D3DTEXF_NONE); - todo_wine_if(dst_pool == D3DPOOL_DEFAULT) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pool %#x).\n", hr, src_format, dst_format, dst_pool); @@ -12388,7 +12386,6 @@ static void test_stretch_rect(void) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", hr, src_format, dst_format, src_pool, dst_pool); hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst, NULL, D3DTEXF_NONE); - todo_wine_if(src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", hr, src_format, dst_format, src_pool, dst_pool); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 23fd1fb..08d1849 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3743,7 +3743,7 @@ static void stretchrect_test(void) /* offscreenplain ==> texture, same size (should fail). */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the smaller offscreen surface with red. */ fill_surface(surf_offscreen32, 0xffff0000, 0); @@ -3769,7 +3769,7 @@ static void stretchrect_test(void) /* offscreenplain ==> texture, scaling (should fail). */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /************************************************************* * Tests for when the source parameter is a regular texture. * @@ -3826,7 +3826,7 @@ static void stretchrect_test(void) /* texture ==> texture, same size (should fail). */ hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller regular texture with red. */ /* Can't fill the surf_tex directly because it's created in D3DPOOL_DEFAULT. */ @@ -3855,7 +3855,7 @@ static void stretchrect_test(void) /* texture ==> texture, scaling (should fail). */ hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /****************************************************************** * Tests for when the source parameter is a rendertarget texture. * @@ -3912,7 +3912,7 @@ static void stretchrect_test(void) /* rendertarget texture ==> texture, same size (should fail). */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller rendertarget texture with red. */ /* Can't fill the surf_tex_rt directly because it's created in D3DPOOL_DEFAULT. */ @@ -3941,7 +3941,7 @@ static void stretchrect_test(void) /* rendertarget texture ==> texture, scaling (should fail). */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /****************************************************************** * Tests for when the source parameter is a rendertarget surface. * @@ -3995,7 +3995,7 @@ static void stretchrect_test(void) /* rendertarget surface ==> texture, same size (should fail). */ hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller rendertarget texture with red. */ fill_surface(surf_rt32, 0xffff0000, 0); @@ -4021,7 +4021,7 @@ static void stretchrect_test(void) /* rendertarget surface ==> texture, scaling (should fail). */ hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* backbuffer ==> surface tests (no scaling). */ /* Blit with NULL rectangles. */

1 0

Józef Kucia : wined3d: Use multisample textures by default.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: fb6b3cc872077e641cf68165e04012a95c94699d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb6b3cc872077e641cf68165… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 22 16:43:14 2018 +0100 wined3d: Use multisample textures by default. 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/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index cc0dc25..b57bcdc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -81,7 +81,7 @@ struct wined3d_settings wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ - FALSE, /* Prefer multisample renderbuffers to multisample textures by default. */ + TRUE, /* Prefer multisample textures to multisample renderbuffers. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ FALSE, /* Don't range check relative addressing indices in float constants. */

1 0

Józef Kucia : d3d9: Reject blits on CPU accessible resources.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 514ffe8ac94c44e8808a5aaad9e2a8cb0472d468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=514ffe8ac94c44e8808a5aaa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 22 16:43:11 2018 +0100 d3d9: Reject blits on CPU accessible resources. 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/d3d9/device.c | 11 +++++++++++ dlls/d3d9/tests/device.c | 13 +++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5e0f558..3d3d273 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1612,6 +1612,17 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect src_rect = &s; } + if (dst_desc.access & WINED3D_RESOURCE_ACCESS_CPU) + { + WARN("Destination resource is not in DEFAULT pool.\n"); + goto done; + } + if (src_desc.access & WINED3D_RESOURCE_ACCESS_CPU) + { + WARN("Source resource is not in DEFAULT pool.\n"); + goto done; + } + if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { if (device->in_scene) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0bd5016..0f3abf3 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12342,7 +12342,7 @@ static void test_stretch_rect(void) IDirect3DTexture9_Release(dst_texture); hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst, NULL, D3DTEXF_NONE); - todo_wine + todo_wine_if(src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", hr, src_format, dst_format, src_pool, dst_pool); @@ -12352,11 +12352,10 @@ static void test_stretch_rect(void) else expected_hr = D3DERR_INVALIDCALL; hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst_rt, NULL, D3DTEXF_NONE); - todo_wine_if(expected_hr != D3D_OK) ok(hr == expected_hr, "Got hr %#x, expected hr %#x (formats %#x/%#x, pool %#x).\n", hr, expected_hr, src_format, dst_format, src_pool); hr = IDirect3DDevice9_StretchRect(device, src_rt, NULL, dst, NULL, D3DTEXF_NONE); - todo_wine + todo_wine_if(dst_pool == D3DPOOL_DEFAULT) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pool %#x).\n", hr, src_format, dst_format, dst_pool); @@ -12380,28 +12379,26 @@ static void test_stretch_rect(void) ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst_surface, NULL, D3DTEXF_NONE); - todo_wine_if(expected_hr != D3D_OK) ok(hr == expected_hr, "Got hr %#x, expected %#x (formats %#x/%#x, pools %#x/%#x).\n", hr, expected_hr, src_format, dst_format, src_pool, dst_pool); /* offscreen plain <-> texture */ hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst_surface, NULL, D3DTEXF_NONE); - todo_wine + todo_wine_if(src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", hr, src_format, dst_format, src_pool, dst_pool); hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst, NULL, D3DTEXF_NONE); - todo_wine + todo_wine_if(src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", hr, src_format, dst_format, src_pool, dst_pool); /* offscreen plain <-> render target */ expected_hr = src_pool == D3DPOOL_DEFAULT ? D3D_OK : D3DERR_INVALIDCALL; hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst_rt, NULL, D3DTEXF_NONE); - todo_wine_if(expected_hr != D3D_OK) ok(hr == expected_hr, "Got hr %#x, expected hr %#x (formats %#x/%#x, pool %#x).\n", hr, expected_hr, src_format, dst_format, src_pool); hr = IDirect3DDevice9_StretchRect(device, src_rt, NULL, dst_surface, NULL, D3DTEXF_NONE); - todo_wine + todo_wine_if(dst_pool == D3DPOOL_DEFAULT) ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pool %#x).\n", hr, src_format, dst_format, dst_pool);

1 0

Józef Kucia : d3d9/tests: Add more tests for StretchRect().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: a49153cfa039f02639ddc67d51d28079fdd675ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a49153cfa039f02639ddc67d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 22 16:43:10 2018 +0100 d3d9/tests: Add more tests for StretchRect(). 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/d3d9/tests/device.c | 179 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0ffc1ae..0bd5016 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12246,6 +12246,184 @@ static void test_swapchain_multisample_reset(void) DestroyWindow(window); } +static void test_stretch_rect(void) +{ + IDirect3DTexture9 *src_texture, *dst_texture; + IDirect3DSurface9 *src_surface, *dst_surface; + IDirect3DSurface9 *src_rt, *dst_rt; + D3DFORMAT src_format, dst_format; + IDirect3DSurface9 *src, *dst; + D3DPOOL src_pool, dst_pool; + BOOL can_stretch_textures; + IDirect3DDevice9 *device; + HRESULT expected_hr; + unsigned int i, j; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + static const D3DFORMAT formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, + }; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get caps, hr %#x.\n", hr); + can_stretch_textures = caps.DevCaps2 & D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES; + + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + { + src_format = formats[i]; + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, src_format)) + || FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, src_format))) + { + skip("Format %#x not supported.\n", src_format); + continue; + } + + for (j = 0; j < sizeof(formats) / sizeof(*formats); ++j) + { + dst_format = formats[j]; + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, dst_format)) + || FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, dst_format))) + { + skip("Format %#x not supported.\n", dst_format); + continue; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, src_format, + D3DMULTISAMPLE_NONE, 0, FALSE, &src_rt, NULL); + ok(hr == D3D_OK, "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, dst_format, + D3DMULTISAMPLE_NONE, 0, FALSE, &dst_rt, NULL); + ok(hr == D3D_OK, "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, src_rt, NULL, dst_rt, NULL, D3DTEXF_NONE); + ok(hr == D3D_OK, "Got hr %#x (formats %#x/%#x).\n", hr, src_format, dst_format); + + for (src_pool = D3DPOOL_DEFAULT; src_pool <= D3DPOOL_SCRATCH; ++src_pool) + { + for (dst_pool = D3DPOOL_DEFAULT; dst_pool <= D3DPOOL_SCRATCH; ++dst_pool) + { + hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 1, 0, + src_format, src_pool, &src_texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 1, 0, + dst_format, dst_pool, &dst_texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(src_texture, 0, &src); + ok(hr == D3D_OK, "Failed to get surface, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(dst_texture, 0, &dst); + ok(hr == D3D_OK, "Failed to get surface, hr %#x.\n", hr); + IDirect3DTexture9_Release(src_texture); + IDirect3DTexture9_Release(dst_texture); + + hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst, NULL, D3DTEXF_NONE); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", + hr, src_format, dst_format, src_pool, dst_pool); + + /* render target <-> texture */ + if (src_pool == D3DPOOL_DEFAULT && can_stretch_textures) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst_rt, NULL, D3DTEXF_NONE); + todo_wine_if(expected_hr != D3D_OK) + ok(hr == expected_hr, "Got hr %#x, expected hr %#x (formats %#x/%#x, pool %#x).\n", + hr, expected_hr, src_format, dst_format, src_pool); + hr = IDirect3DDevice9_StretchRect(device, src_rt, NULL, dst, NULL, D3DTEXF_NONE); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pool %#x).\n", + hr, src_format, dst_format, dst_pool); + + if (src_pool == D3DPOOL_MANAGED || dst_pool == D3DPOOL_MANAGED) + { + IDirect3DSurface9_Release(src); + IDirect3DSurface9_Release(dst); + continue; + } + + if (src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, + src_format, src_pool, &src_surface, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, + dst_format, dst_pool, &dst_surface, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst_surface, NULL, D3DTEXF_NONE); + todo_wine_if(expected_hr != D3D_OK) + ok(hr == expected_hr, "Got hr %#x, expected %#x (formats %#x/%#x, pools %#x/%#x).\n", + hr, expected_hr, src_format, dst_format, src_pool, dst_pool); + + /* offscreen plain <-> texture */ + hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst_surface, NULL, D3DTEXF_NONE); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", + hr, src_format, dst_format, src_pool, dst_pool); + hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst, NULL, D3DTEXF_NONE); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n", + hr, src_format, dst_format, src_pool, dst_pool); + + /* offscreen plain <-> render target */ + expected_hr = src_pool == D3DPOOL_DEFAULT ? D3D_OK : D3DERR_INVALIDCALL; + hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst_rt, NULL, D3DTEXF_NONE); + todo_wine_if(expected_hr != D3D_OK) + ok(hr == expected_hr, "Got hr %#x, expected hr %#x (formats %#x/%#x, pool %#x).\n", + hr, expected_hr, src_format, dst_format, src_pool); + hr = IDirect3DDevice9_StretchRect(device, src_rt, NULL, dst_surface, NULL, D3DTEXF_NONE); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pool %#x).\n", + hr, src_format, dst_format, dst_pool); + + IDirect3DSurface9_Release(src_surface); + IDirect3DSurface9_Release(dst_surface); + + IDirect3DSurface9_Release(src); + IDirect3DSurface9_Release(dst); + } + } + + IDirect3DSurface9_Release(src_rt); + IDirect3DSurface9_Release(dst_rt); + } + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -12368,6 +12546,7 @@ START_TEST(device) test_lockable_backbuffer(); test_clip_planes_limits(); test_swapchain_multisample_reset(); + test_stretch_rect(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Mark Jansen : kernel32/tests: Close process / thread handles.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 85f515292aa5264e6affde6ba7e05a30f05c6684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f515292aa5264e6affde6b… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Fri Feb 23 12:16:58 2018 +0100 kernel32/tests: Close process / thread handles. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 59df58a..cbca00e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -618,6 +618,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); GetStartupInfoA(&si); okChildInt("StartupInfoA", "cb", startup.cb); @@ -656,6 +658,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -694,6 +698,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", si.lpDesktop); @@ -732,6 +738,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -770,6 +778,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -810,6 +820,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -848,6 +860,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -888,6 +902,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); @@ -909,6 +925,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("Arguments", "argcA", 7); okChildString("Arguments", "argvA4", "a\"b\\"); @@ -930,6 +948,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); @@ -945,6 +965,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, ".\\%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); @@ -965,6 +987,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); if (p) sprintf(buffer, "..%s/%s", p, exename); else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); @@ -988,6 +1012,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, "tests/process.c dump %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); @@ -1085,6 +1111,8 @@ static void test_Directory(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildIString("Misc", "CurrDirA", windir); release_memory(); @@ -1093,6 +1121,8 @@ static void test_Directory(void) /* search PATH for the exe if directory is NULL */ ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(TerminateProcess(info.hProcess, 0), "Child process termination\n"); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); /* if any directory is provided, don't search PATH, error on bad directory */ SetLastError(0xdeadbeef);

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_get_blt_info().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: cb4b757410128f692ca13d530d1a216b48bc9a1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb4b757410128f692ca13d53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 23 10:06:24 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_get_blt_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d4da824..657127f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -60,10 +60,19 @@ static inline void cube_coords_float(const RECT *r, UINT w, UINT h, struct float f->b = ((r->bottom * 2.0f) / h) - 1.0f; } -static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLsizei h, struct blt_info *info) +static void texture2d_get_blt_info(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, const RECT *rect, struct blt_info *info) { struct wined3d_vec3 *coords = info->texcoords; struct float_rect f; + unsigned int level; + GLenum target; + GLsizei w, h; + + level = sub_resource_idx % texture->level_count; + w = wined3d_texture_get_level_pow2_width(texture, level); + h = wined3d_texture_get_level_pow2_height(texture, level); + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); switch (target) { @@ -182,14 +191,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour { const struct wined3d_gl_info *gl_info = context->gl_info; struct blt_info info; - unsigned int level; - GLenum target; - level = sub_resource_idx % texture->level_count; - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - surface_get_blt_info(target, src_rect, - wined3d_texture_get_level_pow2_width(texture, level), - wined3d_texture_get_level_pow2_height(texture, level), &info); + texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)");

1 0