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

Józef Kucia : wined3d: Add support for rasterizer discard.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 591b17838e63d693d0fb57e085f6af8f9edec14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=591b17838e63d693d0fb57e08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:22 2017 +0200 wined3d: Add support for rasterizer discard. 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/tests/d3d11.c | 6 +++--- dlls/wined3d/drawprim.c | 15 ++++++++++++++- include/wine/wined3d.h | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c44afb4..1e7b5df 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16833,7 +16833,7 @@ static void test_stream_output_resume(void) check_texture_color(test_context.backbuffer, 0xffffffff, 0); draw_color_quad(&test_context, &red); - todo_wine check_texture_color(test_context.backbuffer, 0xffffffff, 0); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); draw_color_quad(&test_context, &green); @@ -16842,7 +16842,7 @@ static void test_stream_output_resume(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constants[1], 0, 0); ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); draw_color_quad(&test_context, &red); - todo_wine check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); draw_color_quad(&test_context, &red); @@ -16851,7 +16851,7 @@ static void test_stream_output_resume(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constants[2], 0, 0); ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); draw_color_quad(&test_context, &white); - todo_wine check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); draw_color_quad(&test_context, &green); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e055361..b5537a8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -419,6 +419,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { + BOOL emulation = FALSE, rasterizer_discard = FALSE; const struct wined3d_fb_state *fb = state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_event_query *ib_query = NULL; @@ -428,7 +429,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_context *context; unsigned int i, idx_size = 0; const void *idx_data = NULL; - BOOL emulation = FALSE; if (!index_count) return; @@ -569,6 +569,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; GLenum primitive_mode = gl_primitive_type_from_d3d(shader->u.gs.output_type); + if (shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + { + glEnable(GL_RASTERIZER_DISCARD); + checkGLcall("enable rasterizer discard"); + rasterizer_discard = TRUE; + } + GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); checkGLcall("glBeginTransformFeedback"); context->transform_feedback_active = 1; @@ -587,6 +594,12 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } + if (rasterizer_discard) + { + glDisable(GL_RASTERIZER_DISCARD); + checkGLcall("disable rasterizer discard"); + } + if (ib_query) wined3d_event_query_issue(ib_query, device); for (i = 0; i < context->num_buffer_queries; ++i) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4e2c800..f575547 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1518,6 +1518,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_MAX_STREAM_OUTPUT_BUFFERS 4 #define WINED3D_STREAM_OUTPUT_GAP 0xffffffff +#define WINED3D_NO_RASTERIZER_STREAM 0xffffffff #define WINED3D_VIEW_BUFFER_RAW 0x00000001 #define WINED3D_VIEW_BUFFER_APPEND 0x00000002

1 0

Józef Kucia : wined3d: Pause transform feedback between draw calls.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 3ca84a348edc32d04778f3412e9c09cae32b3710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca84a348edc32d04778f3412… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:23 2017 +0200 wined3d: Pause transform feedback between draw calls. In order to avoid recording vertices generated by other operations, e.g. blits. 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/buffer.c | 4 +--- dlls/wined3d/context.c | 12 ++++++++++++ dlls/wined3d/drawprim.c | 37 ++++++++++++++++++++++++++++--------- dlls/wined3d/state.c | 7 +------ dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ba8b004..52cdc67 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -181,9 +181,7 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w * when deleting a potentially bound transform feedback buffer. * This may happen when the device is being destroyed. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer); - GL_EXTCALL(glEndTransformFeedback()); - checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; + context_end_transform_feedback(context); } } } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3c297df..8427eb7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3687,6 +3687,18 @@ void context_apply_compute_state(struct wined3d_context *context, context->last_was_blit = FALSE; } +void context_end_transform_feedback(struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + if (context->transform_feedback_active) + { + GL_EXTCALL(glEndTransformFeedback()); + checkGLcall("glEndTransformFeedback"); + context->transform_feedback_active = 0; + context->transform_feedback_paused = 0; + } +} + static void context_setup_target(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b5537a8..3611bf5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -448,11 +448,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s gl_info = context->gl_info; if (context->transform_feedback_active && !use_transform_feedback(state)) - { - GL_EXTCALL(glEndTransformFeedback()); - checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; - } + context_end_transform_feedback(context); for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -564,7 +560,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } } - if (use_transform_feedback(state) && !context->transform_feedback_active) + if (use_transform_feedback(state)) { const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; GLenum primitive_mode = gl_primitive_type_from_d3d(shader->u.gs.output_type); @@ -576,9 +572,18 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s rasterizer_discard = TRUE; } - GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); - checkGLcall("glBeginTransformFeedback"); - context->transform_feedback_active = 1; + if (context->transform_feedback_paused) + { + GL_EXTCALL(glResumeTransformFeedback()); + checkGLcall("glResumeTransformFeedback"); + context->transform_feedback_paused = 0; + } + else if (!context->transform_feedback_active) + { + GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); + checkGLcall("glBeginTransformFeedback"); + context->transform_feedback_active = 1; + } } if (context->use_immediate_mode_draw || emulation) @@ -594,6 +599,20 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } + if (context->transform_feedback_active) + { + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) + { + GL_EXTCALL(glPauseTransformFeedback()); + checkGLcall("glPauseTransformFeedback"); + context->transform_feedback_paused = 1; + } + else + { + WARN("Cannot pause transform feedback operations.\n"); + } + } + if (rasterizer_discard) { glDisable(GL_RASTERIZER_DISCARD); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index dedde1e..e138936 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4982,12 +4982,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (context->transform_feedback_active) - { - GL_EXTCALL(glEndTransformFeedback()); - checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; - } + context_end_transform_feedback(context); for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2f90efd..30625a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1690,7 +1690,8 @@ struct wined3d_context DWORD uses_uavs : 1; DWORD destroy_delayed : 1; DWORD transform_feedback_active : 1; - DWORD padding : 8; + DWORD transform_feedback_paused : 1; + DWORD padding : 7; DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask; @@ -1920,6 +1921,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, stru const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Resume transform feedback after geometry shader switch.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: ac793e5503d1d9159bb4ca9fc4f255d23bda1c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac793e5503d1d9159bb4ca9fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:24 2017 +0200 wined3d: Resume transform feedback after geometry shader switch. 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/tests/d3d11.c | 1 - dlls/wined3d/drawprim.c | 39 ++++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e7b5df..dbf8324 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16870,7 +16870,6 @@ static void test_stream_output_resume(void) for (j = 0; j < 6; ++j) /* 2 triangles */ { data = get_readback_vec4(&rb, idx++, 0); - todo_wine ok(compare_vec4(data, &constants[i], 0), "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u (%u, %u).\n", data->x, data->y, data->z, data->w, idx, i, j); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3611bf5..1335707 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -414,6 +414,27 @@ static BOOL use_transform_feedback(const struct wined3d_state *state) return shader->u.gs.so_desc.element_count; } +static void context_pause_transform_feedback(struct wined3d_context *context, BOOL force) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!context->transform_feedback_active || context->transform_feedback_paused) + return; + + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) + { + GL_EXTCALL(glPauseTransformFeedback()); + checkGLcall("glPauseTransformFeedback"); + context->transform_feedback_paused = 1; + return; + } + + WARN("Cannot pause transform feedback operations.\n"); + + if (force) + context_end_transform_feedback(context); +} + /* Routine common to the draw primitive and draw indexed primitive routines */ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, @@ -447,8 +468,8 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } gl_info = context->gl_info; - if (context->transform_feedback_active && !use_transform_feedback(state)) - context_end_transform_feedback(context); + if (!use_transform_feedback(state)) + context_pause_transform_feedback(context, TRUE); for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -599,19 +620,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } - if (context->transform_feedback_active) - { - if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) - { - GL_EXTCALL(glPauseTransformFeedback()); - checkGLcall("glPauseTransformFeedback"); - context->transform_feedback_paused = 1; - } - else - { - WARN("Cannot pause transform feedback operations.\n"); - } - } + context_pause_transform_feedback(context, FALSE); if (rasterizer_discard) {

1 0

Nikolay Sivov : dwrite: Simplify requested texture type validation in IDWriteGlyphRunAnalysis.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: a46b81a4785b8b394e6b62676147a25ff4d3b079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46b81a4785b8b394e6b62676… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 15:06:59 2017 +0300 dwrite: Simplify requested texture type validation in IDWriteGlyphRunAnalysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b3e2286..e50eda8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -167,6 +167,7 @@ struct dwrite_glyphrunanalysis { LONG ref; DWRITE_RENDERING_MODE1 rendering_mode; + DWRITE_TEXTURE_TYPE texture_type; /* derived from rendering mode specified on creation */ DWRITE_GLYPH_RUN run; /* glyphAdvances and glyphOffsets are not used */ DWRITE_MATRIX m; FLOAT ppdip; @@ -4874,8 +4875,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return E_INVALIDARG; } - if ((type == DWRITE_TEXTURE_ALIASED_1x1 && This->rendering_mode != DWRITE_RENDERING_MODE1_ALIASED) || - (type == DWRITE_TEXTURE_CLEARTYPE_3x1 && This->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED)) { + if (type != This->texture_type) { memset(bounds, 0, sizeof(*bounds)); return S_OK; } @@ -5059,24 +5059,9 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi if (size < required) return E_NOT_SUFFICIENT_BUFFER; - /* validate requested texture type with rendering mode */ - switch (This->rendering_mode) - { - case DWRITE_RENDERING_MODE1_ALIASED: - if (type != DWRITE_TEXTURE_ALIASED_1x1) - return DWRITE_E_UNSUPPORTEDOPERATION; - break; - case DWRITE_RENDERING_MODE1_GDI_CLASSIC: - case DWRITE_RENDERING_MODE1_GDI_NATURAL: - case DWRITE_RENDERING_MODE1_NATURAL: - case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: - case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: - if (type != DWRITE_TEXTURE_CLEARTYPE_3x1) - return DWRITE_E_UNSUPPORTEDOPERATION; - break; - default: - ; - } + /* validate requested texture type */ + if (This->texture_type != type) + return DWRITE_E_UNSUPPORTEDOPERATION; memset(bitmap, 0, size); glyphrunanalysis_get_texturebounds(This, &runbounds); @@ -5197,6 +5182,12 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl; analysis->ref = 1; analysis->rendering_mode = desc->rendering_mode; + + if (desc->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED) + analysis->texture_type = DWRITE_TEXTURE_ALIASED_1x1; + else + analysis->texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1; + analysis->flags = 0; analysis->bitmap = NULL; analysis->ppdip = desc->ppdip;

1 0

Nikolay Sivov : dwrite: Allocate glyph buffer once per run rendering pass.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 89d074a3fc063722fe45a3148ee3b55cb473d11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d074a3fc063722fe45a3148… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 15:07:00 2017 +0300 dwrite: Allocate glyph buffer once per run rendering pass. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e50eda8..e89d0a8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -180,6 +180,7 @@ struct dwrite_glyphrunanalysis { UINT8 flags; RECT bounds; BYTE *bitmap; + UINT32 max_glyph_bitmap_size; }; struct dwrite_colorglyphenum { @@ -4797,6 +4798,12 @@ static BOOL is_natural_rendering_mode(DWRITE_RENDERING_MODE1 mode) } } +static UINT32 get_glyph_bitmap_pitch(DWRITE_TEXTURE_TYPE type, INT width) +{ + return type == DWRITE_TEXTURE_CLEARTYPE_3x1 ? (width + 3) / 4 * 4 : + ((width + 31) >> 5) << 2; +} + static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *analysis, RECT *bounds) { struct dwrite_glyphbitmap glyph_bitmap; @@ -4836,10 +4843,16 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a const D2D_POINT_2F *ascenderoffset = analysis->ascenderoffsets ? analysis->ascenderoffsets + i : NULL; const D2D_POINT_2F *advance = analysis->advances + i; RECT *bbox = &glyph_bitmap.bbox; + UINT32 bitmap_size; glyph_bitmap.index = analysis->run.glyphIndices[i]; freetype_get_glyph_bbox(&glyph_bitmap); + bitmap_size = get_glyph_bitmap_pitch(analysis->texture_type, bbox->right - bbox->left) * + (bbox->bottom - bbox->top); + if (bitmap_size > analysis->max_glyph_bitmap_size) + analysis->max_glyph_bitmap_size = bitmap_size; + if (is_rtl) OffsetRect(bbox, origin.x + advance->x, origin.y + advance->y); else @@ -4899,7 +4912,7 @@ static inline BYTE *get_pixel_ptr(BYTE *ptr, DWRITE_TEXTURE_TYPE type, const REC runbounds->left - bounds->left; } -static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DWRITE_TEXTURE_TYPE type) +static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) { static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; struct dwrite_glyphbitmap glyph_bitmap; @@ -4917,11 +4930,11 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, } size = (analysis->bounds.right - analysis->bounds.left)*(analysis->bounds.bottom - analysis->bounds.top); - if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) + if (analysis->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) size *= 3; if (!(analysis->bitmap = heap_alloc_zero(size))) { WARN("Failed to allocate run bitmap, %s, type %s.\n", wine_dbgstr_rect(&analysis->bounds), - type == DWRITE_TEXTURE_CLEARTYPE_3x1 ? "3x1" : "1x1"); + analysis->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1 ? "3x1" : "1x1"); IDWriteFontFace4_Release(fontface); return E_OUTOFMEMORY; } @@ -4933,17 +4946,22 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, glyph_bitmap.fontface = fontface; glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); - glyph_bitmap.type = type; + glyph_bitmap.type = analysis->texture_type; if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; + if (!(glyph_bitmap.buf = heap_alloc(analysis->max_glyph_bitmap_size))) { + IDWriteFontFace4_Release(fontface); + return E_OUTOFMEMORY; + } + bbox = &glyph_bitmap.bbox; for (i = 0; i < analysis->run.glyphCount; i++) { const D2D_POINT_2F *advanceoffset = analysis->advanceoffsets ? analysis->advanceoffsets + i : NULL; const D2D_POINT_2F *ascenderoffset = analysis->ascenderoffsets ? analysis->ascenderoffsets + i : NULL; const D2D_POINT_2F *advance = analysis->advances + i; + BYTE *src = glyph_bitmap.buf, *dst; int x, y, width, height; - BYTE *src, *dst; BOOL is_1bpp; glyph_bitmap.index = analysis->run.glyphIndices[i]; @@ -4958,12 +4976,8 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, width = bbox->right - bbox->left; height = bbox->bottom - bbox->top; - if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) - glyph_bitmap.pitch = (width + 3) / 4 * 4; - else - glyph_bitmap.pitch = ((width + 31) >> 5) << 2; - - glyph_bitmap.buf = src = heap_alloc_zero(height * glyph_bitmap.pitch); + glyph_bitmap.pitch = get_glyph_bitmap_pitch(analysis->texture_type, width); + memset(src, 0, height * glyph_bitmap.pitch); is_1bpp = freetype_get_glyph_bitmap(&glyph_bitmap); if (is_rtl) @@ -4979,11 +4993,11 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, OffsetRect(bbox, analysis->m.dx, analysis->m.dy); /* blit to analysis bitmap */ - dst = get_pixel_ptr(analysis->bitmap, type, bbox, &analysis->bounds); + dst = get_pixel_ptr(analysis->bitmap, analysis->texture_type, bbox, &analysis->bounds); if (is_1bpp) { /* convert 1bpp to 8bpp/24bpp */ - if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) { + if (analysis->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) if (src[x / 8] & masks[x % 8]) @@ -5012,11 +5026,10 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, } } - heap_free(glyph_bitmap.buf); - origin.x += advance->x; origin.y += advance->y; } + heap_free(glyph_bitmap.buf); IDWriteFontFace4_Release(fontface); @@ -5076,7 +5089,7 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi if (!(This->flags & RUNANALYSIS_BITMAP_READY)) { HRESULT hr; - if (FAILED(hr = glyphrunanalysis_render(This, type))) + if (FAILED(hr = glyphrunanalysis_render(This))) return hr; }

1 0

Nikolay Sivov : dwrite/tests: Test glyph count for each DrawGlyphRun().
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 7371325c042f2b64a48066cf93ef07654316beea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7371325c042f2b64a48066cf9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 15:07:01 2017 +0300 dwrite/tests: Test glyph count for each DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 99 +++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0d73716..c097e20 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -310,6 +310,7 @@ struct drawcall_entry { enum drawcall_kind kind; WCHAR string[10]; /* only meaningful for DrawGlyphRun() */ WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + UINT32 glyphcount; /* only meaningful for DrawGlyphRun() */ }; struct drawcall_sequence @@ -409,6 +410,28 @@ static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, else ok_(file, line) (cmp == 0, "%s: glyphrun string %s was expected, but got %s instead\n", context, wine_dbgstr_w(expected->string), wine_dbgstr_w(actual->string)); + + cmp = lstrcmpW(expected->locale, actual->locale); + if (cmp != 0 && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: glyph run locale %s was expected, but got %s instead\n", + context, wine_dbgstr_w(expected->locale), wine_dbgstr_w(actual->locale)); + } + else + ok_(file, line) (cmp == 0, "%s: glyph run locale %s was expected, but got %s instead\n", + context, wine_dbgstr_w(expected->locale), wine_dbgstr_w(actual->locale)); + + if (expected->glyphcount != actual->glyphcount && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: wrong glyph count, %u was expected, but got %u instead\n", + context, expected->glyphcount, actual->glyphcount); + } + else + ok_(file, line) (expected->glyphcount == actual->glyphcount, + "%s: wrong glyph count, %u was expected, but got %u instead\n", + context, expected->glyphcount, actual->glyphcount); } else if ((expected->kind & DRAW_KINDS_MASK) == DRAW_UNDERLINE) { int cmp = lstrcmpW(expected->locale, actual->locale); @@ -579,6 +602,8 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, entry.kind = DRAW_GLYPHRUN; if (effect) entry.kind |= DRAW_EFFECT; + lstrcpyW(entry.locale, descr->localeName); + entry.glyphcount = run->glyphCount; add_call(sequences, RENDERER_ID, &entry); return S_OK; } @@ -1173,7 +1198,7 @@ static void test_GetLocaleName(void) } static const struct drawcall_entry drawellipsis_seq[] = { - { DRAW_GLYPHRUN, {0x2026, 0} }, + { DRAW_GLYPHRUN, {0x2026, 0}, {'e','n','-','u','s',0}, 1 }, { DRAW_LAST_KIND } }; @@ -1488,10 +1513,10 @@ static void test_SetInlineObject(void) /* drawing calls sequence doesn't depend on run order, instead all runs are drawn first, inline objects next and then underline/strikes */ static const struct drawcall_entry draw_seq[] = { - { DRAW_GLYPHRUN, {'s',0} }, - { DRAW_GLYPHRUN, {'r','i',0} }, - { DRAW_GLYPHRUN|DRAW_EFFECT, {'n',0} }, - { DRAW_GLYPHRUN, {'g',0} }, + { DRAW_GLYPHRUN, {'s',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'r','i',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN|DRAW_EFFECT, {'n',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'g',0}, {'r','u',0}, 1 }, { DRAW_INLINE }, { DRAW_UNDERLINE, {0}, {'r','u',0} }, { DRAW_STRIKETHROUGH }, @@ -1499,32 +1524,32 @@ static const struct drawcall_entry draw_seq[] = { }; static const struct drawcall_entry draw_seq2[] = { - { DRAW_GLYPHRUN, {'s',0} }, - { DRAW_GLYPHRUN, {'t',0} }, - { DRAW_GLYPHRUN, {'r',0} }, - { DRAW_GLYPHRUN, {'i',0} }, - { DRAW_GLYPHRUN, {'n',0} }, - { DRAW_GLYPHRUN, {'g',0} }, + { DRAW_GLYPHRUN, {'s',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'t',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'r',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'i',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'n',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'g',0}, {'r','u',0}, 1 }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_seq3[] = { - { DRAW_GLYPHRUN, {0x202a,0x202c,0} }, - { DRAW_GLYPHRUN, {'a','b',0} }, + { DRAW_GLYPHRUN, {0x202a,0x202c,0}, {'r','u',0}, 0 }, + { DRAW_GLYPHRUN, {'a','b',0}, {'r','u',0}, 2 }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_seq4[] = { - { DRAW_GLYPHRUN, {'s','t','r',0} }, - { DRAW_GLYPHRUN, {'i','n','g',0} }, + { DRAW_GLYPHRUN, {'s','t','r',0}, {'r','u',0}, 3 }, + { DRAW_GLYPHRUN, {'i','n','g',0}, {'r','u',0}, 3 }, { DRAW_STRIKETHROUGH }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_seq5[] = { - { DRAW_GLYPHRUN, {'s','t',0} }, - { DRAW_GLYPHRUN, {'r','i',0} }, - { DRAW_GLYPHRUN, {'n','g',0} }, + { DRAW_GLYPHRUN, {'s','t',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {'r','i',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {'n','g',0}, {'r','u',0}, 2 }, { DRAW_STRIKETHROUGH }, { DRAW_LAST_KIND } }; @@ -1534,15 +1559,15 @@ static const struct drawcall_entry empty_seq[] = { }; static const struct drawcall_entry draw_single_run_seq[] = { - { DRAW_GLYPHRUN, {'s','t','r','i','n','g',0} }, + { DRAW_GLYPHRUN, {'s','t','r','i','n','g',0}, {'r','u',0}, 6 }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_reordered_run_seq[] = { - { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0} }, - { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0} }, - { DRAW_GLYPHRUN, {'7','1',0} }, - { DRAW_GLYPHRUN, {'.',0} }, + { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6 }, + { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7 }, + { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1 }, { DRAW_LAST_KIND } }; @@ -1601,7 +1626,7 @@ static void test_Draw(void) flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", FALSE); + ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", TRUE); IDWriteTextLayout_Release(layout); /* with reduced width DrawGlyphRun() is called for every line */ @@ -3185,14 +3210,14 @@ static void test_SetFlowDirection(void) } static const struct drawcall_entry draweffect_seq[] = { - { DRAW_GLYPHRUN|DRAW_EFFECT, {'a','e',0x0300,0} }, - { DRAW_GLYPHRUN, {'d',0} }, + { DRAW_GLYPHRUN|DRAW_EFFECT, {'a','e',0x0300,0}, {'e','n','-','u','s',0}, 2 }, + { DRAW_GLYPHRUN, {'d',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draweffect2_seq[] = { - { DRAW_GLYPHRUN|DRAW_EFFECT, {'a','e',0} }, - { DRAW_GLYPHRUN, {'c','d',0} }, + { DRAW_GLYPHRUN|DRAW_EFFECT, {'a','e',0}, {'e','n','-','u','s',0}, 2 }, + { DRAW_GLYPHRUN, {'c','d',0}, {'e','n','-','u','s',0}, 2 }, { DRAW_LAST_KIND } }; @@ -4837,30 +4862,30 @@ static void test_SetOpticalAlignment(void) } static const struct drawcall_entry drawunderline_seq[] = { - { DRAW_GLYPHRUN, {'a','e',0x0300,0} }, /* reported runs can't mix different underline values */ - { DRAW_GLYPHRUN, {'d',0} }, + { DRAW_GLYPHRUN, {'a','e',0x0300,0}, {'e','n','-','u','s',0}, 2 }, /* reported runs can't mix different underline values */ + { DRAW_GLYPHRUN, {'d',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_LAST_KIND } }; static const struct drawcall_entry drawunderline2_seq[] = { - { DRAW_GLYPHRUN, {'a',0} }, - { DRAW_GLYPHRUN, {'e',0} }, + { DRAW_GLYPHRUN, {'a',0}, {'e','n','-','u','s',0}, 1 }, + { DRAW_GLYPHRUN, {'e',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_LAST_KIND } }; static const struct drawcall_entry drawunderline3_seq[] = { - { DRAW_GLYPHRUN, {'a',0} }, - { DRAW_GLYPHRUN, {'e',0} }, + { DRAW_GLYPHRUN, {'a',0}, {'e','n','-','c','a',0}, 1 }, + { DRAW_GLYPHRUN, {'e',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_UNDERLINE, {0}, {'e','n','-','c','a',0} }, { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_LAST_KIND } }; static const struct drawcall_entry drawunderline4_seq[] = { - { DRAW_GLYPHRUN, {'a',0} }, - { DRAW_GLYPHRUN, {'e',0} }, + { DRAW_GLYPHRUN, {'a',0}, {'e','n','-','u','s',0}, 1 }, + { DRAW_GLYPHRUN, {'e',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_STRIKETHROUGH }, { DRAW_LAST_KIND } @@ -4962,7 +4987,7 @@ todo_wine flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, drawunderline4_seq, "draw underline test 4", FALSE); + ok_sequence(sequences, RENDERER_ID, drawunderline4_seq, "draw underline test 4", TRUE); IDWriteTextLayout_Release(layout);

1 0

Nikolay Sivov : dwrite: Fix off by one error in glyph count adjustment.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 3d7fabf62788f6ea41e48d3daad05aa776d8bc1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7fabf62788f6ea41e48d3da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 15:07:02 2017 +0300 dwrite: Fix off by one error in glyph count adjustment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 5 ++--- dlls/dwrite/tests/layout.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a7fff46..590b2c5 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1269,10 +1269,9 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const run->line = line; if (r->u.regular.run.glyphCount) { - /* trim from the left */ + /* Trim leading and trailing clusters. */ run->glyphcount = r->u.regular.run.glyphCount - r->u.regular.clustermap[start]; - /* trim from the right */ - if (start + length < r->u.regular.descr.stringLength - 1) + if (start + length < r->u.regular.descr.stringLength) run->glyphcount -= r->u.regular.run.glyphCount - r->u.regular.clustermap[start + length]; } else diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c097e20..daffd81 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1626,7 +1626,7 @@ static void test_Draw(void) flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", TRUE); + ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", FALSE); IDWriteTextLayout_Release(layout); /* with reduced width DrawGlyphRun() is called for every line */ @@ -4987,7 +4987,7 @@ todo_wine flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, drawunderline4_seq, "draw underline test 4", TRUE); + ok_sequence(sequences, RENDERER_ID, drawunderline4_seq, "draw underline test 4", FALSE); IDWriteTextLayout_Release(layout);

1 0

Jacek Caban : kernel32: Use default buffer size in CreatePipe if 0 was passed.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: e44c0f710b72606e1badb4937dc51edeb6e0804e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44c0f710b72606e1badb4937… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 30 14:02:49 2017 +0200 kernel32: Use default buffer size in CreatePipe if 0 was passed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 2 ++ dlls/kernel32/tests/pipe.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 494db9c..ee995f5 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1932,6 +1932,8 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; + if (!size) size = 4096; + timeout.QuadPart = (ULONGLONG)NMPWAIT_USE_DEFAULT_WAIT * -10000; /* generate a unique pipe name (system wide) */ do diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index fb6d3c0..dc4be32 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -125,6 +125,20 @@ static void _test_signaled(unsigned line, HANDLE handle) ok_(__FILE__,line)(res == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", res); } +#define test_pipe_info(a,b,c,d,e) _test_pipe_info(__LINE__,a,b,c,d,e) +static void _test_pipe_info(unsigned line, HANDLE pipe, DWORD ex_flags, DWORD ex_out_buf_size, DWORD ex_in_buf_size, DWORD ex_max_instances) +{ + DWORD flags = 0xdeadbeef, out_buf_size = 0xdeadbeef, in_buf_size = 0xdeadbeef, max_instances = 0xdeadbeef; + BOOL res; + + res = GetNamedPipeInfo(pipe, &flags, &out_buf_size, &in_buf_size, &max_instances); + ok_(__FILE__,line)(res, "GetNamedPipeInfo failed: %x\n", res); + ok_(__FILE__,line)(flags == ex_flags, "flags = %x, expected %x\n", flags, ex_flags); + ok_(__FILE__,line)(out_buf_size == ex_out_buf_size, "out_buf_size = %x, expected %u\n", out_buf_size, ex_out_buf_size); + ok_(__FILE__,line)(in_buf_size == ex_in_buf_size, "in_buf_size = %x, expected %u\n", in_buf_size, ex_in_buf_size); + ok_(__FILE__,line)(max_instances == ex_max_instances, "max_instances = %x, expected %u\n", max_instances, ex_max_instances); +} + static void test_CreateNamedPipe(int pipemode) { HANDLE hnp; @@ -1319,6 +1333,9 @@ static void test_CreatePipe(void) pipe_attr.bInheritHandle = TRUE; pipe_attr.lpSecurityDescriptor = NULL; ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n"); + test_pipe_info(piperead, FILE_PIPE_SERVER_END, 4096, 4096, 1); + test_pipe_info(pipewrite, 0, 4096, 4096, 1); + ok(WriteFile(pipewrite,PIPENAME,sizeof(PIPENAME), &written, NULL), "Write to anonymous pipe failed\n"); ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written); ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from non empty pipe failed\n"); @@ -1358,6 +1375,12 @@ static void test_CreatePipe(void) ok(user_apc_ran == FALSE, "user apc ran, pipe using alertable io mode\n"); SleepEx(0, TRUE); /* get rid of apc */ + + ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 1) != 0, "CreatePipe failed\n"); + test_pipe_info(piperead, FILE_PIPE_SERVER_END, 1, 1, 1); + test_pipe_info(pipewrite, 0, 1, 1, 1); + ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); } static void test_CloseHandle(void) @@ -2250,20 +2273,6 @@ static void test_NamedPipeHandleState(void) CloseHandle(server); } -#define test_pipe_info(a,b,c,d,e) _test_pipe_info(__LINE__,a,b,c,d,e) -static void _test_pipe_info(unsigned line, HANDLE pipe, DWORD ex_flags, DWORD ex_out_buf_size, DWORD ex_in_buf_size, DWORD ex_max_instances) -{ - DWORD flags = 0xdeadbeef, out_buf_size = 0xdeadbeef, in_buf_size = 0xdeadbeef, max_instances = 0xdeadbeef; - BOOL res; - - res = GetNamedPipeInfo(pipe, &flags, &out_buf_size, &in_buf_size, &max_instances); - ok_(__FILE__,line)(res, "GetNamedPipeInfo failed: %x\n", res); - ok_(__FILE__,line)(flags == ex_flags, "flags = %x, expected %x\n", flags, ex_flags); - ok_(__FILE__,line)(out_buf_size == ex_out_buf_size, "out_buf_size = %x, expected %u\n", out_buf_size, ex_out_buf_size); - ok_(__FILE__,line)(in_buf_size == ex_in_buf_size, "in_buf_size = %x, expected %u\n", in_buf_size, ex_in_buf_size); - ok_(__FILE__,line)(max_instances == ex_max_instances, "max_instances = %x, expected %u\n", max_instances, ex_max_instances); -} - static void test_GetNamedPipeInfo(void) { HANDLE server;

1 0

Huw Davies : user32: Don' t finish tracking when the menu borders or scroll arrows are clicked.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: d4544f7feda2c8249b32c2062ff194436c7cb385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4544f7feda2c8249b32c2062… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 30 10:58:31 2017 +0100 user32: Don't finish tracking when the menu borders or scroll arrows are clicked. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 119 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 41 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 79bef64..dd62063 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -665,6 +665,14 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect) OffsetRect( rect, menu->items_rect.left, menu->items_rect.top - scroll_offset ); } +enum hittest +{ + ht_nowhere, /* outside the menu */ + ht_border, /* anywhere that's not an item or a scroll arrow */ + ht_item, /* a menu item */ + ht_scroll_up, /* scroll up arrow */ + ht_scroll_down /* scroll down arrow */ +}; /*********************************************************************** * MENU_FindItemByCoords @@ -672,30 +680,61 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect) * Find the item at the specified coordinates (screen coords). Does * not work for child windows and therefore should not be called for * an arbitrary system menu. + * + * Returns a hittest code. *pos will contain the position of the + * item or NO_SELECTED_ITEM. If the hittest code is ht_scroll_up + * or ht_scroll_down then *pos will contain the position of the + * item that's just outside the items_rect - ie, the one that would + * be scrolled completely into view. */ -static MENUITEM *MENU_FindItemByCoords( const POPUPMENU *menu, - POINT pt, UINT *pos ) +static enum hittest MENU_FindItemByCoords( const POPUPMENU *menu, POINT pt, UINT *pos ) { MENUITEM *item; UINT i; RECT rect; + enum hittest ht = ht_border; + + *pos = NO_SELECTED_ITEM; + + if (!GetWindowRect(menu->hWnd, &rect) || !PtInRect(&rect, pt)) + return ht_nowhere; - if (!GetWindowRect(menu->hWnd, &rect)) return NULL; if (GetWindowLongW( menu->hWnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) pt.x = rect.right - 1 - pt.x; else pt.x -= rect.left; pt.y -= rect.top; + + if (!PtInRect(&menu->items_rect, pt)) + { + if (!menu->bScrolling || pt.x < menu->items_rect.left || pt.x >= menu->items_rect.right) + return ht_border; + + /* On a scroll arrow. Update pt so that it points to the item just outside items_rect */ + if (pt.y < menu->items_rect.top) + { + ht = ht_scroll_up; + pt.y = menu->items_rect.top - 1; + } + else + { + ht = ht_scroll_down; + pt.y = menu->items_rect.bottom; + } + } + item = menu->items; for (i = 0; i < menu->nItems; i++, item++) { rect = item->rect; MENU_AdjustMenuItemRect(menu, &rect); - if (PtInRect(&rect, pt)) - { - if (pos) *pos = i; - return item; - } + if (PtInRect(&rect, pt)) + { + *pos = i; + if (ht != ht_scroll_up && ht != ht_scroll_down) ht = ht_item; + break; + } } - return NULL; + + return ht; } @@ -2549,29 +2588,28 @@ static BOOL MENU_ButtonDown( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) if (hPtMenu) { - UINT id = 0; - POPUPMENU *ptmenu = MENU_GetMenu( hPtMenu ); - MENUITEM *item; + UINT pos; + POPUPMENU *ptmenu = MENU_GetMenu( hPtMenu ); + enum hittest ht = ht_nowhere; - if( IS_SYSTEM_MENU(ptmenu) ) - item = ptmenu->items; - else - item = MENU_FindItemByCoords( ptmenu, pmt->pt, &id ); + if( IS_SYSTEM_MENU(ptmenu) ) + pos = 0; + else + ht = MENU_FindItemByCoords( ptmenu, pmt->pt, &pos ); - if( item ) - { - if( ptmenu->FocusedItem != id ) - MENU_SwitchTracking( pmt, hPtMenu, id, wFlags ); + if (pos != NO_SELECTED_ITEM) + { + if (ptmenu->FocusedItem != pos) + MENU_SwitchTracking( pmt, hPtMenu, pos, wFlags ); - /* If the popup menu is not already "popped" */ - if(!(item->fState & MF_MOUSESELECT )) - { - pmt->hCurrentMenu = MENU_ShowSubPopup( pmt->hOwnerWnd, hPtMenu, FALSE, wFlags ); - } + /* If the popup menu is not already "popped" */ + if (!(ptmenu->items[pos].fState & MF_MOUSESELECT)) + pmt->hCurrentMenu = MENU_ShowSubPopup( pmt->hOwnerWnd, hPtMenu, FALSE, wFlags ); + } - return TRUE; - } - /* Else the click was on the menu bar, finish the tracking */ + /* A click on an item or anywhere on a popup keeps tracking going */ + if (ht == ht_item || ((ptmenu->wFlags & MF_POPUP) && ht != ht_nowhere)) + return TRUE; } return FALSE; } @@ -2590,20 +2628,19 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags) if (hPtMenu) { - UINT id = 0; + UINT pos; POPUPMENU *ptmenu = MENU_GetMenu( hPtMenu ); - MENUITEM *item; if( IS_SYSTEM_MENU(ptmenu) ) - item = ptmenu->items; - else - item = MENU_FindItemByCoords( ptmenu, pmt->pt, &id ); + pos = 0; + else if (MENU_FindItemByCoords( ptmenu, pmt->pt, &pos ) != ht_item) + pos = NO_SELECTED_ITEM; - if( item && (ptmenu->FocusedItem == id )) + if (pos != NO_SELECTED_ITEM && (ptmenu->FocusedItem == pos)) { - debug_print_menuitem ("FocusedItem: ", item, ""); + debug_print_menuitem ("FocusedItem: ", &ptmenu->items[pos], ""); - if( !(item->fType & MF_POPUP) ) + if (!(ptmenu->items[pos].fType & MF_POPUP)) { INT executedMenuId = MENU_ExecFocusedItem( pmt, hPtMenu, wFlags); if (executedMenuId == -1 || executedMenuId == -2) return -1; @@ -2638,8 +2675,8 @@ static BOOL MENU_MouseMove( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) ptmenu = MENU_GetMenu( hPtMenu ); if( IS_SYSTEM_MENU(ptmenu) ) id = 0; - else - MENU_FindItemByCoords( ptmenu, pmt->pt, &id ); + else if (MENU_FindItemByCoords( ptmenu, pmt->pt, &id ) != ht_item) + id = NO_SELECTED_ITEM; } if( id == NO_SELECTED_ITEM ) @@ -2650,8 +2687,8 @@ static BOOL MENU_MouseMove( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) } else if( ptmenu->FocusedItem != id ) { - MENU_SwitchTracking( pmt, hPtMenu, id, wFlags ); - pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hPtMenu, FALSE, wFlags); + MENU_SwitchTracking( pmt, hPtMenu, id, wFlags ); + pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hPtMenu, FALSE, wFlags); } return TRUE; } @@ -5254,7 +5291,7 @@ INT WINAPI MenuItemFromPoint(HWND hWnd, HMENU hMenu, POINT ptScreen) /*FIXME: Do we have to handle hWnd here? */ if (!menu) return -1; - if (!MENU_FindItemByCoords(menu, ptScreen, &pos)) return -1; + if (MENU_FindItemByCoords( menu, ptScreen, &pos ) != ht_item) return -1; return pos; }

1 0

Henri Verbeet : wined3d: Only drop WINED3D_MAP_DISCARD right before mapping the buffer object in wined3d_buffer_map ().
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: cd4223b0a43185c3477597e57447a6435d811657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4223b0a43185c3477597e57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:27 2017 +0200 wined3d: Only drop WINED3D_MAP_DISCARD right before mapping the buffer object in wined3d_buffer_map(). Dropping WINED3D_MAP_DISCARD too early means we go through the system memory path unnecessarily. Worse, as mentioned in an earlier comment, Darkstar One depends on the entire buffer being uploaded in case of WINED3D_MAP_DISCARD maps, and dropping the flag too early prevents that as well. This fixes a regression introduced by commit 15d53761a5fbfc12fc5f9974c029dace00eab33d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4e8569c..cb3cbbd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1004,14 +1004,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); - /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 multitexture - * fill rate test seems to depend on this. When we map a buffer with - * GL_MAP_INVALIDATE_BUFFER_BIT, the driver is free to discard the - * previous contents of the buffer. The r600g driver only does this when - * the buffer is currently in use, while the proprietary NVIDIA driver - * appears to do this unconditionally. */ - if (buffer->flags & WINED3D_BUFFER_DISCARD) - flags &= ~WINED3D_MAP_DISCARD; count = ++buffer->resource.map_count; if (buffer->buffer_object) @@ -1064,6 +1056,16 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI { buffer_bind(buffer, context); + /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 + * multitexture fill rate test seems to depend on this. When + * we map a buffer with GL_MAP_INVALIDATE_BUFFER_BIT, the + * driver is free to discard the previous contents of the + * buffer. The r600g driver only does this when the buffer is + * currently in use, while the proprietary NVIDIA driver + * appears to do this unconditionally. */ + if (buffer->flags & WINED3D_BUFFER_DISCARD) + flags &= ~WINED3D_MAP_DISCARD; + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { GLbitfield mapflags = wined3d_resource_gl_map_flags(flags);

1 0