May 2019 - Wine-Commits - list.winehq.org

Paul Gofman : ddraw/tests: Test lighting with ambient light and material in ddraw1.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 034d2b9963b58eca2112757b1bdbfe17e9e8e8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=034d2b9963b58eca2112757b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 14 13:19:09 2019 +0300 ddraw/tests: Test lighting with ambient light and material in ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 99 ++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=034d2b9963b58eca2112…

1 0

Matteo Bruni : d3d8: Always allow read and write map access to non-DEFAULT buffers.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 7dfc56937d95cbfac0dc0c2c2e2ef3a610825292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dfc56937d95cbfac0dc0c2c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 13 20:34:19 2019 +0200 d3d8: Always allow read and write map access to non-DEFAULT buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 822730f..8598766 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -309,6 +309,9 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); + /* Buffers are always readable. */ + if (pool != D3DPOOL_DEFAULT) + desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -628,6 +631,9 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); + /* Buffers are always readable. */ + if (pool != D3DPOOL_DEFAULT) + desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Alexandre Julliard : configure: Don' t allow using config.h when cross-compiling.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: ce09e564d71eec1633cdc8385d6f851f575ed5c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce09e564d71eec1633cdc838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:57:06 2019 +0200 configure: Don't allow using config.h when cross-compiling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 7 ++++--- dlls/winecrt0/register.c | 1 - dlls/winecrt0/stub.c | 2 -- include/config.h.in | 5 +++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 7509dc7..10cef9c 100644 --- a/configure.ac +++ b/configure.ac @@ -2715,9 +2715,10 @@ dnl **** Generate output files **** AH_TOP([#ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifndef WINE_CROSS_PE]) -AH_BOTTOM([#endif /* WINE_CROSS_PE */ -#endif /* __WINE_CONFIG_H */]) +#ifdef WINE_CROSS_PE +#error config.h should not be used when cross-compiling +#endif]) +AH_BOTTOM([#endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 70a4a35..8c15d1b 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #define COBJMACROS diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c index 913181a..49e179e 100644 --- a/dlls/winecrt0/stub.c +++ b/dlls/winecrt0/stub.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/include/config.h.in b/include/config.h.in index 836008f..7998764 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,7 +2,9 @@ #ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifndef WINE_CROSS_PE +#ifdef WINE_CROSS_PE +#error config.h should not be used when cross-compiling +#endif /* Define to the file extension for executables. */ #undef EXEEXT @@ -1475,5 +1477,4 @@ #undef inline #endif -#endif /* WINE_CROSS_PE */ #endif /* __WINE_CONFIG_H */

1 0

Nikolay Sivov : kernelbase: Duplicate some path handling functions from shlwapi.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 44ac5af07aebb2e8a79b058332c45cafbb7d6571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44ac5af07aebb2e8a79b0583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:30:35 2019 +0300 kernelbase: Duplicate some path handling functions from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 54 +-- dlls/kernelbase/path.c | 753 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 780 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44ac5af07aebb2e8a79b…

1 0

Nikolay Sivov : dwrite/analyzer: Use array allocation helper for fallback builder.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: a782605ef52bbcdc0cc841c1ab666a771fc249b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a782605ef52bbcdc0cc841c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:27:26 2019 +0300 dwrite/analyzer: Use array allocation helper for fallback builder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 70 +++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 41 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index ca6dca1..679e1ed 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -236,13 +236,14 @@ struct dwrite_fontfallback { UINT32 mappings_count; }; -struct dwrite_fontfallback_builder { +struct dwrite_fontfallback_builder +{ IDWriteFontFallbackBuilder IDWriteFontFallbackBuilder_iface; - LONG ref; + LONG refcount; IDWriteFactory5 *factory; struct fallback_mapping *mappings; - UINT32 mappings_count; - UINT32 mappings_capacity; + size_t size; + size_t count; }; struct dwrite_numbersubstitution { @@ -2228,9 +2229,7 @@ static const IDWriteFontFallbackVtbl customfontfallbackvtbl = static HRESULT WINAPI fontfallbackbuilder_QueryInterface(IDWriteFontFallbackBuilder *iface, REFIID riid, void **obj) { - struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); - - TRACE("(%p)->(%s %p)\n", fallbackbuilder, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteFontFallbackBuilder) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; @@ -2247,22 +2246,25 @@ static HRESULT WINAPI fontfallbackbuilder_QueryInterface(IDWriteFontFallbackBuil static ULONG WINAPI fontfallbackbuilder_AddRef(IDWriteFontFallbackBuilder *iface) { struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); - ULONG ref = InterlockedIncrement(&fallbackbuilder->ref); - TRACE("(%p)->(%d)\n", fallbackbuilder, ref); - return ref; + ULONG refcount = InterlockedIncrement(&fallbackbuilder->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *iface) { struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); - ULONG ref = InterlockedDecrement(&fallbackbuilder->ref); - - TRACE("(%p)->(%d)\n", fallbackbuilder, ref); + ULONG refcount = InterlockedDecrement(&fallbackbuilder->refcount); + size_t i; - if (!ref) { - UINT32 i; + TRACE("%p, refcount %d.\n", iface, refcount); - for (i = 0; i < fallbackbuilder->mappings_count; i++) { + if (!refcount) + { + for (i = 0; i < fallbackbuilder->count; ++i) + { struct fallback_mapping *mapping = &fallbackbuilder->mappings[i]; UINT32 j; @@ -2281,7 +2283,7 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac heap_free(fallbackbuilder); } - return ref; + return refcount; } static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder *iface, @@ -2292,8 +2294,8 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder struct fallback_mapping *mapping; UINT32 i; - TRACE("(%p)->(%p, %u, %p, %u, %p, %s, %s, %f)\n", fallbackbuilder, ranges, ranges_count, target_families, - families_count, collection, debugstr_w(locale), debugstr_w(base_family), scale); + TRACE("%p, %p, %u, %p, %u, %p, %s, %s, %f.\n", iface, ranges, ranges_count, target_families, families_count, + collection, debugstr_w(locale), debugstr_w(base_family), scale); if (!ranges || ranges_count == 0 || !target_families || families_count == 0 || scale < 0.0f) return E_INVALIDARG; @@ -2301,25 +2303,13 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder if (base_family) FIXME("base family ignored.\n"); - if (fallbackbuilder->mappings_count == fallbackbuilder->mappings_capacity) { - struct fallback_mapping *mappings; - - if (fallbackbuilder->mappings_capacity == 0) { - if ((mappings = heap_calloc(16, sizeof(*mappings)))) - fallbackbuilder->mappings_capacity = 16; - } - else { - if ((mappings = heap_realloc(fallbackbuilder->mappings, sizeof(*fallbackbuilder->mappings) * - fallbackbuilder->mappings_capacity * 2))) - fallbackbuilder->mappings_capacity *= 2; - } - if (!mappings) - return E_OUTOFMEMORY; - - fallbackbuilder->mappings = mappings; + if (!dwrite_array_reserve((void **)&fallbackbuilder->mappings, &fallbackbuilder->size, fallbackbuilder->count + 1, + sizeof(*fallbackbuilder->mappings))) + { + return E_OUTOFMEMORY; } - mapping = &fallbackbuilder->mappings[fallbackbuilder->mappings_count++]; + mapping = &fallbackbuilder->mappings[fallbackbuilder->count++]; mapping->ranges = heap_calloc(ranges_count, sizeof(*mapping->ranges)); memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); @@ -2339,9 +2329,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder static HRESULT WINAPI fontfallbackbuilder_AddMappings(IDWriteFontFallbackBuilder *iface, IDWriteFontFallback *fallback) { - struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); - - FIXME("(%p)->(%p): stub\n", fallbackbuilder, fallback); + FIXME("%p, %p stub.\n", iface, fallback); return E_NOTIMPL; } @@ -2352,7 +2340,7 @@ static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallback struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); struct dwrite_fontfallback *fallback; - FIXME("(%p)->(%p): stub\n", fallbackbuilder, ret); + FIXME("%p, %p stub.\n", iface, ret); *ret = NULL; @@ -2390,7 +2378,7 @@ HRESULT create_fontfallback_builder(IDWriteFactory5 *factory, IDWriteFontFallbac return E_OUTOFMEMORY; builder->IDWriteFontFallbackBuilder_iface.lpVtbl = &fontfallbackbuildervtbl; - builder->ref = 1; + builder->refcount = 1; builder->factory = factory; IDWriteFactory5_AddRef(builder->factory);

1 0

Matteo Bruni : wined3d: Avoid some redundant glVertexAttrib4f() calls.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 8958eb68d7f59b002e4d8e20d8cc7c45c18a68b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8958eb68d7f59b002e4d8e20… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 14 15:44:26 2019 +0430 wined3d: Avoid some redundant glVertexAttrib4f() calls. Signed-off-by: Matteo Bruni <mbruni(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 | 20 ++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 ++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cda1ea0..75abee8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5358,9 +5358,23 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (context->numbered_array_mask & (1u << i)) context_unload_numbered_array(context, i); if (!use_vs(state) && i == WINED3D_FFP_DIFFUSE) - GL_EXTCALL(glVertexAttrib4f(i, 1.0f, 1.0f, 1.0f, 1.0f)); + { + if (!(context_gl->default_attrib_value_set & (1u << i)) || !context_gl->diffuse_attrib_to_1) + { + GL_EXTCALL(glVertexAttrib4f(i, 1.0f, 1.0f, 1.0f, 1.0f)); + context_gl->diffuse_attrib_to_1 = 1; + } + } else - GL_EXTCALL(glVertexAttrib4f(i, 0.0f, 0.0f, 0.0f, 0.0f)); + { + if (!(context_gl->default_attrib_value_set & (1u << i))) + { + GL_EXTCALL(glVertexAttrib4f(i, 0.0f, 0.0f, 0.0f, 0.0f)); + if (i == WINED3D_FFP_DIFFUSE) + context_gl->diffuse_attrib_to_1 = 0; + } + } + context_gl->default_attrib_value_set |= 1u << i; continue; } @@ -5380,6 +5394,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c * mode instead. */ if (context->numbered_array_mask & (1u << i)) context_unload_numbered_array(context, i); + context_gl->default_attrib_value_set &= ~(1u << i); continue; } @@ -5526,6 +5541,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c break; } + context_gl->default_attrib_value_set &= ~(1u << i); } } checkGLcall("Loading numbered arrays"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0a8c8ca..bb982f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1996,7 +1996,10 @@ struct wined3d_context_gl struct wined3d_context c; uint32_t fog_enabled : 1; - uint32_t padding : 31; + uint32_t diffuse_attrib_to_1 : 1; + uint32_t padding : 30; + + uint32_t default_attrib_value_set; GLenum *texture_type;

1 0

Matteo Bruni : wined3d: Pass a wined3d_context_gl structure to context_update_stream_sources().
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 33d382194310253245f8fb17431dfd9f69375fda URL: https://source.winehq.org/git/wine.git/?a=commit;h=33d382194310253245f8fb17… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 14 15:44:25 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_update_stream_sources(). Signed-off-by: Matteo Bruni <mbruni(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 | 18 +++++++++--------- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5183265..cda1ea0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5531,24 +5531,24 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c checkGLcall("Loading numbered arrays"); } -void context_update_stream_sources(struct wined3d_context *context, const struct wined3d_state *state) +void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) { - - if (context->use_immediate_mode_draw) + if (context_gl->c.use_immediate_mode_draw) return; - context_unload_vertex_data(context); - if (context->d3d_info->ffp_generic_attributes || use_vs(state)) + context_unload_vertex_data(&context_gl->c); + if (context_gl->c.d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); - wined3d_context_gl_load_numbered_arrays(wined3d_context_gl(context), &context->stream_info, state); + wined3d_context_gl_load_numbered_arrays(context_gl, &context_gl->c.stream_info, state); return; } TRACE("Loading named arrays.\n"); - context_unload_numbered_arrays(context); - context_load_vertex_data(context, &context->stream_info, state); - context->namedArraysLoaded = TRUE; + context_unload_numbered_arrays(&context_gl->c); + context_load_vertex_data(&context_gl->c, &context_gl->c.stream_info, state); + context_gl->c.namedArraysLoaded = TRUE; } static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, struct gl_texture *texture, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 729100a..08423e8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3863,14 +3863,14 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat { if (isStateDirty(context, STATE_VDECL)) return; - context_update_stream_sources(context, state); + wined3d_context_gl_update_stream_sources(wined3d_context_gl(context), state); } static void vdecl_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (isStateDirty(context, STATE_STREAMSRC)) return; - context_update_stream_sources(context, state); + wined3d_context_gl_update_stream_sources(wined3d_context_gl(context), state); } static void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0aa3795..0a8c8ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2080,6 +2080,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; +void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -2264,8 +2266,6 @@ void context_texture_update(struct wined3d_context *context, void context_unload_tex_coords(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; -void context_update_stream_sources(struct wined3d_context *context, - const struct wined3d_state *state) DECLSPEC_HIDDEN; /***************************************************************************** * Internal representation of a light

1 0

Nikolay Sivov : dwrite/layout: Use array allocation helper for line metrics.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 1315098aef784e7d6fccd79b36a799eab7260249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1315098aef784e7d6fccd79b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:27:28 2019 +0300 dwrite/layout: Use array allocation helper for line metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 116 ++++++++++++++++++++++----------------------------- 1 file changed, 51 insertions(+), 65 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4e9ce14..5140dec 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -227,9 +227,11 @@ struct layout_cluster { UINT32 position; /* relative to run, first cluster has 0 position */ }; -struct layout_line { - FLOAT height; /* height based on content */ - FLOAT baseline; /* baseline based on content */ +struct layout_line +{ + float height; /* height based on content */ + float baseline; /* baseline based on content */ + DWRITE_LINE_METRICS1 metrics; }; enum layout_recompute_mask { @@ -276,8 +278,7 @@ struct dwrite_textlayout { FLOAT minwidth; struct layout_line *lines; - DWRITE_LINE_METRICS1 *linemetrics; - UINT32 line_alloc; + size_t lines_size; DWRITE_TEXT_METRICS1 metrics; DWRITE_OVERHANG_METRICS overhangs; @@ -1364,16 +1365,16 @@ static void layout_apply_line_spacing(struct dwrite_textlayout *layout, UINT32 l switch (layout->format.spacing.method) { case DWRITE_LINE_SPACING_METHOD_DEFAULT: - layout->linemetrics[line].height = layout->lines[line].height; - layout->linemetrics[line].baseline = layout->lines[line].baseline; + layout->lines[line].metrics.height = layout->lines[line].height; + layout->lines[line].metrics.baseline = layout->lines[line].baseline; break; case DWRITE_LINE_SPACING_METHOD_UNIFORM: - layout->linemetrics[line].height = layout->format.spacing.height; - layout->linemetrics[line].baseline = layout->format.spacing.baseline; + layout->lines[line].metrics.height = layout->format.spacing.height; + layout->lines[line].metrics.baseline = layout->format.spacing.baseline; break; case DWRITE_LINE_SPACING_METHOD_PROPORTIONAL: - layout->linemetrics[line].height = layout->lines[line].height * layout->format.spacing.height; - layout->linemetrics[line].baseline = layout->lines[line].baseline * layout->format.spacing.baseline; + layout->lines[line].metrics.height = layout->lines[line].height * layout->format.spacing.height; + layout->lines[line].metrics.baseline = layout->lines[line].baseline * layout->format.spacing.baseline; break; default: ERR("Unknown spacing method %u\n", layout->format.spacing.method); @@ -1382,37 +1383,15 @@ static void layout_apply_line_spacing(struct dwrite_textlayout *layout, UINT32 l static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_LINE_METRICS1 *metrics) { - UINT32 i = layout->metrics.lineCount; - - if (!layout->line_alloc) { - layout->line_alloc = 5; - layout->linemetrics = heap_calloc(layout->line_alloc, sizeof(*layout->linemetrics)); - layout->lines = heap_calloc(layout->line_alloc, sizeof(*layout->lines)); - if (!layout->linemetrics || !layout->lines) { - heap_free(layout->linemetrics); - heap_free(layout->lines); - layout->linemetrics = NULL; - layout->lines = NULL; - return E_OUTOFMEMORY; - } - } - - if (layout->metrics.lineCount == layout->line_alloc) { - DWRITE_LINE_METRICS1 *metrics; - struct layout_line *lines; - - if ((metrics = heap_realloc(layout->linemetrics, layout->line_alloc * 2 * sizeof(*layout->linemetrics)))) - layout->linemetrics = metrics; - if ((lines = heap_realloc(layout->lines, layout->line_alloc * 2 * sizeof(*layout->lines)))) - layout->lines = lines; + size_t i = layout->metrics.lineCount; - if (!metrics || !lines) - return E_OUTOFMEMORY; - - layout->line_alloc *= 2; + if (!dwrite_array_reserve((void **)&layout->lines, &layout->lines_size, layout->metrics.lineCount + 1, + sizeof(*layout->lines))) + { + return E_OUTOFMEMORY; } - layout->linemetrics[i] = *metrics; + layout->lines[i].metrics = *metrics; layout->lines[i].height = metrics->height; layout->lines[i].baseline = metrics->baseline; @@ -1674,8 +1653,9 @@ static void layout_apply_par_alignment(struct dwrite_textlayout *layout) erun = layout_get_next_erun(layout, NULL); inrun = layout_get_next_inline_run(layout, NULL); - for (line = 0; line < layout->metrics.lineCount; line++) { - FLOAT pos_y = origin_y + layout->linemetrics[line].baseline; + for (line = 0; line < layout->metrics.lineCount; line++) + { + float pos_y = origin_y + layout->lines[line].metrics.baseline; while (erun && erun->line == line) { erun->origin.y = pos_y; @@ -1687,7 +1667,7 @@ static void layout_apply_par_alignment(struct dwrite_textlayout *layout) inrun = layout_get_next_inline_run(layout, inrun); } - origin_y += layout->linemetrics[line].height; + origin_y += layout->lines[line].metrics.height; } } @@ -1992,8 +1972,9 @@ static void layout_set_line_positions(struct dwrite_textlayout *layout) erun = layout_get_next_erun(layout, NULL); inrun = layout_get_next_inline_run(layout, NULL); - for (line = 0, origin_y = 0.0f; line < layout->metrics.lineCount; line++) { - FLOAT pos_y = origin_y + layout->linemetrics[line].baseline; + for (line = 0, origin_y = 0.0f; line < layout->metrics.lineCount; line++) + { + float pos_y = origin_y + layout->lines[line].metrics.baseline; /* For all runs on this line */ while (erun && erun->line == line) { @@ -2007,7 +1988,7 @@ static void layout_set_line_positions(struct dwrite_textlayout *layout) inrun = layout_get_next_inline_run(layout, inrun); } - origin_y += layout->linemetrics[line].height; + origin_y += layout->lines[line].metrics.height; } layout->metrics.height = origin_y; @@ -2862,7 +2843,6 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout3 *iface) heap_free(This->actual_breakpoints); heap_free(This->clustermetrics); heap_free(This->clusters); - heap_free(This->linemetrics); heap_free(This->lines); heap_free(This->str); heap_free(This); @@ -3574,23 +3554,25 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout3 *iface, static HRESULT WINAPI dwritetextlayout_GetLineMetrics(IDWriteTextLayout3 *iface, DWRITE_LINE_METRICS *metrics, UINT32 max_count, UINT32 *count) { - struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout3(iface); + unsigned int line_count; HRESULT hr; + size_t i; - TRACE("(%p)->(%p %u %p)\n", This, metrics, max_count, count); + TRACE("%p, %p, %u, %p.\n", iface, metrics, max_count, count); - hr = layout_compute_effective_runs(This); - if (FAILED(hr)) + if (FAILED(hr = layout_compute_effective_runs(layout))) return hr; - if (metrics) { - UINT32 i, c = min(max_count, This->metrics.lineCount); - for (i = 0; i < c; i++) - memcpy(metrics + i, This->linemetrics + i, sizeof(*metrics)); + if (metrics) + { + line_count = min(max_count, layout->metrics.lineCount); + for (i = 0; i < line_count; ++i) + memcpy(&metrics[i], &layout->lines[i].metrics, sizeof(*metrics)); } - *count = This->metrics.lineCount; - return max_count >= This->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; + *count = layout->metrics.lineCount; + return max_count >= layout->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static HRESULT layout_update_metrics(struct dwrite_textlayout *layout) @@ -4061,20 +4043,25 @@ static HRESULT WINAPI dwritetextlayout3_GetLineSpacing(IDWriteTextLayout3 *iface static HRESULT WINAPI dwritetextlayout3_GetLineMetrics(IDWriteTextLayout3 *iface, DWRITE_LINE_METRICS1 *metrics, UINT32 max_count, UINT32 *count) { - struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout3(iface); + unsigned int line_count; HRESULT hr; + size_t i; - TRACE("(%p)->(%p %u %p)\n", This, metrics, max_count, count); + TRACE("%p, %p, %u, %p.\n", iface, metrics, max_count, count); - hr = layout_compute_effective_runs(This); - if (FAILED(hr)) + if (FAILED(hr = layout_compute_effective_runs(layout))) return hr; if (metrics) - memcpy(metrics, This->linemetrics, sizeof(*metrics) * min(max_count, This->metrics.lineCount)); + { + line_count = min(max_count, layout->metrics.lineCount); + for (i = 0; i < line_count; ++i) + metrics[i] = layout->lines[i].metrics; + } - *count = This->metrics.lineCount; - return max_count >= This->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; + *count = layout->metrics.lineCount; + return max_count >= layout->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static const IDWriteTextLayout3Vtbl dwritetextlayoutvtbl = { @@ -4978,9 +4965,8 @@ static HRESULT init_textlayout(const struct textlayout_desc *desc, struct dwrite layout->cluster_count = 0; layout->clustermetrics = NULL; layout->clusters = NULL; - layout->linemetrics = NULL; layout->lines = NULL; - layout->line_alloc = 0; + layout->lines_size = 0; layout->minwidth = 0.0f; list_init(&layout->eruns); list_init(&layout->inlineobjects);

1 0

Nikolay Sivov : dwrite: Use array allocation helper for strings object.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 0a3aef62d85720af1b1dcc133300d0afcc347ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a3aef62d85720af1b1dcc13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:27:27 2019 +0300 dwrite: Use array allocation helper for strings object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 146 ++++++++++++++++++++++++++--------------------------- 1 file changed, 72 insertions(+), 74 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1816fbc..3fe2b7e 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -241,13 +241,14 @@ struct localizedpair { WCHAR *string; }; -struct localizedstrings { +struct localizedstrings +{ IDWriteLocalizedStrings IDWriteLocalizedStrings_iface; - LONG ref; + LONG refcount; struct localizedpair *data; - UINT32 count; - UINT32 alloc; + size_t size; + size_t count; }; static inline struct localizedstrings *impl_from_IDWriteLocalizedStrings(IDWriteLocalizedStrings *iface) @@ -275,54 +276,61 @@ static HRESULT WINAPI localizedstrings_QueryInterface(IDWriteLocalizedStrings *i static ULONG WINAPI localizedstrings_AddRef(IDWriteLocalizedStrings *iface) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + ULONG refcount = InterlockedIncrement(&strings->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(%d)\n", This, ref); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + ULONG refcount = InterlockedDecrement(&strings->refcount); + size_t i; - if (!ref) { - unsigned int i; + TRACE("%p, refcount %d.\n", iface, refcount); - for (i = 0; i < This->count; i++) { - heap_free(This->data[i].locale); - heap_free(This->data[i].string); + if (!refcount) + { + for (i = 0; i < strings->count; ++i) + { + heap_free(strings->data[i].locale); + heap_free(strings->data[i].string); } - heap_free(This->data); - heap_free(This); + heap_free(strings->data); + heap_free(strings); } - return ref; + return refcount; } static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - TRACE("(%p)\n", This); - return This->count; + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + + TRACE("%p.\n", iface); + + return strings->count; } static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *iface, WCHAR const *locale_name, UINT32 *index, BOOL *exists) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - UINT32 i; + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + size_t i; - TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(locale_name), index, exists); + TRACE("%p, %s, %p, %p.\n", iface, debugstr_w(locale_name), index, exists); *exists = FALSE; *index = ~0; - for (i = 0; i < This->count; i++) { - if (!strcmpiW(This->data[i].locale, locale_name)) { + for (i = 0; i < strings->count; ++i) + { + if (!strcmpiW(strings->data[i].locale, locale_name)) + { *exists = TRUE; *index = i; break; @@ -334,16 +342,17 @@ static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *i static HRESULT WINAPI localizedstrings_GetLocaleNameLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("(%p)->(%u %p)\n", This, index, length); + TRACE("%p, %u, %p.\n", iface, index, length); - if (index >= This->count) { + if (index >= strings->count) + { *length = (UINT32)-1; return E_FAIL; } - *length = strlenW(This->data[index].locale); + *length = strlenW(strings->data[index].locale); return S_OK; } @@ -416,58 +425,45 @@ static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = { HRESULT create_localizedstrings(IDWriteLocalizedStrings **strings) { - struct localizedstrings *This; + struct localizedstrings *object; *strings = NULL; - This = heap_alloc(sizeof(struct localizedstrings)); - if (!This) return E_OUTOFMEMORY; - - This->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; - This->ref = 1; - This->count = 0; - This->data = heap_alloc_zero(sizeof(struct localizedpair)); - if (!This->data) { - heap_free(This); + object = heap_alloc_zero(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - } - This->alloc = 1; - *strings = &This->IDWriteLocalizedStrings_iface; + object->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + object->refcount = 1; + + *strings = &object->IDWriteLocalizedStrings_iface; return S_OK; } HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, const WCHAR *string) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - UINT32 i; + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + size_t i, count = strings->count; /* make sure there's no duplicates */ - for (i = 0; i < This->count; i++) - if (!strcmpW(This->data[i].locale, locale)) + for (i = 0; i < count; i++) + if (!strcmpW(strings->data[i].locale, locale)) return S_OK; - if (This->count == This->alloc) { - void *ptr; - - ptr = heap_realloc(This->data, 2*This->alloc*sizeof(struct localizedpair)); - if (!ptr) - return E_OUTOFMEMORY; - - This->alloc *= 2; - This->data = ptr; - } + if (!dwrite_array_reserve((void **)&strings->data, &strings->size, strings->count + 1, sizeof(*strings->data))) + return E_OUTOFMEMORY; - This->data[This->count].locale = heap_strdupW(locale); - This->data[This->count].string = heap_strdupW(string); - if (!This->data[This->count].locale || !This->data[This->count].string) { - heap_free(This->data[This->count].locale); - heap_free(This->data[This->count].string); + strings->data[count].locale = heap_strdupW(locale); + strings->data[count].string = heap_strdupW(string); + if (!strings->data[count].locale || !strings->data[count].string) + { + heap_free(strings->data[count].locale); + heap_free(strings->data[count].string); return E_OUTOFMEMORY; } - This->count++; + strings->count++; return S_OK; } @@ -475,7 +471,7 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) { struct localizedstrings *strings, *strings_clone; - int i; + size_t i; *ret = NULL; @@ -483,24 +479,26 @@ HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedSt return S_FALSE; strings = impl_from_IDWriteLocalizedStrings(iface); - strings_clone = heap_alloc(sizeof(*strings_clone)); + strings_clone = heap_alloc_zero(sizeof(*strings_clone)); if (!strings_clone) return E_OUTOFMEMORY; - strings_clone->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; - strings_clone->ref = 1; - strings_clone->count = strings->count; - strings_clone->data = heap_calloc(strings_clone->count, sizeof(*strings_clone->data)); - if (!strings_clone->data) { + if (!dwrite_array_reserve((void **)&strings_clone->data, &strings_clone->size, strings->count, + sizeof(*strings_clone->data))) + { heap_free(strings_clone); return E_OUTOFMEMORY; } - for (i = 0; i < strings_clone->count; i++) + + strings_clone->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + strings_clone->refcount = 1; + strings_clone->count = strings->count; + + for (i = 0; i < strings_clone->count; ++i) { strings_clone->data[i].locale = heap_strdupW(strings->data[i].locale); strings_clone->data[i].string = heap_strdupW(strings->data[i].string); } - strings_clone->alloc = strings_clone->count; *ret = &strings_clone->IDWriteLocalizedStrings_iface;

1 0

Matteo Bruni : d3d9: Always allow read and write map access to non-DEFAULT buffers.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 9d9dd8b378b84e125f877a1c675c5b9a5ffa673f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d9dd8b378b84e125f877a1c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 13 20:34:18 2019 +0200 d3d9: Always allow read and write map access to non-DEFAULT buffers. D3d9 is very lax WRT map access to buffers and there isn't really much of a reason for us to restrict read access to non-DEFAULT resources. On the other hand, we'd still really like to be able to ensure that DEFAULT, DYNAMIC | WRITEONLY buffers get allocated in the proper memory region and get efficient data uploads, so keep the restriction for DEFAULT resources. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46849 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 43321b3..46d11e7 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -316,6 +316,9 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); + /* Buffers are always readable. */ + if (pool != D3DPOOL_DEFAULT) + desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -639,6 +642,9 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); + /* Buffers are always readable. */ + if (pool != D3DPOOL_DEFAULT) + desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0