February 2017 - Wine-commits

Fabian Maurer : user32/tests: Add tests for windows when first shown with SetWindowPos.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: ea6dbfcd075656220066443703b772bab37b3c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6dbfcd07565622006644370… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:26 2017 +0100 user32/tests: Add tests for windows when first shown with SetWindowPos. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2fe7d91..3a69035 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1000,6 +1000,126 @@ static const struct message WmShowPopupFirstDrawSeq_2[] = { { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; +static const struct message WmFirstDrawSetWindowPosSeq1[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_ACTIVATEAPP, sent }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent|wparam, 1 }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { 0 } +}; +static const struct message WmFirstDrawSetWindowPosSeq2[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { HCBT_ACTIVATE, hook }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_ACTIVATEAPP, sent }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { 0 } +}; +static const struct message WmFirstDrawSetWindowPosSeq3[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { HCBT_ACTIVATE, hook|optional }, + /* Probably shouldn't happen, but not part of this test */ + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_ACTIVATEAPP, sent|optional }, + { WM_NCACTIVATE, sent|optional }, + { WM_ACTIVATE, sent|optional }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { 0 } +}; +static const struct message WmFirstDrawSetWindowPosSeq4[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_ACTIVATEAPP, sent }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent|wparam, 1 }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { 0 } +}; +static const struct message WmFirstDrawSetWindowPosSeq5[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_ACTIVATEAPP, sent }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_WINDOWPOSCHANGED, sent }, + { 0 } +}; /* CreateWindow (for child window, not initially visible) */ static const struct message WmCreateChildSeq[] = { { HCBT_CREATEWND, hook }, @@ -4777,6 +4897,23 @@ static DWORD CALLBACK show_window_thread(LPVOID arg) return 0; } +/* Helper function to easier test SetWindowPos messages */ +#define test_msg_setpos( expected_list, flags, todo ) \ + test_msg_setpos_( (expected_list), (flags), (todo), __FILE__, __LINE__) +static void test_msg_setpos_(const struct message *expected_list, UINT flags, BOOL todo, const char *file, int line) +{ + HWND hwnd; + + flush_events(); + flush_sequence(); + hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP, + 10, 10, 100, 100, NULL, 0, 0, NULL ); + ok (hwnd != 0, "Failed to create popup window\n"); + SetWindowPos(hwnd, NULL, 0, 0, 100, 100, flags); + ok_sequence_(expected_list, "SetWindowPos:show_popup_first_show_window", todo, file, line); + DestroyWindow(hwnd); +} + /* test if we receive the right sequence of messages */ static void test_messages(void) { @@ -4937,6 +5074,39 @@ static void test_messages(void) ok_sequence(WmShowPopupFirstDrawSeq_2, "RedrawWindow:show_popup_first_draw_show_maximized", TRUE); DestroyWindow(hwnd); + /* Test SetWindowPos */ + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq2, 0, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, + SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER, TRUE); + + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOZORDER, TRUE); + + test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq5, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOSIZE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOZORDER, FALSE); + + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOZORDER, TRUE); + + test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq5, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOSIZE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOZORDER, FALSE); + /* Test child windows */ hparent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE,

1 0

Fabian Maurer : user32/tests: Add tests for windows when first shown if they have children.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 372e3e223a2954673df1e6f3b1b3bcad51fc3adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=372e3e223a2954673df1e6f3b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:27 2017 +0100 user32/tests: Add tests for windows when first shown if they have children. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3a69035..d60b93e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1120,6 +1120,17 @@ static const struct message WmFirstDrawSetWindowPosSeq5[] = { { WM_WINDOWPOSCHANGED, sent }, { 0 } }; +static const struct message WmFirstDrawChildSeq1[] = { + { 0 } +}; +static const struct message WmFirstDrawChildSeq2[] = { + { WM_NCPAINT, sent|wparam, 1 }, + { WM_ERASEBKGND, sent }, + /* ocasionally received on test machines */ + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { 0 } +}; /* CreateWindow (for child window, not initially visible) */ static const struct message WmCreateChildSeq[] = { { HCBT_CREATEWND, hook }, @@ -5107,6 +5118,38 @@ static void test_messages(void) test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOZORDER, FALSE); + /* Test SetWindowPos with child windows */ + flush_events(); + hparent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hparent != 0, "Failed to create parent window\n"); + + hchild = CreateWindowExA(0, "TestWindowClass", "Test child", WS_CHILD | WS_VISIBLE, + 0, 0, 10, 10, hparent, 0, 0, NULL); + ok (hchild != 0, "Failed to create child window\n"); + flush_sequence(); + SetWindowPos(hparent, NULL, 0, 0, 100, 100, SWP_SHOWWINDOW); + ok_sequence(WmFirstDrawChildSeq1, /* Expect no messages for the child */ + "SetWindowPos:show_popup_first_show_window_child1", FALSE); + DestroyWindow(hchild); + DestroyWindow(hparent); + + flush_events(); + hparent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hparent != 0, "Failed to create parent window\n"); + + hchild = CreateWindowExA(0, "TestWindowClass", "Test child", WS_CHILD | WS_VISIBLE, + 0, 0, 10, 10, hparent, 0, 0, NULL); + ok (hchild != 0, "Failed to create child window\n"); + flush_sequence(); + SetWindowPos(hparent, NULL, 0, 0, 100, 100, SWP_SHOWWINDOW); + ok_sequence(WmFirstDrawChildSeq2, /* Expect child to be redrawn */ + "SetWindowPos:show_popup_first_show_window_child2", TRUE); + DestroyWindow(hchild); + DestroyWindow(hparent); + + /* Test child windows */ hparent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE,

1 0

Fabian Maurer : user32/tests: Add WM_NCPAINT tests for windows crossing screen or maximized.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: eba9294d9e4806882ffda21c4a3ca526153649be URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba9294d9e4806882ffda21c4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:28 2017 +0100 user32/tests: Add WM_NCPAINT tests for windows crossing screen or maximized. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d60b93e..1752b68 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -758,7 +758,7 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a resized not visible popup window */ -static const struct message WmShowMaxPopupResizedSeq[] = { +static const struct message WmShowMaxPopupResizedSeq_todo[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, @@ -789,6 +789,37 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +static const struct message WmShowMaxPopupResizedSeq[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, + { WM_GETMINMAXINFO, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, + { WM_GETTEXT, sent|optional }, + { WM_NCPAINT, sent|optional }, /* We'll check WM_NCPAINT behaviour in another test */ + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent }, + /* WinNT4.0 sends WM_MOVE */ + { WM_MOVE, sent|defwinproc|optional }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { 0 } +}; /* ShowWindow(SW_SHOWMAXIMIZED) for a not visible popup window */ static const struct message WmShowMaxPopupSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, @@ -927,6 +958,38 @@ static const struct message WmShowVisiblePopupSeq_3[] = { { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_SHOWWINDOW }, { 0 } }; +/* CreateWindow (for a popup window with WS_VISIBLE style set and extreme location) + */ +static const struct message WmShowPopupExtremeLocationSeq[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_SHOWWINDOW, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_ACTIVATEAPP, sent }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent|wparam, 1 }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent }, + /* ocasionally received on test machines */ + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { 0 } +}; /* CreateWindow (for a popup window with WS_VISIBLE style set) */ static const struct message WmShowPopupFirstDrawSeq_1[] = { @@ -4580,6 +4643,18 @@ static void test_showwindow(void) DestroyWindow(hwnd); flush_sequence(); + /* Test again, this time the NC_PAINT message */ + hwnd = CreateWindowExA(0, "TestWindowClass", "Test popup", WS_POPUP | WS_MAXIMIZE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create popup window\n"); + SetWindowPos(hwnd, 0, 10, 10, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ok_sequence(WmShowMaxPopupResizedSeq_todo, + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); + DestroyWindow(hwnd); + flush_sequence(); + /* Test 2: * 1. Create invisible maximized popup window. * 2. Show it maximized. @@ -5149,6 +5224,15 @@ static void test_messages(void) DestroyWindow(hchild); DestroyWindow(hparent); + /* Test message sequence for extreme position and size */ + + flush_sequence(); + hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP | WS_VISIBLE, + -10, -10, 10000, 10000, NULL, 0, 0, NULL ); + ok (hwnd != 0, "Failed to create popup window\n"); + ok_sequence(WmShowPopupExtremeLocationSeq, "RedrawWindow:show_popup_extreme_location", TRUE); + DestroyWindow(hwnd); + /* Test child windows */

1 0

Huw Davies : gdi32: Don't copy biSizeImage in copy_color_info().
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 9d0338bc4f12def9292fc7de5243cc6549f6aa38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0338bc4f12def9292fc7de5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:07:58 2017 +0000 gdi32: Don't copy biSizeImage in copy_color_info(). It meant there was a hack which incorrectly changed the corresponding value in src_info. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 11 +++++++---- dlls/gdi32/tests/bitmap.c | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 96280f9..0d558b0 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1051,8 +1051,7 @@ static void copy_color_info(BITMAPINFO *dst, const BITMAPINFO *src, UINT colorus } else { - dst->bmiHeader.biClrUsed = src->bmiHeader.biClrUsed; - dst->bmiHeader.biSizeImage = src->bmiHeader.biSizeImage; + dst->bmiHeader.biClrUsed = src->bmiHeader.biClrUsed; if (src->bmiHeader.biCompression == BI_BITFIELDS) /* bitfields are always at bmiColors even in larger structures */ @@ -1388,7 +1387,6 @@ INT WINAPI GetDIBits( } break; } - src_info->bmiHeader.biSizeImage = get_dib_image_size( dst_info ); copy_color_info( dst_info, src_info, coloruse ); } else if (dst_info->bmiHeader.biBitCount <= 8) /* otherwise construct a default colour table for the dst, if needed */ @@ -1409,6 +1407,7 @@ INT WINAPI GetDIBits( dst_info->bmiHeader.biHeight = src.height; else dst_info->bmiHeader.biHeight = -src.height; + dst_info->bmiHeader.biSizeImage = get_dib_image_size( dst_info ); convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits ); if (src_bits.free) src_bits.free( &src_bits ); @@ -1425,7 +1424,11 @@ INT WINAPI GetDIBits( } copy_color_info( info, dst_info, coloruse ); - if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) info->bmiHeader.biClrUsed = 0; + if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + { + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biSizeImage = get_dib_image_size( info ); + } done: release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 88250ca..1c1db17 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -4303,8 +4303,10 @@ static void test_GetDIBits_scanlines(void) memset( data, 0xaa, sizeof(data) ); info->bmiHeader.biHeight = 16; + info->bmiHeader.biSizeImage = 0; ret = GetDIBits( hdc, dib, 1, 12, data, info, DIB_RGB_COLORS ); ok( ret == 5, "got %d\n", ret ); + ok( info->bmiHeader.biSizeImage == 128 * 4, "got %d\n", info->bmiHeader.biSizeImage ); for (i = 0; i < 56; i++) ok( data[i] == 0, "%d: got %08x\n", i, data[i] ); ok( !memcmp( data + 56, dib_bits, 40 * 4 ), "bits differ\n"); for (i = 96; i < 128; i++) ok( data[i] == 0xaaaaaaaa, "%d: got %08x\n", i, data[i] );

1 0

Huw Davies : gdi32: Use the image size returned by GetImage.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: a3e09aa43f97a6d58550708c0e99ac3ff22e61a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e09aa43f97a6d58550708c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:07:59 2017 +0000 gdi32: Use the image size returned by GetImage. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1155ee4..ddd0051 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2004,6 +2004,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = src.width; info->bmiHeader.biHeight = -src.height; + info->bmiHeader.biSizeImage = get_dib_image_size( info ); err = dst_dev->funcs->pPutImage( dst_dev, 0, info, NULL, NULL, NULL, 0 ); if (!err || err == ERROR_BAD_FORMAT) { @@ -2013,7 +2014,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect src.visrect.right = src.width; src.visrect.bottom = src.height; - bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )); + bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); if (!bits.ptr) return ERROR_OUTOFMEMORY; bits.is_copy = TRUE; bits.free = free_heap_bits; @@ -2026,13 +2027,13 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect err = src_dev->funcs->pGetImage( src_dev, info, &bits, &src ); if (!err && !bits.is_copy) { - void *ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )); + void *ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); if (!ptr) { if (bits.free) bits.free( &bits ); return ERROR_OUTOFMEMORY; } - memcpy( ptr, bits.ptr, get_dib_image_size( info )); + memcpy( ptr, bits.ptr, info->bmiHeader.biSizeImage ); if (bits.free) bits.free( &bits ); bits.ptr = ptr; bits.is_copy = TRUE;

1 0

Huw Davies : gdi32: Update biSizeImage when uncompressing the RLE bitmap.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 8c2374ab08bd4869f91d03069ee025600ceca64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2374ab08bd4869f91d03069… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:00 2017 +0000 gdi32: Update biSizeImage when uncompressing the RLE bitmap. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0d558b0..f071bbf 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -316,7 +316,7 @@ static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) return (char *)bits + y * get_dib_stride( width, bpp ) + x * bpp / 8; } -static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bits, HRGN *clip ) +static BOOL build_rle_bitmap( BITMAPINFO *info, struct gdi_image_bits *bits, HRGN *clip ) { DWORD i = 0; int left, right; @@ -449,6 +449,7 @@ done: bits->ptr = out_bits; bits->is_copy = TRUE; bits->free = free_heap_bits; + info->bmiHeader.biSizeImage = get_dib_image_size( info ); return TRUE;

1 0

Huw Davies : gdi32: Initialize biSizeImage in the DDB's bitmapinfo.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 2eeed2df518ae382d31c4810eb24775100a882b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eeed2df518ae382d31c4810e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:01 2017 +0000 gdi32: Initialize biSizeImage in the DDB's bitmapinfo. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index f071bbf..ef63f40 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1177,6 +1177,7 @@ void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = bmp->dib.dsBm.bmBitsPixel; info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = get_dib_image_size( info ); info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0;

1 0

Huw Davies : gdi32: Reset the image size when cropping the source bitmap.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: fe26147c17e503bbb4dd97bed317a73edb2a1cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe26147c17e503bbb4dd97bed… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:02 2017 +0000 gdi32: Reset the image size when cropping the source bitmap. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ef63f40..a85bf6f 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -831,6 +831,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR else if (src.y >= lines) return lines; } src_info->bmiHeader.biHeight = top_down ? -lines : lines; + src_info->bmiHeader.biSizeImage = get_dib_image_size( src_info ); } src.visrect.left = src.x;

1 0

Huw Davies : gdi32: Calculate the stride from the image size.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: a4f0415a5b2170c86e3cf4483b5a435bfdab9311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f0415a5b2170c86e3cf4483… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:03 2017 +0000 gdi32: Calculate the stride from the image size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 4b7a2ed..768911a 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -267,7 +267,7 @@ LONG WINAPI GetBitmapBits( if (!get_image_from_bitmap( bmp, info, &src_bits, &src )) { const char *src_ptr = src_bits.ptr; - int src_stride = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); + int src_stride = info->bmiHeader.biSizeImage / abs( info->bmiHeader.biHeight ); /* GetBitmapBits returns 16-bit aligned data */

1 0

Huw Davies : gdi32: Calculate the stride from the image size.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 0bec2f7965db53ca369aaa0b84d07fa73d626d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bec2f7965db53ca369aaa0b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:04 2017 +0000 gdi32: Calculate the stride from the image size. This allows bitmaps to be created by D3DKMTCreateDCFromMemory() which have more freedom in their choice of stride. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9bd263c..aee305f 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -154,7 +154,10 @@ static void init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, int stride, void init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits) { - init_dib_info( dib, &info->bmiHeader, get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ), + int width_bytes = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); + if (info->bmiHeader.biSizeImage) + width_bytes = info->bmiHeader.biSizeImage / abs( info->bmiHeader.biHeight ); + init_dib_info( dib, &info->bmiHeader, width_bytes, (const DWORD *)info->bmiColors, info->bmiColors, bits ); }

1 0