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

Nikolay Sivov : dwrite: Use array allocation helper to manage collection entries.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 0520b593775b2a618cd513323d29a5073d57e3a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0520b593775b2a618cd51332… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:27:24 2019 +0300 dwrite: Use array allocation helper to manage collection entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 142 ++++++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0520b593775b2a618cd5…

1 0

Nikolay Sivov : dwrite: Use array allocation helper to manage family entries.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 958911c699b5ef90bb4fe73faf3d8766d34da144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=958911c699b5ef90bb4fe73f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:27:23 2019 +0300 dwrite: Use array allocation helper to manage family entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 166 ++++++++++++++++++++++++++--------------------------- 1 file changed, 82 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=958911c699b5ef90bb4f…

1 0

Henri Verbeet : wined3d: Move the timestamp query fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: f942b20a97199ee62cb174e7bee012943abbdd56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f942b20a97199ee62cb174e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:20 2019 +0430 wined3d: Move the timestamp query fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 57 +++++++++++++++++++++--------------------- dlls/wined3d/query.c | 12 ++++----- dlls/wined3d/wined3d_private.h | 18 ++++++------- 3 files changed, 44 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f942b20a97199ee62cb1…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_clear_state().
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: dfe7e9106083cf8e2ef0eefa447f507140b7838c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe7e9106083cf8e2ef0eefa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:23 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_clear_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 50 +++++++++++++++++++++--------------------- dlls/wined3d/device.c | 4 +++- dlls/wined3d/wined3d_private.h | 16 +++++++------- 3 files changed, 36 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dfe7e9106083cf8e2ef0…

1 0

Henri Verbeet : wined3d: Move the pipeline statistics query fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 776b84e6a589fa4fd57616793ee4644ad9e55709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=776b84e6a589fa4fd5761679… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:22 2019 +0430 wined3d: Move the pipeline statistics query fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 73 ++++++++++++++++++------------------------ dlls/wined3d/query.c | 20 ++++++------ dlls/wined3d/wined3d_private.h | 20 ++++++------ 3 files changed, 50 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=776b84e6a589fa4fd576…

1 0

Matteo Bruni : wined3d: Avoid a GCC 8 warning.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 3724e9c4abb43a7e5a044bcc17010660d55c4ff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3724e9c4abb43a7e5a044bcc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 13 20:34:17 2019 +0200 wined3d: Avoid a GCC 8 warning. 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/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b183704..de32587 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -226,7 +226,7 @@ struct recorded_instruction struct shader_arb_ctx_priv { - char addr_reg[20]; + char addr_reg[50]; enum { /* plain GL_ARB_vertex_program or GL_ARB_fragment_program */

1 0

Nikolay Sivov : dwrite/tests: Fix a typo in test message.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 7c02ab5ed1669b46139f8a62b79adc5889fa9b7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c02ab5ed1669b46139f8a62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:27:29 2019 +0300 dwrite/tests: Fix a typo in test message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8337ce7..2c90e31 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3307,7 +3307,7 @@ todo_wine ok(metrics.layoutWidth == 500.0, "Unexpected box width %f.\n", metrics.layoutWidth); ok(metrics.layoutHeight == 1000.0, "Unexpected box height %f.\n", metrics.layoutHeight); ok(metrics.maxBidiReorderingDepth == 1, "Unexpected reordering depth %u.\n", metrics.maxBidiReorderingDepth); - ok(metrics.lineCount == 1, "Unexpected line coun %u.\n", metrics.lineCount); + ok(metrics.lineCount == 1, "Unexpected line count %u.\n", metrics.lineCount); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Nikolay Sivov : dwrite: Use array allocation helper for in-memory loader.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: 3cfd0a7a4b29cb081508705731eb01e90cd77517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cfd0a7a4b29cb0815087057… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:27:25 2019 +0300 dwrite: Use array allocation helper for in-memory loader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index de7ccef..5f4abc7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4588,8 +4588,8 @@ struct dwrite_inmemory_fileloader LONG ref; struct dwrite_inmemory_stream_data **streams; - UINT32 filecount; - UINT32 capacity; + size_t size; + size_t count; }; static inline struct dwrite_localfontfileloader *impl_from_IDWriteLocalFontFileLoader(IDWriteLocalFontFileLoader *iface) @@ -6208,13 +6208,12 @@ static ULONG WINAPI inmemoryfontfileloader_Release(IDWriteInMemoryFontFileLoader { struct dwrite_inmemory_fileloader *loader = impl_from_IDWriteInMemoryFontFileLoader(iface); ULONG ref = InterlockedDecrement(&loader->ref); + size_t i; TRACE("(%p)->(%u)\n", loader, ref); if (!ref) { - UINT32 i; - - for (i = 0; i < loader->filecount; i++) + for (i = 0; i < loader->count; ++i) release_inmemory_stream(loader->streams[i]); heap_free(loader->streams); heap_free(loader); @@ -6239,7 +6238,7 @@ static HRESULT WINAPI inmemoryfontfileloader_CreateStreamFromKey(IDWriteInMemory index = *(DWORD *)key; - if (index >= loader->filecount) + if (index >= loader->count) return E_INVALIDARG; if (!(stream = heap_alloc(sizeof(*stream)))) @@ -6266,21 +6265,8 @@ static HRESULT WINAPI inmemoryfontfileloader_CreateInMemoryFontFileReference(IDW *fontfile = NULL; - if (loader->filecount == loader->capacity) { - if (loader->streams) { - struct dwrite_inmemory_stream_data **ptr; - - if (!(ptr = heap_realloc(loader->streams, 2 * loader->capacity * sizeof(*loader->streams)))) - return E_OUTOFMEMORY; - - loader->streams = ptr; - loader->capacity *= 2; - } - else { - loader->capacity = 16; - loader->streams = heap_calloc(loader->capacity, sizeof(*loader->streams)); - } - } + if (!dwrite_array_reserve((void **)&loader->streams, &loader->size, loader->count + 1, sizeof(*loader->streams))) + return E_OUTOFMEMORY; if (!(stream = heap_alloc(sizeof(*stream)))) return E_OUTOFMEMORY; @@ -6300,8 +6286,8 @@ static HRESULT WINAPI inmemoryfontfileloader_CreateInMemoryFontFileReference(IDW memcpy(stream->data, data, data_size); } - key = loader->filecount; - loader->streams[loader->filecount++] = stream; + key = loader->count; + loader->streams[loader->count++] = stream; return IDWriteFactory_CreateCustomFontFileReference(factory, &key, sizeof(key), (IDWriteFontFileLoader *)&loader->IDWriteInMemoryFontFileLoader_iface, fontfile); @@ -6311,9 +6297,9 @@ static UINT32 WINAPI inmemoryfontfileloader_GetFileCount(IDWriteInMemoryFontFile { struct dwrite_inmemory_fileloader *loader = impl_from_IDWriteInMemoryFontFileLoader(iface); - TRACE("(%p)\n", loader); + TRACE("%p.\n", iface); - return loader->filecount; + return loader->count; } static const IDWriteInMemoryFontFileLoaderVtbl inmemoryfontfileloadervtbl =

1 0

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

May 14, 2019

Module: wine Branch: master Commit: 24f906f497729b07876e54d925a56579617eeeff URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f906f497729b07876e54d9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 14 15:44:24 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_load_numbered_arrays(). 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e4869b..5183265 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5334,9 +5334,10 @@ static void context_unload_numbered_arrays(struct wined3d_context *context) } } -static void context_load_numbered_arrays(struct wined3d_context *context, +static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *stream_info, const struct wined3d_state *state) { + struct wined3d_context *context = &context_gl->c; const struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint current_bo; @@ -5540,7 +5541,7 @@ void context_update_stream_sources(struct wined3d_context *context, const struct if (context->d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); - context_load_numbered_arrays(context, &context->stream_info, state); + wined3d_context_gl_load_numbered_arrays(wined3d_context_gl(context), &context->stream_info, state); return; }

1 0

Henri Verbeet : wined3d: Move the stream-output statistics query fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: wine Branch: master Commit: cc5e38e1bf3be426da90908b6fb7b4059f9ed5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5e38e1bf3be426da90908b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:21 2019 +0430 wined3d: Move the stream-output statistics query fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 67 ++++++++++++++++++++---------------------- dlls/wined3d/query.c | 20 ++++++------- dlls/wined3d/wined3d_private.h | 19 ++++++------ 3 files changed, 51 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc5e38e1bf3be426da90…

1 0