December 2011 - Wine-Commits

Francois Gouget : quartz: Define the QuartzTypeLib library in control.idl.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 209132724a8cfefaef6a7c2b95c41d97b0ba04a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209132724a8cfefaef6a7c2b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 28 10:45:12 2011 +0100 quartz: Define the QuartzTypeLib library in control.idl. Also remove some unneeded forward declarations. --- include/control.idl | 446 ++++++++++++++++++++++++++------------------------- 1 files changed, 224 insertions(+), 222 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=209132724a8cfefaef6a7…

1 0

Jacek Caban : jscript: Added bytecode version of for..in statement.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 661241a392bb90b931e8637f4f3e28f1369bc3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661241a392bb90b931e8637f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:05:53 2011 +0100 jscript: Added bytecode version of for..in statement. --- dlls/jscript/compile.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + dlls/jscript/parser.y | 2 +- 4 files changed, 137 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5f25598..585520d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1097,6 +1097,72 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) return S_OK; } +/* ECMA-262 3rd Edition 12.6.4 */ +static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *stat) +{ + unsigned loop_addr, off_backup = ctx->code_off; + BOOL prev_no_fallback; + HRESULT hres; + + if(stat->variable) { + hres = compile_variable_list(ctx, stat->variable); + if(FAILED(hres)) + return hres; + } + + hres = compile_expression(ctx, stat->in_expr); + if(FAILED(hres)) + return hres; + + if(stat->variable) { + hres = push_instr_bstr_uint(ctx, OP_identid, stat->variable->identifier, fdexNameEnsure); + if(FAILED(hres)) + return hres; + }else if(is_memberid_expr(stat->expr->type)) { + hres = compile_memberid_expression(ctx, stat->expr, fdexNameEnsure); + if(FAILED(hres)) + return hres; + }else { + hres = push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + if(FAILED(hres)) + return hres; + + /* FIXME: compile statement anyways when we depend on compiler to check errors */ + return S_OK; + } + + hres = push_instr_int(ctx, OP_int, DISPID_STARTENUM); + if(FAILED(hres)) + return hres; + + /* FIXME: avoid */ + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + + loop_addr = ctx->code_off; + if(push_instr(ctx, OP_forin) == -1) + return E_OUTOFMEMORY; + + prev_no_fallback = ctx->no_fallback; + ctx->no_fallback = TRUE; + hres = compile_statement(ctx, stat->statement); + ctx->no_fallback = prev_no_fallback; + if(hres == E_NOTIMPL) { + ctx->code_off = off_backup; + stat->stat.eval = forin_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + if(FAILED(hres)) + return hres; + + hres = push_instr_uint(ctx, OP_jmp, loop_addr); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, loop_addr)->arg1.uint = ctx->code_off; + return S_OK; +} + /* ECMA-262 3rd Edition 12.10 */ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) { @@ -1244,6 +1310,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_expression_statement(ctx, (expression_statement_t*)stat); case STAT_FOR: return compile_for_statement(ctx, (for_statement_t*)stat); + case STAT_FORIN: + return compile_forin_statement(ctx, (forin_statement_t*)stat); case STAT_IF: return compile_if_statement(ctx, (if_statement_t*)stat); case STAT_LABEL: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fbeee6f..f3268ba 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -936,6 +936,73 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return S_OK; } +/* ECMA-262 3rd Edition 12.6.4 */ +static HRESULT interp_forin(exec_ctx_t *ctx) +{ + const HRESULT arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; + IDispatch *var_obj, *obj = NULL; + IDispatchEx *dispex; + DISPID id, var_id; + BSTR name = NULL; + VARIANT *val; + HRESULT hres; + + TRACE("\n"); + + val = stack_pop(ctx); + + assert(V_VT(stack_top(ctx)) == VT_I4); + id = V_I4(stack_top(ctx)); + + var_obj = stack_topn_objid(ctx, 1, &var_id); + if(!var_obj) { + FIXME("invalid ref\n"); + VariantClear(val); + return E_FAIL; + } + + if(V_VT(stack_topn(ctx, 3)) == VT_DISPATCH) + obj = V_DISPATCH(stack_topn(ctx, 3)); + + if(obj) { + hres = IDispatch_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, id, &id); + if(hres == S_OK) + hres = IDispatchEx_GetMemberName(dispex, id, &name); + IDispatchEx_Release(dispex); + if(FAILED(hres)) { + VariantClear(val); + return hres; + } + }else { + TRACE("No IDispatchEx\n"); + } + } + + if(name) { + VARIANT v; + + VariantClear(val); + + V_I4(stack_top(ctx)) = id; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = name; + hres = disp_propput(ctx->parser->script, var_obj, var_id, &v, ctx->ei, NULL/*FIXME*/); + SysFreeString(name); + if(FAILED(hres)) + return hres; + + ctx->ip++; + }else { + stack_popn(ctx, 4); + ctx->ip = arg; + return stack_push(ctx, val); + } + return S_OK; +} + /* ECMA-262 3rd Edition 12.7 */ HRESULT continue_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7dbaeb2..b2f2f82 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -61,6 +61,7 @@ typedef struct _func_stack { X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ + X(forin, 0, ARG_UINT, 0) \ X(func, 1, ARG_FUNC, 0) \ X(gt, 1, 0,0) \ X(gteq, 1, 0,0) \ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 02d35bd..a184202 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -842,7 +842,7 @@ static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, compiled_statement_eval, compiled_statement_eval, - forin_statement_eval, + compiled_statement_eval, compiled_statement_eval, compiled_statement_eval, return_statement_eval,

1 0

Nikolay Sivov : msxml3: Implement element stack and use it in related callbacks.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 9d662928f5ea228a8dbcd1fd1283309a06d8d3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d662928f5ea228a8dbcd1fd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 24 16:10:33 2011 +0300 msxml3: Implement element stack and use it in related callbacks. --- dlls/msxml3/saxreader.c | 415 ++++++++++++++++++++--------------------- dlls/msxml3/tests/saxreader.c | 15 +- 2 files changed, 218 insertions(+), 212 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d662928f5ea228a8dbcd…

1 0

Jacek Caban : jscript: Use labels in compiler for ending loops.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 80113b5c5cfec2fdd9b9b33a46c1df361546b055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80113b5c5cfec2fdd9b9b33a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:41 2011 +0100 jscript: Use labels in compiler for ending loops. --- dlls/jscript/compile.c | 216 +++++++++++++++++++++++++++++++++++++---------- dlls/jscript/engine.c | 7 +- dlls/jscript/engine.h | 8 +- 3 files changed, 180 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80113b5c5cfec2fdd9b9b…

1 0

Francois Gouget : winetest: Always report errors and fatal errors, even in quiet mode.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 043c7fc0760736ea1bafcea8e64b7d2da9550c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043c7fc0760736ea1bafcea8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 28 10:42:11 2011 +0100 winetest: Always report errors and fatal errors, even in quiet mode. --- programs/winetest/gui.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index a9f3465..d5e3e27 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -402,12 +402,6 @@ qNoOp (va_list ap) } static int -qFatal (va_list ap) -{ - exit (1); -} - -static int qAsk (va_list ap) { return MBdefault (va_arg (ap, int)); @@ -507,7 +501,7 @@ report (enum report_type t, ...) static r_fun_t * const quiet_funcs[] = {qNoOp, qNoOp, qNoOp, qNoOp, qNoOp, qNoOp, qNoOp, - qNoOp, qNoOp, qFatal, qAsk}; + qNoOp, textError, textFatal, qAsk}; static r_fun_t * const * funcs = NULL; switch (t) {

1 0

Jacek Caban : jscript: Rename throw opcode to throw_ref.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 3f4f9f0f40d607a60ad3263489a747e679d0d696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4f9f0f40d607a60ad326348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:03 2011 +0100 jscript: Rename throw opcode to throw_ref. --- dlls/jscript/compile.c | 6 +++--- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 585520d..c02db25 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -322,7 +322,7 @@ static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expressio if(FAILED(hres)) return hres; - return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + return push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN); } hres = compile_memberid_expression(ctx, expr->expression, fdexNameEnsure); @@ -545,7 +545,7 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ if(op != OP_LAST && push_instr(ctx, op) == -1) return E_OUTOFMEMORY; - return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + return push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN); } hres = compile_memberid_expression(ctx, expr->expression1, fdexNameEnsure); @@ -1123,7 +1123,7 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s if(FAILED(hres)) return hres; }else { - hres = push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + hres = push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f3268ba..5c4852b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1250,7 +1250,7 @@ HRESULT throw_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return DISP_E_EXCEPTION; } -static HRESULT interp_throw(exec_ctx_t *ctx) +static HRESULT interp_throw_ref(exec_ctx_t *ctx) { const HRESULT arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b2f2f82..147bcad 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -99,7 +99,7 @@ typedef struct _func_stack { X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ - X(throw, 0, ARG_UINT, 0) \ + X(throw_ref, 0, ARG_UINT, 0) \ X(throw_type, 0, ARG_UINT, ARG_STR) \ X(tonum, 1, 0,0) \ X(tree, 1, ARG_STAT, 0) \

1 0

Jacek Caban : jscript: Use bytecode for throw statement.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 02ff8d18539455cfda8efa2c0b719e9998dea396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ff8d18539455cfda8efa2c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:17 2011 +0100 jscript: Use bytecode for throw statement. --- dlls/jscript/compile.c | 14 ++++++++++++++ dlls/jscript/engine.c | 12 ++---------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c02db25..9e8cb47 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1299,6 +1299,18 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t return S_OK; } +/* ECMA-262 3rd Edition 12.13 */ +static HRESULT compile_throw_statement(compiler_ctx_t *ctx, expression_statement_t *stat) +{ + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + return push_instr(ctx, OP_throw) == -1 ? E_OUTOFMEMORY : S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -1318,6 +1330,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return push_instr(ctx, OP_label) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ case STAT_SWITCH: return compile_switch_statement(ctx, (switch_statement_t*)stat); + case STAT_THROW: + return compile_throw_statement(ctx, (expression_statement_t*)stat); case STAT_VAR: return compile_var_statement(ctx, (var_statement_t*)stat); case STAT_WHILE: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5c4852b..b7b3248 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1234,19 +1234,11 @@ HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type } /* ECMA-262 3rd Edition 12.13 */ -HRESULT throw_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) +static HRESULT interp_throw(exec_ctx_t *ctx) { - expression_statement_t *stat = (expression_statement_t*)_stat; - VARIANT val; - HRESULT hres; - TRACE("\n"); - hres = expr_eval(ctx, stat->expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - rt->ei.var = val; + ctx->rt->ei.var = *stack_pop(ctx); return DISP_E_EXCEPTION; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 147bcad..9aa5616 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -99,6 +99,7 @@ typedef struct _func_stack { X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ + X(throw, 0, 0,0) \ X(throw_ref, 0, ARG_UINT, 0) \ X(throw_type, 0, ARG_UINT, ARG_STR) \ X(tonum, 1, 0,0) \ @@ -413,7 +414,6 @@ HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT with_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT switch_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT throw_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT try_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; typedef struct { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a184202..570eb5b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -847,7 +847,7 @@ static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, return_statement_eval, compiled_statement_eval, - throw_statement_eval, + compiled_statement_eval, try_statement_eval, compiled_statement_eval, compiled_statement_eval,

1 0

Jacek Caban : jscript: Added bytecode version of try statement.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 3b56e49ef9769671a904cb5ca8d1ce16e4b6bf39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b56e49ef9769671a904cb5ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:28 2011 +0100 jscript: Added bytecode version of try statement. --- dlls/jscript/compile.c | 92 ++++++++++++++++++++++++++ dlls/jscript/engine.c | 157 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/engine.h | 7 ++- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 23 +++++++ 5 files changed, 276 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b56e49ef9769671a904c…

1 0

Alexandre Julliard : gdi32: Pass the clip region to the brush_rect helper and add a similar helper for pens .
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: 9b8d920cb736eab30d65690f960b1833cbb00600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8d920cb736eab30d65690f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 11:28:21 2011 +0100 gdi32: Pass the clip region to the brush_rect helper and add a similar helper for pens. --- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- dlls/gdi32/dibdrv/graphics.c | 8 +++----- dlls/gdi32/dibdrv/objects.c | 32 ++++++++++++++++++-------------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 85aa2cf..8649752 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -229,7 +229,8 @@ extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HID extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; -extern BOOL brush_rect( dibdrv_physdev *pdev, const RECT *rect, INT rop ) DECLSPEC_HIDDEN; +extern BOOL brush_rect( dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop ) DECLSPEC_HIDDEN; +extern BOOL pen_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index c84cce2..e5aad2a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -479,7 +479,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, dst->x, dst->y, dst->width, dst->height, rop); - return brush_rect( pdev, &dst->visrect, get_rop2_from_rop(rop) ); + return brush_rect( pdev, &dst->visrect, pdev->clip, get_rop2_from_rop(rop) ); } /*********************************************************************** @@ -501,7 +501,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, region->rects[i].right, region->rects[i].bottom, FALSE ); - brush_rect( pdev, &rect, GetROP2( dev->hdc ) ); + brush_rect( pdev, &rect, pdev->clip, GetROP2( dev->hdc ) ); } release_wine_region( rgn ); @@ -603,9 +603,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.right -= (pdev->pen_width + 2) / 2; rect.bottom -= (pdev->pen_width + 2) / 2; - brush_rect( pdev, &rect, GetROP2(dev->hdc) ); - - return TRUE; + return brush_rect( pdev, &rect, pdev->clip, GetROP2(dev->hdc) ); } /*********************************************************************** diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 79ae047..e203af7 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1227,22 +1227,11 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) { - struct clipped_rects clipped_rects; - rop_mask color; HRGN region; - DWORD pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); - - calc_rop_masks( GetROP2(pdev->dev.hdc), pen_color, &color ); region = get_wide_lines_region( pdev, num, pts, close ); if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); - - if (get_clipped_rects( &pdev->dib, NULL, region, &clipped_rects )) - { - pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, - color.and, color.xor ); - free_clipped_rects( &clipped_rects ); - } + pen_rect( pdev, NULL, region, GetROP2( pdev->dev.hdc ) ); DeleteObject( region ); return TRUE; } @@ -1715,13 +1704,28 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) return next->funcs->pSetDCBrushColor( next, color ); } -BOOL brush_rect(dibdrv_physdev *pdev, const RECT *rect, INT rop) +BOOL brush_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) { struct clipped_rects clipped_rects; BOOL ret; - if (!get_clipped_rects( &pdev->dib, rect, pdev->clip, &clipped_rects )) return TRUE; + if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = pdev->brush_rects( pdev, &pdev->dib, clipped_rects.count, clipped_rects.rects, rop ); free_clipped_rects( &clipped_rects ); return ret; } + +BOOL pen_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) +{ + struct clipped_rects clipped_rects; + rop_mask color; + DWORD pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); + + if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; + + calc_rop_masks( rop, pen_color, &color ); + pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, + color.and, color.xor ); + free_clipped_rects( &clipped_rects ); + return TRUE; +}

1 0

Alexandre Julliard : gdi32: Fix the scaling of the width of cosmetic pens.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

Module: wine Branch: master Commit: ab63eb5c40d25bcbf2742f2dcb73df08a4301c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab63eb5c40d25bcbf2742f2dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 13:50:41 2011 +0100 gdi32: Fix the scaling of the width of cosmetic pens. --- dlls/gdi32/dibdrv/objects.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e203af7..c9b7814 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1245,18 +1245,15 @@ 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 ) +static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) { - int width = pen->lopnWidth.x; + POINT pts[2]; - 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 = abs( pts[1].x - pts[0].x ); - } + if (!width) return 1; + pts[0].x = pts[0].y = pts[1].y = 0; + pts[1].x = width; + LPtoDP( pdev->dev.hdc, pts, 2 ); + width = abs( pts[1].x - pts[0].x ); return max( width, 1 ); } @@ -1285,15 +1282,16 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) /* FIXME: add support for user style pens */ logpen.lopnStyle = elp->elpPenStyle; logpen.lopnWidth.x = elp->elpWidth; - logpen.lopnWidth.y = 0; logpen.lopnColor = elp->elpColor; + /* cosmetic ext pens are always 1-pixel wide */ + if (!(logpen.lopnStyle & PS_GEOMETRIC)) logpen.lopnWidth.x = 0; 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 ); + pdev->pen_width = get_pen_device_width( pdev, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) logpen.lopnColor = GetDCPenColor( dev->hdc );

1 0