January 2019 - Wine-commits

Zebediah Figura : hal: Implement plain spinlock functions on top of DPC-level ones.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 286ef484982c96504fdf4c43f5e2d182fcd9e771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=286ef484982c96504fdf4c43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 20:45:34 2019 -0600 hal: Implement plain spinlock functions on top of DPC-level ones. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/Makefile.in | 1 + dlls/hal/hal.c | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index cc2620e..63211a1 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -1,5 +1,6 @@ MODULE = hal.dll IMPORTLIB = hal +IMPORTS = ntoskrnl C_SRCS = \ hal.c diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index fca4f23..5b3ee44 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -76,16 +76,10 @@ KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock( KSPIN_LOCK *lock ) return irql; } -static inline void small_pause(void) -{ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -} - void WINAPI KeAcquireSpinLock( KSPIN_LOCK *lock, KIRQL *irql ) { TRACE("lock %p, irql %p.\n", lock, irql); - while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) - small_pause(); + KeAcquireSpinLockAtDpcLevel( lock ); *irql = 0; } @@ -98,7 +92,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock( KSPIN_LOCK *lock, KIRQL ir void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) { TRACE("lock %p, irql %u.\n", lock, irql); - InterlockedExchangePointer( (void **)lock, 0 ); + KeReleaseSpinLockFromDpcLevel( lock ); } #endif /* __i386__ */

1 0

Andrey Gusev : d3drm/tests: Add missing HRESULT.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: c04c0f26581f60bc7b1ebd579d9768f51f4bb392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c04c0f26581f60bc7b1ebd57… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Jan 27 23:49:20 2019 +0200 d3drm/tests: Add missing HRESULT. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5157952..2fb2699 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3268,7 +3268,7 @@ static void test_device_qi(void) ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr); - IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr); IDirect3DRMDevice3_Release(device3); test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));

1 0

Zebediah Figura : wined3d: Introduce a separate structure for stateblock state and store vertex shader state therein.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: f2e7906d9cd17b4cdab28a71cc9ca8ecaaf0c26c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e7906d9cd17b4cdab28a71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:52 2019 -0600 wined3d: Introduce a separate structure for stateblock state and store vertex shader state therein. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 25 +++++++++++++++++++++---- dlls/wined3d/stateblock.c | 40 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 3 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7e274d..b7071db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -486,6 +486,8 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { UINT i; + wined3d_stateblock_state_cleanup(&device->stateblock_state); + wined3d_cs_destroy(device->cs); if (device->recording && wined3d_stateblock_decref(device->recording)) @@ -2208,21 +2210,29 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration( void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_VERTEX]; + struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (device->update_stateblock_state->vs) + wined3d_shader_decref(device->update_stateblock_state->vs); + device->update_stateblock_state->vs = shader; + if (device->recording) + { device->recording->changed.vertexShader = TRUE; + return; + } if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader; - if (!device->recording) - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); + device->state.shader[WINED3D_SHADER_TYPE_VERTEX] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); if (prev) wined3d_shader_decref(prev); } @@ -3552,6 +3562,7 @@ HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) device->recording = stateblock; device->update_state = &stateblock->state; + device->update_stateblock_state = &stateblock->stateblock_state; TRACE("Recording stateblock %p.\n", stateblock); @@ -3577,6 +3588,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device, *stateblock = object; device->recording = NULL; device->update_state = &device->state; + device->update_stateblock_state = &device->stateblock_state; TRACE("Returning stateblock %p.\n", *stateblock); @@ -4998,6 +5010,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); + wined3d_stateblock_state_cleanup(&device->stateblock_state); if (device->d3d_initialized) wined3d_device_delete_opengl_contexts(device); @@ -5005,6 +5018,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; + memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); + device->update_stateblock_state = &device->stateblock_state; device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) @@ -5279,6 +5294,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; + device->update_stateblock_state = &device->stateblock_state; device->max_frame_latency = 3; @@ -5286,6 +5302,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, { WARN("Failed to create command stream.\n"); state_cleanup(&device->state); + wined3d_stateblock_state_cleanup(&device->stateblock_state); hr = E_FAIL; goto err; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9539ae0..4ead27b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -521,6 +521,17 @@ void state_unbind_resources(struct wined3d_state *state) } } +void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) +{ + struct wined3d_shader *shader; + + if ((shader = state->vs)) + { + state->vs = NULL; + wined3d_shader_decref(shader); + } +} + void state_cleanup(struct wined3d_state *state) { unsigned int counter; @@ -554,6 +565,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { state_cleanup(&stateblock->state); + wined3d_stateblock_state_cleanup(&stateblock->stateblock_state); heap_free(stateblock); } @@ -669,6 +681,7 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { + const struct wined3d_stateblock_state *state = &stateblock->device->stateblock_state; const struct wined3d_state *src_state = &stateblock->device->state; unsigned int i; DWORD map; @@ -677,18 +690,15 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Capturing state %p.\n", src_state); - if (stateblock->changed.vertexShader && stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX] - != src_state->shader[WINED3D_SHADER_TYPE_VERTEX]) + if (stateblock->changed.vertexShader && stateblock->stateblock_state.vs != state->vs) { - TRACE("Updating vertex shader from %p to %p\n", - stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX], - src_state->shader[WINED3D_SHADER_TYPE_VERTEX]); + TRACE("Updating vertex shader from %p to %p.\n", stateblock->stateblock_state.vs, state->vs); - if (src_state->shader[WINED3D_SHADER_TYPE_VERTEX]) - wined3d_shader_incref(src_state->shader[WINED3D_SHADER_TYPE_VERTEX]); - if (stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]) - wined3d_shader_decref(stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]); - stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX] = src_state->shader[WINED3D_SHADER_TYPE_VERTEX]; + if (state->vs) + wined3d_shader_incref(state->vs); + if (stateblock->stateblock_state.vs) + wined3d_shader_decref(stateblock->stateblock_state.vs); + stateblock->stateblock_state.vs = state->vs; } /* Vertex shader float constants. */ @@ -978,6 +988,7 @@ static void apply_lights(struct wined3d_device *device, const struct wined3d_sta void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) { + struct wined3d_stateblock_state *state = &stateblock->device->stateblock_state; struct wined3d_device *device = stateblock->device; unsigned int i; DWORD map; @@ -985,7 +996,14 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applying stateblock %p to device %p.\n", stateblock, device); if (stateblock->changed.vertexShader) - wined3d_device_set_vertex_shader(device, stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]); + { + if (stateblock->stateblock_state.vs) + wined3d_shader_incref(stateblock->stateblock_state.vs); + if (state->vs) + wined3d_shader_decref(state->vs); + state->vs = stateblock->stateblock_state.vs; + wined3d_device_set_vertex_shader(device, stateblock->stateblock_state.vs); + } /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7b265f3..e45ee7b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2968,6 +2968,11 @@ struct wined3d_dummy_textures * wined3d_device_create() ignores it. */ #define WINED3DCREATE_MULTITHREADED 0x00000004 +struct wined3d_stateblock_state +{ + struct wined3d_shader *vs; +}; + struct wined3d_device { LONG ref; @@ -3006,6 +3011,8 @@ struct wined3d_device struct wined3d_state state; struct wined3d_state *update_state; struct wined3d_stateblock *recording; + struct wined3d_stateblock_state stateblock_state; + struct wined3d_stateblock_state *update_stateblock_state; /* Internal use fields */ struct wined3d_device_creation_parameters create_parms; @@ -3556,6 +3563,7 @@ struct wined3d_stateblock /* Array indicating whether things have been set or changed */ struct wined3d_saved_states changed; struct wined3d_state state; + struct wined3d_stateblock_state stateblock_state; /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; @@ -3582,6 +3590,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; +void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; + void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Store vertex shader floating point constants in the wined3d_stateblock_state structure.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 4de2da1d146248ed872ae45c30b8d485832f4ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4de2da1d146248ed872ae45c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:53 2019 -0600 wined3d: Store vertex shader floating point constants in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++++------ dlls/wined3d/stateblock.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7071db..dcbdc3d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2493,18 +2493,22 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, || count > d3d_info->limits.vs_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_f[start_idx], constants, count * sizeof(*constants)); + memcpy(&device->update_stateblock_state->vs_consts_f[start_idx], constants, count * sizeof(*constants)); + if (device->recording) + { + memset(&device->recording->changed.vs_consts_f[start_idx], 1, + count * sizeof(*device->recording->changed.vs_consts_f)); + return WINED3D_OK; + } + + memcpy(&device->state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { for (i = 0; i < count; ++i) TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); } - if (device->recording) - memset(&device->recording->changed.vs_consts_f[start_idx], 1, - count * sizeof(*device->recording->changed.vs_consts_f)); - else - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4ead27b..f28c29c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -706,9 +706,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { unsigned int idx = stateblock->contained_vs_consts_f[i]; - TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&src_state->vs_consts_f[idx])); + TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&state->vs_consts_f[idx])); - stateblock->state.vs_consts_f[idx] = src_state->vs_consts_f[idx]; + stateblock->stateblock_state.vs_consts_f[idx] = state->vs_consts_f[idx]; } /* Vertex shader integer constants. */ @@ -1008,8 +1008,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) { + state->vs_consts_f[i] = stateblock->stateblock_state.vs_consts_f[i]; wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i], - 1, &stateblock->state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); + 1, &stateblock->stateblock_state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e45ee7b..047439d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2971,6 +2971,7 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { struct wined3d_shader *vs; + struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; }; struct wined3d_device

1 0

Zebediah Figura : wined3d: Store vertex shader integer constants in the wined3d_stateblock_state structure.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 96d7437ada7cbd8f9c7d280e1eee695a118ff2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d7437ada7cbd8f9c7d280e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:54 2019 -0600 wined3d: Store vertex shader integer constants in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 +++++++++-------- dlls/wined3d/stateblock.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dcbdc3d..14cb620 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2445,23 +2445,24 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, if (count > WINED3D_MAX_CONSTS_I - start_idx) count = WINED3D_MAX_CONSTS_I - start_idx; - memcpy(&device->update_state->vs_consts_i[start_idx], constants, count * sizeof(*constants)); - if (TRACE_ON(d3d)) - { - for (i = 0; i < count; ++i) - TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); - } + memcpy(&device->update_stateblock_state->vs_consts_i[start_idx], constants, count * sizeof(*constants)); if (device->recording) { for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsI |= (1u << i); + return WINED3D_OK; } - else + + memcpy(&device->state.vs_consts_i[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) { - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); + for (i = 0; i < count; ++i) + TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); } + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); + return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f28c29c..dd1e638 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -716,9 +716,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { unsigned int idx = stateblock->contained_vs_consts_i[i]; - TRACE("Setting vs_consts[%u] to %s.\n", idx, debug_ivec4(&src_state->vs_consts_i[idx])); + TRACE("Setting vs_consts_i[%u] to %s.\n", idx, debug_ivec4(&state->vs_consts_i[idx])); - stateblock->state.vs_consts_i[idx] = src_state->vs_consts_i[idx]; + stateblock->stateblock_state.vs_consts_i[idx] = state->vs_consts_i[idx]; } /* Vertex shader boolean constants. */ @@ -1014,8 +1014,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { + state->vs_consts_i[i] = stateblock->stateblock_state.vs_consts_i[i]; wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - 1, &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); + 1, &stateblock->stateblock_state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 047439d..fedf2b8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2972,6 +2972,7 @@ struct wined3d_stateblock_state { struct wined3d_shader *vs; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; + struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; }; struct wined3d_device

1 0

Nikolay Sivov : dwrite/tests: Some more tests for ComputeGlyphOrigins().
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 3795100bf7b7bd53ba1b62e1b8b04dc79a8a0310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3795100bf7b7bd53ba1b62e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:24 2019 +0300 dwrite/tests: Some more tests for ComputeGlyphOrigins(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3f41289..3e736c8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8038,17 +8038,73 @@ static void test_HasKerningPairs(void) ok(ref == 0, "factory not released, %u\n", ref); } +static void get_expected_glyph_origins(D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *run, + D2D1_POINT_2F *origins) +{ + unsigned int i; + + if (run->bidiLevel & 1) + { + DWRITE_GLYPH_METRICS glyph_metrics[2]; + DWRITE_FONT_METRICS metrics; + float advance; + HRESULT hr; + + hr = IDWriteFontFace_GetDesignGlyphMetrics(run->fontFace, run->glyphIndices, run->glyphCount, glyph_metrics, FALSE); + ok(hr == S_OK, "Failed to get glyph metrics, hr %#x.\n", hr); + + IDWriteFontFace_GetMetrics(run->fontFace, &metrics); + + advance = run->fontEmSize * glyph_metrics[0].advanceWidth / metrics.designUnitsPerEm; + + baseline_origin.x -= advance; + + for (i = 0; i < run->glyphCount; ++i) + { + origins[i].x = baseline_origin.x - run->glyphOffsets[i].advanceOffset; + origins[i].y = baseline_origin.y - run->glyphOffsets[i].ascenderOffset; + + baseline_origin.x -= run->glyphAdvances[i]; + } + } + else + { + for (i = 0; i < run->glyphCount; ++i) + { + origins[i].x = baseline_origin.x + run->glyphOffsets[i].advanceOffset; + origins[i].y = baseline_origin.y - run->glyphOffsets[i].ascenderOffset; + + baseline_origin.x += run->glyphAdvances[i]; + } + } +} + static void test_ComputeGlyphOrigins(void) { + static const struct origins_test + { + D2D1_POINT_2F baseline_origin; + float advances[2]; + DWRITE_GLYPH_OFFSET offsets[2]; + unsigned int bidi_level; + } + origins_tests[] = + { + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } } }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0.3f, 0.5f }, { -0.1f, 0.9f } } }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } }, 1 }, + }; IDWriteFactory4 *factory; DWRITE_GLYPH_RUN run; HRESULT hr; - D2D1_POINT_2F origins[2]; + D2D1_POINT_2F origins[2], expected_origins[2]; D2D1_POINT_2F baseline_origin; - UINT16 glyphs[2]; + UINT16 glyphs[2] = { 0 }; FLOAT advances[2]; DWRITE_MATRIX m; ULONG ref; + unsigned int i, j; + IDWriteFontFace *fontface; factory = create_factory_iid(&IID_IDWriteFactory4); if (!factory) { @@ -8056,6 +8112,35 @@ static void test_ComputeGlyphOrigins(void) return; } + fontface = create_fontface((IDWriteFactory *)factory); + + for (i = 0; i < ARRAY_SIZE(origins_tests); ++i) + { + run.fontFace = fontface; + run.fontEmSize = 32.0f; + run.glyphCount = 2; + run.glyphIndices = glyphs; + run.glyphAdvances = origins_tests[i].advances; + run.glyphOffsets = origins_tests[i].offsets; + run.isSideways = FALSE; + run.bidiLevel = origins_tests[i].bidi_level; + + get_expected_glyph_origins(origins_tests[i].baseline_origin, &run, expected_origins); + + memset(origins, 0, sizeof(origins)); + hr = IDWriteFactory4_ComputeGlyphOrigins_(factory, &run, origins_tests[i].baseline_origin, origins); + ok(hr == S_OK, "%u: failed to compute glyph origins, hr %#x.\n", i, hr); + for (j = 0; j < run.glyphCount; ++j) + { + todo_wine_if(run.bidiLevel & 1) + ok(!memcmp(&origins[j], &expected_origins[j], sizeof(origins[j])), + "%u: unexpected origin[%u] (%f, %f) - (%f, %f).\n", i, j, origins[j].x, origins[j].y, + expected_origins[j].x, expected_origins[j].y); + } + } + + IDWriteFontFace_Release(fontface); + advances[0] = 10.0f; advances[1] = 20.0f;

1 0

Nikolay Sivov : dwrite: Validate font data when retrieving supported unicode ranges data.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 2dcb3c7451a2f804b8f1fda058fa24db862a9afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dcb3c7451a2f804b8f1fda0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:25 2019 +0300 dwrite: Validate font data when retrieving supported unicode ranges data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 11 ++- dlls/dwrite/font.c | 36 ++++------ dlls/dwrite/opentype.c | 159 ++++++++++++++++++++++++++++--------------- 3 files changed, 127 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2dcb3c7451a2f804b8f1…

1 0

Nikolay Sivov : dwrite: Validate 'gasp' data before accessing it.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 471611b575a4de0896ffc41c30ff005e4689433c URL: https://source.winehq.org/git/wine.git/?a=commit;h=471611b575a4de0896ffc41c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:26 2019 +0300 dwrite: Validate 'gasp' data before accessing it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 42 +++++++++++++++++------------------------- dlls/dwrite/opentype.c | 43 ++++++++++++++++++++++++++++++++----------- 3 files changed, 50 insertions(+), 37 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 52e7a18..9f8c941 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -254,7 +254,7 @@ enum gasp_flags { GASP_SYMMETRIC_SMOOTHING = 0x0008, }; -extern WORD opentype_get_gasp_flags(const WORD*,UINT32,INT) DECLSPEC_HIDDEN; +extern unsigned int opentype_get_gasp_flags(const struct dwrite_fonttable *gasp, float emsize) DECLSPEC_HIDDEN; /* BiDi helpers */ extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5c287ea..5c0b2a4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -379,11 +379,10 @@ static const void* get_fontface_vdmx(struct dwrite_fontface *fontface) return get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_VDMX_TAG, &fontface->vdmx); } -static const void* get_fontface_gasp(struct dwrite_fontface *fontface, UINT32 *size) +static const struct dwrite_fonttable *get_fontface_gasp(struct dwrite_fontface *fontface) { - const void *ptr = get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_GASP_TAG, &fontface->gasp); - *size = fontface->gasp.size; - return ptr; + get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_GASP_TAG, &fontface->gasp); + return &fontface->gasp; } static const void* get_fontface_cpal(struct dwrite_fontface *fontface) @@ -687,7 +686,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace4 *iface, } static DWRITE_RENDERING_MODE fontface_renderingmode_from_measuringmode(DWRITE_MEASURING_MODE measuring, - FLOAT ppem, WORD gasp) + float ppem, unsigned int gasp) { DWRITE_RENDERING_MODE mode = DWRITE_RENDERING_MODE_DEFAULT; @@ -718,10 +717,8 @@ static HRESULT WINAPI dwritefontface_GetRecommendedRenderingMode(IDWriteFontFace FLOAT ppdip, DWRITE_MEASURING_MODE measuring, IDWriteRenderingParams *params, DWRITE_RENDERING_MODE *mode) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); - const WORD *ptr; - UINT32 size; + unsigned int flags; FLOAT ppem; - WORD gasp; TRACE("(%p)->(%.2f %.2f %d %p %p)\n", This, emSize, ppdip, measuring, params, mode); @@ -741,9 +738,8 @@ static HRESULT WINAPI dwritefontface_GetRecommendedRenderingMode(IDWriteFontFace return S_OK; } - ptr = get_fontface_gasp(This, &size); - gasp = opentype_get_gasp_flags(ptr, size, ppem); - *mode = fontface_renderingmode_from_measuringmode(measuring, ppem, gasp); + flags = opentype_get_gasp_flags(get_fontface_gasp(This), ppem); + *mode = fontface_renderingmode_from_measuringmode(measuring, ppem, flags); return S_OK; } @@ -1097,10 +1093,8 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac DWRITE_GRID_FIT_MODE *gridfitmode) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); + unsigned int flags; FLOAT emthreshold; - const WORD *ptr; - UINT32 size; - WORD gasp; TRACE("(%p)->(%.2f %.2f %.2f %p %d %d %d %p %p %p)\n", This, emSize, dpiX, dpiY, m, is_sideways, threshold, measuringmode, params, renderingmode, gridfitmode); @@ -1131,14 +1125,13 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac emthreshold = threshold == DWRITE_OUTLINE_THRESHOLD_ANTIALIASED ? RECOMMENDED_OUTLINE_AA_THRESHOLD : RECOMMENDED_OUTLINE_A_THRESHOLD; - ptr = get_fontface_gasp(This, &size); - gasp = opentype_get_gasp_flags(ptr, size, emSize); + flags = opentype_get_gasp_flags(get_fontface_gasp(This), emSize); if (*renderingmode == DWRITE_RENDERING_MODE_DEFAULT) { if (emSize >= emthreshold) *renderingmode = DWRITE_RENDERING_MODE_OUTLINE; else - *renderingmode = fontface_renderingmode_from_measuringmode(measuringmode, emSize, gasp); + *renderingmode = fontface_renderingmode_from_measuringmode(measuringmode, emSize, flags); } if (*gridfitmode == DWRITE_GRID_FIT_MODE_DEFAULT) { @@ -1147,7 +1140,8 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac else if (measuringmode == DWRITE_MEASURING_MODE_GDI_CLASSIC || measuringmode == DWRITE_MEASURING_MODE_GDI_NATURAL) *gridfitmode = DWRITE_GRID_FIT_MODE_ENABLED; else - *gridfitmode = (gasp & (GASP_GRIDFIT|GASP_SYMMETRIC_GRIDFIT)) ? DWRITE_GRID_FIT_MODE_ENABLED : DWRITE_GRID_FIT_MODE_DISABLED; + *gridfitmode = flags & (GASP_GRIDFIT|GASP_SYMMETRIC_GRIDFIT) ? + DWRITE_GRID_FIT_MODE_ENABLED : DWRITE_GRID_FIT_MODE_DISABLED; } return S_OK; @@ -1229,10 +1223,8 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac IDWriteRenderingParams *params, DWRITE_RENDERING_MODE1 *rendering_mode, DWRITE_GRID_FIT_MODE *gridfit_mode) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); + unsigned int flags; FLOAT emthreshold; - const WORD *ptr; - UINT32 size; - WORD gasp; TRACE("(%p)->(%.2f %.2f %.2f %p %d %d %d %p %p %p)\n", This, emSize, dpiX, dpiY, m, is_sideways, threshold, measuring_mode, params, rendering_mode, gridfit_mode); @@ -1263,14 +1255,13 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac emthreshold = threshold == DWRITE_OUTLINE_THRESHOLD_ANTIALIASED ? RECOMMENDED_OUTLINE_AA_THRESHOLD : RECOMMENDED_OUTLINE_A_THRESHOLD; - ptr = get_fontface_gasp(This, &size); - gasp = opentype_get_gasp_flags(ptr, size, emSize); + flags = opentype_get_gasp_flags(get_fontface_gasp(This), emSize); if (*rendering_mode == DWRITE_RENDERING_MODE1_DEFAULT) { if (emSize >= emthreshold) *rendering_mode = DWRITE_RENDERING_MODE1_OUTLINE; else - *rendering_mode = fontface_renderingmode_from_measuringmode(measuring_mode, emSize, gasp); + *rendering_mode = fontface_renderingmode_from_measuringmode(measuring_mode, emSize, flags); } if (*gridfit_mode == DWRITE_GRID_FIT_MODE_DEFAULT) { @@ -1279,7 +1270,8 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac else if (measuring_mode == DWRITE_MEASURING_MODE_GDI_CLASSIC || measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL) *gridfit_mode = DWRITE_GRID_FIT_MODE_ENABLED; else - *gridfit_mode = (gasp & (GASP_GRIDFIT|GASP_SYMMETRIC_GRIDFIT)) ? DWRITE_GRID_FIT_MODE_ENABLED : DWRITE_GRID_FIT_MODE_DISABLED; + *gridfit_mode = flags & (GASP_GRIDFIT|GASP_SYMMETRIC_GRIDFIT) ? + DWRITE_GRID_FIT_MODE_ENABLED : DWRITE_GRID_FIT_MODE_DISABLED; } return S_OK; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0e0de87..291b41b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -292,6 +292,20 @@ typedef struct { BYTE bitDepth; BYTE flags; } CBLCBitmapSizeTable; + +struct gasp_range +{ + WORD max_ppem; + WORD flags; +}; + +struct gasp_header +{ + WORD version; + WORD num_ranges; + struct gasp_range ranges[1]; +}; + #include "poppack.h" enum OS2_FSSELECTION { @@ -1959,25 +1973,32 @@ BOOL opentype_get_vdmx_size(const void *data, INT emsize, UINT16 *ascent, UINT16 return FALSE; } -WORD opentype_get_gasp_flags(const WORD *ptr, UINT32 size, INT emsize) +unsigned int opentype_get_gasp_flags(const struct dwrite_fonttable *gasp, float emsize) { - WORD num_recs, version; + unsigned int version, num_ranges, i; + const struct gasp_header *table; WORD flags = 0; - if (!ptr) + if (!gasp->exists) return 0; - version = GET_BE_WORD( *ptr++ ); - num_recs = GET_BE_WORD( *ptr++ ); - if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) { - ERR("unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs); + num_ranges = table_read_be_word(gasp, FIELD_OFFSET(struct gasp_header, num_ranges)); + + table = table_read_ensure(gasp, 0, FIELD_OFFSET(struct gasp_header, ranges[num_ranges])); + if (!table) + return 0; + + version = GET_BE_WORD(table->version); + if (version > 1) + { + ERR("Unsupported gasp table format version %u.\n", version); goto done; } - while (num_recs--) { - flags = GET_BE_WORD( *(ptr + 1) ); - if (emsize <= GET_BE_WORD( *ptr )) break; - ptr += 2; + for (i = 0; i < num_ranges; ++i) + { + flags = GET_BE_WORD(table->ranges[i].flags); + if (emsize <= GET_BE_WORD(table->ranges[i].max_ppem)) break; } done:

1 0

Nikolay Sivov : dwrite: Validate 'CPAL' data before using it.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 1c99186c8838c698ba9179faf741a5b7883675e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c99186c8838c698ba9179fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:27 2019 +0300 dwrite: Validate 'CPAL' data before using it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 7 +++-- dlls/dwrite/font.c | 5 ++-- dlls/dwrite/opentype.c | 67 ++++++++++++++++++++++---------------------- 3 files changed, 41 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9f8c941..6eac1f4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -227,9 +227,10 @@ extern HRESULT opentype_get_font_familyname(struct file_stream_desc*,IDWriteLoca extern HRESULT opentype_get_font_facename(struct file_stream_desc*,WCHAR*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; -extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; -extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN; +extern unsigned int opentype_get_cpal_palettecount(const struct dwrite_fonttable *table) DECLSPEC_HIDDEN; +extern unsigned int opentype_get_cpal_paletteentrycount(const struct dwrite_fonttable *table) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_cpal_entries(const struct dwrite_fonttable *table, unsigned int palette, + unsigned int first_entry_index, unsigned int entry_count, DWRITE_COLOR_F *entries) DECLSPEC_HIDDEN; extern BOOL opentype_has_vertical_variants(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern DWRITE_CONTAINER_TYPE opentype_analyze_container_type(void const *, UINT32) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5c0b2a4..2c51674 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -385,9 +385,10 @@ static const struct dwrite_fonttable *get_fontface_gasp(struct dwrite_fontface * return &fontface->gasp; } -static const void* get_fontface_cpal(struct dwrite_fontface *fontface) +static const struct dwrite_fonttable *get_fontface_cpal(struct dwrite_fontface *fontface) { - return get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_CPAL_TAG, &fontface->cpal); + get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_CPAL_TAG, &fontface->cpal); + return &fontface->cpal; } static const void* get_fontface_colr(struct dwrite_fontface *fontface) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 291b41b..647ac99 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -843,25 +843,17 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIP }; /* CPAL table */ -struct CPAL_Header_0 +struct cpal_header_0 { USHORT version; - USHORT numPaletteEntries; - USHORT numPalette; - USHORT numColorRecords; - ULONG offsetFirstColorRecord; - USHORT colorRecordIndices[1]; + USHORT num_palette_entries; + USHORT num_palettes; + USHORT num_color_records; + ULONG offset_first_color_record; + USHORT color_record_indices[1]; }; -/* for version == 1, this comes after full CPAL_Header_0 */ -struct CPAL_SubHeader_1 -{ - ULONG offsetPaletteTypeArray; - ULONG offsetPaletteLabelArray; - ULONG offsetPaletteEntryLabelArray; -}; - -struct CPAL_ColorRecord +struct cpal_color_record { BYTE blue; BYTE green; @@ -2005,37 +1997,46 @@ done: return flags; } -UINT32 opentype_get_cpal_palettecount(const void *cpal) +unsigned int opentype_get_cpal_palettecount(const struct dwrite_fonttable *cpal) { - const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; - return header ? GET_BE_WORD(header->numPalette) : 0; + return table_read_be_word(cpal, FIELD_OFFSET(struct cpal_header_0, num_palettes)); } -UINT32 opentype_get_cpal_paletteentrycount(const void *cpal) +unsigned int opentype_get_cpal_paletteentrycount(const struct dwrite_fonttable *cpal) { - const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; - return header ? GET_BE_WORD(header->numPaletteEntries) : 0; + return table_read_be_word(cpal, FIELD_OFFSET(struct cpal_header_0, num_palette_entries)); } -HRESULT opentype_get_cpal_entries(const void *cpal, UINT32 palette, UINT32 first_entry_index, UINT32 entry_count, - DWRITE_COLOR_F *entries) +HRESULT opentype_get_cpal_entries(const struct dwrite_fonttable *cpal, unsigned int palette, + unsigned int first_entry_index, unsigned int entry_count, DWRITE_COLOR_F *entries) { - const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; - const struct CPAL_ColorRecord *records; - UINT32 palettecount, entrycount, i; + unsigned int num_palettes, num_palette_entries, i; + const struct cpal_color_record *records; + const struct cpal_header_0 *header; + + header = table_read_ensure(cpal, 0, sizeof(*header)); + + if (!cpal->exists || !header) + return DWRITE_E_NOCOLOR; - if (!header) return DWRITE_E_NOCOLOR; + num_palettes = GET_BE_WORD(header->num_palettes); + if (palette >= num_palettes) + return DWRITE_E_NOCOLOR; - palettecount = GET_BE_WORD(header->numPalette); - if (palette >= palettecount) + header = table_read_ensure(cpal, 0, FIELD_OFFSET(struct cpal_header_0, color_record_indices[palette])); + if (!header) return DWRITE_E_NOCOLOR; - entrycount = GET_BE_WORD(header->numPaletteEntries); - if (first_entry_index + entry_count > entrycount) + num_palette_entries = GET_BE_WORD(header->num_palette_entries); + if (first_entry_index + entry_count > num_palette_entries) return E_INVALIDARG; - records = (const struct CPAL_ColorRecord*)((BYTE*)cpal + GET_BE_DWORD(header->offsetFirstColorRecord)); - first_entry_index += GET_BE_WORD(header->colorRecordIndices[palette]); + records = table_read_ensure(cpal, GET_BE_DWORD(header->offset_first_color_record), + sizeof(*records) * GET_BE_WORD(header->num_color_records)); + if (!records) + return DWRITE_E_NOCOLOR; + + first_entry_index += GET_BE_WORD(header->color_record_indices[palette]); for (i = 0; i < entry_count; i++) { entries[i].u1.r = records[first_entry_index + i].red / 255.0f;

1 0

Nikolay Sivov : comctl32/rebar: Do not use global variable for debug buffer (Coverity).
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: fc87823654ccb4830d54bf91a880e82577635f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc87823654ccb4830d54bf91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:57:24 2019 +0300 comctl32/rebar: Do not use global variable for debug buffer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 20ce49b..aaa1047 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -281,6 +281,9 @@ static const char * const band_stylename[] = { "RBBS_VARIABLEHEIGHT", /* 0040 */ "RBBS_GRIPPERALWAYS", /* 0080 */ "RBBS_NOGRIPPER", /* 0100 */ + "RBBS_USECHEVRON", /* 0200 */ + "RBBS_HIDETITLE", /* 0400 */ + "RBBS_TOPALIGN", /* 0800 */ NULL }; static const char * const band_maskname[] = { @@ -296,50 +299,52 @@ static const char * const band_maskname[] = { "RBBIM_IDEALSIZE", /* 0x00000200 */ "RBBIM_LPARAM", /* 0x00000400 */ "RBBIM_HEADERSIZE", /* 0x00000800 */ + "RBBIM_CHEVRONLOCATION", /* 0x00001000 */ + "RBBIM_CHEVRONSTATE", /* 0x00002000 */ NULL }; -static CHAR line[200]; - static const WCHAR themeClass[] = { 'R','e','b','a','r',0 }; static CHAR * -REBAR_FmtStyle( UINT style) +REBAR_FmtStyle(char *buffer, UINT style) { INT i = 0; - *line = 0; + *buffer = 0; while (band_stylename[i]) { if (style & (1<<i)) { - if (*line != 0) strcat(line, " | "); - strcat(line, band_stylename[i]); + if (*buffer) strcat(buffer, " | "); + strcat(buffer, band_stylename[i]); } i++; } - return line; + return buffer; } static CHAR * -REBAR_FmtMask( UINT mask) +REBAR_FmtMask(char *buffer, UINT mask) { INT i = 0; - *line = 0; + *buffer = 0; while (band_maskname[i]) { if (mask & (1<<i)) { - if (*line != 0) strcat(line, " | "); - strcat(line, band_maskname[i]); + if (*buffer) strcat(buffer, " | "); + strcat(buffer, band_maskname[i]); } i++; } - return line; + return buffer; } static VOID REBAR_DumpBandInfo(const REBARBANDINFOW *pB) { + char buff[300]; + if( !TRACE_ON(rebar) ) return; TRACE("band info: "); if (pB->fMask & RBBIM_ID) @@ -349,9 +354,9 @@ REBAR_DumpBandInfo(const REBARBANDINFOW *pB) TRACE(", clrF=0x%06x, clrB=0x%06x", pB->clrFore, pB->clrBack); TRACE("\n"); - TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask)); + TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(buff, pB->fMask)); if (pB->fMask & RBBIM_STYLE) - TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(pB->fStyle)); + TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(buff, pB->fStyle)); if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_HEADERSIZE | RBBIM_LPARAM )) { TRACE("band info:"); if (pB->fMask & RBBIM_SIZE) @@ -373,6 +378,7 @@ REBAR_DumpBandInfo(const REBARBANDINFOW *pB) static VOID REBAR_DumpBand (const REBAR_INFO *iP) { + char buff[300]; REBAR_BAND *pB; UINT i; @@ -398,10 +404,9 @@ REBAR_DumpBand (const REBAR_INFO *iP) if (pB->fMask & RBBIM_COLORS) TRACE(" clrF=0x%06x clrB=0x%06x", pB->clrFore, pB->clrBack); TRACE("\n"); - TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask)); + TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(buff, pB->fMask)); if (pB->fMask & RBBIM_STYLE) - TRACE("band # %u: style=0x%08x (%s)\n", - i, pB->fStyle, REBAR_FmtStyle(pB->fStyle)); + TRACE("band # %u: style=0x%08x (%s)\n", i, pB->fStyle, REBAR_FmtStyle(buff, pB->fStyle)); TRACE("band # %u: xHeader=%u", i, pB->cxHeader); if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_LPARAM )) {

1 0