December 2011 - Wine-Commits

Jacek Caban : jscript: Use bytecode for '<<=' expression implementation.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 7c3728d728da6a0732eb265e0a195f75e71b4490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3728d728da6a0732eb265e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:05:08 2011 +0100 jscript: Use bytecode for '<<=' expression implementation. --- dlls/jscript/compile.c | 2 + dlls/jscript/engine.c | 71 ------------------------------------------------ dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 73 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0f85471..1121838 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -625,6 +625,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_ASSIGNOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); + case EXPR_ASSIGNLSHIFT: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_lshift); case EXPR_ASSIGNRSHIFT: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift); case EXPR_ASSIGNRRSHIFT: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0f74940..7886c0c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1440,47 +1440,6 @@ static HRESULT binary_expr_eval(script_ctx_t *ctx, binary_expression_t *expr, op return S_OK; } -/* ECMA-262 3rd Edition 11.13.2 */ -static HRESULT assign_oper_eval(script_ctx_t *ctx, expression_t *lexpr, expression_t *rexpr, oper_t oper, - jsexcept_t *ei, exprval_t *ret) -{ - VARIANT retv, lval, rval; - exprval_t exprval, exprvalr; - HRESULT hres; - - hres = expr_eval(ctx, lexpr, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_value(ctx, &exprval, ei, &lval); - if(SUCCEEDED(hres)) { - hres = expr_eval(ctx, rexpr, 0, ei, &exprvalr); - if(SUCCEEDED(hres)) { - hres = exprval_value(ctx, &exprvalr, ei, &rval); - exprval_release(&exprvalr); - } - if(SUCCEEDED(hres)) { - hres = oper(ctx, &lval, &rval, ei, &retv); - VariantClear(&rval); - } - VariantClear(&lval); - } - - if(SUCCEEDED(hres)) { - hres = put_value(ctx, &exprval, &retv, ei); - if(FAILED(hres)) - VariantClear(&retv); - } - exprval_release(&exprval); - - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - ret->u.var = retv; - return S_OK; -} - /* ECMA-262 3rd Edition 13 */ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -3093,26 +3052,6 @@ static HRESULT interp_neg(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.7.1 */ -static HRESULT lshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - DWORD ri; - INT li; - HRESULT hres; - - hres = to_int32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_uint32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li << (ri&0x1f); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.7.1 */ static HRESULT interp_lshift(exec_ctx_t *ctx) { DWORD r; @@ -3191,16 +3130,6 @@ static HRESULT interp_assign(exec_ctx_t *ctx) return stack_push(ctx, v); } -/* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_lshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, lshift_eval, ei, ret); -} - static HRESULT interp_undefined(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d7714fe..e6ad0c9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -568,7 +568,6 @@ HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3019c60..76d1c1d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1340,7 +1340,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_lshift_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '<<' expression implementation.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: a80392e5eaa746590aaf46a8e046a0837fcfc54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80392e5eaa746590aaf46a8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:57 2011 +0100 jscript: Use bytecode for '<<' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 16 ++++++++++++---- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 541e945..0f85471 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -667,6 +667,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); + case EXPR_LSHIFT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lshift); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr); case EXPR_MINUS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3ebdb83..0f74940 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3113,13 +3113,21 @@ static HRESULT lshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsex } /* ECMA-262 3rd Edition 11.7.1 */ -HRESULT left_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_lshift(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + DWORD r; + INT l; + HRESULT hres; - TRACE("\n"); + hres = stack_pop_uint(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; - return binary_expr_eval(ctx, expr, lshift_eval, ei, ret); + return stack_push_int(ctx, l << (r&0x1f)); } /* ECMA-262 3rd Edition 11.7.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ba2c3a8..d7714fe 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -65,6 +65,7 @@ typedef struct _func_stack { X(jmp, 0, ARG_ADDR, 0) \ X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \ X(member, 1, ARG_BSTR, 0) \ @@ -567,7 +568,6 @@ HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 00fea0b..3019c60 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1336,7 +1336,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - left_shift_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Fixed memory leaks.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: fcdd85267db6a3f12a94712f86d93b488ee62c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcdd85267db6a3f12a94712f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:14 2011 +0100 jscript: Fixed memory leaks. --- dlls/jscript/engine.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 63ae9d7..6a76f8e 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1585,6 +1585,7 @@ static HRESULT interp_array(exec_ctx_t *ctx) } hres = to_string(ctx->parser->script, namev, &ctx->ei, &name); + VariantClear(namev); if(FAILED(hres)) { IDispatch_Release(obj); return hres; @@ -2701,6 +2702,8 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) num_set_val(&inc, num_val(&n)+(double)arg); hres = disp_propput(ctx->parser->script, obj, id, &inc, &ctx->ei, NULL/*FIXME*/); } + if(FAILED(hres)) + VariantClear(&v); } IDispatch_Release(obj); if(FAILED(hres))

1 0

Hans Leidekker : winhttp: Remove some dead assignments (clang).
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 053d1731fe815c11d355cf9bf64602dd183fdd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053d1731fe815c11d355cf9bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 09:01:42 2011 +0100 winhttp: Remove some dead assignments (clang). --- dlls/winhttp/request.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f610dde..fac6fac 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1872,7 +1872,7 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(ret = handle_redirect( request, status ))) break; clear_response_headers( request ); - ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ + send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ continue; } else if (status == 401 || status == 407) @@ -1886,7 +1886,7 @@ static BOOL receive_response( request_t *request, BOOL async ) break; } clear_response_headers( request ); - ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); + send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); continue; } break;

1 0

Huw Davies : gdi32/tests: Add some tests for wide pens.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: ac7e9f6dcc7c5b05be0d993cfb7f6ea804955f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7e9f6dcc7c5b05be0d993cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 13:47:28 2011 +0000 gdi32/tests: Add some tests for wide pens. --- dlls/gdi32/tests/dib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 79a62db..909457d 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -135,6 +135,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "0cdf6fee6721d60d5d5ed26b1989eacddc16b14e", "e462052a03dbe4ec3814db7700e166d00d4d686f", "a27917d4db49ce77989fae246015aeb2a28520ee", + "657514a4ca1f2b6ca7a125ad58dfed82099a37d1", NULL }; @@ -196,6 +197,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "0cdf6fee6721d60d5d5ed26b1989eacddc16b14e", "0cda6b3297003b3ccd6d5baa17e1ca9bb7c56f08", "b2c8e1ebb9435031fe068442f479d1304096e79f", + "657514a4ca1f2b6ca7a125ad58dfed82099a37d1", NULL }; @@ -257,6 +259,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "9c8f3063504a81bbbfa8558e111c63d8bc36dbbf", "87f57a31253a38dbf3dc3070473328fa04b68a48", "db64cc4d830fc35ed170b53943e722b2342954d4", + "9988ceca44dafbee247aece1f027c06c27c01652", NULL }; @@ -318,6 +321,7 @@ static const char *sha1_graphics_r10g10b10[] = "3a81fe558c69ca0aea7e7191771ed86cf4321a5a", "8ea5d7e4bebc40a1d91b04b12e1c11a42c188095", "317521e576801acaea62c76fe16813cdfe20f4ad", + "ce0fc29bb0281d6c955d64e239254ef9e6dbc06d", NULL }; @@ -379,6 +383,7 @@ static const char *sha1_graphics_r6g6b6[] = "796fd861474aa7861bd0384127df755458757ec3", "aecb242c31f31a90f071b6455ea7d808d4ea22e3", "77ea86e51a94b11a8081b29696cb4115687843e3", + "d67b897cad72d31e75359094007b1346fd8806ea", NULL }; @@ -440,6 +445,7 @@ static const char *sha1_graphics_24[] = "826de85271b67a11e7bd1a6596b58a045a96b69e", "354b92008a8409c62d0fa1dff1532c5943aa37a2", "8dc9cb7deae5c24d1eae004d53893fa6caf4723c", + "cf311a96d41bd98fdbdfb5dfaac4ba1ba9b7d6da", NULL }; @@ -505,6 +511,7 @@ static const char *sha1_graphics_r5g5b5[] = "517e32a8c0312b5676d498583ea092b0f198f2bc", "295ec16530126046790fb734e99f86f5b3b74ed8", "d98b0561010606b55a1b9b85fbc93640f681d256", + "1c1499051860b7caa25173b328ca9c862f01dd1a", NULL }; @@ -565,6 +572,7 @@ static const char *sha1_graphics_r4g4b4[] = "d8ba2e556fd64c9c2f1746496e6e7dd7a487cd6d", "7587a9c87cab1eca827807f351bb67ca184d1ac5", "b53ef0b5c674822e784903a9dbdd3b386d9f2350", + "5505d2ed20dc61ffe48832ecf5329162a5ceb734", NULL }; @@ -631,6 +639,7 @@ static const char *sha1_graphics_8_color[] = "1f9a21eba2f2ce87768a5618d9cfefa7e48fb386", "e58d9c0acf0219d0839e1dbd162e08a765ed7f0f", "34ca0f9660e1889f9f2c0deb80535d3c4f349fa4", + "2c07272462c68cf5944b03e2aa049475b99143c5", NULL }; @@ -702,6 +711,7 @@ static const char *sha1_graphics_8_grayscale[] = "d908c86b7301666a8d7999b831841115a4938181", "0ca8775d9a61ccc251d1e6f2e3cfd26a24ae24a2", "17ae603c199a5d6695d198a7f36e6d7263990951", + "1918a33f59d3500204ffc573318a39e9ff754221", NULL }; @@ -766,6 +776,7 @@ static const char *sha1_graphics_8[] = "ba49de83c4668fb08956221f465b93e7dd6a3383", "bd28d77cd85b20a2384d6b25082cfd884bba683e", "7e591ec8ae9bb61c3a443c93f071cab2b8978394", + "f81c70b6ee2d4690f9f7c797c66582b176f8dcef", NULL }; @@ -826,6 +837,7 @@ static const char *sha1_graphics_4[] = "38a3b6edcba2a1fba6064f0b4d771aedae7f4673", "28a6b9f7927e99e53cf46f0333d29168cb10e920", "029552113292cc110fd6b7888e766628950aaeef", + "297f6ad15200bffbf15198324ee8f27a61a6f2d4", NULL }; @@ -886,6 +898,7 @@ static const char *sha1_graphics_4_grayscale[] = "2e4dc1e859350289575ffc2a47cd0033efca6c32", "ada3b7c34946e584dcdf4203e07cfa3dad02bc63", "c2f61571b067a44b30f56b4658c9606f0edfc0f3", + "58f400c9bb78e49a879276fb049edfc9c981740a", NULL }; @@ -961,6 +974,7 @@ static const char *sha1_graphics_1[] = "6c4640b17e072efc682044c499e5a4f3481b7c87", "781d8c5cbc28591fd48fce06f984c502fdc6b363", "df510792a7790cc699532b1420d43c6d4da2ae2f", + "55c26d22f11d80b73383fa57d0fac552d705b092", NULL }; @@ -1114,6 +1128,18 @@ static const RECT line_clips[] = {199, 142, 210, 143} /* start pt just inside r edge */ }; +static const RECT wide_lines[] = +{ + {100, 10, 200, 10}, + {100, 21, 200, 21}, + {200, 40, 100, 40}, + {200, 61, 100, 61}, + { 10, 100, 10, 200}, + { 21, 100, 21, 200}, + { 40, 200, 40, 100}, + { 61, 200, 61, 100}, +}; + static const RECT patblt_clips[] = { {120, 120, 140, 126}, /* unclipped */ @@ -1181,7 +1207,7 @@ static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, C static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { DWORD dib_size = get_dib_size(bmi); - HPEN solid_pen, dashed_pen, orig_pen; + HPEN solid_pen, dashed_pen, wide_pen, orig_pen; HBRUSH solid_brush, dib_brush, hatch_brush, orig_brush; HBITMAP bmp; INT i, x, y, hatch_style; @@ -2168,14 +2194,33 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "GdiGradientFill" ); memset(bits, 0xcc, dib_size); } - else win_skip( "GdiGradientFill not supported\n" ); + else + { + win_skip( "GdiGradientFill not supported\n" ); + *sha1 += 2; + } + + /* wide pen */ + + wide_pen = CreatePen( PS_SOLID, 7, RGB( 0xff, 0, 0 ) ); + SelectObject( hdc, wide_pen ); + + for (i = 0; i < sizeof( wide_lines ) / sizeof( wide_lines[0] ); i++) + { + MoveToEx( hdc, wide_lines[i].left, wide_lines[i].top, NULL ); + LineTo( hdc, wide_lines[i].right, wide_lines[i].bottom ); + } + + compare_hash(bmi, bits, sha1, "wide pen" ); + memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn); DeleteObject(dib_brush); - DeleteObject(dashed_pen); DeleteObject(solid_brush); + DeleteObject(wide_pen); + DeleteObject(dashed_pen); DeleteObject(solid_pen); }

1 0

Huw Davies : gdi32: Add support for wide cosmetic pens.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: e155a8054bff9e139116ceaeec272b5cbf0a3d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e155a8054bff9e139116ceaee… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 13:47:27 2011 +0000 gdi32: Add support for wide cosmetic pens. --- dlls/gdi32/dibdrv/dibdrv.h | 3 +- dlls/gdi32/dibdrv/objects.c | 185 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 185 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 1bf0696..6f01a5e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,7 +85,8 @@ typedef struct dibdrv_physdev /* pen */ COLORREF pen_colorref; - DWORD pen_color, pen_and, pen_xor; + DWORD pen_color, pen_and, pen_xor, pen_endcap, pen_join; + int pen_width; dash_pattern pen_pattern; dash_pos dash_pos; BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 9c85094..14f1260 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1017,6 +1017,166 @@ static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close return TRUE; } +static void add_cap( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) +{ + HRGN cap; + + switch (pdev->pen_endcap) + { + 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; + + default: /* only supporting cosmetic pens so far, so always PS_ENDCAP_ROUND */ + return; + } + + CombineRgn( region, region, cap, RGN_OR ); + DeleteObject( cap ); + return; +} + +static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) +{ + HRGN join; + + switch (pdev->pen_join) + { + 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; + + default: /* only supporting cosmetic pens so far, so always PS_JOIN_ROUND */ + return; + } + + CombineRgn( region, region, join, RGN_OR ); + DeleteObject( join ); + return; +} + +#define round( f ) (((f) > 0) ? (f) + 0.5 : (f) - 0.5) + +static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BOOL close ) +{ + int i; + HRGN total, segment; + + assert( num >= 2 ); + + total = CreateRectRgn( 0, 0, 0, 0 ); + + 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; + RECT rect; + + if (dx == 0 && dy == 0) continue; + + if (dy == 0) + { + rect.left = min( pt_1->x, pt_2->x ); + rect.right = rect.left + abs( dx ); + rect.top = pt_1->y - pdev->pen_width / 2; + rect.bottom = rect.top + pdev->pen_width; + segment = CreateRectRgnIndirect( &rect ); + } + else if (dx == 0) + { + rect.top = min( pt_1->y, pt_2->y ); + rect.bottom = rect.top + abs( dy ); + rect.left = pt_1->x - pdev->pen_width / 2; + rect.right = rect.left + pdev->pen_width; + segment = CreateRectRgnIndirect( &rect ); + } + else + { + double len = hypot( dx, dy ); + double width_x, width_y; + POINT seg_pts[4]; + POINT wide_half, narrow_half; + + width_x = pdev->pen_width * abs( dy ) / len; + width_y = pdev->pen_width * abs( dx ) / len; + + narrow_half.x = round( width_x / 2 ); + narrow_half.y = round( width_y / 2 ); + wide_half.x = round( (width_x + 1) / 2 ); + wide_half.y = round( (width_y + 1) / 2 ); + + if (dx < 0) + { + wide_half.y = -wide_half.y; + narrow_half.y = -narrow_half.y; + } + + if (dy < 0) + { + POINT tmp = narrow_half; narrow_half = wide_half; wide_half = tmp; + wide_half.x = -wide_half.x; + narrow_half.x = -narrow_half.x; + } + + seg_pts[0].x = pt_1->x - narrow_half.x; + seg_pts[0].y = pt_1->y + narrow_half.y; + seg_pts[1].x = pt_1->x + wide_half.x; + seg_pts[1].y = pt_1->y - wide_half.y; + seg_pts[2].x = pt_2->x + wide_half.x; + seg_pts[2].y = pt_2->y - wide_half.y; + seg_pts[3].x = pt_2->x - narrow_half.x; + seg_pts[3].y = pt_2->y + narrow_half.y; + + segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + } + + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); + + if (i == 0) + { + if (!close) add_cap( pdev, total, pt_1 ); + } + else + add_join( pdev, total, pt_1 ); + + if (i == num - 1) + { + if (close) add_join( pdev, total, pt_2 ); + else add_cap( pdev, total, pt_2 ); + } + + } + return total; +} + +static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +{ + const WINEREGION *data; + rop_mask color; + HRGN region; + + color.and = pdev->pen_and; + color.xor = pdev->pen_xor; + + region = get_wide_lines_region( pdev, num, pts, close ); + + if (CombineRgn( region, region, pdev->clip, RGN_AND ) != ERROR) + { + data = get_wine_region( region ); + solid_rects( &pdev->dib, data->numRects, data->rects, &color, NULL ); + release_wine_region( region ); + } + + DeleteObject( region ); + return TRUE; +} + static const dash_pattern dash_patterns[5] = { {0, {0}, 0}, /* PS_SOLID - a pseudo-pattern used to initialise unpatterned pens. */ @@ -1026,6 +1186,21 @@ static const dash_pattern dash_patterns[5] = {6, {9, 3, 3, 3, 3, 3}, 24} /* PS_DASHDOTDOT */ }; +static inline int get_pen_device_width( dibdrv_physdev *pdev, LOGPEN *pen ) +{ + int width = pen->lopnWidth.x; + + if (pen->lopnStyle & PS_GEOMETRIC && width > 1) + { + POINT pts[2]; + pts[0].x = pts[0].y = pts[1].y = 0; + pts[1].x = width; + LPtoDP( pdev->dev.hdc, pts, 2 ); + width = max( abs( pts[1].x - pts[0].x ), 1 ); + } + return width; +} + /*********************************************************************** * dibdrv_SelectPen */ @@ -1058,6 +1233,10 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) HeapFree( GetProcessHeap(), 0, elp ); } + pdev->pen_join = logpen.lopnStyle & PS_JOIN_MASK; + pdev->pen_endcap = logpen.lopnStyle & PS_ENDCAP_MASK; + pdev->pen_width = get_pen_device_width( pdev, &logpen ); + if (hpen == GetStockObject( DC_PEN )) logpen.lopnColor = GetDCPenColor( dev->hdc ); @@ -1075,8 +1254,10 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) { case PS_SOLID: if(logpen.lopnStyle & PS_GEOMETRIC) break; - if(logpen.lopnWidth.x > 1) break; - pdev->pen_lines = solid_pen_lines; + if(pdev->pen_width <= 1) + pdev->pen_lines = solid_pen_lines; + else + pdev->pen_lines = wide_pen_lines; pdev->defer &= ~DEFER_PEN; break;

1 0

Hans Leidekker : po: Update Dutch translation.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: b37151b980743cfadf904b4a7eaadca1a900f106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37151b980743cfadf904b4a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 08:59:18 2011 +0100 po: Update Dutch translation. --- po/nl.po | 1092 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 476 insertions(+), 616 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b37151b980743cfadf904…

1 0

Hans Leidekker : winhttp: Avoid a null pointer dereference (clang).
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: e950e89867cca8ed3fad6c9cbbdb12a746c320bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e950e89867cca8ed3fad6c9cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 09:01:23 2011 +0100 winhttp: Avoid a null pointer dereference (clang). --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 0f9e782..b4ed568 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -565,7 +565,7 @@ static void str_to_buffer( WCHAR *buffer, const WCHAR *str, LPDWORD buflen ) if (str) len = strlenW( str ); if (buffer && *buflen > len) { - memcpy( buffer, str, len * sizeof(WCHAR) ); + if (str) memcpy( buffer, str, len * sizeof(WCHAR) ); buffer[len] = 0; } *buflen = len * sizeof(WCHAR);

1 0

Nikolay Sivov : comctl32/listview: Create header when LVS_EX_FULLROWSELECT is requested.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 485fde811db67ba2aaf51ac6f0850f32a6b5afe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485fde811db67ba2aaf51ac6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 10:42:54 2011 +0300 comctl32/listview: Create header when LVS_EX_FULLROWSELECT is requested. --- dlls/comctl32/listview.c | 5 +++++ dlls/comctl32/tests/listview.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c951633..3cd316a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8450,6 +8450,11 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD mas LISTVIEW_UpdateSize(infoPtr); } + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_FULLROWSELECT) + { + LISTVIEW_CreateHeader(infoPtr); + } + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_TRANSPARENTBKGND) { if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 64d6090..b3df59e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1557,6 +1557,20 @@ static void test_create(void) ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + /* setting LVS_EX_FULLROWSELECT creates header */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader) || + broken(!IsWindow(hHeader)), /* 4.7x common controls */ + "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); + /* not report style accepts LVS_EX_HEADERDRAGDROP too */ hList = create_listview_control(LVS_ICON); SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP);

1 0

Piotr Caban : services: Accept SERVICE_START_PENDING as valid service start status.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 8e915c51e1e34aae76dacc97065998c13a090090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e915c51e1e34aae76dacc970… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 9 13:33:32 2011 +0100 services: Accept SERVICE_START_PENDING as valid service start status. --- programs/services/services.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 4369d28..4a4aeb8 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -711,7 +711,12 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL service_lock_shared(service_entry); dwCurrentStatus = service_entry->status.dwCurrentState; service_unlock(service_entry); - if (dwCurrentStatus == SERVICE_RUNNING) + if (dwCurrentStatus == SERVICE_START_PENDING) + { + WINE_TRACE("Service changed its status to SERVICE_START_PENDING\n"); + return ERROR_SUCCESS; + } + else if (dwCurrentStatus == SERVICE_RUNNING) { WINE_TRACE("Service started successfully\n"); return ERROR_SUCCESS;

1 0