January 2012 - Wine-commits

Dmitry Timoshkov : user32: Add some tests for SetFocus/ SetActiveWindow called on invalid or belonging to another thread windows.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 593340774a5257d50489c842ddab81706e48b278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=593340774a5257d50489c842d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 4 19:14:56 2012 +0800 user32: Add some tests for SetFocus/SetActiveWindow called on invalid or belonging to another thread windows. --- dlls/user32/tests/msg.c | 137 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 133 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 407fc7b..c14fc04 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13523,8 +13523,19 @@ static const struct message WmSetFocus_4[] = { static void test_SetFocus(void) { - HWND parent, old_parent, child, old_focus; + HWND parent, old_parent, child, old_focus, old_active; MSG msg; + struct wnd_event wnd_event; + HANDLE hthread; + DWORD ret, tid; + + wnd_event.start_event = CreateEvent(NULL, 0, 0, NULL); + ok(wnd_event.start_event != 0, "CreateEvent error %d\n", GetLastError()); + hthread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hthread != 0, "CreateThread error %d\n", GetLastError()); + ret = WaitForSingleObject(wnd_event.start_event, INFINITE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); parent = CreateWindowEx(0, "TestParentClass", NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, 0, 0, 0, NULL); @@ -13533,7 +13544,7 @@ static void test_SetFocus(void) 0, 0, 0, 0, parent, 0, 0, NULL); ok(child != 0, "failed to create child window\n"); - trace("parent %p, child %p\n", parent, child); + trace("parent %p, child %p, thread window %p\n", parent, child, wnd_event.hwnd); SetFocus(0); SetActiveWindow(0); @@ -13560,26 +13571,138 @@ static void test_SetFocus(void) ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + SetLastError(0xdeadbeef); + old_focus = SetFocus((HWND)0xdeadbeef); +todo_wine + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "SetFocus on an invalid window", TRUE); + ok(old_focus == 0, "expected old focus 0, got %p\n", old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + SetLastError(0xdeadbeef); + old_focus = SetFocus(GetDesktopWindow()); + ok(GetLastError() == ERROR_ACCESS_DENIED /* Vista+ */ || + broken(GetLastError() == 0xdeadbeef), "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "SetFocus on a desktop window", TRUE); + ok(old_focus == 0, "expected old focus 0, got %p\n", old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + SetLastError(0xdeadbeef); + old_focus = SetFocus(wnd_event.hwnd); + ok(GetLastError() == ERROR_ACCESS_DENIED /* Vista+ */ || + broken(GetLastError() == 0xdeadbeef), "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "SetFocus on another thread window", TRUE); + ok(old_focus == 0, "expected old focus 0, got %p\n", old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + SetLastError(0xdeadbeef); + old_active = SetActiveWindow((HWND)0xdeadbeef); +todo_wine + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "SetActiveWindow on an invalid window", TRUE); + ok(old_active == 0, "expected old focus 0, got %p\n", old_active); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + SetLastError(0xdeadbeef); + old_active = SetActiveWindow(GetDesktopWindow()); +todo_wine + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "SetActiveWindow on a desktop window", TRUE); + ok(old_active == 0, "expected old focus 0, got %p\n", old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + SetLastError(0xdeadbeef); + old_active = SetActiveWindow(wnd_event.hwnd); +todo_wine + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "SetActiveWindow on another thread window", TRUE); + ok(old_active == 0, "expected old focus 0, got %p\n", old_active); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + SetLastError(0xdeadbeef); + ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + +todo_wine { + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); +} + flush_events(); + flush_sequence(); + + old_focus = SetFocus(wnd_event.hwnd); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(old_focus == wnd_event.hwnd, "expected old focus %p, got %p\n", wnd_event.hwnd, old_focus); + ok(GetActiveWindow() == wnd_event.hwnd, "expected active %p, got %p\n", wnd_event.hwnd, GetActiveWindow()); + ok(GetFocus() == wnd_event.hwnd, "expected focus %p, got %p\n", wnd_event.hwnd, GetFocus()); + + old_focus = SetFocus(parent); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(old_focus == parent, "expected old focus %p, got %p\n", parent, old_focus); + ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + flush_events(); + flush_sequence(); + + old_active = SetActiveWindow(wnd_event.hwnd); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(old_active == parent, "expected old focus %p, got %p\n", parent, old_active); + ok(GetActiveWindow() == wnd_event.hwnd, "expected active %p, got %p\n", wnd_event.hwnd, GetActiveWindow()); + ok(GetFocus() == wnd_event.hwnd, "expected focus %p, got %p\n", wnd_event.hwnd, GetFocus()); + + SetLastError(0xdeadbeef); + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ok(GetActiveWindow() == 0, "expected active 0, got %p\n", GetActiveWindow()); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); + old_parent = SetParent(child, GetDesktopWindow()); ok(old_parent == parent, "expected old parent %p, got %p\n", parent, old_parent); + ok(GetActiveWindow() == 0, "expected active 0, got %p\n", GetActiveWindow()); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); + + old_focus = SetFocus(parent); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(old_focus == parent, "expected old focus %p, got %p\n", parent, old_focus); ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); flush_events(); flush_sequence(); + SetLastError(0xdeadbeef); old_focus = SetFocus(child); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER /* Vista+ */ || + broken(GetLastError() == 0) /* XP */ || + broken(GetLastError() == 0xdeadbeef), "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmSetFocus_3, "SetFocus on a child window", TRUE); ok(old_focus == 0, "expected old focus 0, got %p\n", old_focus); ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); - old_focus = SetActiveWindow(child); + SetLastError(0xdeadbeef); + old_active = SetActiveWindow(child); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmEmptySeq, "SetActiveWindow on a child window", FALSE); - ok(old_focus == parent, "expected old active %p, got %p\n", parent, old_focus); + ok(old_active == parent, "expected old active %p, got %p\n", parent, old_active); ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); @@ -13587,6 +13710,12 @@ static void test_SetFocus(void) DestroyWindow(child); DestroyWindow(parent); + + ret = PostMessage(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessage(WM_QUIT) error %d\n", GetLastError()); + ret = WaitForSingleObject(hthread, INFINITE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); } START_TEST(msg)

1 0

Jacek Caban : vbscript: Added for each loop parser implementation.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 8c1b9a01bf20f13d470a06caeeb08f88cc7d7e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1b9a01bf20f13d470a06cae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 4 11:50:29 2012 +0100 vbscript: Added for each loop parser implementation. --- dlls/vbscript/compile.c | 9 +++++++++ dlls/vbscript/lex.c | 4 ++++ dlls/vbscript/parse.h | 8 ++++++++ dlls/vbscript/parser.y | 20 +++++++++++++++++++- 4 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 435f9e3..9f62a23 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -616,6 +616,12 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * return S_OK; } +static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t *stat) +{ + FIXME("for each loop not implemented\n"); + return E_NOTIMPL; +} + static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) { unsigned step_instr, instr, prev_label; @@ -895,6 +901,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_EXITSUB: hres = compile_exitsub_statement(ctx); break; + case STAT_FOREACH: + hres = compile_foreach_statement(ctx, (foreach_statement_t*)stat); + break; case STAT_FORTO: hres = compile_forto_statement(ctx, (forto_statement_t*)stat); break; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 81d4517..fe5fbae 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -35,6 +35,7 @@ static const WCHAR constW[] = {'c','o','n','s','t',0}; static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; static const WCHAR dimW[] = {'d','i','m',0}; static const WCHAR doW[] = {'d','o',0}; +static const WCHAR eachW[] = {'e','a','c','h',0}; static const WCHAR elseW[] = {'e','l','s','e',0}; static const WCHAR elseifW[] = {'e','l','s','e','i','f',0}; static const WCHAR emptyW[] = {'e','m','p','t','y',0}; @@ -50,6 +51,7 @@ static const WCHAR getW[] = {'g','e','t',0}; static const WCHAR gotoW[] = {'g','o','t','o',0}; static const WCHAR ifW[] = {'i','f',0}; static const WCHAR impW[] = {'i','m','p',0}; +static const WCHAR inW[] = {'i','n',0}; static const WCHAR isW[] = {'i','s',0}; static const WCHAR letW[] = {'l','e','t',0}; static const WCHAR loopW[] = {'l','o','o','p',0}; @@ -93,6 +95,7 @@ static const struct { {defaultW, tDEFAULT}, {dimW, tDIM}, {doW, tDO}, + {eachW, tEACH}, {elseW, tELSE}, {elseifW, tELSEIF}, {emptyW, tEMPTY}, @@ -108,6 +111,7 @@ static const struct { {gotoW, tGOTO}, {ifW, tIF}, {impW, tIMP}, + {inW, tIN}, {isW, tIS}, {letW, tLET}, {loopW, tLOOP}, diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index e58e7f3..b97ee13 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -107,6 +107,7 @@ typedef enum { STAT_EXITFUNC, STAT_EXITPROP, STAT_EXITSUB, + STAT_FOREACH, STAT_FORTO, STAT_FUNC, STAT_IF, @@ -209,6 +210,13 @@ typedef struct { typedef struct { statement_t stat; + const WCHAR *identifier; + expression_t *group_expr; + statement_t *body; +} foreach_statement_t; + +typedef struct { + statement_t stat; BOOL resume_next; } onerror_statement_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d6bda55..45e0e8a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -53,6 +53,7 @@ static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,express static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); static statement_t *new_while_statement(parser_ctx_t*,statement_type_t,expression_t*,statement_t*); static statement_t *new_forto_statement(parser_ctx_t*,const WCHAR*,expression_t*,expression_t*,expression_t*,statement_t*); +static statement_t *new_foreach_statement(parser_ctx_t*,const WCHAR*,expression_t*,statement_t*); static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); static statement_t *new_onerror_statement(parser_ctx_t*,BOOL); @@ -103,7 +104,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token tIS tLTEQ tGTEQ tMOD %token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP +%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP tEACH tIN %token tBYREF tBYVAL %token tOPTION tEXPLICIT %token tSTOP @@ -190,6 +191,8 @@ SimpleStatement | tCONST ConstDeclList { $$ = new_const_statement(ctx, $2); CHECK_ERROR; } | tFOR tIdentifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } + | tFOR tEACH tIdentifier tIN Expression tNL StatementsNl_opt tNEXT + { $$ = new_foreach_statement(ctx, $3, $5, $7); } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -651,6 +654,21 @@ static statement_t *new_forto_statement(parser_ctx_t *ctx, const WCHAR *identifi return &stat->stat; } +static statement_t *new_foreach_statement(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *group_expr, + statement_t *body) +{ + foreach_statement_t *stat; + + stat = new_statement(ctx, STAT_FOREACH, sizeof(*stat)); + if(!stat) + return NULL; + + stat->identifier = identifier; + stat->group_expr = group_expr; + stat->body = body; + return &stat->stat; +} + static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, statement_t *if_stat, elseif_decl_t *elseif_decl, statement_t *else_stat) {

1 0

Aric Stewart : usp10: Move CMAP functions to opentype.c.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 6311ccfe9703e819449ba93b4dfe717dcfda1dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6311ccfe9703e819449ba93b4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 4 08:13:38 2012 -0600 usp10: Move CMAP functions to opentype.c. --- dlls/usp10/Makefile.in | 1 + dlls/usp10/opentype.c | 162 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/shape.c | 114 ------------------------------ dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 2 +- 5 files changed, 165 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6311ccfe9703e819449ba…

1 0

Aric Stewart : usp10: Move GDEF functions to opentype.c.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: bf1ef214e6f131945b84cb8fd91092d5a75e9b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1ef214e6f131945b84cb8fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 4 08:13:41 2012 -0600 usp10: Move GDEF functions to opentype.c. --- dlls/usp10/opentype.c | 146 ++++++++++++++++++++++++++++++++++++++++ dlls/usp10/shape.c | 155 ++----------------------------------------- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 153 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf1ef214e6f131945b84c…

1 0

Alexandre Julliard : gdi32: Implement dashed wide lines.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: c82d2a034f918a297915e39784ddfe949b37919c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82d2a034f918a297915e3978… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 15:05:00 2012 +0100 gdi32: Implement dashed wide lines. --- dlls/gdi32/dibdrv/objects.c | 144 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 138 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 6933346..51a49cc 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1523,6 +1523,125 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close return TRUE; } +static BOOL dashed_wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total) +{ + int i, start, cur_len, initial_num = 0; + POINT initial_point, start_point, end_point; + HRGN round_cap = 0; + + 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 ); + + start = 0; + cur_len = 0; + start_point = pts[0]; + + for (i = 0; i < (close ? num : num - 1); 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; + + if (dx == 0 && dy == 0) continue; + + if (dy == 0) + { + if (abs( dx ) - cur_len < pdev->dash_pos.left_in_dash) + { + skip_dash( pdev, abs( dx ) - cur_len ); + cur_len = 0; + continue; + } + cur_len += pdev->dash_pos.left_in_dash; + dx = (dx > 0) ? cur_len : -cur_len; + } + else if (dx == 0) + { + if (abs( dy ) - cur_len < pdev->dash_pos.left_in_dash) + { + skip_dash( pdev, abs( dy ) - cur_len ); + cur_len = 0; + continue; + } + cur_len += pdev->dash_pos.left_in_dash; + dy = (dy > 0) ? cur_len : -cur_len; + } + else + { + double len = hypot( dx, dy ); + + if (len - cur_len < pdev->dash_pos.left_in_dash) + { + skip_dash( pdev, len - cur_len ); + cur_len = 0; + continue; + } + cur_len += pdev->dash_pos.left_in_dash; + dx = dx * cur_len / len; + dy = dy * cur_len / len; + } + end_point.x = pt_1->x + dx; + end_point.y = pt_1->y + dy; + + if (pdev->dash_pos.mark) + { + if (!initial_num && close) /* this is the first dash, save it for later */ + { + initial_num = i - start + 1; + initial_point = end_point; + } + else wide_line_segments( pdev, num, pts, FALSE, start, i - start + 1, + &start_point, &end_point, round_cap, total ); + } + if (!initial_num) initial_num = -1; /* no need to close it */ + + skip_dash( pdev, pdev->dash_pos.left_in_dash ); + start_point = end_point; + start = i; + i--; /* go on with the same segment */ + } + + if (pdev->dash_pos.mark) /* we have a final dash */ + { + int count; + + if (initial_num > 0) + { + count = num - start + initial_num; + end_point = initial_point; + } + else if (close) + { + count = num - start; + end_point = pts[0]; + } + else + { + count = num - start - 1; + end_point = pts[num - 1]; + } + wide_line_segments( pdev, num, pts, FALSE, start, count, + &start_point, &end_point, round_cap, total ); + } + else if (initial_num > 0) /* initial dash only */ + { + wide_line_segments( pdev, num, pts, FALSE, 0, initial_num, + &pts[0], &initial_point, round_cap, total ); + } + + if (round_cap) DeleteObject( round_cap ); + return TRUE; +} + static const dash_pattern dash_patterns_cosmetic[4] = { {2, {18, 6}, 24}, /* PS_DASH */ @@ -1550,11 +1669,21 @@ static inline void set_dash_pattern( dash_pattern *pattern, DWORD count, DWORD * if (pattern->count % 2) pattern->total_len *= 2; } -static inline void scale_dash_pattern( dash_pattern *pattern, DWORD scale ) +static inline void scale_dash_pattern( dash_pattern *pattern, DWORD scale, DWORD endcap ) { DWORD i; + for (i = 0; i < pattern->count; i++) pattern->dashes[i] *= scale; pattern->total_len *= scale; + + if (endcap != PS_ENDCAP_FLAT) /* shrink the dashes to leave room for the caps */ + { + for (i = 0; i < pattern->count; i += 2) + { + pattern->dashes[i] -= scale; + pattern->dashes[i + 1] += scale; + } + } } static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) @@ -1971,9 +2100,13 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte case PS_DASHDOTDOT: if (logpen.lopnStyle & PS_GEOMETRIC) { - if (pdev->pen_width > 1) break; /* not supported yet */ - pdev->pen_lines = dashed_pen_lines; pdev->pen_pattern = dash_patterns_geometric[pdev->pen_style - 1]; + if (pdev->pen_width > 1) + { + scale_dash_pattern( &pdev->pen_pattern, pdev->pen_width, pdev->pen_endcap ); + pdev->pen_lines = dashed_wide_pen_lines; + } + else pdev->pen_lines = dashed_pen_lines; pdev->defer &= ~DEFER_PEN; break; } @@ -2004,10 +2137,9 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte break; case PS_USERSTYLE: - if (pdev->pen_width > 1) break; /* not supported yet */ - pdev->pen_lines = dashed_pen_lines; + pdev->pen_lines = (pdev->pen_width == 1) ? dashed_pen_lines : dashed_wide_pen_lines; set_dash_pattern( &pdev->pen_pattern, elp->elpNumEntries, elp->elpStyleEntry ); - if (!(logpen.lopnStyle & PS_GEOMETRIC)) scale_dash_pattern( &pdev->pen_pattern, 3 ); + if (!(logpen.lopnStyle & PS_GEOMETRIC)) scale_dash_pattern( &pdev->pen_pattern, 3, PS_ENDCAP_FLAT ); pdev->defer &= ~DEFER_PEN; break; }

1 0

Alexandre Julliard : gdi32: Get rid of the pen deferring support, all pen styles are implemented now.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: d858041a1960789701ca09cbc2cc41d3fc85d5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d858041a1960789701ca09cbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 16:53:17 2012 +0100 gdi32: Get rid of the pen deferring support, all pen styles are implemented now. --- dlls/gdi32/dibdrv/dc.c | 1 - dlls/gdi32/dibdrv/dibdrv.h | 8 -------- dlls/gdi32/dibdrv/graphics.c | 13 ------------- dlls/gdi32/dibdrv/objects.c | 8 -------- 4 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 5b9c844..97771c5 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -363,7 +363,6 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) return 0; } pdev->dib = dib; - pdev->defer = 0; GDI_ReleaseObj( bitmap ); return next->funcs->pSelectBitmap( next, bitmap ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 03d48af..5d93578 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -96,7 +96,6 @@ typedef struct dibdrv_physdev dib_brush brush; HRGN clip; - DWORD defer; /* pen */ DWORD pen_style, pen_endcap, pen_join; @@ -109,8 +108,6 @@ typedef struct dibdrv_physdev BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region); } dibdrv_physdev; -#define DEFER_PEN 2 - extern BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN; extern DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, @@ -261,8 +258,3 @@ static inline int edge_coord( int y, int x1, int y1, int x2, int y2 ) else return x1 + (y - y1) * (x2 - x1) / (y2 - y1); } - -static inline BOOL defer_pen(dibdrv_physdev *pdev) -{ - return pdev->defer & DEFER_PEN; -} diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d14148e..1ba157b 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -441,14 +441,11 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) */ 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; pts[1].y = y; @@ -525,14 +522,11 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolygon ); DWORD total, i, pos; BOOL ret = TRUE; POINT *points; HRGN outline = 0, interior = 0; - if (defer_pen( pdev )) return next->funcs->pPolyPolygon( next, pt, counts, polygons ); - for (i = total = 0; i < polygons; i++) { if (counts[i] < 2) return FALSE; @@ -589,14 +583,11 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolyline ); DWORD max_points = 0, i; POINT *points; BOOL ret = TRUE; HRGN outline = 0; - if (defer_pen( pdev )) return next->funcs->pPolyPolyline( next, pt, counts, polylines ); - for (i = 0; i < polylines; i++) { if (counts[i] < 2) return FALSE; @@ -659,7 +650,6 @@ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) */ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); POINT pts[4]; @@ -670,9 +660,6 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) if(rect.left == rect.right || rect.top == rect.bottom) return TRUE; - if(defer_pen(pdev)) - return next->funcs->pRectangle( next, left, top, right, bottom ); - if (pdev->pen_style == PS_INSIDEFRAME) { rect.left += pdev->pen_width / 2; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 51a49cc..e18d715 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -2088,8 +2088,6 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte set_dash_pattern( &pdev->pen_pattern, 0, NULL ); select_brush( &pdev->pen_brush, &logbrush, pattern ); - pdev->defer |= DEFER_PEN; - pdev->pen_style = logpen.lopnStyle & PS_STYLE_MASK; switch (pdev->pen_style) @@ -2107,40 +2105,34 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte pdev->pen_lines = dashed_wide_pen_lines; } else pdev->pen_lines = dashed_pen_lines; - pdev->defer &= ~DEFER_PEN; break; } if (pdev->pen_width == 1) /* wide cosmetic pens are not dashed */ { pdev->pen_lines = dashed_pen_lines; pdev->pen_pattern = dash_patterns_cosmetic[pdev->pen_style - 1]; - pdev->defer &= ~DEFER_PEN; break; } /* fall through */ case PS_SOLID: case PS_INSIDEFRAME: pdev->pen_lines = (pdev->pen_width == 1) ? solid_pen_lines : wide_pen_lines; - pdev->defer &= ~DEFER_PEN; break; case PS_NULL: pdev->pen_width = 0; pdev->pen_lines = null_pen_lines; - pdev->defer &= ~DEFER_PEN; break; case PS_ALTERNATE: pdev->pen_lines = dashed_pen_lines; pdev->pen_pattern = dash_patterns_geometric[PS_DOT - 1]; - pdev->defer &= ~DEFER_PEN; break; case PS_USERSTYLE: pdev->pen_lines = (pdev->pen_width == 1) ? dashed_pen_lines : dashed_wide_pen_lines; set_dash_pattern( &pdev->pen_pattern, elp->elpNumEntries, elp->elpStyleEntry ); if (!(logpen.lopnStyle & PS_GEOMETRIC)) scale_dash_pattern( &pdev->pen_pattern, 3, PS_ENDCAP_FLAT ); - pdev->defer &= ~DEFER_PEN; break; }

1 0

Alexandre Julliard : gdi32/tests: Add some tests for brushed and dashed wide pens.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 4b524f91e2f96b2eb4a275ce071bc367309ff9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b524f91e2f96b2eb4a275ce0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 18:17:05 2012 +0100 gdi32/tests: Add some tests for brushed and dashed wide pens. --- dlls/gdi32/tests/dib.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b524f91e2f96b2eb4a27…

1 0

André Hentschel : usp10: Check for pointer before using it (Coverity).
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: d845510170d41b7da901e6d9aaf52a91c76e394f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d845510170d41b7da901e6d9a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 3 03:33:23 2012 +0100 usp10: Check for pointer before using it (Coverity). --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9ddff1b..1f6ec53 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2737,7 +2737,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, ((ScriptCache *)*psc)->userLang = tagLangSys; /* set fNoGlyphIndex non truetype/opentype fonts */ - if (!psa->fNoGlyphIndex && !((ScriptCache *)*psc)->sfnt) + if (psa && !psa->fNoGlyphIndex && !((ScriptCache *)*psc)->sfnt) psa->fNoGlyphIndex = TRUE; /* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */

1 0

Jörg Höhle : mciseq: Only send non-MCI commands to DefDriverProc.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: dc17cec398d8047368ac38d8dd3b748f9e6a7e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc17cec398d8047368ac38d8d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 15 21:49:58 2010 +0100 mciseq: Only send non-MCI commands to DefDriverProc. --- dlls/mciseq/mcimidi.c | 31 +++++++------------------------ 1 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 6bf7f4d..55f06f8 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1630,6 +1630,10 @@ LRESULT CALLBACK MCIMIDI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, if (dwDevID == 0xFFFFFFFF) return MCIERR_UNSUPPORTED_FUNCTION; + if ((wMsg < DRV_MCI_FIRST) || (wMsg > DRV_MCI_LAST)) { + TRACE("Sending msg %04x to default driver proc\n", wMsg); + return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + } switch (wMsg) { case MCI_OPEN_DRIVER: return MIDI_mciOpen (dwDevID, dwParam1, (LPMCI_OPEN_PARMSW) dwParam2); case MCI_CLOSE_DRIVER: return MIDI_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); @@ -1642,33 +1646,12 @@ LRESULT CALLBACK MCIMIDI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_GETDEVCAPS: return MIDI_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); case MCI_INFO: return MIDI_mciInfo (dwDevID, dwParam1, (LPMCI_INFO_PARMSW) dwParam2); case MCI_SEEK: return MIDI_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); - /* commands that should report an error */ - case MCI_RECORD: - case MCI_LOAD: - case MCI_SAVE: - case MCI_FREEZE: - case MCI_PUT: - case MCI_WINDOW: - case MCI_REALIZE: - case MCI_UNFREEZE: - case MCI_UPDATE: - case MCI_WHERE: - case MCI_STEP: - case MCI_SPIN: - case MCI_ESCAPE: - case MCI_COPY: - case MCI_CUT: - case MCI_DELETE: - case MCI_PASTE: - TRACE("Unsupported command [0x%x]\n", wMsg); - break; case MCI_OPEN: case MCI_CLOSE: FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n"); - break; + /* fall through */ default: - TRACE("Sending msg [%u] to default driver proc\n", wMsg); - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + TRACE("Unsupported command [0x%x]\n", wMsg); + return MCIERR_UNSUPPORTED_FUNCTION; /* Win9x: MCIERR_UNRECOGNIZED_COMMAND */ } - return MCIERR_UNSUPPORTED_FUNCTION; }

1 0

Jörg Höhle : mciseq: Check Device ID prior to command invocation.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 39fa94324d8e309d4b7416b9b5c5539376258b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fa94324d8e309d4b7416b9b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 15 22:36:01 2010 +0100 mciseq: Check Device ID prior to command invocation. --- dlls/mciseq/mcimidi.c | 128 +++++++++++++++++++------------------------------ 1 files changed, 49 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39fa94324d8e309d4b741…

1 0