December 2011 - Wine-commits

Jacek Caban : jscript: No longer support per-statement compilation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: b3907c40f74f4b25ed9c7a34004ddac051eb43e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3907c40f74f4b25ed9c7a340… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:09:09 2011 +0100 jscript: No longer support per-statement compilation. --- dlls/jscript/compile.c | 4 ++-- dlls/jscript/engine.c | 14 ++++---------- dlls/jscript/engine.h | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5d63dbe..05d1ccc 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1637,7 +1637,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *re return push_instr(parser->compiler, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK; } -HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL compile_block, unsigned *ret_off) +HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned *ret_off) { HRESULT hres; @@ -1648,7 +1648,7 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL com return hres; *ret_off = parser->compiler->code_off; - if(compile_block && stat->next) + if(stat->next) hres = compile_block_statement(parser->compiler, stat); else hres = compile_statement(parser->compiler, NULL, stat); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c792a66..1cd96a7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2589,7 +2589,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) return hres; } -HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, VARIANT *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; except_frame_t *prev_except_frame; @@ -2602,19 +2602,13 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ TRACE("\n"); - if(stat->instr_off == -1) { - hres = compile_subscript_stat(exec_ctx->parser, stat, FALSE, &stat->instr_off); - if(FAILED(hres)) - return hres; - } - prev_rt = exec_ctx->rt; prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; prev_ei = exec_ctx->ei; - exec_ctx->ip = stat->instr_off; + exec_ctx->ip = ip; exec_ctx->rt = rt; exec_ctx->ei = &rt->ei; exec_ctx->except_frame = NULL; @@ -2762,9 +2756,9 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so if(source->statement) { if(source->statement->instr_off == -1) - hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off); + hres = compile_subscript_stat(ctx->parser, source->statement, &source->statement->instr_off); if(SUCCEEDED(hres)) - hres = compiled_statement_eval(script, source->statement, &rt, &val); + hres = enter_bytecode(script, source->statement->instr_off, &rt, &val); } script->exec_ctx = prev_ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b42a2ba..c984ade 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -591,4 +591,4 @@ typedef struct { } property_value_expression_t; HRESULT compile_subscript(parser_ctx_t*,expression_t*,unsigned*) DECLSPEC_HIDDEN; -HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN; +HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,unsigned*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Moved instr_off from statement_t to source_elements_t.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: ee6e6986fb8d93632ba02c63f3f2015cd125c048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6e6986fb8d93632ba02c63f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:09:29 2011 +0100 jscript: Moved instr_off from statement_t to source_elements_t. --- dlls/jscript/engine.c | 6 +++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1cd96a7..9a4ac64 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2755,10 +2755,10 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so rt.type = RT_NORMAL; if(source->statement) { - if(source->statement->instr_off == -1) - hres = compile_subscript_stat(ctx->parser, source->statement, &source->statement->instr_off); + if(source->instr_off == -1) + hres = compile_subscript_stat(ctx->parser, source->statement, &source->instr_off); if(SUCCEEDED(hres)) - hres = enter_bytecode(script, source->statement->instr_off, &rt, &val); + hres = enter_bytecode(script, source->instr_off, &rt, &val); } script->exec_ctx = prev_ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c984ade..530a65a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -320,7 +320,6 @@ typedef enum { struct _statement_t { statement_type_t type; statement_eval_t eval; - unsigned instr_off; statement_t *next; }; @@ -508,6 +507,7 @@ struct _source_elements_t { statement_t *statement_tail; function_declaration_t *functions; var_list_t *variables; + unsigned instr_off; }; struct _function_expression_t { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a3fe42a..c45fb6e 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -845,7 +845,6 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size stat->type = type; stat->eval = NULL; - stat->instr_off = -1; stat->next = NULL; return stat; @@ -1472,6 +1471,7 @@ static source_elements_t *new_source_elements(parser_ctx_t *ctx) source_elements_t *ret = parser_alloc(ctx, sizeof(source_elements_t)); memset(ret, 0, sizeof(*ret)); + ret->instr_off = -1; return ret; }

1 0

Jacek Caban : jscript: Added bytecode dumper implementation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 59619073a89cc6add5eda979ac234ed8e2d0266e URL: http://source.winehq.org/git/wine.git/?a=commit;h=59619073a89cc6add5eda979a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:09:51 2011 +0100 jscript: Added bytecode dumper implementation. --- dlls/jscript/compile.c | 55 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 05d1ccc..62dadea 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -25,6 +25,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); +WINE_DECLARE_DEBUG_CHANNEL(jscript_disas); typedef struct _statement_ctx_t { unsigned stack_use; @@ -61,6 +62,46 @@ OP_LIST #undef X }; +static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) +{ + switch(type) { + case ARG_STR: + TRACE_(jscript_disas)("\t%s", debugstr_w(arg->str)); + break; + case ARG_BSTR: + TRACE_(jscript_disas)("\t%s", debugstr_wn(arg->bstr, SysStringLen(arg->bstr))); + break; + case ARG_INT: + TRACE_(jscript_disas)("\t%d", arg->uint); + break; + case ARG_UINT: + case ARG_ADDR: + TRACE_(jscript_disas)("\t%u", arg->uint); + break; + case ARG_DBL: + TRACE_(jscript_disas)("\t%lf", *arg->dbl); + break; + case ARG_STAT: + case ARG_FUNC: + case ARG_NONE: + break; + default: + assert(0); + } +} + +static void dump_code(compiler_ctx_t *ctx, unsigned off) +{ + instr_t *instr; + + for(instr = ctx->code->instrs+off; instr < ctx->code->instrs+ctx->code_off; instr++) { + TRACE_(jscript_disas)("%d:\t%s", (int)(instr-ctx->code->instrs), instr_info[instr->op].op_str); + dump_instr_arg(instr_info[instr->op].arg1_type, &instr->arg1); + dump_instr_arg(instr_info[instr->op].arg2_type, &instr->arg2); + TRACE_(jscript_disas)("\n"); + } +} + static HRESULT compile_expression(compiler_ctx_t*,expression_t*); static HRESULT compile_statement(compiler_ctx_t*,statement_ctx_t*,statement_t*); @@ -1639,6 +1680,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *re HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned *ret_off) { + unsigned off; HRESULT hres; TRACE("\n"); @@ -1647,7 +1689,7 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned if(FAILED(hres)) return hres; - *ret_off = parser->compiler->code_off; + off = parser->compiler->code_off; if(stat->next) hres = compile_block_statement(parser->compiler, stat); else @@ -1655,7 +1697,14 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned if(FAILED(hres)) return hres; - resolve_labels(parser->compiler, *ret_off); + resolve_labels(parser->compiler, off); - return push_instr(parser->compiler, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK; + if(push_instr(parser->compiler, OP_ret) == -1) + return E_OUTOFMEMORY; + + if(TRACE_ON(jscript_disas)) + dump_code(parser->compiler, off); + + *ret_off = off; + return S_OK; }

1 0

Nikolay Sivov : wshom.ocx: Added IDispatch support for IWshShell3.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 322887635599ebae4bd13f838fb427face085c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=322887635599ebae4bd13f838… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 29 12:16:22 2011 +0300 wshom.ocx: Added IDispatch support for IWshShell3. --- dlls/wshom.ocx/Makefile.in | 1 + dlls/wshom.ocx/shell.c | 37 +++++++++++++++++--- dlls/wshom.ocx/tests/wshom.c | 6 +++- dlls/wshom.ocx/wshom_main.c | 70 +++++++++++++++++++++++++++++++++++++++- dlls/wshom.ocx/wshom_private.h | 9 +++++ 5 files changed, 115 insertions(+), 8 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 879cc70..385fe73 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,4 +1,5 @@ MODULE = wshom.ocx +IMPORTS = uuid oleaut32 C_SRCS = \ shell.c \ diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 9392ff5..68f14b8 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -23,6 +23,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); +static IWshShell3 WshShell3; + static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { @@ -66,23 +68,46 @@ static HRESULT WINAPI WshShell3_GetTypeInfoCount(IWshShell3 *iface, UINT *pctinf static HRESULT WINAPI WshShell3_GetTypeInfo(IWshShell3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("(%u %u %p)\n", iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("(%u %u %p)\n", iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshShell3_tid, ppTInfo); } static HRESULT WINAPI WshShell3_GetIDsOfNames(IWshShell3 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("(%s %p %u %u %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%s %p %u %u %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshShell3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("(%d %s %d %d %p %p %p %p)\n", dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%d %s %d %d %p %p %p %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo(IWshShell3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &WshShell3, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI WshShell3_get_SpecialFolders(IWshShell3 *iface, IWshCollection **out_Folders) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index f9768b9..36081aa 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -31,6 +31,7 @@ DEFINE_GUID(IID_IWshShell3, 0x41904400, 0xbe18, 0x11d3, 0xa2,0x8b, 0x00,0x10,0x4 static void test_wshshell(void) { + IDispatchEx *dispex; IDispatch *disp; IUnknown *shell; HRESULT hres; @@ -43,9 +44,12 @@ static void test_wshshell(void) } hres = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); - IDispatch_Release(disp); ok(hres == S_OK, "Could not get IWshShell3 iface: %08x\n", hres); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == E_NOINTERFACE, "got %08x\n", hres); + + IDispatch_Release(disp); IUnknown_Release(shell); } diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index b05eb86..c750592 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -16,8 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "initguid.h" #include "wshom_private.h" + +#include "initguid.h" #include "wshom.h" #include "rpcproxy.h" @@ -27,6 +28,70 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); static HINSTANCE wshom_instance; +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IWshShell3 +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_IWshRuntimeLibrary, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + +void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -91,6 +156,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) wshom_instance = hInstDLL; DisableThreadLibraryCalls(wshom_instance); break; + case DLL_PROCESS_DETACH: + release_typelib(); + break; } return TRUE; diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index 50b84b3..42be641 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -24,4 +24,13 @@ #include "winbase.h" #include "ole2.h" +/* typelibs */ +typedef enum tid_t { + NULL_tid, + IWshShell3_tid, + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo); + HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add support for updating a region from the pen backend functions instead of painting directly .
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 0429d9181f211e40f1fc922185a8924048f199c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0429d9181f211e40f1fc92218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 11:56:24 2011 +0100 gdi32: Add support for updating a region from the pen backend functions instead of painting directly. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 8 ++++---- dlls/gdi32/dibdrv/objects.c | 21 ++++++++++----------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 5d9ecb6..fa8d445 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -89,7 +89,7 @@ typedef struct dibdrv_physdev dash_pattern pen_pattern; dash_pos dash_pos; rop_mask dash_masks[2]; - BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close); + BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region); /* brush */ UINT brush_style; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e5aad2a..e8b45a1 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -453,7 +453,7 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) reset_dash_origin(pdev); - if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts, FALSE)) + if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts, FALSE, 0)) return next->funcs->pLineTo( next, x, y ); return TRUE; @@ -532,7 +532,7 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO LPtoDP( dev->hdc, points, counts[i] ); reset_dash_origin( pdev ); - pdev->pen_lines( pdev, counts[i], points, FALSE ); + pdev->pen_lines( pdev, counts[i], points, FALSE, 0 ); } HeapFree( GetProcessHeap(), 0, points ); @@ -557,7 +557,7 @@ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) LPtoDP( dev->hdc, points, count ); reset_dash_origin( pdev ); - pdev->pen_lines( pdev, count, points, FALSE ); + pdev->pen_lines( pdev, count, points, FALSE, 0 ); HeapFree( GetProcessHeap(), 0, points ); return TRUE; @@ -596,7 +596,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) pts[1].x = pts[2].x = rect.left; pts[2].y = pts[3].y = rect.bottom - 1; - pdev->pen_lines(pdev, 4, pts, TRUE); + pdev->pen_lines(pdev, 4, pts, TRUE, 0); rect.left += (pdev->pen_width + 1) / 2; rect.top += (pdev->pen_width + 1) / 2; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 46f3092..bf821f2 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -631,7 +631,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD return TRUE; } -static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; DWORD color, and, xor; @@ -927,7 +927,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } -static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; @@ -945,7 +945,7 @@ static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL clo return TRUE; } -static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { return TRUE; } @@ -1072,15 +1072,13 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, return; } -static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BOOL close ) +static BOOL get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total ) { int i; - HRGN total, segment; + HRGN segment; assert( num >= 2 ); - total = CreateRectRgn( 0, 0, 0, 0 ); - if (!close) num--; for (i = 0; i < num; i++) { @@ -1223,14 +1221,15 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO prev_face = face_2; } - return total; + return TRUE; } -static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { - HRGN region; + if (region) return get_wide_lines_region( pdev, num, pts, close, region ); - region = get_wide_lines_region( pdev, num, pts, close ); + if (!(region = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; + get_wide_lines_region( pdev, num, pts, close, region ); if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); pen_rect( pdev, NULL, region, GetROP2( pdev->dev.hdc ) ); DeleteObject( region );

1 0

Alexandre Julliard : gdi32: Implement returning a region for 1-pixel wide solid pen lines.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 3188c3022971abe4bb441be8ae97496ab13aab7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3188c3022971abe4bb441be8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 12:21:07 2011 +0100 gdi32: Implement returning a region for 1-pixel wide solid pen lines. --- dlls/gdi32/dibdrv/objects.c | 136 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 128 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index bf821f2..bb68029 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -631,21 +631,141 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD return TRUE; } +static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *end, HRGN region ) +{ + RECT rect; + + rect.left = start->x; + rect.top = start->y; + rect.right = start->x + 1; + rect.bottom = start->y + 1; + + if (start->y == end->y) + { + rect.right = end->x; + order_end_points(&rect.left, &rect.right); + add_rect_to_region( region, &rect ); + } + else if(start->x == end->x) + { + rect.bottom = end->y; + order_end_points(&rect.top, &rect.bottom); + add_rect_to_region( region, &rect ); + } + else + { + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); + DWORD octant = get_octant_mask(dx, dy); + INT bias = get_bias( octant ); + + if (is_xmajor( octant )) + { + int y_inc = is_y_increasing( octant ) ? 1 : -1; + int err_add_1 = 2 * abs_dy - 2 * abs_dx; + int err_add_2 = 2 * abs_dy; + int err = 2 * abs_dy - abs_dx; + + if (is_x_increasing( octant )) + { + for (rect.right = start->x + 1; rect.right <= end->x; rect.right++) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.left = rect.right; + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + else + { + for (rect.left = start->x; rect.left > end->x; rect.left--) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.right = rect.left; + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + else + { + int x_inc = is_x_increasing( octant ) ? 1 : -1; + int err_add_1 = 2 * abs_dx - 2 * abs_dy; + int err_add_2 = 2 * abs_dx; + int err = 2 * abs_dx - abs_dy; + + if (is_y_increasing( octant )) + { + for (rect.bottom = start->y + 1; rect.bottom <= end->y; rect.bottom++) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.top = rect.bottom; + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + else + { + for (rect.top = start->y; rect.top > end->y; rect.top--) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.bottom = rect.top; + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + /* add final rect */ + add_rect_to_region( region, &rect ); + } + return TRUE; +} + static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; - DWORD color, and, xor; - - color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); - calc_and_xor_masks( GetROP2(pdev->dev.hdc), color, &and, &xor ); assert( num >= 2 ); - for (i = 0; i < num - 1; i++) - if (!solid_pen_line( pdev, pts + i, pts + i + 1, and, xor )) - return FALSE; - if (close) return solid_pen_line( pdev, pts + num - 1, pts, and, xor ); + if (region) + { + for (i = 0; i < num - 1; i++) + if (!solid_pen_line_region( pdev, pts + i, pts + i + 1, region )) + return FALSE; + if (close) return solid_pen_line_region( pdev, pts + num - 1, pts, region ); + } + else + { + DWORD color, and, xor; + + color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); + calc_and_xor_masks( GetROP2(pdev->dev.hdc), color, &and, &xor ); + for (i = 0; i < num - 1; i++) + if (!solid_pen_line( pdev, pts + i, pts + i + 1, and, xor )) + return FALSE; + if (close) return solid_pen_line( pdev, pts + num - 1, pts, and, xor ); + } return TRUE; }

1 0

Alexandre Julliard : gdi32: Implement returning a region for 1-pixel wide dashed pen lines.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 9ee690c984b22b9af936bd481a445a20444d3d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee690c984b22b9af936bd481… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 14:28:06 2011 +0100 gdi32: Implement returning a region for 1-pixel wide dashed pen lines. --- dlls/gdi32/dibdrv/objects.c | 153 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 145 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index bb68029..dd7ddb7 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1047,21 +1047,158 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } +static BOOL dashed_pen_line_region(dibdrv_physdev *pdev, POINT *start, POINT *end, HRGN region) +{ + int i, dash_len; + RECT rect; + + rect.left = start->x; + rect.top = start->y; + rect.right = start->x + 1; + rect.bottom = start->y + 1; + + if (start->y == end->y) /* hline */ + { + if (start->x <= end->x) + { + for (i = start->x; i < end->x; i += dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, end->x - i ); + if (pdev->dash_pos.mark) + { + rect.left = i; + rect.right = i + dash_len; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + else + { + for (i = start->x; i > end->x; i -= dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, i - end->x ); + if (pdev->dash_pos.mark) + { + rect.left = i - dash_len + 1; + rect.right = i + 1; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + } + else if (start->x == end->x) /* vline */ + { + if (start->y <= end->y) + { + for (i = start->y; i < end->y; i += dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, end->y - i ); + if (pdev->dash_pos.mark) + { + rect.top = i; + rect.bottom = i + dash_len; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + else + { + for (i = start->y; i > end->y; i -= dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, i - end->y ); + if (pdev->dash_pos.mark) + { + rect.top = i - dash_len + 1; + rect.bottom = i + 1; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + } + else + { + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); + DWORD octant = get_octant_mask(dx, dy); + INT bias = get_bias( octant ); + int x_inc = is_x_increasing( octant ) ? 1 : -1; + int y_inc = is_y_increasing( octant ) ? 1 : -1; + + if (is_xmajor( octant )) + { + int err_add_1 = 2 * abs_dy - 2 * abs_dx; + int err_add_2 = 2 * abs_dy; + int err = 2 * abs_dy - abs_dx; + + while (abs_dx--) + { + if (pdev->dash_pos.mark) add_rect_to_region( region, &rect ); + skip_dash(pdev, 1); + rect.left += x_inc; + rect.right += x_inc; + if (err + bias > 0) + { + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + + } + else + { + int err_add_1 = 2 * abs_dx - 2 * abs_dy; + int err_add_2 = 2 * abs_dx; + int err = 2 * abs_dx - abs_dy; + + while (abs_dy--) + { + if (pdev->dash_pos.mark) add_rect_to_region( region, &rect ); + skip_dash(pdev, 1); + rect.top += y_inc; + rect.bottom += y_inc; + if (err + bias > 0) + { + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + return TRUE; +} + static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; - get_color_masks( pdev, GetROP2(pdev->dev.hdc), pdev->pen_colorref, - pdev->pen_is_ext ? TRANSPARENT : GetBkMode(pdev->dev.hdc), - &pdev->dash_masks[1], &pdev->dash_masks[0] ); - assert( num >= 2 ); - for (i = 0; i < num - 1; i++) - if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) - return FALSE; - if (close) return dashed_pen_line( pdev, pts + num - 1, pts ); + if (region) + { + for (i = 0; i < num - 1; i++) + if (!dashed_pen_line_region( pdev, pts + i, pts + i + 1, region )) + return FALSE; + if (close) return dashed_pen_line_region( pdev, pts + num - 1, pts, region ); + } + else + { + get_color_masks( pdev, GetROP2(pdev->dev.hdc), pdev->pen_colorref, + pdev->pen_is_ext ? TRANSPARENT : GetBkMode(pdev->dev.hdc), + &pdev->dash_masks[1], &pdev->dash_masks[0] ); + for (i = 0; i < num - 1; i++) + if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) + return FALSE; + if (close) return dashed_pen_line( pdev, pts + num - 1, pts ); + } return TRUE; }

1 0

Alexandre Julliard : gdi32: Use a region to render geometric and wide pens in PolyPolyline.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 64ed56366c6ac64c8d5a1e818b0480ff533ef5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ed56366c6ac64c8d5a1e818… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 13:52:58 2011 +0100 gdi32: Use a region to render geometric and wide pens in PolyPolyline. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 45 ++++++++++++++++++++++++----------------- dlls/gdi32/dibdrv/objects.c | 2 + 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index fa8d445..ba8c0a4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -84,7 +84,7 @@ typedef struct dibdrv_physdev /* pen */ COLORREF pen_colorref; DWORD pen_style, pen_endcap, pen_join; - BOOL pen_is_ext; + BOOL pen_uses_region, pen_is_ext; int pen_width; dash_pattern pen_pattern; dash_pos dash_pos; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e8b45a1..d43b30b 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -517,14 +517,27 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolyline ); DWORD max_points = 0, i; POINT *points; + BOOL ret = TRUE; + INT rop = GetROP2( dev->hdc ); + HRGN outline = 0; if (defer_pen( pdev )) return next->funcs->pPolyPolyline( next, pt, counts, polylines ); - for (i = 0; i < polylines; i++) max_points = max( counts[i], max_points ); + for (i = 0; i < polylines; i++) + { + if (counts[i] < 2) return FALSE; + max_points = max( counts[i], max_points ); + } points = HeapAlloc( GetProcessHeap(), 0, max_points * sizeof(*pt) ); if (!points) return FALSE; + if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) + { + HeapFree( GetProcessHeap(), 0, points ); + return FALSE; + } + for (i = 0; i < polylines; i++) { memcpy( points, pt, counts[i] * sizeof(*pt) ); @@ -532,11 +545,18 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO LPtoDP( dev->hdc, points, counts[i] ); reset_dash_origin( pdev ); - pdev->pen_lines( pdev, counts[i], points, FALSE, 0 ); + pdev->pen_lines( pdev, counts[i], points, FALSE, outline ); + } + + if (outline) + { + if (pdev->clip) CombineRgn( outline, outline, pdev->clip, RGN_AND ); + ret = pen_rect( pdev, NULL, outline, rop ); + DeleteObject( outline ); } HeapFree( GetProcessHeap(), 0, points ); - return TRUE; + return ret; } /*********************************************************************** @@ -544,23 +564,10 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO */ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) { - dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyline ); - POINT *points; - - if (defer_pen( pdev )) return next->funcs->pPolyline( next, pt, count ); - - points = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*pt) ); - if (!points) return FALSE; + DWORD counts[1] = { count }; - memcpy( points, pt, count * sizeof(*pt) ); - LPtoDP( dev->hdc, points, count ); - - reset_dash_origin( pdev ); - pdev->pen_lines( pdev, count, points, FALSE, 0 ); - - HeapFree( GetProcessHeap(), 0, points ); - return TRUE; + if (count < 0) return FALSE; + return dibdrv_PolyPolyline( dev, pt, counts, 1 ); } /*********************************************************************** diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dd7ddb7..197b220 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1615,6 +1615,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) break; case PS_NULL: + pdev->pen_width = 0; pdev->pen_lines = null_pen_lines; pdev->defer &= ~DEFER_PEN; break; @@ -1637,6 +1638,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) break; } + pdev->pen_uses_region = (logpen.lopnStyle & PS_GEOMETRIC || pdev->pen_width > 1); pdev->pen_is_ext = (elp != NULL); HeapFree( GetProcessHeap(), 0, elp );

1 0

Alexandre Julliard : gdi32: Use a region to render geometric and wide pens in Rectangle.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: da8ae113001051d8118b7dd7acb5e17f3b5a2334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8ae113001051d8118b7dd7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 00:18:44 2011 +0100 gdi32: Use a region to render geometric and wide pens in Rectangle. --- dlls/gdi32/dibdrv/graphics.c | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d43b30b..00d0e2a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -579,6 +579,9 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); POINT pts[4]; + BOOL ret; + INT rop = GetROP2( dev->hdc ); + HRGN outline = 0; TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); @@ -595,22 +598,43 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.bottom -= (pdev->pen_width - 1) / 2; } + if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; + + rect.right--; + rect.bottom--; reset_dash_origin(pdev); /* 4 pts going anti-clockwise starting from top-right */ - pts[0].x = pts[3].x = rect.right - 1; + pts[0].x = pts[3].x = rect.right; pts[0].y = pts[1].y = rect.top; pts[1].x = pts[2].x = rect.left; - pts[2].y = pts[3].y = rect.bottom - 1; + pts[2].y = pts[3].y = rect.bottom; - pdev->pen_lines(pdev, 4, pts, TRUE, 0); + pdev->pen_lines(pdev, 4, pts, TRUE, outline); - rect.left += (pdev->pen_width + 1) / 2; - rect.top += (pdev->pen_width + 1) / 2; - rect.right -= (pdev->pen_width + 2) / 2; - rect.bottom -= (pdev->pen_width + 2) / 2; + if (outline) + { + HRGN interior = CreateRectRgnIndirect( &rect ); - return brush_rect( pdev, &rect, pdev->clip, GetROP2(dev->hdc) ); + CombineRgn( interior, interior, outline, RGN_DIFF ); + if (pdev->clip) + { + CombineRgn( outline, outline, pdev->clip, RGN_AND ); + CombineRgn( interior, interior, pdev->clip, RGN_AND ); + } + ret = pen_rect( pdev, NULL, outline, rop ) && brush_rect( pdev, NULL, interior, rop ); + DeleteObject( outline ); + DeleteObject( interior ); + } + else + { + rect.left += (pdev->pen_width + 1) / 2; + rect.top += (pdev->pen_width + 1) / 2; + rect.right -= pdev->pen_width / 2; + rect.bottom -= pdev->pen_width / 2; + ret = brush_rect( pdev, &rect, pdev->clip, rop ); + } + return ret; } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Use a region to render geometric and wide pens in LineTo.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: f5549ae1d00d8bc0e02d14ec66aacbf9d14ce695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5549ae1d00d8bc0e02d14ec6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 09:57:41 2011 +0100 gdi32: Use a region to render geometric and wide pens in LineTo. --- dlls/gdi32/dibdrv/graphics.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 00d0e2a..4fb1126 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -444,6 +444,10 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pLineTo ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); POINT pts[2]; + HRGN region = 0; + BOOL ret; + + if(defer_pen(pdev)) return next->funcs->pLineTo( next, x, y ); GetCurrentPositionEx(dev->hdc, pts); pts[1].x = x; @@ -451,12 +455,19 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) LPtoDP(dev->hdc, pts, 2); + if (pdev->pen_uses_region && !(region = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; + reset_dash_origin(pdev); - if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts, FALSE, 0)) - return next->funcs->pLineTo( next, x, y ); + ret = pdev->pen_lines(pdev, 2, pts, FALSE, region); - return TRUE; + if (region) + { + if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); + ret = pen_rect( pdev, NULL, region, GetROP2(dev->hdc) ); + DeleteObject( region ); + } + return ret; } /***********************************************************************

1 0