January 2012 - Wine-commits

Henri Verbeet : wined3d: Get rid of the WINED3DCULL typedef.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 808e92678398a0b56f2054a27e5e2676194c8aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=808e92678398a0b56f2054a27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:54 2012 +0100 wined3d: Get rid of the WINED3DCULL typedef. --- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a392f1f..c10997c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -129,24 +129,24 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d * offscreen / onscreen rendering switch. */ switch (state->render_states[WINED3D_RS_CULLMODE]) { - case WINED3DCULL_NONE: + case WINED3D_CULL_NONE: glDisable(GL_CULL_FACE); checkGLcall("glDisable GL_CULL_FACE"); break; - case WINED3DCULL_CW: + case WINED3D_CULL_CW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); glCullFace(GL_FRONT); checkGLcall("glCullFace(GL_FRONT)"); break; - case WINED3DCULL_CCW: + case WINED3D_CULL_CCW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); glCullFace(GL_BACK); checkGLcall("glCullFace(GL_BACK)"); break; default: - FIXME("Unrecognized/Unhandled WINED3DCULL value %#x.\n", + FIXME("Unrecognized cull mode %#x.\n", state->render_states[WINED3D_RS_CULLMODE]); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index feabe3d..8da32c2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1133,7 +1133,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_LASTPIXEL] = TRUE; state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE; state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO; - state->render_states[WINED3D_RS_CULLMODE] = WINED3DCULL_CCW; + state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_CCW; state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL; state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_ALPHAREF] = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 312b63c..6c06fc6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -462,13 +462,12 @@ enum wined3d_fill_mode WINED3D_FILL_SOLID = 3, }; -typedef enum _WINED3DCULL +enum wined3d_cull { - WINED3DCULL_NONE = 1, - WINED3DCULL_CW = 2, - WINED3DCULL_CCW = 3, - WINED3DCULL_FORCE_DWORD = 0x7fffffff -} WINED3DCULL; + WINED3D_CULL_NONE = 1, + WINED3D_CULL_CW = 2, + WINED3D_CULL_CCW = 3, +}; typedef enum _WINED3DSTENCILOP {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSTENCILOP typedef.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: fd8597b2bfba7063157bbf2059add9bd675fd777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8597b2bfba7063157bbf205… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:55 2012 +0100 wined3d: Get rid of the WINED3DSTENCILOP typedef. --- dlls/wined3d/state.c | 38 ++++++++++++++++++++++++++++++++------ dlls/wined3d/stateblock.c | 12 ++++++------ dlls/wined3d/utils.c | 19 ------------------- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 21 ++++++++++----------- 5 files changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c10997c..a68fae9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -801,6 +801,32 @@ static void renderstate_stencil_twosided(struct wined3d_context *context, GLint checkGLcall("glStencilOp(...)"); } +static GLenum gl_stencil_op(enum wined3d_stencil_op op) +{ + switch (op) + { + case WINED3D_STENCIL_OP_KEEP: + return GL_KEEP; + case WINED3D_STENCIL_OP_ZERO: + return GL_ZERO; + case WINED3D_STENCIL_OP_REPLACE: + return GL_REPLACE; + case WINED3D_STENCIL_OP_INCR_SAT: + return GL_INCR; + case WINED3D_STENCIL_OP_DECR_SAT: + return GL_DECR; + case WINED3D_STENCIL_OP_INVERT: + return GL_INVERT; + case WINED3D_STENCIL_OP_INCR: + return GL_INCR_WRAP_EXT; + case WINED3D_STENCIL_OP_DECR: + return GL_DECR_WRAP_EXT; + default: + FIXME("Unrecognized stencil op %#x.\n", op); + return GL_KEEP; + } +} + static void state_stencil(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -833,12 +859,12 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ func_ccw = GL_ALWAYS; ref = state->render_states[WINED3D_RS_STENCILREF]; mask = state->render_states[WINED3D_RS_STENCILMASK]; - stencilFail = StencilOp(state->render_states[WINED3D_RS_STENCILFAIL]); - depthFail = StencilOp(state->render_states[WINED3D_RS_STENCILZFAIL]); - stencilPass = StencilOp(state->render_states[WINED3D_RS_STENCILPASS]); - stencilFail_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILFAIL]); - depthFail_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILZFAIL]); - stencilPass_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILPASS]); + stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); + depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); + stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]); + stencilFail_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILFAIL]); + depthFail_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILZFAIL]); + stencilPass_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILPASS]); TRACE("(onesided %d, twosided %d, ref %x, mask %x, " "GL_FRONT: func: %x, fail %x, zfail %x, zpass %x " diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8da32c2..0f9d07c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1153,9 +1153,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_EDGEANTIALIAS] = FALSE; state->render_states[WINED3D_RS_RANGEFOGENABLE] = FALSE; state->render_states[WINED3D_RS_STENCILENABLE] = FALSE; - state->render_states[WINED3D_RS_STENCILFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_STENCILZFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_STENCILPASS] = WINED3DSTENCILOP_KEEP; + state->render_states[WINED3D_RS_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_STENCILZFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_STENCILPASS] = WINED3D_STENCIL_OP_KEEP; state->render_states[WINED3D_RS_STENCILREF] = 0; state->render_states[WINED3D_RS_STENCILMASK] = 0xffffffff; state->render_states[WINED3D_RS_STENCILFUNC] = WINED3D_CMP_ALWAYS; @@ -1226,9 +1226,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_ADAPTIVETESS_W] = tmpfloat.d; state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION] = FALSE; state->render_states[WINED3D_RS_TWOSIDEDSTENCILMODE] = FALSE; - state->render_states[WINED3D_RS_CCW_STENCILFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_CCW_STENCILZFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_CCW_STENCILPASS] = WINED3DSTENCILOP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILZFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILPASS] = WINED3D_STENCIL_OP_KEEP; state->render_states[WINED3D_RS_CCW_STENCILFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a521f4b..2b00765 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2477,25 +2477,6 @@ const char *debug_surflocation(DWORD flag) { return wine_dbg_sprintf("%s", buf[0] ? buf + 3 : "0"); } -/***************************************************************************** - * Useful functions mapping GL <-> D3D values - */ -GLenum StencilOp(DWORD op) { - switch(op) { - case WINED3DSTENCILOP_KEEP : return GL_KEEP; - case WINED3DSTENCILOP_ZERO : return GL_ZERO; - case WINED3DSTENCILOP_REPLACE : return GL_REPLACE; - case WINED3DSTENCILOP_INCRSAT : return GL_INCR; - case WINED3DSTENCILOP_DECRSAT : return GL_DECR; - case WINED3DSTENCILOP_INVERT : return GL_INVERT; - case WINED3DSTENCILOP_INCR : return GL_INCR_WRAP_EXT; - case WINED3DSTENCILOP_DECR : return GL_DECR_WRAP_EXT; - default: - FIXME("Unrecognized stencil op %d\n", op); - return GL_KEEP; - } -} - BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1602bdd..fd21187 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2515,8 +2515,6 @@ const char *debug_d3dtop(WINED3DTEXTUREOP d3dtop) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN; -/* Routines for GL <-> D3D values */ -GLenum StencilOp(DWORD op) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6c06fc6..cb09168 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -469,18 +469,17 @@ enum wined3d_cull WINED3D_CULL_CCW = 3, }; -typedef enum _WINED3DSTENCILOP -{ - WINED3DSTENCILOP_KEEP = 1, - WINED3DSTENCILOP_ZERO = 2, - WINED3DSTENCILOP_REPLACE = 3, - WINED3DSTENCILOP_INCRSAT = 4, - WINED3DSTENCILOP_DECRSAT = 5, - WINED3DSTENCILOP_INVERT = 6, - WINED3DSTENCILOP_INCR = 7, - WINED3DSTENCILOP_DECR = 8, - WINED3DSTENCILOP_FORCE_DWORD = 0x7fffffff -} WINED3DSTENCILOP; +enum wined3d_stencil_op +{ + WINED3D_STENCIL_OP_KEEP = 1, + WINED3D_STENCIL_OP_ZERO = 2, + WINED3D_STENCIL_OP_REPLACE = 3, + WINED3D_STENCIL_OP_INCR_SAT = 4, + WINED3D_STENCIL_OP_DECR_SAT = 5, + WINED3D_STENCIL_OP_INVERT = 6, + WINED3D_STENCIL_OP_INCR = 7, + WINED3D_STENCIL_OP_DECR = 8, +}; typedef enum _WINED3DMATERIALCOLORSOURCE {

1 0

Alexandre Julliard : gdi32: Fix skipping of zero-length dashes.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 618425ac4c405aaa28aa30d787e119ae6c605996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618425ac4c405aaa28aa30d78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 14:57:52 2012 +0100 gdi32: Fix skipping of zero-length dashes. --- dlls/gdi32/dibdrv/objects.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dffea12..ee58192 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -779,7 +779,7 @@ void reset_dash_origin(dibdrv_physdev *pdev) static inline void skip_dash(dibdrv_physdev *pdev, unsigned int skip) { skip %= pdev->pen_pattern.total_len; - while(skip) + do { if(pdev->dash_pos.left_in_dash > skip) { @@ -792,6 +792,7 @@ static inline void skip_dash(dibdrv_physdev *pdev, unsigned int skip) pdev->dash_pos.left_in_dash = pdev->pen_pattern.dashes[pdev->dash_pos.cur_dash]; pdev->dash_pos.mark = !pdev->dash_pos.mark; } + while (skip); } static void dashed_pen_line_callback(dibdrv_physdev *pdev, INT x, INT y)

1 0

Alexandre Julliard : gdi32: Only create the round cap region once per call.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 5f2371c229372951eb758476e703cbd3b6ec06a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2371c229372951eb758476e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 14:59:01 2012 +0100 gdi32: Only create the round cap region once per call. --- dlls/gdi32/dibdrv/objects.c | 49 ++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ee58192..879d920 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1214,27 +1214,22 @@ struct face int dx, dy; }; -static void add_cap( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) +static void add_cap( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const POINT *pt ) { - HRGN cap; - switch (pdev->pen_endcap) { default: FIXME( "Unknown end cap %x\n", pdev->pen_endcap ); /* fall through */ case PS_ENDCAP_ROUND: - cap = CreateEllipticRgn( pt->x - pdev->pen_width / 2, pt->y - pdev->pen_width / 2, - pt->x + (pdev->pen_width + 1) / 2, pt->y + (pdev->pen_width + 1) / 2 ); - break; + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + return; case PS_ENDCAP_SQUARE: /* already been handled */ case PS_ENDCAP_FLAT: return; } - - CombineRgn( region, region, cap, RGN_OR ); - DeleteObject( cap ); - return; } #define round( f ) (((f) > 0) ? (f) + 0.5 : (f) - 0.5) @@ -1297,7 +1292,7 @@ static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, return CreatePolygonRgn( pts, 5, ALTERNATE ); } -static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, +static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const POINT *pt, const struct face *face_1, const struct face *face_2 ) { HRGN join; @@ -1308,9 +1303,10 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, default: FIXME( "Unknown line join %x\n", pdev->pen_join ); /* fall through */ case PS_JOIN_ROUND: - join = CreateEllipticRgn( pt->x - pdev->pen_width / 2, pt->y - pdev->pen_width / 2, - pt->x + (pdev->pen_width + 1) / 2, pt->y + (pdev->pen_width + 1) / 2 ); - break; + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + return; case PS_JOIN_MITER: join = create_miter_region( pdev, pt, face_1, face_2 ); @@ -1333,11 +1329,15 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total) { int i; - HRGN segment; + HRGN round_cap = 0; assert( total != 0 ); /* wide pens should always be drawn through a region */ assert( num >= 2 ); + if (pdev->pen_join == PS_JOIN_ROUND || pdev->pen_endcap == PS_ENDCAP_ROUND) + round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2), + (pdev->pen_width + 1) / 2, (pdev->pen_width + 1) / 2 ); + if (!close) num--; for (i = 0; i < num; i++) { @@ -1362,7 +1362,7 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close rect.bottom = rect.top + pdev->pen_width; if ((sq_cap_1 && dx > 0) || (sq_cap_2 && dx < 0)) rect.left -= pdev->pen_width / 2; if ((sq_cap_2 && dx > 0) || (sq_cap_1 && dx < 0)) rect.right += pdev->pen_width / 2; - segment = CreateRectRgnIndirect( &rect ); + add_rect_to_region( total, &rect ); if (dx > 0) { face_1.start.x = face_1.end.x = rect.left; @@ -1386,7 +1386,7 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close rect.right = rect.left + pdev->pen_width; if ((sq_cap_1 && dy > 0) || (sq_cap_2 && dy < 0)) rect.top -= pdev->pen_width / 2; if ((sq_cap_2 && dy > 0) || (sq_cap_1 && dy < 0)) rect.bottom += pdev->pen_width / 2; - segment = CreateRectRgnIndirect( &rect ); + add_rect_to_region( total, &rect ); if (dy > 0) { face_1.start.x = face_2.end.x = rect.left; @@ -1408,6 +1408,7 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close double width_x, width_y; POINT seg_pts[4]; POINT wide_half, narrow_half; + HRGN segment; width_x = pdev->pen_width * abs( dy ) / len; width_y = pdev->pen_width * abs( dx ) / len; @@ -1456,6 +1457,8 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close } segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); face_1.start = seg_pts[0]; face_1.end = seg_pts[1]; @@ -1463,23 +1466,21 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close face_2.end = seg_pts[3]; } - CombineRgn( total, total, segment, RGN_OR ); - DeleteObject( segment ); - - if (need_cap_1) add_cap( pdev, total, pt_1 ); - if (need_cap_2) add_cap( pdev, total, pt_2 ); + if (need_cap_1) add_cap( pdev, total, round_cap, pt_1 ); + if (need_cap_2) add_cap( pdev, total, round_cap, pt_2 ); face_1.dx = face_2.dx = dx; face_1.dy = face_2.dy = dy; if (i == 0) first_face = face_1; - else add_join( pdev, total, pt_1, &prev_face, &face_1 ); + else add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); if (i == num - 1 && close) - add_join( pdev, total, pt_2, &face_2, &first_face ); + add_join( pdev, total, round_cap, pt_2, &face_2, &first_face ); prev_face = face_2; } + if (round_cap) DeleteObject( round_cap ); return TRUE; }

1 0

Alexandre Julliard : gdi32: Skip empty segments at the beginning and end of a line to make sure the caps are correct .
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 8b1bab524b4cfe72a6d7eebbe2698626d456ca7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1bab524b4cfe72a6d7eebbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 15:10:10 2012 +0100 gdi32: Skip empty segments at the beginning and end of a line to make sure the caps are correct. --- dlls/gdi32/dibdrv/objects.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 879d920..9f4f035 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1334,6 +1334,10 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close assert( total != 0 ); /* wide pens should always be drawn through a region */ assert( num >= 2 ); + /* skip empty segments */ + while (num > 2 && pts[0].x == pts[1].x && pts[0].y == pts[1].y) { pts++; num--; } + while (num > 2 && pts[num - 1].x == pts[num - 2].x && pts[num - 1].y == pts[num - 2].y) num--; + if (pdev->pen_join == PS_JOIN_ROUND || pdev->pen_endcap == PS_ENDCAP_ROUND) round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2), (pdev->pen_width + 1) / 2, (pdev->pen_width + 1) / 2 );

1 0

Alexandre Julliard : gdi32: Add a helper function for drawing a wide line segment.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: a59c53b312926e5bf1361039e8d79424ffa6d2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59c53b312926e5bf1361039e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 15:50:31 2012 +0100 gdi32: Add a helper function for drawing a wide line segment. --- dlls/gdi32/dibdrv/objects.c | 246 ++++++++++++++++++++++--------------------- 1 files changed, 127 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a59c53b312926e5bf1361…

1 0

Alexandre Julliard : gdi32: Add a helper function for drawing multiple line segments.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: bc5428600b97b1d1cf6e7481e9d346a01b07f3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5428600b97b1d1cf6e7481e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 16:06:01 2012 +0100 gdi32: Add a helper function for drawing multiple line segments. --- dlls/gdi32/dibdrv/objects.c | 75 +++++++++++++++++++++++++++++-------------- 1 files changed, 51 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f04147c..6933346 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1452,9 +1452,55 @@ static void wide_line_segment( dibdrv_physdev *pdev, HRGN total, face_1->dy = face_2->dy = dy; } -static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total) +static void wide_line_segments( dibdrv_physdev *pdev, int num, const POINT *pts, BOOL close, + int start, int count, const POINT *first_pt, const POINT *last_pt, + HRGN round_cap, HRGN total ) { int i; + struct face face_1, face_2, prev_face, first_face; + const POINT *pt_1, *pt_2; + + if (!close) + { + add_cap( pdev, total, round_cap, first_pt ); + add_cap( pdev, total, round_cap, last_pt ); + } + + if (count == 1) + { + pt_1 = &pts[start]; + pt_2 = &pts[(start + 1) % num]; + wide_line_segment( pdev, total, first_pt, last_pt, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + TRUE, TRUE, &face_1, &face_2 ); + return; + } + + pt_1 = &pts[start]; + pt_2 = &pts[(start + 1) % num]; + wide_line_segment( pdev, total, first_pt, pt_2, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + !close, FALSE, &first_face, &prev_face ); + + + for (i = 1; i < count - 1; i++) + { + pt_1 = &pts[(start + i) % num]; + pt_2 = &pts[(start + i + 1) % num]; + wide_line_segment( pdev, total, pt_1, pt_2, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + FALSE, FALSE, &face_1, &face_2 ); + add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); + prev_face = face_2; + } + + pt_1 = &pts[(start + count - 1) % num]; + pt_2 = &pts[(start + count) % num]; + wide_line_segment( pdev, total, pt_1, last_pt, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + FALSE, !close, &face_1, &face_2 ); + add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); + if (close) add_join( pdev, total, round_cap, last_pt, &face_2, &first_face ); +} + +static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total) +{ HRGN round_cap = 0; assert( total != 0 ); /* wide pens should always be drawn through a region */ @@ -1468,30 +1514,11 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2), (pdev->pen_width + 1) / 2, (pdev->pen_width + 1) / 2 ); - if (!close) num--; - for (i = 0; i < num; i++) - { - const POINT *pt_1 = pts + i; - const POINT *pt_2 = pts + ((close && i == num - 1) ? 0 : i + 1); - int dx = pt_2->x - pt_1->x; - int dy = pt_2->y - pt_1->y; - struct face face_1, face_2, prev_face, first_face; - BOOL need_cap_1 = !close && (i == 0); - BOOL need_cap_2 = !close && (i == num - 1); - - wide_line_segment( pdev, total, pt_1, pt_2, dx, dy, need_cap_1, need_cap_2, &face_1, &face_2 ); - - if (need_cap_1) add_cap( pdev, total, round_cap, pt_1 ); - if (need_cap_2) add_cap( pdev, total, round_cap, pt_2 ); - - if (i == 0) first_face = face_1; - else add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); - - if (i == num - 1 && close) - add_join( pdev, total, round_cap, pt_2, &face_2, &first_face ); + if (close) + wide_line_segments( pdev, num, pts, TRUE, 0, num, &pts[0], &pts[0], round_cap, total ); + else + wide_line_segments( pdev, num, pts, FALSE, 0, num - 1, &pts[0], &pts[num - 1], round_cap, total ); - prev_face = face_2; - } if (round_cap) DeleteObject( round_cap ); return TRUE; }

1 0

Francois Gouget : winmm: Don't include newlines in standard error messages.
by Alexandre Julliard 03 Jan '12

03 Jan '12

1 0

Francois Gouget : notepad: Remove unused resource strings.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: b60ff240d1091c63be13bb5aaad6dae7843f753a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60ff240d1091c63be13bb5aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 3 12:26:49 2012 +0100 notepad: Remove unused resource strings. --- po/ar.po | 85 +++++++++++--------------------- po/bg.po | 95 +++++++++++++----------------------- po/ca.po | 84 +++++++++++-------------------- po/cs.po | 85 +++++++++++--------------------- po/da.po | 86 +++++++++++--------------------- po/de.po | 86 +++++++++++--------------------- po/el.po | 78 +++++++++++------------------ po/en.po | 80 +++++++++++------------------- po/en_US.po | 84 +++++++++++-------------------- po/eo.po | 86 +++++++++++--------------------- po/es.po | 96 +++++++++++++----------------------- po/fa.po | 86 +++++++++++--------------------- po/fi.po | 97 +++++++++++++----------------------- po/fr.po | 84 +++++++++++-------------------- po/he.po | 85 +++++++++++--------------------- po/hi.po | 78 +++++++++++------------------ po/hu.po | 85 +++++++++++--------------------- po/it.po | 85 +++++++++++--------------------- po/ja.po | 85 +++++++++++--------------------- po/ko.po | 85 +++++++++++--------------------- po/lt.po | 84 +++++++++++-------------------- po/ml.po | 78 +++++++++++------------------ po/nb_NO.po | 86 +++++++++++--------------------- po/nl.po | 85 +++++++++++--------------------- po/or.po | 78 +++++++++++------------------ po/pa.po | 78 +++++++++++------------------ po/pl.po | 84 +++++++++++-------------------- po/pt_BR.po | 85 +++++++++++--------------------- po/pt_PT.po | 85 +++++++++++--------------------- po/rm.po | 78 +++++++++++------------------ po/ro.po | 105 +++++++++++++++------------------------- po/ru.po | 84 +++++++++++-------------------- po/sk.po | 78 +++++++++++------------------ po/sl.po | 85 +++++++++++--------------------- po/sr_RS(a)cyrillic.po | 85 +++++++++++--------------------- po/sr_RS(a)latin.po | 105 +++++++++++++++------------------------- po/sv.po | 86 +++++++++++--------------------- po/te.po | 78 +++++++++++------------------ po/th.po | 83 +++++++++++-------------------- po/tr.po | 86 +++++++++++--------------------- po/uk.po | 85 +++++++++++--------------------- po/wa.po | 85 +++++++++++--------------------- po/wine.pot | 78 +++++++++++------------------ po/zh_CN.po | 83 +++++++++++-------------------- po/zh_TW.po | 95 +++++++++++++----------------------- programs/notepad/notepad.rc | 8 --- programs/notepad/notepad_res.h | 5 -- 47 files changed, 1390 insertions(+), 2460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b60ff240d1091c63be13b…

1 0

Aric Stewart : usp10: Implement ScriptGetFontLanguageTags.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 0661d2d202ef00319cffb2dafec9fbe8df64e8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0661d2d202ef00319cffb2daf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:07 2012 -0600 usp10: Implement ScriptGetFontLanguageTags. --- dlls/usp10/shape.c | 121 ++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/tests/usp10.c | 37 ++++++++++++- dlls/usp10/usp10.c | 11 ++++ dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 9 +++ 5 files changed, 176 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0661d2d202ef00319cffb…

1 0