January 2018 - Wine-Devel - list.winehq.org

Re: [PATCH] user32: Allow mouse messages to land on windows below top-level HTTRANSPARENT windows.

by Alexandre Julliard

Huw Davies <huw(a)codeweavers.com> writes: > @@ -2502,7 +2502,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H > } > else > { > - msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); > + msg->hwnd = WINPOS_WindowFromPoint( 0, msg->pt, &hittest ); In general we want to trust the X11 window information over the wineserver. In particular I don't think we want to send a mouse click to some unrelated window that may be behind another X11 window. Also note that the same patch in staging has been reported to cause regressions. -- Alexandre Julliard julliard(a)winehq.org

Jan. 31, 2018

Re: [PATCH resend 2/2] winex11.drv, winemac.drv: Don't send WM_CANCELMODE on focus loss.

by Zebediah Figura

On 30/01/18 20:56, Dmitry Timoshkov wrote: > Zebediah Figura <z.figura12(a)gmail.com> wrote: > >> --- a/dlls/winex11.drv/event.c >> +++ b/dlls/winex11.drv/event.c >> @@ -804,7 +804,6 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) >> return; >> } >> if (hwnd != GetForegroundWindow()) return; >> - SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); >> >> /* don't reset the foreground window, if the window which is >> getting the focus is a Wine window */ > > Menu modal loop depends on this, and probably will be broken if > WM_CANCELMODE no longer sent. > Actually, as far as my testing shows, it's broken right now. Windows doesn't send WM_CANCELMODE on focus loss, even if the window is tracking a menu.

Jan. 31, 2018

[PATCH] dbghelp: Use correct module name buffer length when doing enumeration

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Manually tested on Windows. dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 684111c86c..f37991dacd 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -353,6 +353,7 @@ struct module { struct process* process; IMAGEHLP_MODULEW64 module; + WCHAR modulename[64]; /* used for enumeration */ struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6c7f2dcb6d..9f90d5e0ca 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -102,6 +102,7 @@ void module_set_module(struct module* module, const WCHAR* name) { module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName) / sizeof(module->module.ModuleName[0])); + module_fill_module(name, module->modulename, sizeof(module->modulename) / sizeof(module->modulename[0])); } const WCHAR *get_wine_loader_name(void) @@ -812,7 +813,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && (module->type == DMT_ELF || module->type == DMT_MACHO)) continue; - if (!EnumModulesCallback(module->module.ModuleName, + if (!EnumModulesCallback(module->modulename, module->module.BaseOfImage, UserContext)) break; } -- 2.15.1

Jan. 31, 2018

[PATCH 6/6] d2d1: Use d2d_array_reserve() in d2d_clip_stack_push().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 30 ++++++++++++++++++++++++++++-- dlls/d2d1/geometry.c | 27 --------------------------- dlls/d2d1/render_target.c | 17 ++--------------- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2c10252..07f71a0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -62,8 +62,8 @@ extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; struct d2d_clip_stack { D2D1_RECT_F *stack; - unsigned int size; - unsigned int count; + size_t size; + size_t count; }; struct d2d_error_state @@ -486,6 +486,32 @@ static inline void *d2d_calloc(size_t count, size_t size) return heap_alloc(s); } +static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) { D2D_MATRIX_3X2_F tmp = *a; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c805084..4a2f7d7 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -562,33 +562,6 @@ static void d2d_rect_get_bezier_segment_bounds(D2D_RECT_F *bounds, const D2D1_PO d2d_rect_get_bezier_bounds(bounds, &q[0], &q[1], &q[2]); } -static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) -{ - size_t new_capacity, max_capacity; - void *new_elements; - - if (element_count <= *capacity) - return TRUE; - - max_capacity = ~(size_t)0 / element_size; - if (max_capacity < element_count) - return FALSE; - - new_capacity = max(*capacity, 4); - while (new_capacity < element_count && new_capacity <= max_capacity / 2) - new_capacity *= 2; - - if (new_capacity < element_count) - new_capacity = max_capacity; - - if (!(new_elements = heap_realloc(*elements, new_capacity * element_size))) - return FALSE; - - *elements = new_elements; - *capacity = new_capacity; - return TRUE; -} - static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1_POINT_2F vertex) { if (!d2d_array_reserve((void **)&figure->vertices, &figure->vertices_size, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cc820cf..a202279 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -95,21 +95,8 @@ static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F { D2D1_RECT_F r; - if (stack->count == stack->size) - { - D2D1_RECT_F *new_stack; - unsigned int new_size; - - if (stack->size > UINT_MAX / 2) - return FALSE; - - new_size = stack->size * 2; - if (!(new_stack = heap_realloc(stack->stack, new_size * sizeof(*stack->stack)))) - return FALSE; - - stack->stack = new_stack; - stack->size = new_size; - } + if (!d2d_array_reserve((void **)&stack->stack, &stack->size, stack->count + 1, sizeof(*stack->stack))) + return FALSE; r = *rect; if (stack->count) -- 2.1.4

Jan. 31, 2018

[PATCH 5/6] d2d1: Introduce a helper function to allocate arrays.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 6 ++++-- dlls/d2d1/brush.c | 4 ++-- dlls/d2d1/d2d1_private.h | 9 +++++++++ dlls/d2d1/geometry.c | 6 +++--- dlls/d2d1/render_target.c | 4 ++-- dlls/d2d1/stroke.c | 2 +- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 43ed094..028fab3 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -509,9 +509,11 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d } pitch = ((bpp * size.width) + 15) & ~15; - data_size = pitch * size.height; - if (!(data = heap_alloc(data_size))) + if (pitch / bpp < size.width) return E_OUTOFMEMORY; + if (!(data = d2d_calloc(size.height, pitch))) + return E_OUTOFMEMORY; + data_size = size.height * pitch; rect.X = 0; rect.Y = 0; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6759019..0531a3a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -142,7 +142,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D unsigned int i; HRESULT hr; - if (!(data = heap_alloc_zero(2 * stop_count * sizeof(*data)))) + if (!(data = d2d_calloc(stop_count, 2 * sizeof(*data)))) { ERR("Failed to allocate data.\n"); return E_OUTOFMEMORY; @@ -205,7 +205,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->view = view; (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = heap_alloc(stop_count * sizeof(*stops)))) + if (!((*gradient)->stops = d2d_calloc(stop_count, sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); heap_free(*gradient); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index caeb4b9..2c10252 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,15 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +static inline void *d2d_calloc(size_t count, size_t size) +{ + SIZE_T s = count * size; + + if (size && s / size != count) + return NULL; + return heap_alloc(s); +} + static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) { D2D_MATRIX_3X2_F tmp = *a; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 88beee2..c805084 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2052,7 +2052,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) return S_OK; } - if (!(vertices = heap_alloc(vertex_count * sizeof(*vertices)))) + if (!(vertices = d2d_calloc(vertex_count, sizeof(*vertices)))) return E_OUTOFMEMORY; for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) @@ -2819,8 +2819,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.bezier_vertices = heap_alloc(geometry->fill.bezier_vertex_count - * sizeof(*geometry->fill.bezier_vertices)))) + if (!(geometry->fill.bezier_vertices = d2d_calloc(geometry->fill.bezier_vertex_count, + sizeof(*geometry->fill.bezier_vertices)))) { ERR("Failed to allocate bezier vertices array.\n"); geometry->fill.bezier_vertex_count = 0; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 73f15f7..cc820cf 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1175,12 +1175,12 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_size.width *= 3; - opacity_values_size = bitmap_size.width * bitmap_size.height; - if (!(opacity_values = heap_alloc(opacity_values_size))) + if (!(opacity_values = d2d_calloc(bitmap_size.height, bitmap_size.width))) { ERR("Failed to allocate opacity values.\n"); goto done; } + opacity_values_size = bitmap_size.height * bitmap_size.width; if (FAILED(hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, texture_type, &bounds, opacity_values, opacity_values_size))) diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index a0830e3..63f88c7 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -212,7 +212,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (!dashes || !dash_count) return E_INVALIDARG; - if (!(style->dashes = heap_alloc(dash_count * sizeof(*style->dashes)))) + if (!(style->dashes = d2d_calloc(dash_count, sizeof(*style->dashes)))) return E_OUTOFMEMORY; memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); style->dash_count = dash_count; -- 2.1.4

Jan. 31, 2018

[PATCH 4/6] wined3d: Use the resource access flags in surface_blt_special().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 520f88c..5f91c21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1990,10 +1990,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - /* Get the swapchain. One of the surfaces has to be a primary surface */ - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + /* Get the swapchain. One of the surfaces has to be a primary surface. */ + if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - WARN("Destination is in sysmem, rejecting gl blt\n"); + WARN("Destination resource is not GPU accessible, rejecting GL blit.\n"); return WINED3DERR_INVALIDCALL; } @@ -2002,9 +2002,9 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (src_surface) { src_texture = src_surface->container; - if (src_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - WARN("Src is in sysmem, rejecting gl blt\n"); + WARN("Source resource is not GPU accessible, rejecting GL blit.\n"); return WINED3DERR_INVALIDCALL; } -- 2.1.4

Jan. 31, 2018

[PATCH 3/6] wined3d: Use the resource access flags in wined3d_resource_set_priority().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 44f9f00..437261b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -284,7 +284,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO { DWORD prev; - if (resource->pool != WINED3D_POOL_MANAGED) + if (!wined3d_resource_access_is_managed(resource->access)) { WARN("Called on non-managed resource %p, ignoring.\n", resource); return 0; -- 2.1.4

Jan. 31, 2018

[PATCH 2/6] wined3d: Use the resource access flags in resource_cleanup().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 172a054..44f9f00 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -262,7 +262,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (!(resource->usage & WINED3DUSAGE_PRIVATE)) { - if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(resource->access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); -- 2.1.4

Jan. 31, 2018

[PATCH 1/6] wined3d: Use the resource access flags in resource_init().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 12 +++++++----- dlls/wined3d/utils.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index cf01f93..172a054 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -83,6 +83,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * enum wined3d_gl_resource_type base_type = WINED3D_GL_RES_TYPE_COUNT; enum wined3d_gl_resource_type gl_type = WINED3D_GL_RES_TYPE_COUNT; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + DWORD access = resource_access_from_pool(pool); BOOL tex_2d_ok = FALSE; unsigned int i; @@ -104,9 +105,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_check_usage(usage); - if (usage & WINED3DUSAGE_SCRATCH && pool != WINED3D_POOL_SYSTEM_MEM) + if (usage & WINED3DUSAGE_SCRATCH && access & WINED3D_RESOURCE_ACCESS_GPU) { - ERR("WINED3DUSAGE_SCRATCH used with pool %s.\n", debug_d3dpool(pool)); + ERR("Trying to create a scratch resource with access flags %s.\n", + wined3d_debug_resource_access(access)); return WINED3DERR_INVALIDCALL; } @@ -197,9 +199,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->pool = pool; - resource->access = resource_access_from_pool(pool); if (usage & WINED3DUSAGE_DYNAMIC) - resource->access |= WINED3D_RESOURCE_ACCESS_MAP; + access |= WINED3D_RESOURCE_ACCESS_MAP; + resource->access = access; resource->width = width; resource->height = height; resource->depth = depth; @@ -226,7 +228,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (!(usage & WINED3DUSAGE_PRIVATE)) { /* Check that we have enough video ram left */ - if (pool == WINED3D_POOL_DEFAULT && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(access & WINED3D_RESOURCE_ACCESS_CPU) && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) { if (size > wined3d_device_get_available_texture_mem(device)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd8aa06..a79c3af 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4129,6 +4129,22 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) } } +const char *wined3d_debug_resource_access(DWORD access) +{ + char buf[91]; + + buf[0] = '\0'; +#define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_GPU); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_CPU); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP); +#undef ACCESS_TO_STR + if (access) + FIXME("Unrecognised access flag(s) %#x.\n", access); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; +} + const char *debug_d3dusage(DWORD usage) { char buf[552]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f95330f..8006f3a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2965,6 +2965,8 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta #define WINED3D_RESOURCE_ACCESS_CPU 0x2u #define WINED3D_RESOURCE_ACCESS_MAP 0x4u +const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; + static inline BOOL wined3d_resource_access_is_managed(unsigned int access) { return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); -- 2.1.4

Jan. 31, 2018

[PATCH v2] ole32: Return error from IStream Clone.

by Daniel Lehman

v2: minus assert.h header

Jan. 31, 2018