winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
December 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
810 discussions
Start a n
N
ew thread
Francois Gouget : include: Fix the wia idl imports.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: 9cdc6ac0d4ac2f2d554f4c34417b402bc36d423f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9cdc6ac0d4ac2f2d554f4c344…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 30 09:27:27 2011 +0100 include: Fix the wia idl imports. --- include/wia_lh.idl | 5 +++-- include/wia_xp.idl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wia_lh.idl b/include/wia_lh.idl index 5024787..e13a658 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -16,8 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "wtypes.idl"; -import "objidl.idl"; +import "unknwn.idl"; +import "oaidl.idl"; +import "propidl.idl"; interface IEnumWIA_DEV_INFO; interface IWiaItem; diff --git a/include/wia_xp.idl b/include/wia_xp.idl index 5024787..e13a658 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -16,8 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "wtypes.idl"; -import "objidl.idl"; +import "unknwn.idl"; +import "oaidl.idl"; +import "propidl.idl"; interface IEnumWIA_DEV_INFO; interface IWiaItem;
1
0
0
0
Dmitry Timoshkov : user32: Add some SetFocus message tests.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: 229fb8a4478fa4aa9ed55b697938fd11c066b2ee URL:
http://source.winehq.org/git/wine.git/?a=commit;h=229fb8a4478fa4aa9ed55b697…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 30 15:36:19 2011 +0800 user32: Add some SetFocus message tests. --- dlls/user32/tests/msg.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1a02e02..407fc7b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13490,6 +13490,105 @@ end: flush_sequence(); } + +static const struct message WmSetFocus_1[] = { + { HCBT_SETFOCUS, hook }, /* child */ + { HCBT_ACTIVATE, hook }, /* parent */ + { WM_QUERYNEWPALETTE, sent|wparam|lparam|parent|optional, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent|parent, 0, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam|parent, 1 }, + { WM_NCACTIVATE, sent|wparam|parent, 1 }, + { WM_GETTEXT, sent|defwinproc|parent|optional }, + { WM_GETTEXT, sent|defwinproc|parent|optional }, + { WM_ACTIVATE, sent|wparam|parent, 1 }, + { HCBT_SETFOCUS, hook }, /* parent */ + { WM_SETFOCUS, sent|defwinproc|parent }, + { WM_KILLFOCUS, sent|parent }, + { WM_SETFOCUS, sent }, + { 0 } +}; +static const struct message WmSetFocus_2[] = { + { HCBT_SETFOCUS, hook }, /* parent */ + { WM_KILLFOCUS, sent }, + { WM_SETFOCUS, sent|parent }, + { 0 } +}; +static const struct message WmSetFocus_3[] = { + { HCBT_SETFOCUS, hook }, /* child */ + { 0 } +}; +static const struct message WmSetFocus_4[] = { + { 0 } +}; + +static void test_SetFocus(void) +{ + HWND parent, old_parent, child, old_focus; + MSG msg; + + parent = CreateWindowEx(0, "TestParentClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, 0, 0, 0, NULL); + ok(parent != 0, "failed to create parent window\n"); + child = CreateWindowEx(0, "TestWindowClass", NULL, WS_CHILD, + 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); + + SetFocus(0); + SetActiveWindow(0); + + flush_events(); + flush_sequence(); + + ok(GetActiveWindow() == 0, "expected active 0, got %p\n", GetActiveWindow()); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); + + log_all_parent_messages++; + + old_focus = SetFocus(child); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmSetFocus_1, "SetFocus on a child window", TRUE); + 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() == child, "expected focus %p, got %p\n", child, GetFocus()); + + old_focus = SetFocus(parent); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmSetFocus_2, "SetFocus on a parent window", FALSE); + ok(old_focus == child, "expected old focus %p, got %p\n", child, 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_parent = SetParent(child, GetDesktopWindow()); + ok(old_parent == parent, "expected old parent %p, got %p\n", parent, old_parent); + + 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(child); + 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); + 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(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); + ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); + + log_all_parent_messages--; + + DestroyWindow(child); + DestroyWindow(parent); +} + START_TEST(msg) { char **test_argv; @@ -13553,6 +13652,7 @@ START_TEST(msg) hEvent_hook = 0; #endif + test_SetFocus(); test_SetParent(); test_PostMessage(); test_ShowWindow();
1
0
0
0
Alexandre Julliard : user32/tests: Remove a crashing test.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: f6ccb2c498f79099d1291d3c706944f846c7e530 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f6ccb2c498f79099d1291d3c7…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 10:17:00 2011 +0100 user32/tests: Remove a crashing test. --- dlls/user32/tests/msg.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bde0023..1a02e02 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8134,12 +8134,6 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) { } -static VOID CALLBACK tfunc_crash(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) -{ - /* Crash on purpose */ - *(volatile int *)0 = 2; -} - #define TIMER_ID 0x19 static DWORD WINAPI timer_thread_proc(LPVOID x) @@ -8161,7 +8155,6 @@ static void test_timers(void) { struct timer_info info; DWORD id; - MSG msg; info.hWnd = CreateWindow ("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW , @@ -8184,26 +8177,6 @@ static void test_timers(void) ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); - - /* Test timer callback with crash */ - SetLastError(0xdeadbeef); - info.hWnd = CreateWindowW(testWindowClassW, NULL, - WS_OVERLAPPEDWINDOW , - CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, - NULL, NULL, 0); - if ((!info.hWnd && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) || /* Win9x/Me */ - (!pGetMenuInfo)) /* Win95/NT4 */ - { - win_skip("Test would crash on Win9x/WinMe/NT4\n"); - DestroyWindow(info.hWnd); - return; - } - info.id = SetTimer(info.hWnd, TIMER_ID, 0, tfunc_crash); - ok(info.id, "SetTimer failed\n"); - Sleep(150); - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); - - ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); } static int count = 0;
1
0
0
0
Alexandre Julliard : gdi32: Don' t bother computing interior regions when the brush is null.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: 2c9c9f78fb02abb1dd28ddf7a0d100d4a34e00e7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2c9c9f78fb02abb1dd28ddf7a…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 12:53:19 2011 +0100 gdi32: Don't bother computing interior regions when the brush is null. --- dlls/gdi32/dibdrv/graphics.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 26d3d58..d14148e 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -527,9 +527,9 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD dibdrv_physdev *pdev = get_dibdrv_pdev(dev); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolygon ); DWORD total, i, pos; - BOOL ret = FALSE; + BOOL ret = TRUE; POINT *points; - HRGN outline = 0, interior; + HRGN outline = 0, interior = 0; if (defer_pen( pdev )) return next->funcs->pPolyPolygon( next, pt, counts, polygons ); @@ -544,15 +544,22 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD memcpy( points, pt, total * sizeof(*pt) ); LPtoDP( dev->hdc, points, total ); - if (!(interior = CreatePolyPolygonRgn( points, counts, polygons, GetPolyFillMode( dev->hdc )))) + if (pdev->brush.style != BS_NULL && + !(interior = CreatePolyPolygonRgn( points, counts, polygons, GetPolyFillMode( dev->hdc )))) { HeapFree( GetProcessHeap(), 0, points ); return FALSE; } + if (pdev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); + /* if not using a region, paint the interior first so the outline can overlap it */ - if (!pdev->pen_uses_region || !(outline = CreateRectRgn( 0, 0, 0, 0 ))) + if (interior && !outline) + { ret = brush_region( pdev, interior ); + DeleteObject( interior ); + interior = 0; + } for (i = pos = 0; i < polygons; i++) { @@ -561,14 +568,17 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD pos += counts[i]; } - if (outline) + if (interior) { CombineRgn( interior, interior, outline, RGN_DIFF ); - ret = pen_region( pdev, outline ) && brush_region( pdev, interior ); + ret = brush_region( pdev, interior ); + DeleteObject( interior ); + } + if (outline) + { + if (ret) ret = pen_region( pdev, outline ); DeleteObject( outline ); } - - DeleteObject( interior ); HeapFree( GetProcessHeap(), 0, points ); return ret; } @@ -687,12 +697,16 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) if (outline) { - HRGN interior = CreateRectRgnIndirect( &rect ); + if (pdev->brush.style != BS_NULL) + { + HRGN interior = CreateRectRgnIndirect( &rect ); - CombineRgn( interior, interior, outline, RGN_DIFF ); - ret = pen_region( pdev, outline ) && brush_region( pdev, interior ); + CombineRgn( interior, interior, outline, RGN_DIFF ); + brush_region( pdev, interior ); + DeleteObject( interior ); + } + ret = pen_region( pdev, outline ); DeleteObject( outline ); - DeleteObject( interior ); } else {
1
0
0
0
Alexandre Julliard : gdi32: Implement brushed pens.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: 488bf107a9623c94442a96b515a2b1e853c3c7a1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=488bf107a9623c94442a96b51…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 10:38:18 2011 +0100 gdi32: Implement brushed pens. --- dlls/gdi32/dibdrv/dc.c | 8 +- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 276 ++++++++++++++++++++----------------------- 3 files changed, 137 insertions(+), 149 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=488bf107a9623c94442a9…
1
0
0
0
Alexandre Julliard : gdi32: Define a structure to make the brush state independent from the physdev.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: 4e03247427dc23af776d9a14652bf338cc27e5f6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4e03247427dc23af776d9a146…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 10:17:37 2011 +0100 gdi32: Define a structure to make the brush state independent from the physdev. --- dlls/gdi32/dibdrv/bitblt.c | 4 +- dlls/gdi32/dibdrv/dc.c | 6 +- dlls/gdi32/dibdrv/dibdrv.h | 31 +++++--- dlls/gdi32/dibdrv/graphics.c | 6 +- dlls/gdi32/dibdrv/objects.c | 175 +++++++++++++++++++++--------------------- 5 files changed, 116 insertions(+), 106 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e03247427dc23af776d9…
1
0
0
0
Alexandre Julliard : gdi32: Pass a brush_pattern structure to the SelectPen entry point for brushed pens .
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: cc9836bda02798ba48383acae7acb1e9899cd4b7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cc9836bda02798ba48383acae…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 20:16:46 2011 +0100 gdi32: Pass a brush_pattern structure to the SelectPen entry point for brushed pens. --- dlls/gdi32/brush.c | 48 +++++++++++++++---------------- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 4 +- dlls/gdi32/driver.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/gdi32/pen.c | 51 ++++++++++++++++++++++++---------- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/pen.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 4 +- 15 files changed, 74 insertions(+), 54 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc9836bda02798ba48383…
1
0
0
0
Alexandre Julliard : gdi32: Pass a brush_pattern structure to the SelectBrush entry point.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: f85bb3528047fc3a5fd2291dea9e21ed72b8a843 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f85bb3528047fc3a5fd2291de…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 19:49:41 2011 +0100 gdi32: Pass a brush_pattern structure to the SelectBrush entry point. --- dlls/gdi32/brush.c | 19 +++++++------------ dlls/gdi32/dibdrv/dibdrv.h | 8 ++------ dlls/gdi32/dibdrv/objects.c | 28 ++++++++++++---------------- dlls/gdi32/driver.c | 3 +-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 +-- dlls/gdi32/enhmfdrv/objects.c | 3 +-- dlls/gdi32/gdi_private.h | 8 -------- dlls/gdi32/mfdrv/metafiledrv.h | 3 +-- dlls/gdi32/mfdrv/objects.c | 3 +-- dlls/wineps.drv/brush.c | 11 ++++------- dlls/wineps.drv/psdrv.h | 11 ++++------- dlls/winex11.drv/brush.c | 14 ++++++++------ dlls/winex11.drv/x11drv.h | 5 ++--- dlls/winex11.drv/xrender.c | 11 ++++++----- include/wine/gdi_driver.h | 12 ++++++++++-- 15 files changed, 60 insertions(+), 82 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f85bb3528047fc3a5fd22…
1
0
0
0
Alexandre Julliard : gdi32: Store the pattern brush information for geometric pens.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: a1fdd5856f62bb5c9b3efe9d5ca287c0c0858bde URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a1fdd5856f62bb5c9b3efe9d5…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 16:18:07 2011 +0100 gdi32: Store the pattern brush information for geometric pens. --- dlls/gdi32/pen.c | 72 +++++++++++----------------- dlls/gdi32/tests/pen.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 43 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1fdd5856f62bb5c9b3ef…
1
0
0
0
Alexandre Julliard : gdi32: Add sanity checks for brush hatch styles.
by Alexandre Julliard
30 Dec '11
30 Dec '11
Module: wine Branch: master Commit: ee89ce29821834ade66d14e89428aade8d06076f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ee89ce29821834ade66d14e89…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 30 11:02:57 2011 +0100 gdi32: Add sanity checks for brush hatch styles. --- dlls/gdi32/brush.c | 8 ++++++++ dlls/gdi32/tests/brush.c | 37 +++++++++++++++++++++++++++++++++++++ include/wingdi.h | 1 + 3 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5dc7dfe..eda80a3 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -149,7 +149,15 @@ BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) { case BS_SOLID: case BS_HOLLOW: + return TRUE; + case BS_HATCHED: + if (brush->lbHatch > HS_DIAGCROSS) + { + if (brush->lbHatch >= HS_API_MAX) return FALSE; + brush->lbStyle = BS_SOLID; + brush->lbHatch = 0; + } return TRUE; case BS_PATTERN8X8: diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index b11d21c..76e158d 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -79,6 +79,42 @@ static void test_solidbrush(void) } } +static void test_hatch_brush(void) +{ + int i, size; + HBRUSH brush; + LOGBRUSH lb; + + for (i = 0; i < 20; i++) + { + SetLastError( 0xdeadbeef ); + brush = CreateHatchBrush( i, RGB(12,34,56) ); + if (i < HS_API_MAX) + { + ok( brush != 0, "%u: CreateHatchBrush failed err %u\n", i, GetLastError() ); + size = GetObject( brush, sizeof(lb), &lb ); + ok( size == sizeof(lb), "wrong size %u\n", size ); + ok( lb.lbColor == RGB(12,34,56), "wrong color %08x\n", lb.lbColor ); + if (i <= HS_DIAGCROSS) + { + ok( lb.lbStyle == BS_HATCHED, "wrong style %u\n", lb.lbStyle ); + ok( lb.lbHatch == i, "wrong hatch %lu/%u\n", lb.lbHatch, i ); + } + else + { + ok( lb.lbStyle == BS_SOLID, "wrong style %u\n", lb.lbStyle ); + ok( lb.lbHatch == 0, "wrong hatch %lu\n", lb.lbHatch ); + } + DeleteObject( brush ); + } + else + { + ok( !brush, "%u: CreateHatchBrush succeeded\n", i ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + } + } +} + static void test_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD) + 32 * 32 / 8]; @@ -310,6 +346,7 @@ static void test_palette_brush(void) START_TEST(brush) { test_solidbrush(); + test_hatch_brush(); test_pattern_brush(); test_palette_brush(); } diff --git a/include/wingdi.h b/include/wingdi.h index ab91409..2f9fa08 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -526,6 +526,7 @@ typedef LOGBRUSH PATTERN, *PPATTERN, *LPPATTERN; #define HS_BDIAGONAL 3 #define HS_CROSS 4 #define HS_DIAGCROSS 5 +#define HS_API_MAX 12 /* Fonts */
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
...
81
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
Results per page:
10
25
50
100
200