March 2017 - Wine-commits - list.winehq.org

Józef Kucia : d3d11: Validate stream output description.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 958f2d634d3abc6b40589349b1845d5c7895de49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=958f2d634d3abc6b40589349b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 28 12:00:03 2017 +0200 d3d11: Validate stream output description. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++ dlls/d3d11/shader.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 515da0e..6d230ee 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2498,7 +2498,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutp if (FAILED(hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, so_entries, entry_count, buffer_strides, strides_count, rasterizer_stream, &object))) + { + *shader = NULL; return hr; + } *shader = &object->ID3D11GeometryShader_iface; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 3025a1c..4105fd3 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1205,6 +1205,22 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o f->Stream, debugstr_a(f->SemanticName), f->SemanticIndex, f->StartComponent, f->ComponentCount, f->OutputSlot); + if (f->Stream >= D3D11_SO_STREAM_COUNT) + { + WARN("Invalid stream %u.\n", f->Stream); + return E_INVALIDARG; + } + if (f->Stream) + { + FIXME("Streams not implemented yet.\n"); + return E_INVALIDARG; + } + if (f->OutputSlot >= D3D11_SO_BUFFER_SLOT_COUNT) + { + WARN("Invalid output slot %u.\n", f->OutputSlot); + return E_INVALIDARG; + } + e->stream_idx = f->Stream; e->component_idx = f->StartComponent; e->component_count = f->ComponentCount; @@ -1212,11 +1228,22 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o if (!f->SemanticName) { + if (f->SemanticIndex) + { + WARN("Invalid semantic idx %u for stream output gap.\n", f->SemanticIndex); + return E_INVALIDARG; + } + if (e->component_idx || !e->component_count) + { + WARN("Invalid stream output gap %u-%u.\n", e->component_idx, e->component_count); + return E_INVALIDARG; + } + e->register_idx = WINED3D_STREAM_OUTPUT_GAP; } else if ((output = shader_find_signature_element(os, f->SemanticName, f->SemanticIndex))) { - if (e->component_idx > 3 || e->component_count > 4 + if (e->component_idx > 3 || e->component_count > 4 || !e->component_count || e->component_idx + e->component_count > 4) { WARN("Invalid component range %u-%u.\n", e->component_idx, e->component_count); @@ -1248,6 +1275,52 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o } } + for (i = 0; i < entry_count; ++i) + { + const struct wined3d_stream_output_element *e1 = &elements[i]; + if (e1->register_idx == WINED3D_STREAM_OUTPUT_GAP) + continue; + + for (j = i + 1; j < entry_count; ++j) + { + const struct wined3d_stream_output_element *e2 = &elements[j]; + + if (e1->register_idx == e2->register_idx + && e1->component_idx < e2->component_idx + e2->component_count + && e1->component_idx + e1->component_count > e2->component_idx) + { + WARN("Stream output elements %u and %u overlap.\n", i, j); + return E_INVALIDARG; + } + } + } + + for (i = 0; i < D3D11_SO_STREAM_COUNT; ++i) + { + BOOL has_element[D3D11_SO_BUFFER_SLOT_COUNT] = {FALSE}; + BOOL is_used[D3D11_SO_BUFFER_SLOT_COUNT] = {FALSE}; + + for (j = 0; j < entry_count; ++j) + { + const struct wined3d_stream_output_element *e = &elements[j]; + + if (e->stream_idx != i) + continue; + is_used[e->output_slot] = TRUE; + if (e->register_idx != WINED3D_STREAM_OUTPUT_GAP) + has_element[e->output_slot] = TRUE; + } + + for (j = 0; j < D3D11_SO_BUFFER_SLOT_COUNT; ++j) + { + if (is_used[j] && !has_element[j]) + { + WARN("Stream %u, output slot %u contains only gaps.\n", i, j); + return E_INVALIDARG; + } + } + } + return S_OK; } @@ -1268,6 +1341,16 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, so_entry_count, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT); return E_INVALIDARG; } + if (so_entries && !so_entry_count) + { + WARN("Invalid SO entry count %u.\n", so_entry_count); + return E_INVALIDARG; + } + if (rasterizer_stream != D3D11_SO_NO_RASTERIZED_STREAM && rasterizer_stream >= D3D11_SO_STREAM_COUNT) + { + WARN("Invalid rasterizer stream %u.\n", rasterizer_stream); + return E_INVALIDARG; + } if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) {

1 0

Józef Kucia : wined3d: Add ARB_transform_feedback2 extension.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: e9bc775c246e5ce79242009bd26f550a1e46345c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bc775c246e5ce79242009bd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 28 12:00:04 2017 +0200 wined3d: Add ARB_transform_feedback2 extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index da6ff59..8e2798f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -182,6 +182,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_ARB_texture_view", ARB_TEXTURE_VIEW }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, + {"GL_ARB_transform_feedback2", ARB_TRANSFORM_FEEDBACK2 }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND }, @@ -2868,6 +2869,14 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_timer_query */ USE_GL_FUNC(glQueryCounter) USE_GL_FUNC(glGetQueryObjectui64v) + /* GL_ARB_transform_feedback2 */ + USE_GL_FUNC(glBindTransformFeedback); + USE_GL_FUNC(glDeleteTransformFeedbacks); + USE_GL_FUNC(glDrawTransformFeedback); + USE_GL_FUNC(glGenTransformFeedbacks); + USE_GL_FUNC(glIsTransformFeedback); + USE_GL_FUNC(glPauseTransformFeedback); + USE_GL_FUNC(glResumeTransformFeedback); /* GL_ARB_uniform_buffer_object */ USE_GL_FUNC(glBindBufferBase) USE_GL_FUNC(glBindBufferRange) @@ -3814,6 +3823,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, + {ARB_TRANSFORM_FEEDBACK2, MAKEDWORD_VERSION(4, 0)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 99930c4..b7c8727 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -115,6 +115,7 @@ enum wined3d_gl_extension ARB_TEXTURE_SWIZZLE, ARB_TEXTURE_VIEW, ARB_TIMER_QUERY, + ARB_TRANSFORM_FEEDBACK2, ARB_UNIFORM_BUFFER_OBJECT, ARB_VERTEX_ARRAY_BGRA, ARB_VERTEX_BLEND,

1 0

Józef Kucia : wined3d: Add ARB_transform_feedback3 extension.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: d50745b7aeaa770bdc36fc6057a840defb06db02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50745b7aeaa770bdc36fc605… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 28 12:00:05 2017 +0200 wined3d: Add ARB_transform_feedback3 extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8e2798f..419eb4d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -183,6 +183,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_view", ARB_TEXTURE_VIEW }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_transform_feedback2", ARB_TRANSFORM_FEEDBACK2 }, + {"GL_ARB_transform_feedback3", ARB_TRANSFORM_FEEDBACK3 }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND }, @@ -2877,6 +2878,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glIsTransformFeedback); USE_GL_FUNC(glPauseTransformFeedback); USE_GL_FUNC(glResumeTransformFeedback); + /* GL_ARB_transform_feedback3 */ + USE_GL_FUNC(glBeginQueryIndexed); + USE_GL_FUNC(glDrawTransformFeedbackStream); + USE_GL_FUNC(glEndQueryIndexed); + USE_GL_FUNC(glGetQueryIndexediv); /* GL_ARB_uniform_buffer_object */ USE_GL_FUNC(glBindBufferBase) USE_GL_FUNC(glBindBufferRange) @@ -3696,6 +3702,11 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] = FALSE; } } + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_STREAMS, &gl_max); + TRACE("Max vertex streams: %d.\n", gl_max); + } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) gl_info->gl_ops.gl.p_glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->limits.shininess); @@ -3824,6 +3835,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, {ARB_TRANSFORM_FEEDBACK2, MAKEDWORD_VERSION(4, 0)}, + {ARB_TRANSFORM_FEEDBACK3, MAKEDWORD_VERSION(4, 0)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b7c8727..6290032 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -116,6 +116,7 @@ enum wined3d_gl_extension ARB_TEXTURE_VIEW, ARB_TIMER_QUERY, ARB_TRANSFORM_FEEDBACK2, + ARB_TRANSFORM_FEEDBACK3, ARB_UNIFORM_BUFFER_OBJECT, ARB_VERTEX_ARRAY_BGRA, ARB_VERTEX_BLEND,

1 0

Józef Kucia : wined3d: Specify geometry shader outputs to record in stream output buffers.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 16ab2033426c5fd4193d5e520761a0b9757a463a URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ab2033426c5fd4193d5e520… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 28 12:00:06 2017 +0200 wined3d: Specify geometry shader outputs to record in stream output buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 132 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 30 ++++++++-- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 157 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 004d490..128464c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -727,6 +727,133 @@ static void shader_glsl_load_program_resources(const struct wined3d_context *con shader_glsl_load_samplers(context, priv, program_id, reg_maps); } +static void append_transform_feedback_varying(const char **varyings, unsigned int *varying_count, + char **strings, unsigned int *strings_length, struct wined3d_string_buffer *buffer) +{ + if (varyings && *strings) + { + char *ptr = *strings; + + varyings[*varying_count] = ptr; + + memcpy(ptr, buffer->buffer, buffer->content_size + 1); + ptr += buffer->content_size + 1; + + *strings = ptr; + } + + *strings_length += buffer->content_size + 1; + ++(*varying_count); +} + +static void shader_glsl_generate_transform_feedback_varyings(const struct wined3d_stream_output_desc *so_desc, + struct wined3d_string_buffer *buffer, const char **varyings, unsigned int *varying_count, + char *strings, unsigned int *strings_length) +{ + unsigned int i, j, buffer_idx, count, length, highest_output_slot; + + count = length = 0; + highest_output_slot = 0; + for (buffer_idx = 0; buffer_idx < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++buffer_idx) + { + for (i = 0; i < so_desc->element_count; ++i) + { + const struct wined3d_stream_output_element *e = &so_desc->elements[i]; + + highest_output_slot = max(highest_output_slot, e->output_slot); + if (e->output_slot != buffer_idx) + continue; + + if (e->stream_idx) + { + FIXME("Unhandled stream %u.\n", e->stream_idx); + continue; + } + + if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + { + for (j = 0; j < e->component_count / 4; ++j) + { + string_buffer_sprintf(buffer, "gl_SkipComponents4"); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } + if (e->component_count % 4) + { + string_buffer_sprintf(buffer, "gl_SkipComponents%u", e->component_count % 4); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } + continue; + } + + if (e->component_idx || e->component_count != 4) + { + FIXME("Unsupported component range %u-%u.\n", e->component_idx, e->component_count); + continue; + } + + string_buffer_sprintf(buffer, "ps_link[%u]", e->register_idx); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } + + if (highest_output_slot <= buffer_idx) + break; + + string_buffer_sprintf(buffer, "gl_NextBuffer"); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } + + if (varying_count) + *varying_count = count; + if (strings_length) + *strings_length = length; +} + +static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, + struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader *shader) +{ + const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_string_buffer *buffer; + unsigned int count, length; + const char **varyings; + char *strings; + + if (!gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) + { + FIXME("ARB_transform_feedback3 not supported by OpenGL implementation.\n"); + return; + } + + if (so_desc->buffer_stride_count) + FIXME("Ignoring buffer strides.\n"); + + buffer = string_buffer_get(&priv->string_buffers); + + shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length); + + if (!(varyings = wined3d_calloc(count, sizeof(*varyings)))) + { + ERR("Out of memory.\n"); + string_buffer_release(&priv->string_buffers, buffer); + return; + } + if (!(strings = wined3d_calloc(length, sizeof(*strings)))) + { + ERR("Out of memory.\n"); + HeapFree(GetProcessHeap(), 0, varyings); + string_buffer_release(&priv->string_buffers, buffer); + return; + } + + shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, varyings, NULL, strings, NULL); + GL_EXTCALL(glTransformFeedbackVaryings(program_id, count, varyings, GL_INTERLEAVED_ATTRIBS)); + checkGLcall("glTransformFeedbackVaryings"); + + HeapFree(GetProcessHeap(), 0, varyings); + HeapFree(GetProcessHeap(), 0, strings); + string_buffer_release(&priv->string_buffers, buffer); +} + /* Context activation is done by the caller. */ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) @@ -8994,6 +9121,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const checkGLcall("glProgramParameteriARB"); } + shader_glsl_init_transform_feedback(context, priv, program_id, gshader); + list_add_head(&gshader->linked_programs, &entry->gs.shader_entry); } @@ -9588,7 +9717,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] - && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) + && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] + && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7ba6993..ab8d85c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2813,6 +2813,9 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe static void shader_cleanup(struct wined3d_shader *shader) { + if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) + HeapFree(GetProcessHeap(), 0, shader->u.gs.so_desc.elements); + HeapFree(GetProcessHeap(), 0, shader->output_signature.elements); HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); HeapFree(GetProcessHeap(), 0, shader->signature_strings); @@ -3399,9 +3402,27 @@ static HRESULT hull_shader_init(struct wined3d_shader *shader, struct wined3d_de } static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) + const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, + void *parent, const struct wined3d_parent_ops *parent_ops) { - return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops); + HRESULT hr; + + if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) + return hr; + + if (so_desc) + { + struct wined3d_stream_output_desc *d = &shader->u.gs.so_desc; + *d = *so_desc; + if (!(d->elements = wined3d_calloc(so_desc->element_count, sizeof(*d->elements)))) + { + shader_cleanup(shader); + return E_OUTOFMEMORY; + } + memcpy(d->elements, so_desc->elements, so_desc->element_count * sizeof(*d->elements)); + } + + return WINED3D_OK; } void find_gs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, @@ -3797,13 +3818,10 @@ HRESULT CDECL wined3d_shader_create_gs(struct wined3d_device *device, const stru TRACE("device %p, desc %p, so_desc %p, parent %p, parent_ops %p, shader %p.\n", device, desc, so_desc, parent, parent_ops, shader); - if (so_desc) - FIXME("Stream output not supported.\n"); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = geometry_shader_init(object, device, desc, parent, parent_ops))) + if (FAILED(hr = geometry_shader_init(object, device, desc, so_desc, parent, parent_ops))) { WARN("Failed to initialize geometry shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3f4696e..1d59982 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3610,6 +3610,8 @@ struct wined3d_geometry_shader enum wined3d_primitive_type input_type; enum wined3d_primitive_type output_type; UINT vertices_out; + + struct wined3d_stream_output_desc so_desc; }; struct wined3d_pixel_shader

1 0

Józef Kucia : d3d11: Validate stream output buffer strides.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: ea60b8746c26f50ca92272db3b57dc1f0d0f066f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea60b8746c26f50ca92272db3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 28 12:00:07 2017 +0200 d3d11: Validate stream output buffer strides. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 4105fd3..84d6b9f 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1190,6 +1190,7 @@ static const struct wined3d_parent_ops d3d_geometry_shader_wined3d_parent_ops = static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_output_element *elements, const D3D11_SO_DECLARATION_ENTRY *entries, unsigned int entry_count, + const unsigned int *buffer_strides, unsigned int buffer_stride_count, const struct wined3d_shader_signature *os) { unsigned int i, j, mask; @@ -1297,6 +1298,7 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o for (i = 0; i < D3D11_SO_STREAM_COUNT; ++i) { + unsigned int current_stride[D3D11_SO_BUFFER_SLOT_COUNT] = {0}; BOOL has_element[D3D11_SO_BUFFER_SLOT_COUNT] = {FALSE}; BOOL is_used[D3D11_SO_BUFFER_SLOT_COUNT] = {FALSE}; @@ -1306,6 +1308,7 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o if (e->stream_idx != i) continue; + current_stride[e->output_slot] += 4 * e->component_count; is_used[e->output_slot] = TRUE; if (e->register_idx != WINED3D_STREAM_OUTPUT_GAP) has_element[e->output_slot] = TRUE; @@ -1318,6 +1321,19 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o WARN("Stream %u, output slot %u contains only gaps.\n", i, j); return E_INVALIDARG; } + if (buffer_stride_count && is_used[j]) + { + if (buffer_stride_count <= j) + { + WARN("Buffer strides are required for all buffer slots.\n"); + return E_INVALIDARG; + } + if (buffer_strides[j] < current_stride[j] || buffer_strides[j] % 4) + { + WARN("Invalid stride %u for buffer slot %u.\n", buffer_strides[j], j); + return E_INVALIDARG; + } + } } } @@ -1376,7 +1392,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, return E_OUTOFMEMORY; } if (FAILED(hr = wined3d_so_elements_from_d3d11_so_entries(so_desc.elements, - so_entries, so_entry_count, &desc.output_signature))) + so_entries, so_entry_count, buffer_strides, buffer_stride_count, &desc.output_signature))) { HeapFree(GetProcessHeap(), 0, so_desc.elements); shader_free_signature(&desc.input_signature);

1 0

Józef Kucia : wined3d: Consider buffer strides when generating transform feedback varyings.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 71eb01cfff48e12f6646e44e122c492cba0c64dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=71eb01cfff48e12f6646e44e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 28 12:00:08 2017 +0200 wined3d: Consider buffer strides when generating transform feedback varyings. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 47 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 128464c..0eccaaa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -746,16 +746,36 @@ static void append_transform_feedback_varying(const char **varyings, unsigned in ++(*varying_count); } +static void append_transform_feedback_skip_components(const char **varyings, + unsigned int *varying_count, char **strings, unsigned int *strings_length, + struct wined3d_string_buffer *buffer, unsigned int component_count) +{ + unsigned int j; + + for (j = 0; j < component_count / 4; ++j) + { + string_buffer_sprintf(buffer, "gl_SkipComponents4"); + append_transform_feedback_varying(varyings, varying_count, strings, strings_length, buffer); + } + if (component_count % 4) + { + string_buffer_sprintf(buffer, "gl_SkipComponents%u", component_count % 4); + append_transform_feedback_varying(varyings, varying_count, strings, strings_length, buffer); + } +} + static void shader_glsl_generate_transform_feedback_varyings(const struct wined3d_stream_output_desc *so_desc, struct wined3d_string_buffer *buffer, const char **varyings, unsigned int *varying_count, char *strings, unsigned int *strings_length) { - unsigned int i, j, buffer_idx, count, length, highest_output_slot; + unsigned int i, buffer_idx, count, length, highest_output_slot, stride; count = length = 0; highest_output_slot = 0; for (buffer_idx = 0; buffer_idx < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++buffer_idx) { + stride = 0; + for (i = 0; i < so_desc->element_count; ++i) { const struct wined3d_stream_output_element *e = &so_desc->elements[i]; @@ -770,18 +790,12 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 continue; } + stride += e->component_count; + if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) { - for (j = 0; j < e->component_count / 4; ++j) - { - string_buffer_sprintf(buffer, "gl_SkipComponents4"); - append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); - } - if (e->component_count % 4) - { - string_buffer_sprintf(buffer, "gl_SkipComponents%u", e->component_count % 4); - append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); - } + append_transform_feedback_skip_components(varyings, &count, + &strings, &length, buffer, e->component_count); continue; } @@ -795,6 +809,14 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } + if (buffer_idx < so_desc->buffer_stride_count + && stride < so_desc->buffer_strides[buffer_idx] / 4) + { + unsigned int component_count = so_desc->buffer_strides[buffer_idx] / 4 - stride; + append_transform_feedback_skip_components(varyings, &count, + &strings, &length, buffer, component_count); + } + if (highest_output_slot <= buffer_idx) break; @@ -824,9 +846,6 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co return; } - if (so_desc->buffer_stride_count) - FIXME("Ignoring buffer strides.\n"); - buffer = string_buffer_get(&priv->string_buffers); shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length);

1 0

Huw Davies : user32: Rationalize the popup menu margin calculation.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: a8344b961661b0894cd9300f5ef2719a1dfaf81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8344b961661b0894cd9300f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 28 12:52:18 2017 +0100 user32: Rationalize the popup menu margin calculation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 60 ++++++++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 93b39b4..7836c76 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -133,9 +133,8 @@ typedef struct /* Space between 2 columns */ #define MENU_COL_SPACE 4 - /* top and bottom margins for popup menus */ -#define MENU_TOP_MARGIN 3 -#define MENU_BOTTOM_MARGIN 2 + /* Margins for popup menus */ +#define MENU_MARGIN 3 /* maximum allowed depth of any branch in the menu tree. * This value is slightly larger than in windows (25) to @@ -1175,7 +1174,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) SelectObject( hdc, get_menu_font(FALSE)); start = 0; - maxX = 2 + 1; + maxX = MENU_MARGIN; lppop->textOffset = 0; @@ -1185,7 +1184,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) orgX = maxX; if( lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK)) orgX += MENU_COL_SPACE; - orgY = MENU_TOP_MARGIN; + orgY = MENU_MARGIN; maxTab = maxTabWidth = 0; /* Parse items until column break or end of menu */ @@ -1226,12 +1225,12 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) if( !textandbmp) lppop->textOffset = 0; /* space for 3d border */ - lppop->Height += MENU_BOTTOM_MARGIN; - lppop->Width += 2; + lppop->Height += MENU_MARGIN; + lppop->Width += MENU_MARGIN; /* Adjust popup height if it exceeds maximum */ maxHeight = MENU_GetMaxPopupHeight(lppop); - lppop->nTotalHeight = lppop->Height - MENU_TOP_MARGIN; + lppop->nTotalHeight = lppop->Height - MENU_MARGIN; if (lppop->Height >= maxHeight) { lppop->Height = maxHeight; @@ -1856,7 +1855,6 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, INT x, INT y, INT xanchor, INT yanchor ) { POPUPMENU *menu; - INT width, height; POINT pt; HMONITOR monitor; MONITORINFO info; @@ -1876,9 +1874,6 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, /* adjust popup menu pos so that it fits within the desktop */ - width = menu->Width + GetSystemMetrics(SM_CXBORDER); - height = menu->Height + GetSystemMetrics(SM_CYBORDER); - /* FIXME: should use item rect */ pt.x = x; pt.y = y; @@ -1889,29 +1884,29 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, if (flags & TPM_LAYOUTRTL) flags ^= TPM_RIGHTALIGN; - if( flags & TPM_RIGHTALIGN ) x -= width; - if( flags & TPM_CENTERALIGN ) x -= width / 2; + if( flags & TPM_RIGHTALIGN ) x -= menu->Width; + if( flags & TPM_CENTERALIGN ) x -= menu->Width / 2; - if( flags & TPM_BOTTOMALIGN ) y -= height; - if( flags & TPM_VCENTERALIGN ) y -= height / 2; + if( flags & TPM_BOTTOMALIGN ) y -= menu->Height; + if( flags & TPM_VCENTERALIGN ) y -= menu->Height / 2; - if( x + width > info.rcWork.right) + if( x + menu->Width > info.rcWork.right) { - if( xanchor && x >= width - xanchor ) - x -= width - xanchor; + if( xanchor && x >= menu->Width - xanchor ) + x -= menu->Width - xanchor; - if( x + width > info.rcWork.right) - x = info.rcWork.right - width; + if( x + menu->Width > info.rcWork.right) + x = info.rcWork.right - menu->Width; } if( x < info.rcWork.left ) x = info.rcWork.left; - if( y + height > info.rcWork.bottom) + if( y + menu->Height > info.rcWork.bottom) { - if( yanchor && y >= height + yanchor ) - y -= height + yanchor; + if( yanchor && y >= menu->Height + yanchor ) + y -= menu->Height + yanchor; - if( y + height > info.rcWork.bottom) - y = info.rcWork.bottom - height; + if( y + menu->Height > info.rcWork.bottom) + y = info.rcWork.bottom - menu->Height; } if( y < info.rcWork.top ) y = info.rcWork.top; @@ -1921,7 +1916,7 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, } /* Display the window */ - SetWindowPos( menu->hWnd, HWND_TOPMOST, x, y, width, height, + SetWindowPos( menu->hWnd, HWND_TOPMOST, x, y, menu->Width, menu->Height, SWP_SHOWWINDOW | SWP_NOACTIVATE ); UpdateWindow( menu->hWnd ); return TRUE; @@ -1949,7 +1944,7 @@ MENU_EnsureMenuItemVisible(LPPOPUPMENU lppop, UINT wIndex, HDC hdc) arrow_bitmap_height = bmp.bmHeight; rc.top += arrow_bitmap_height; - rc.bottom -= arrow_bitmap_height + MENU_BOTTOM_MARGIN; + rc.bottom -= arrow_bitmap_height + MENU_MARGIN; nMaxHeight -= GetSystemMetrics(SM_CYBORDER) + 2 * arrow_bitmap_height; if (item->rect.bottom > lppop->nScrollPos + nMaxHeight) @@ -1959,9 +1954,9 @@ MENU_EnsureMenuItemVisible(LPPOPUPMENU lppop, UINT wIndex, HDC hdc) ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, &rc, &rc); MENU_DrawScrollArrows(lppop, hdc); } - else if (item->rect.top - MENU_TOP_MARGIN < lppop->nScrollPos) + else if (item->rect.top - MENU_MARGIN < lppop->nScrollPos) { - lppop->nScrollPos = item->rect.top - MENU_TOP_MARGIN; + lppop->nScrollPos = item->rect.top - MENU_MARGIN; ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, &rc, &rc); MENU_DrawScrollArrows(lppop, hdc); } @@ -2379,10 +2374,9 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, rect.left += GetSystemMetrics(SM_CXBORDER); else rect.left += rc.right - GetSystemMetrics(SM_CXBORDER); - rect.top += rc.top - MENU_TOP_MARGIN; + rect.top += rc.top - MENU_MARGIN; rect.right = rc.left - rc.right + GetSystemMetrics(SM_CXBORDER); - rect.bottom = rc.top - rc.bottom - MENU_TOP_MARGIN - - MENU_BOTTOM_MARGIN - GetSystemMetrics(SM_CYBORDER); + rect.bottom = rc.top - rc.bottom - 2 * MENU_MARGIN; } else {

1 0

Huw Davies : user32: Add a helper to retrieve the height of the scroll arrows.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: c72a7219fd1ba530cc522c9c8bf2dbe45e735143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72a7219fd1ba530cc522c9c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 28 12:52:19 2017 +0100 user32: Add a helper to retrieve the height of the scroll arrows. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 7836c76..6584a41 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -404,6 +404,14 @@ static HBITMAP get_up_arrow_inactive_bitmap(void) return arrow_bitmap; } +static inline UINT get_scroll_arrow_height(const POPUPMENU *menu) +{ + BITMAP bmp; + + GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp); + return bmp.bmHeight; +} + /*********************************************************************** * MENU_CopySysPopup * @@ -699,13 +707,10 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect) { if (menu->bScrolling) { - UINT arrow_bitmap_height; - BITMAP bmp; + UINT arrow_height; - GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp); - arrow_bitmap_height = bmp.bmHeight; - rect->top += arrow_bitmap_height - menu->nScrollPos; - rect->bottom += arrow_bitmap_height - menu->nScrollPos; + arrow_height = get_scroll_arrow_height( menu ); + OffsetRect( rect, 0, arrow_height - menu->nScrollPos ); } }

1 0

Huw Davies : user32: Simplify GetMenuItemRect().
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: d4d0247f4e3f4ddbcc7857d8c279e45b1107070b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d0247f4e3f4ddbcc7857d8c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 28 12:52:20 2017 +0100 user32: Simplify GetMenuItemRect(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6584a41..3c1bb3e 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5105,35 +5105,26 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, * always on the upper left side of the application. * */ -BOOL WINAPI GetMenuItemRect (HWND hwnd, HMENU hMenu, UINT uItem, - LPRECT rect) +BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { - POPUPMENU *itemMenu; + POPUPMENU *menu; MENUITEM *item; - HWND referenceHwnd; TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); item = MENU_FindItem (&hMenu, &uItem, MF_BYPOSITION); - referenceHwnd = hwnd; - - if(!hwnd) - { - itemMenu = MENU_GetMenu(hMenu); - if (itemMenu == NULL) - return FALSE; + if ((rect == NULL) || (item == NULL)) + return FALSE; - if(itemMenu->hWnd == 0) - return FALSE; - referenceHwnd = itemMenu->hWnd; - } + menu = MENU_GetMenu(hMenu); + if (!menu) return FALSE; - if ((rect == NULL) || (item == NULL)) - return FALSE; + if (!hwnd) hwnd = menu->hWnd; + if (!hwnd) return FALSE; *rect = item->rect; - MapWindowPoints(referenceHwnd, 0, (LPPOINT)rect, 2); + MapWindowPoints(hwnd, 0, (POINT *)rect, 2); return TRUE; }

1 0

Huw Davies : user32: Add an items rect to the header and use it to fix scrolling down.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: bdcaae4b7817cb0c96451cb6d77173e94c34a84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcaae4b7817cb0c96451cb6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 28 12:52:21 2017 +0100 user32: Add an items rect to the header and use it to fix scrolling down. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 52 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3c1bb3e..dafa996 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -97,6 +97,7 @@ typedef struct { BOOL bScrolling; /* Scroll arrows are active */ UINT nScrollPos; /* Current scroll position */ UINT nTotalHeight; /* Total height of menu items inside menu */ + RECT items_rect; /* Rectangle within which the items lie. Excludes margins and scroll arrows */ /* ------------ MENUINFO members ------ */ DWORD dwStyle; /* Extended menu style */ UINT cyMax; /* max height of the whole menu, 0 is screen height */ @@ -1170,26 +1171,27 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) HDC hdc; UINT start, i; BOOL textandbmp = FALSE; - int orgX, orgY, maxX, maxTab, maxTabWidth, maxHeight; + int orgX, orgY, maxTab, maxTabWidth, maxHeight; lppop->Width = lppop->Height = 0; + SetRect(&lppop->items_rect, MENU_MARGIN, MENU_MARGIN, MENU_MARGIN, MENU_MARGIN); + if (lppop->nItems == 0) return; hdc = GetDC( 0 ); SelectObject( hdc, get_menu_font(FALSE)); start = 0; - maxX = MENU_MARGIN; lppop->textOffset = 0; while (start < lppop->nItems) { lpitem = &lppop->items[start]; - orgX = maxX; + orgX = lppop->items_rect.right; if( lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK)) orgX += MENU_COL_SPACE; - orgY = MENU_MARGIN; + orgY = lppop->items_rect.top; maxTab = maxTabWidth = 0; /* Parse items until column break or end of menu */ @@ -1199,7 +1201,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break; MENU_CalcItemSize( hdc, lpitem, lppop->hwndOwner, orgX, orgY, FALSE, lppop ); - maxX = max( maxX, lpitem->rect.right ); + lppop->items_rect.right = max( lppop->items_rect.right, lpitem->rect.right ); orgY = lpitem->rect.bottom; if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab) { @@ -1210,18 +1212,17 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) } /* Finish the column (set all items to the largest width found) */ - maxX = max( maxX, maxTab + maxTabWidth ); + lppop->items_rect.right = max( lppop->items_rect.right, maxTab + maxTabWidth ); for (lpitem = &lppop->items[start]; start < i; start++, lpitem++) { - lpitem->rect.right = maxX; + lpitem->rect.right = lppop->items_rect.right; if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab) lpitem->xTab = maxTab; } - lppop->Height = max( lppop->Height, orgY ); + lppop->items_rect.bottom = max( lppop->items_rect.bottom, orgY ); } - lppop->Width = maxX; /* if none of the items have both text and bitmap then * the text and bitmaps are all aligned on the left. If there is at * least one item with both text and bitmap then bitmaps are @@ -1230,8 +1231,8 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) if( !textandbmp) lppop->textOffset = 0; /* space for 3d border */ - lppop->Height += MENU_MARGIN; - lppop->Width += MENU_MARGIN; + lppop->Height = lppop->items_rect.bottom + MENU_MARGIN; + lppop->Width = lppop->items_rect.right + MENU_MARGIN; /* Adjust popup height if it exceeds maximum */ maxHeight = MENU_GetMaxPopupHeight(lppop); @@ -1239,6 +1240,8 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) if (lppop->Height >= maxHeight) { lppop->Height = maxHeight; + lppop->items_rect.top += get_scroll_arrow_height(lppop); + lppop->items_rect.bottom = lppop->Height - MENU_MARGIN - get_scroll_arrow_height(lppop); lppop->bScrolling = TRUE; } else @@ -1307,6 +1310,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, lprect->bottom = maxY; lppop->Height = lprect->bottom - lprect->top; + lppop->items_rect = *lprect; /* Flush right all items between the MF_RIGHTJUSTIFY and */ /* the last item (if several lines, only move the last line) */ @@ -1937,32 +1941,22 @@ MENU_EnsureMenuItemVisible(LPPOPUPMENU lppop, UINT wIndex, HDC hdc) if (lppop->bScrolling) { MENUITEM *item = &lppop->items[wIndex]; - UINT nMaxHeight = MENU_GetMaxPopupHeight(lppop); UINT nOldPos = lppop->nScrollPos; - RECT rc; - UINT arrow_bitmap_height; - BITMAP bmp; - - GetClientRect(lppop->hWnd, &rc); - - GetObjectW(get_down_arrow_bitmap(), sizeof(bmp), &bmp); - arrow_bitmap_height = bmp.bmHeight; + const RECT *rc = &lppop->items_rect; + UINT scroll_height = rc->bottom - rc->top; - rc.top += arrow_bitmap_height; - rc.bottom -= arrow_bitmap_height + MENU_MARGIN; - - nMaxHeight -= GetSystemMetrics(SM_CYBORDER) + 2 * arrow_bitmap_height; - if (item->rect.bottom > lppop->nScrollPos + nMaxHeight) + /* NB the item rects include the MENU_MARGIN offset (so the first rect has + top == MENU_TOP_MARGIN) */ + if (item->rect.bottom - MENU_MARGIN > lppop->nScrollPos + scroll_height) { - - lppop->nScrollPos = item->rect.bottom - nMaxHeight; - ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, &rc, &rc); + lppop->nScrollPos = item->rect.bottom - MENU_MARGIN - scroll_height; + ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, rc, rc); MENU_DrawScrollArrows(lppop, hdc); } else if (item->rect.top - MENU_MARGIN < lppop->nScrollPos) { lppop->nScrollPos = item->rect.top - MENU_MARGIN; - ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, &rc, &rc); + ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, rc, rc); MENU_DrawScrollArrows(lppop, hdc); } }

1 0