August 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL sampler information.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 5356292ee9338cfe4d74317d67976ff254734cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5356292ee9338cfe4d74317d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 15 14:37:59 2019 +0430 wined3d: Introduce a separate structure for OpenGL sampler information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 14 +++++++----- dlls/wined3d/context.c | 3 ++- dlls/wined3d/sampler.c | 50 ++++++++++++++++++++++-------------------- dlls/wined3d/state.c | 2 +- dlls/wined3d/view.c | 6 ++--- dlls/wined3d/wined3d_private.h | 20 ++++++++++++----- 6 files changed, 55 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5356292ee9338cfe4d74…

1 0

Henri Verbeet : wined3d: Make the adapter responsible for query creation and destruction.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 1174c894e884154b212e3fe25e446cfaa4615156 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1174c894e884154b212e3fe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 15 14:38:00 2019 +0430 wined3d: Make the adapter responsible for query creation and destruction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 16 ++++++++++++++++ dlls/wined3d/directx.c | 16 ++++++++++++++++ dlls/wined3d/query.c | 35 ++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 8 ++++++++ 5 files changed, 94 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f8030bb..6537216 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5069,6 +5069,42 @@ static void adapter_gl_destroy_sampler(struct wined3d_sampler *sampler) wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_gl_destroy_object, sampler_gl); } +static HRESULT adapter_gl_create_query(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) +{ + TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", + device, type, parent, parent_ops, query); + + return wined3d_query_gl_create(device, type, parent, parent_ops, query); +} + +static void wined3d_query_gl_destroy_object(void *object) +{ + struct wined3d_query *query = object; + + if (query->buffer_object) + { + struct wined3d_context *context; + + context = context_acquire(query->device, NULL, 0); + wined3d_query_gl_destroy_buffer_object(wined3d_context_gl(context), query); + context_release(context); + } + + /* Queries are specific to the GL context that created them. Not + * deleting the query will obviously leak it, but that's still better + * than potentially deleting a different query with the same id in this + * context, and (still) leaking the actual query. */ + query->query_ops->query_destroy(query); +} + +static void adapter_gl_destroy_query(struct wined3d_query *query) +{ + TRACE("query %p.\n", query); + + wined3d_cs_destroy_object(query->device->cs, wined3d_query_gl_destroy_object, query); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -5094,6 +5130,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_unordered_access_view, adapter_gl_create_sampler, adapter_gl_destroy_sampler, + adapter_gl_create_query, + adapter_gl_destroy_query, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index afe222a..4e79a7a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -759,6 +759,20 @@ static void adapter_vk_destroy_sampler(struct wined3d_sampler *sampler) wined3d_cs_destroy_object(sampler->device->cs, heap_free, sampler); } +static HRESULT adapter_vk_create_query(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) +{ + TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", + device, type, parent, parent_ops, query); + + return WINED3DERR_NOTAVAILABLE; +} + +static void adapter_vk_destroy_query(struct wined3d_query *query) +{ + TRACE("query %p.\n", query); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -784,6 +798,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_unordered_access_view, adapter_vk_create_sampler, adapter_vk_destroy_sampler, + adapter_vk_create_query, + adapter_vk_destroy_query, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4c9773a..17c5181 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2568,6 +2568,20 @@ static void adapter_no3d_destroy_sampler(struct wined3d_sampler *sampler) TRACE("sampler %p.\n", sampler); } +static HRESULT adapter_no3d_create_query(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) +{ + TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", + device, type, parent, parent_ops, query); + + return WINED3DERR_NOTAVAILABLE; +} + +static void adapter_no3d_destroy_query(struct wined3d_query *query) +{ + TRACE("query %p.\n", query); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2593,6 +2607,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_unordered_access_view, adapter_no3d_create_sampler, adapter_no3d_destroy_sampler, + adapter_no3d_create_query, + adapter_no3d_destroy_query, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ec20a68..6696502 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -54,7 +54,7 @@ static void wined3d_query_create_buffer_object(struct wined3d_context_gl *contex query->buffer_object = buffer_object; } -static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) +void wined3d_query_gl_destroy_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -93,7 +93,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context_gl *context if (wined3d_query_buffer_is_valid(query)) wined3d_query_buffer_invalidate(query); else - wined3d_query_destroy_buffer_object(context_gl, query); + wined3d_query_gl_destroy_buffer_object(context_gl, query); } if (!query->buffer_object) @@ -430,21 +430,6 @@ static void wined3d_query_destroy_object(void *object) if (!list_empty(&query->poll_list_entry)) list_remove(&query->poll_list_entry); - - if (query->buffer_object) - { - struct wined3d_context *context; - - context = context_acquire(query->device, NULL, 0); - wined3d_query_destroy_buffer_object(wined3d_context_gl(context), query); - context_release(context); - } - - /* Queries are specific to the GL context that created them. Not - * deleting the query will obviously leak it, but that's still better - * than potentially deleting a different query with the same id in this - * context, and (still) leaking the actual query. */ - query->query_ops->query_destroy(query); } ULONG CDECL wined3d_query_decref(struct wined3d_query *query) @@ -455,8 +440,11 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) if (!refcount) { + struct wined3d_device *device = query->device; + query->parent_ops->wined3d_object_destroyed(query->parent); - wined3d_cs_destroy_object(query->device->cs, wined3d_query_destroy_object, query); + wined3d_cs_destroy_object(device->cs, wined3d_query_destroy_object, query); + device->adapter->adapter_ops->adapter_destroy_query(query); } return refcount; @@ -1332,7 +1320,7 @@ static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, +HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", @@ -1368,3 +1356,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q return WINED3DERR_NOTAVAILABLE; } } + +HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) +{ + TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", + device, type, parent, parent_ops, query); + + return device->adapter->adapter_ops->adapter_create_query(device, type, parent, parent_ops, query); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0437924..07ac982 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1785,6 +1785,11 @@ struct wined3d_query UINT64 *map_ptr; }; +HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) DECLSPEC_HIDDEN; +void wined3d_query_gl_destroy_buffer_object(struct wined3d_context_gl *context_gl, + struct wined3d_query *query) DECLSPEC_HIDDEN; + struct wined3d_event_query { struct wined3d_query query; @@ -2808,6 +2813,9 @@ struct wined3d_adapter_ops HRESULT (*adapter_create_sampler)(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler); void (*adapter_destroy_sampler)(struct wined3d_sampler *sampler); + HRESULT (*adapter_create_query)(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); + void (*adapter_destroy_query)(struct wined3d_query *query); }; /* The adapter structure */

1 0

Henri Verbeet : wined3d: Make the adapter responsible for flushes.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 65164450d6a9e177813bdb1558527e026a2f9204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65164450d6a9e177813bdb15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 15 14:38:01 2019 +0430 wined3d: Make the adapter responsible for flushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 11 +++++++++++ dlls/wined3d/adapter_vk.c | 6 ++++++ dlls/wined3d/cs.c | 9 ++++----- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6537216..61bdc8a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5105,6 +5105,16 @@ static void adapter_gl_destroy_query(struct wined3d_query *query) wined3d_cs_destroy_object(query->device->cs, wined3d_query_gl_destroy_object, query); } +static void adapter_gl_flush_context(struct wined3d_context *context) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + + TRACE("context_gl %p.\n", context_gl); + + if (context_gl->valid) + context_gl->gl_info->gl_ops.gl.p_glFlush(); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -5132,6 +5142,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_sampler, adapter_gl_create_query, adapter_gl_destroy_query, + adapter_gl_flush_context, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4e79a7a..bb98810 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -773,6 +773,11 @@ static void adapter_vk_destroy_query(struct wined3d_query *query) TRACE("query %p.\n", query); } +static void adapter_vk_flush_context(struct wined3d_context *context) +{ + TRACE("context %p.\n", context); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -800,6 +805,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_sampler, adapter_vk_create_query, adapter_vk_destroy_query, + adapter_vk_flush_context, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a076253..32f9954 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1008,12 +1008,11 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) { - struct wined3d_context_gl *context_gl; + struct wined3d_context *context; - context_gl = wined3d_context_gl(context_acquire(cs->device, NULL, 0)); - if (context_gl->valid) - context_gl->gl_info->gl_ops.gl.p_glFlush(); - context_release(&context_gl->c); + context = context_acquire(cs->device, NULL, 0); + cs->device->adapter->adapter_ops->adapter_flush_context(context); + context_release(context); } void wined3d_cs_emit_flush(struct wined3d_cs *cs) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 17c5181..ecff67d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2582,6 +2582,11 @@ static void adapter_no3d_destroy_query(struct wined3d_query *query) TRACE("query %p.\n", query); } +static void adapter_no3d_flush_context(struct wined3d_context *context) +{ + TRACE("context %p.\n", context); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2609,6 +2614,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_sampler, adapter_no3d_create_query, adapter_no3d_destroy_query, + adapter_no3d_flush_context, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07ac982..3446a84 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2816,6 +2816,7 @@ struct wined3d_adapter_ops HRESULT (*adapter_create_query)(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); + void (*adapter_flush_context)(struct wined3d_context *context); }; /* The adapter structure */

1 0

Henri Verbeet : wined3d: Set WINED3D_BLT_RAW for raw blits in cpu_blitter_blit().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 0a0ab960fbba27829784649710f0d1cbb79f2cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a0ab960fbba278297846497… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 15 14:38:02 2019 +0430 wined3d: Set WINED3D_BLT_RAW for raw blits in cpu_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7009df2..73cf87d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2287,7 +2287,9 @@ static DWORD cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit { case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_DEPTH_BLIT: + break; case WINED3D_BLIT_OP_RAW_BLIT: + flags |= WINED3D_BLT_RAW; break; case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: flags |= WINED3D_BLT_ALPHA_TEST;

1 0

Henri Verbeet : wined3d: Implement 3D texture clears in surface_cpu_blt_colour_fill().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 3de4515c18e08dc3d9ab832fc79e8f9c86cf9b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3de4515c18e08dc3d9ab832f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 15 14:38:03 2019 +0430 wined3d: Implement 3D texture clears in surface_cpu_blt_colour_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 73cf87d..00278d5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2119,13 +2119,13 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, { struct wined3d_device *device = view->resource->device; struct wined3d_context_gl *context_gl = NULL; + unsigned int x, y, z, w, h, d, bpp, level; struct wined3d_context *context = NULL; struct wined3d_texture *texture; struct wined3d_bo_address data; - unsigned int x, y, w, h, bpp; struct wined3d_map_desc map; DWORD map_binding; - BYTE *row; + uint8_t *dst; DWORD c; TRACE("view %p, box %s, colour %s.\n", view, debug_box(box), debug_color(colour)); @@ -2152,18 +2152,28 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, context_gl = wined3d_context_gl(context); } + texture = texture_from_resource(view->resource); + level = view->sub_resource_idx % texture->level_count; + c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; w = min(box->right, view->width) - min(box->left, view->width); h = min(box->bottom, view->height) - min(box->top, view->height); + if (view->resource->type != WINED3D_RTYPE_TEXTURE_3D) + { + d = 1; + } + else + { + d = wined3d_texture_get_level_depth(texture, level); + d = min(box->back, d) - min(box->front, d); + } - texture = texture_from_resource(view->resource); map_binding = texture->resource.map_binding; if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding)) ERR("Failed to load the sub-resource into %s.\n", wined3d_debug_location(map_binding)); wined3d_texture_invalidate_location(texture, view->sub_resource_idx, ~map_binding); - wined3d_texture_get_pitch(texture, view->sub_resource_idx % texture->level_count, - &map.row_pitch, &map.slice_pitch); + wined3d_texture_get_pitch(texture, level, &map.row_pitch, &map.slice_pitch); wined3d_texture_get_memory(texture, view->sub_resource_idx, &data, map_binding); map.data = wined3d_context_gl_map_bo_address(context_gl, &data, texture->sub_resources[view->sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); @@ -2190,12 +2200,12 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, case 3: { - row = map.data; - for (x = 0; x < w; ++x, row += 3) + dst = map.data; + for (x = 0; x < w; ++x, dst += 3) { - row[0] = (c ) & 0xff; - row[1] = (c >> 8) & 0xff; - row[2] = (c >> 16) & 0xff; + dst[0] = (c ) & 0xff; + dst[1] = (c >> 8) & 0xff; + dst[2] = (c >> 16) & 0xff; } break; } @@ -2212,11 +2222,18 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, return; } - row = map.data; + dst = map.data; for (y = 1; y < h; ++y) { - row += map.row_pitch; - memcpy(row, map.data, w * bpp); + dst += map.row_pitch; + memcpy(dst, map.data, w * bpp); + } + + dst = map.data; + for (z = 1; z < d; ++z) + { + dst += map.slice_pitch; + memcpy(dst, map.data, w * h * bpp); } wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); @@ -2246,7 +2263,7 @@ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de box.right = min(clear_rects[i].right, draw_rect->right); box.bottom = min(clear_rects[i].bottom, draw_rect->bottom); box.front = 0; - box.back = 1; + box.back = ~0u; if (box.left >= box.right || box.top >= box.bottom) continue;

1 0

Huw Davies : riched20: Move handling of EM_SETCHARFORMAT to a helper function.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 03a93eb80e281e276c1222670d1332d1754e342b URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a93eb80e281e276c122267… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 15 11:06:35 2019 +0100 riched20: Move handling of EM_SETCHARFORMAT to a helper function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 91 ++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1b78eab..d0034fc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3532,6 +3532,56 @@ static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) return 0; } +static LRESULT handle_EM_SETCHARFORMAT( ME_TextEditor *editor, WPARAM flags, const CHARFORMAT2W *fmt_in ) +{ + CHARFORMAT2W fmt; + BOOL changed = TRUE; + ME_Cursor start, end; + + if (!cfany_to_cf2w( &fmt, fmt_in )) return 0; + + if (flags & SCF_ALL) + { + if (editor->mode & TM_PLAINTEXT) + { + ME_SetDefaultCharFormat( editor, &fmt ); + } + else + { + ME_SetCursorToStart( editor, &start ); + ME_SetCharFormat( editor, &start, NULL, &fmt ); + editor->nModifyStep = 1; + } + } + else if (flags & SCF_SELECTION) + { + if (editor->mode & TM_PLAINTEXT) return 0; + if (flags & SCF_WORD) + { + end = editor->pCursors[0]; + ME_MoveCursorWords( editor, &end, +1 ); + start = end; + ME_MoveCursorWords( editor, &start, -1 ); + ME_SetCharFormat( editor, &start, &end, &fmt ); + } + changed = ME_IsSelection( editor ); + ME_SetSelectionCharFormat( editor, &fmt ); + if (changed) editor->nModifyStep = 1; + } + else /* SCF_DEFAULT */ + { + ME_SetDefaultCharFormat( editor, &fmt ); + } + + ME_CommitUndo( editor ); + if (changed) + { + ME_WrapMarkedParagraphs( editor ); + ME_UpdateScrollBar( editor ); + ME_Repaint( editor ); + } + return 1; +} #define UNSUPPORTED_MSG(e) \ case e: \ @@ -3933,46 +3983,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETEVENTMASK: return editor->nEventMask; case EM_SETCHARFORMAT: - { - CHARFORMAT2W p; - BOOL bRepaint = TRUE; - if (!cfany_to_cf2w(&p, (CHARFORMAT2W *)lParam)) - return 0; - if (wParam & SCF_ALL) { - if (editor->mode & TM_PLAINTEXT) { - ME_SetDefaultCharFormat(editor, &p); - } else { - ME_Cursor start; - ME_SetCursorToStart(editor, &start); - ME_SetCharFormat(editor, &start, NULL, &p); - editor->nModifyStep = 1; - } - } else if (wParam & SCF_SELECTION) { - if (editor->mode & TM_PLAINTEXT) - return 0; - if (wParam & SCF_WORD) { - ME_Cursor start; - ME_Cursor end = editor->pCursors[0]; - ME_MoveCursorWords(editor, &end, +1); - start = end; - ME_MoveCursorWords(editor, &start, -1); - ME_SetCharFormat(editor, &start, &end, &p); - } - bRepaint = ME_IsSelection(editor); - ME_SetSelectionCharFormat(editor, &p); - if (bRepaint) editor->nModifyStep = 1; - } else { /* SCF_DEFAULT */ - ME_SetDefaultCharFormat(editor, &p); - } - ME_CommitUndo(editor); - if (bRepaint) - { - ME_WrapMarkedParagraphs(editor); - ME_UpdateScrollBar(editor); - ME_Repaint(editor); - } - return 1; - } + return handle_EM_SETCHARFORMAT( editor, wParam, (CHARFORMAT2W *)lParam ); case EM_GETCHARFORMAT: { CHARFORMAT2W tmp, *dst = (CHARFORMAT2W *)lParam;

1 0

Huw Davies : riched20: Don't force an update when styles are changed.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 04040d0aca34a3f5fec049f1c36e4e0d42a8d525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04040d0aca34a3f5fec049f1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 15 11:06:36 2019 +0100 riched20: Don't force an update when styles are changed. The appropriate region has already been invalidated and will be repainted in due course. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d0034fc..61f7a0e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3578,7 +3578,6 @@ static LRESULT handle_EM_SETCHARFORMAT( ME_TextEditor *editor, WPARAM flags, con { ME_WrapMarkedParagraphs( editor ); ME_UpdateScrollBar( editor ); - ME_Repaint( editor ); } return 1; } @@ -3730,7 +3729,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); - ME_Repaint(editor); return TRUE; } @@ -4005,7 +4003,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, BOOL result = ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); - ME_Repaint(editor); ME_CommitUndo(editor); return result; }

1 0

Zebediah Figura : mscorwks: Prefer the native version.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: cf87feee13fa0d2feedb5cd762866aed0ed00dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf87feee13fa0d2feedb5cd7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 15 13:00:33 2019 -0500 mscorwks: Prefer the native version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47622 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscorwks/Makefile.in | 5 +++++ dlls/mscorwks/mscorwks_main.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in index 4527266..42a6238 100644 --- a/dlls/mscorwks/Makefile.in +++ b/dlls/mscorwks/Makefile.in @@ -1 +1,6 @@ MODULE = mscorwks.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + mscorwks_main.c diff --git a/dlls/mscorwks/mscorwks_main.c b/dlls/mscorwks/mscorwks_main.c new file mode 100644 index 0000000..ac77080 --- /dev/null +++ b/dlls/mscorwks/mscorwks_main.c @@ -0,0 +1,36 @@ +/* + * .NET workstation runtime + * + * Copyright 2019 Zebediah Figura for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + } + + return TRUE; +}

1 0

Alex Henrie : utildll: Add DLL.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: dc23cca322a93915465a1ea3ca6f360106cd2018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc23cca322a93915465a1ea3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 13 19:57:47 2019 -0600 utildll: Add DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47616 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/utildll/Makefile.in | 6 ++++++ dlls/utildll/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/utildll/utildll.spec | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+) diff --git a/configure b/configure index 702023b..19a56c9 100755 --- a/configure +++ b/configure @@ -1585,6 +1585,7 @@ enable_usbd_sys enable_user32 enable_userenv enable_usp10 +enable_utildll enable_uuid enable_uxtheme enable_vbscript @@ -20689,6 +20690,7 @@ wine_fn_config_makefile dlls/userenv enable_userenv wine_fn_config_makefile dlls/userenv/tests enable_tests wine_fn_config_makefile dlls/usp10 enable_usp10 wine_fn_config_makefile dlls/usp10/tests enable_tests +wine_fn_config_makefile dlls/utildll enable_utildll wine_fn_config_makefile dlls/uuid enable_uuid wine_fn_config_makefile dlls/uxtheme enable_uxtheme wine_fn_config_makefile dlls/uxtheme/tests enable_tests diff --git a/configure.ac b/configure.ac index 499c4f3..6ce39b8 100644 --- a/configure.ac +++ b/configure.ac @@ -3673,6 +3673,7 @@ WINE_CONFIG_MAKEFILE(dlls/userenv) WINE_CONFIG_MAKEFILE(dlls/userenv/tests) WINE_CONFIG_MAKEFILE(dlls/usp10) WINE_CONFIG_MAKEFILE(dlls/usp10/tests) +WINE_CONFIG_MAKEFILE(dlls/utildll) WINE_CONFIG_MAKEFILE(dlls/uuid) WINE_CONFIG_MAKEFILE(dlls/uxtheme) WINE_CONFIG_MAKEFILE(dlls/uxtheme/tests) diff --git a/dlls/utildll/Makefile.in b/dlls/utildll/Makefile.in new file mode 100644 index 0000000..5bd9a6f --- /dev/null +++ b/dlls/utildll/Makefile.in @@ -0,0 +1,6 @@ +MODULE = utildll.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/utildll/main.c b/dlls/utildll/main.c new file mode 100644 index 0000000..e048794 --- /dev/null +++ b/dlls/utildll/main.c @@ -0,0 +1,43 @@ +/* + * Utility Functions + * + * Copyright 2019 Alex Henrie + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(utildll); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/utildll/utildll.spec b/dlls/utildll/utildll.spec new file mode 100644 index 0000000..bb04166 --- /dev/null +++ b/dlls/utildll/utildll.spec @@ -0,0 +1,36 @@ +@ stub AsyncDeviceEnumerate +@ stub CachedGetUserFromSid +@ stub CalculateDiffTime +@ stub CalculateElapsedTime +@ stub CompareElapsedTime +@ stub ConfigureModem +@ stub CtxGetAnyDCName +@ stub CurrentDateTimeString +@ stub DateTimeString +@ stub ElapsedTimeString +@ stub EnumerateMultiUserServers +@ stub FormDecoratedAsyncDeviceName +@ stub GetAssociatedPortName +@ stub GetSystemMessageA +@ stub GetSystemMessageW +@ stub GetUnknownString +@ stub GetUserFromSid +@ stub HaveAnonymousUsersChanged +@ stub InitializeAnonymousUserCompareList +@ stub InstallModem +@ stub IsPartOfDomain +@ stub NetBIOSDeviceEnumerate +@ stub NetworkDeviceEnumerate +@ stub ParseDecoratedAsyncDeviceName +@ stub QueryCurrentWinStation +@ stub RegGetNetworkDeviceName +@ stub RegGetNetworkServiceName +@ stub SetupAsyncCdConfig +@ stub StandardErrorMessage +@ stub StrAsyncConnectState +@ stub StrConnectState +@ stub StrProcessState +@ stub StrSdClass +@ stub StrSystemWaitReason +@ stub TestUserForAdmin +@ stub WinEnumerateDevices

1 0

Zebediah Figura : widl: Introduce type_iface_get_async_iface().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: b4fe4ccc96403aa7af0eacf727fc007d4c27d52d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4fe4ccc96403aa7af0eacf7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 14 21:45:46 2019 -0500 widl: Introduce type_iface_get_async_iface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 6 +++--- tools/widl/parser.y | 2 +- tools/widl/proxy.c | 12 ++++++------ tools/widl/typegen.c | 6 +++--- tools/widl/typetree.h | 7 +++++++ tools/widl/widl.c | 6 +++--- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a862a72..f4bf13a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1651,8 +1651,8 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts) if (is_object(iface) || is_attr(iface->attrs, ATTR_DISPINTERFACE)) { write_forward(header, iface); - if (iface->details.iface->async_iface) - write_forward(header, iface->details.iface->async_iface); + if (type_iface_get_async_iface(iface)) + write_forward(header, type_iface_get_async_iface(iface)); } } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) @@ -1688,7 +1688,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons if (type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; - type_t *async_iface = iface->details.iface->async_iface; + type_t *async_iface = type_iface_get_async_iface(iface); if (is_object(iface)) is_object_interface++; if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type)) { diff --git a/tools/widl/parser.y b/tools/widl/parser.y index daff825..e39d801 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2809,7 +2809,7 @@ static void check_async_uuid(type_t *iface) inherit = iface->details.iface->inherit; if (inherit && strcmp(inherit->name, "IUnknown")) - inherit = inherit->details.iface->async_iface; + inherit = type_iface_get_async_iface(inherit); if (!inherit) error_loc("async_uuid applied to an interface with incompatible parent\n"); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 466c462..22c045d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -739,7 +739,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "{\n"); indent++; print_proxy( "%s_%s\n", - iface->details.iface->async_iface == iface ? "CStdAsyncStubBuffer" : "CStdStubBuffer", + type_iface_get_async_iface(iface) == iface ? "CStdAsyncStubBuffer" : "CStdStubBuffer", need_delegation_indirect(iface) ? "DELEGATING_METHODS" : "METHODS"); indent--; print_proxy( "}\n"); @@ -840,8 +840,8 @@ static void write_proxy_stmts(const statement_list_t *stmts, unsigned int *proc_ if (need_proxy(iface)) { write_proxy(iface, proc_offset); - if (iface->details.iface->async_iface) - write_proxy(iface->details.iface->async_iface, proc_offset); + if (type_iface_get_async_iface(iface)) + write_proxy(type_iface_get_async_iface(iface), proc_offset); } } } @@ -870,9 +870,9 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], { *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); (*ifaces)[(*count)++] = iface; - if (iface->details.iface->async_iface) + if (type_iface_get_async_iface(iface)) { - iface = iface->details.iface->async_iface; + iface = type_iface_get_async_iface(iface); *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); (*ifaces)[(*count)++] = iface; } @@ -1012,7 +1012,7 @@ static void write_proxy_routines(const statement_list_t *stmts) table_version = get_stub_mode() == MODE_Oif ? 2 : 1; for (i = 0; i < count; i++) { - if (interfaces[i]->details.iface->async_iface != interfaces[i]) continue; + if (type_iface_get_async_iface(interfaces[i]) != interfaces[i]) continue; if (table_version != 6) { fprintf(proxy, "static const IID *_AsyncInterfaceTable[] =\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 86611ae..47d12f5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1394,7 +1394,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, if (is_attr( func->attrs, ATTR_NOTIFY )) ext_flags |= 0x08; /* HasNotify */ if (is_attr( func->attrs, ATTR_NOTIFYFLAG )) ext_flags |= 0x10; /* HasNotify2 */ - if (iface == iface->details.iface->async_iface) oi2_flags |= 0x20; + if (iface == type_iface_get_async_iface(iface)) oi2_flags |= 0x20; size = get_function_buffer_size( func, PASS_IN ); print_file( file, indent, "NdrFcShort(0x%x),\t/* client buffer = %u */\n", size, size ); @@ -1493,8 +1493,8 @@ static void for_each_iface(const statement_list_t *stmts, iface = stmt->u.type; if (!pred(iface)) continue; proc(iface, file, indent, offset); - if (iface->details.iface->async_iface) - proc(iface->details.iface->async_iface, file, indent, offset); + if (type_iface_get_async_iface(iface)) + proc(type_iface_get_async_iface(iface), file, indent, offset); } } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 22232fc..4eb0a0a 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -162,6 +162,13 @@ static inline type_t *type_iface_get_inherit(const type_t *type) return type->details.iface->inherit; } +static inline type_t *type_iface_get_async_iface(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); + return type->details.iface->async_iface; +} + static inline var_list_t *type_dispiface_get_props(const type_t *type) { type = type_get_real_type(type); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0bcf67b..1620dfd 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -494,10 +494,10 @@ static void write_id_data_stmts(const statement_list_t *stmts) uuid = get_attrp(type->attrs, ATTR_UUID); write_id_guid(idfile, "IID", is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", type->name, uuid); - if (type->details.iface->async_iface) + if (type_iface_get_async_iface(type)) { - uuid = get_attrp(type->details.iface->async_iface->attrs, ATTR_UUID); - write_id_guid(idfile, "IID", "IID", type->details.iface->async_iface->name, uuid); + uuid = get_attrp(type_iface_get_async_iface(type)->attrs, ATTR_UUID); + write_id_guid(idfile, "IID", "IID", type_iface_get_async_iface(type)->name, uuid); } } else if (type_get_type(type) == TYPE_COCLASS)

1 0