wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

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

20 Jul '17

Module: wine Branch: stable Commit: 1d8ae9fff45593ed32966b17ba889c7840cab103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8ae9fff45593ed32966b17b… 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> (cherry picked from commit 372e3e223a2954673df1e6f3b1b3bcad51fc3adf) Signed-off-by: Michael Stefaniuc <mstefani(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 7dc3d0f..96bc594 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 }, @@ -5103,6 +5114,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 tests for windows when first shown with SetWindowPos.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: aada97e78d3977f7787b6e6eca1a954580a55220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aada97e78d3977f7787b6e6ec… 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> (cherry picked from commit ea6dbfcd075656220066443703b772bab37b3c63) Signed-off-by: Michael Stefaniuc <mstefani(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 34074f8..7dc3d0f 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 }, @@ -4773,6 +4893,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) { @@ -4933,6 +5070,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 with WS_VISIBLE or RedrawWindow.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: e0e060421bcf3a3faa14a6621b10318b2ee7d9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e060421bcf3a3faa14a6621… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:25 2017 +0100 user32/tests: Add tests for windows when first shown with WS_VISIBLE or RedrawWindow. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46b344fc2f8cbf57ceedfcfd074a972527450562) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 45b5222..34074f8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -927,6 +927,79 @@ 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) + */ +static const struct message WmShowPopupFirstDrawSeq_1[] = { + { 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 }, + { WM_PAINT, sent }, + /* ocasionally received on test machines */ + { WM_NCPAINT, sent|beginpaint|optional }, + { WM_ERASEBKGND, sent|beginpaint|optional }, + { 0 } +}; +/* CreateWindow (for a popup window that is shown with ShowWindow(SW_SHOWMAXIMIZED)) + */ +static const struct message WmShowPopupFirstDrawSeq_2[] = { + { 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_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, + { WM_GETMINMAXINFO, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_STATECHANGED|SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_NCPAINT, sent|optional|wparam, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, 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|optional }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc, 0 }, + { WM_PAINT, sent}, + /* ocasionally received on test machines */ + { WM_NCPAINT, sent|beginpaint|optional }, + { WM_ERASEBKGND, sent|beginpaint|optional }, + { 0 } +}; /* CreateWindow (for child window, not initially visible) */ static const struct message WmCreateChildSeq[] = { { HCBT_CREATEWND, hook }, @@ -4826,6 +4899,42 @@ static void test_messages(void) DestroyWindow(hwnd); ok_sequence(WmDestroyOverlappedSeq, "DestroyWindow:overlapped", FALSE); + /* Test if windows are correctly drawn when first shown */ + + /* Visible, redraw */ + flush_events(); + flush_sequence(); + hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP | WS_VISIBLE, + 10, 10, 100, 100, NULL, 0, 0, NULL ); + ok (hwnd != 0, "Failed to create popup window\n"); + RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); + ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_visible", TRUE); + DestroyWindow(hwnd); + + /* Invisible, show, message */ + 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"); + ShowWindow(hwnd, SW_SHOW); + SendMessageW(hwnd, WM_PAINT, 0, 0); + ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_show", TRUE); + DestroyWindow(hwnd); + + /* Invisible, show maximized, redraw */ + 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"); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); + ok_sequence(WmShowPopupFirstDrawSeq_2, "RedrawWindow:show_popup_first_draw_show_maximized", TRUE); + DestroyWindow(hwnd); + + /* Test child windows */ + 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");

1 0

Daniel Lehman : msvcrt: Add Concurrency::event stubs.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 5b5ce97eb876fa19cf75c2414bfdd52570a9ec14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5ce97eb876fa19cf75c2414… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Dec 12 13:21:47 2016 -0800 msvcrt: Add Concurrency::event stubs. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8ec8aba3addfd346aa625345ed6f3eeb65ea6f58) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 24 ++++++++-------- dlls/msvcr100/msvcr100.spec | 24 ++++++++-------- dlls/msvcr110/msvcr110.spec | 34 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 34 +++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 34 +++++++++++----------- dlls/msvcrt/lock.c | 57 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 2 ++ 7 files changed, 134 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b5ce97eb876fa19cf75c…

1 0

Piotr Caban : msvcr100: Add _ReentrantBlockingLock class implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: e51ddfe8826050c2556c116884fad1eed383b7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51ddfe8826050c2556c11688… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:15:56 2017 +0100 msvcr100: Add _ReentrantBlockingLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2682f9e67c78172039de4abc690b33b3a20742f0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 +++++++------- dlls/msvcr100/msvcr100.spec | 20 +++++++------- dlls/msvcr110/msvcr110.spec | 30 ++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 ++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 30 ++++++++++----------- dlls/msvcrt/lock.c | 54 +++++++++++++++++++++++++++++++++++++ 6 files changed, 119 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e51ddfe8826050c2556c1…

1 0

Piotr Caban : msvcr100: Add reader_writer_lock class stub.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 0b62067bffadd922baa50805aa82a12fa5167349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b62067bffadd922baa50805a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 26 17:30:20 2017 +0100 msvcr100: Add reader_writer_lock class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 245426c77e3ca31dc3eca00a79c734b71a6bd754) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 28 ++++++------- dlls/msvcr100/msvcr100.spec | 28 ++++++------- dlls/msvcr110/msvcr110.spec | 42 ++++++++++---------- dlls/msvcr120/msvcr120.spec | 42 ++++++++++---------- dlls/msvcr120_app/msvcr120_app.spec | 42 ++++++++++---------- dlls/msvcrt/lock.c | 79 +++++++++++++++++++++++++++++++++++++ 6 files changed, 170 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b62067bffadd922baa50…

1 0

Piotr Caban : msvcr: Add _Wcsftime implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: fd4ea8ea6a32dd1b6643efc474bb78bf60c23be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4ea8ea6a32dd1b6643efc47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 14 17:41:59 2017 +0100 msvcr: Add _Wcsftime implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6400b9fe7e6247de21c35a8ec73dba629c6dd52) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/time.c | 33 ++++++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 5da3851..463ad7f 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -5,7 +5,7 @@ @ cdecl _W_Getdays() ucrtbase._W_Getdays @ cdecl _W_Getmonths() ucrtbase._W_Getmonths @ cdecl _W_Gettnames() ucrtbase._W_Gettnames -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) ucrtbase._Wcsftime @ cdecl __daylight() ucrtbase.__daylight @ cdecl __dstbias() ucrtbase.__dstbias @ cdecl __timezone() ucrtbase.__timezone diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 39a2eef..3eaa90b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -867,7 +867,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d09c711..fa2cca7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -851,7 +851,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d51f5d3..7ecc163 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -845,7 +845,7 @@ @ cdecl _W_Getdays() msvcr120._W_Getdays @ cdecl _W_Getmonths() msvcr120._W_Getmonths @ cdecl _W_Gettnames() msvcr120._W_Gettnames -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) msvcr120._Wcsftime @ cdecl _XcptFilter(long ptr) msvcr120._XcptFilter @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer @ stub __BuildCatchObject diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b0f5285..c390df6 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1263,16 +1263,14 @@ MSVCRT_size_t CDECL MSVCRT_strftime( char *str, MSVCRT_size_t max, const char *f return strftime_helper(str, max, format, mstm, NULL, NULL); } -/********************************************************************* - * _wcsftime_l (MSVCRT.@) - */ -MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, - const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) +static MSVCRT_size_t wcsftime_helper( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, + MSVCRT___lc_time_data *time_data, MSVCRT__locale_t loc ) { char *s, *fmt; MSVCRT_size_t len; - TRACE("%p %ld %s %p %p\n", str, max, debugstr_w(format), mstm, loc); + TRACE("%p %ld %s %p %p %p\n", str, max, debugstr_w(format), mstm, time_data, loc); len = MSVCRT__wcstombs_l( NULL, format, 0, loc ) + 1; if (!(fmt = MSVCRT_malloc( len ))) return 0; @@ -1280,7 +1278,7 @@ MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, if ((s = MSVCRT_malloc( max*4 ))) { - if (!MSVCRT__strftime_l( s, max*4, fmt, mstm, loc )) s[0] = 0; + if (!strftime_helper( s, max*4, fmt, mstm, time_data, loc )) s[0] = 0; len = MSVCRT__mbstowcs_l( str, s, max, loc ); MSVCRT_free( s ); } @@ -1291,12 +1289,31 @@ MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, } /********************************************************************* + * _wcsftime_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) +{ + return wcsftime_helper(str, max, format, mstm, NULL, loc); +} + +/********************************************************************* * wcsftime (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm ) { - return MSVCRT__wcsftime_l(str, max, format, mstm, NULL); + return wcsftime_helper(str, max, format, mstm, NULL, NULL); +} + +/********************************************************************* + * _Wcsftime (MSVCRT.@) + */ +MSVCRT_size_t CDECL _Wcsftime(MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, + MSVCRT___lc_time_data *time_data) +{ + return wcsftime_helper(str, max, format, mstm, time_data, NULL); } static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b66a4fe..e57b6d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -44,7 +44,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper

1 0

Piotr Caban : msvcp140: Add _TaskEventLogger class implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 046de3692b8611b0d0265e5456971bf0f13e7866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046de3692b8611b0d0265e545… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 15 12:06:20 2017 +0100 msvcp140: Add _TaskEventLogger class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe1ae48bbe7a367ded3f551369f0d5763efffa36) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 36 +++++++++++++++--------------- dlls/msvcp90/misc.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 8d62936..f8a5dfd 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1475,24 +1475,24 @@ @ cdecl -arch=win32 ?_Lockit_dtor@_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_dtor @ cdecl -arch=win64 ?_Lockit_dtor@_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_dtor @ cdecl ?_Lockit_dtor@_Lockit@std@@SAXH@Z(long) _Lockit_free -@ stub -arch=arm ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAAX_N@Z -@ stub -arch=i386 ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAEX_N@Z -@ stub -arch=win64 ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QEAAX_N@Z -@ stub -arch=arm ?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QAAXXZ -@ stub -arch=win32 ?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QEAAXXZ +@ cdecl -arch=arm ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogCancelTask +@ thiscall -arch=i386 ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogCancelTask +@ cdecl -arch=win64 ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogCancelTask +@ cdecl -arch=arm ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAAX_N@Z(ptr long) _TaskEventLogger__LogScheduleTask +@ thiscall -arch=i386 ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAEX_N@Z(ptr long) _TaskEventLogger__LogScheduleTask +@ cdecl -arch=win64 ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QEAAX_N@Z(ptr long) _TaskEventLogger__LogScheduleTask +@ cdecl -arch=arm ?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ thiscall -arch=i386 ?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ cdecl -arch=win64 ?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ cdecl -arch=arm ?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ thiscall -arch=i386 ?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ cdecl -arch=win64 ?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ cdecl -arch=arm ?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ thiscall -arch=i386 ?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ cdecl -arch=win64 ?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ cdecl -arch=arm ?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogWorkItemStarted +@ thiscall -arch=i386 ?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogWorkItemStarted +@ cdecl -arch=win64 ?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogWorkItemStarted @ stub -arch=win32 ?_MP_Add@std@@YAXQA_K_K@Z @ stub -arch=win64 ?_MP_Add@std@@YAXQEA_K_K@Z @ stub -arch=win32 ?_MP_Get@std@@YA_KQA_K@Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index aa0a289..4ff3d51 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1427,4 +1427,58 @@ MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this) TRACE("(%p)\n", this); return FALSE; } + +typedef struct { + /*_Task_impl_base*/void *task; + MSVCP_bool scheduled; + MSVCP_bool started; +} _TaskEventLogger; + +/* ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAEXXZ */ +/* ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogCancelTask, 4) +void __thiscall _TaskEventLogger__LogCancelTask(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAEX_N@Z */ +/* ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QEAAX_N@Z */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogScheduleTask, 8) +void __thiscall _TaskEventLogger__LogScheduleTask(_TaskEventLogger *this, MSVCP_bool continuation) +{ + TRACE("(%p %x)\n", this, continuation); +} + +/* ?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ */ +/* ?_LogTaskCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogTaskCompleted, 4) +void __thiscall _TaskEventLogger__LogTaskCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ */ +/* ?_LogTaskExecutionCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogTaskExecutionCompleted, 4) +void __thiscall _TaskEventLogger__LogTaskExecutionCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QAEXXZ */ +/* ?_LogWorkItemCompleted@_TaskEventLogger@details@Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogWorkItemCompleted, 4) +void __thiscall _TaskEventLogger__LogWorkItemCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QAEXXZ */ +/* ?_LogWorkItemStarted@_TaskEventLogger@details@Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogWorkItemStarted, 4) +void __thiscall _TaskEventLogger__LogWorkItemStarted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} #endif

1 0

Piotr Caban : msvcp140: Add _ContextCallback implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 84ac5d59741f4c9c62ecf95b26cc4a6da8199fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ac5d59741f4c9c62ecf95b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 16:01:36 2017 +0100 msvcp140: Add _ContextCallback implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2fe03d7d3765895260e524e41c187bc0393bc912) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 26 +++++++++++------------ dlls/msvcp90/misc.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 13df2e1..8d62936 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1096,9 +1096,9 @@ @ cdecl -arch=win64 ?_Addfac@_Locimp@locale@std@@AEAAXPEAVfacet@23@_K@Z(ptr ptr long) locale__Locimp__Addfac @ cdecl -arch=win32 ?_Addstd@ios_base@std@@SAXPAV12@@Z(ptr) ios_base_Addstd @ cdecl -arch=win64 ?_Addstd@ios_base@std@@SAXPEAV12@@Z(ptr) ios_base_Addstd -@ stub -arch=arm ?_Assign@_ContextCallback@details@Concurrency@@AAAXPAX@Z -@ stub -arch=i386 ?_Assign@_ContextCallback@details@Concurrency@@AAEXPAX@Z -@ stub -arch=win64 ?_Assign@_ContextCallback@details@Concurrency@@AEAAXPEAX@Z +@ cdecl -arch=arm ?_Assign@_ContextCallback@details@Concurrency@@AAAXPAX@Z(ptr ptr) _ContextCallback__Assign +@ thiscall -arch=i386 ?_Assign@_ContextCallback@details@Concurrency@@AAEXPAX@Z(ptr ptr) _ContextCallback__Assign +@ cdecl -arch=win64 ?_Assign@_ContextCallback@details@Concurrency@@AEAAXPEAX@Z(ptr ptr) _ContextCallback__Assign @ stub ?_Atexit@@YAXP6AXXZ@Z @ extern ?_BADOFF@std@@3_JB std_BADOFF @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @@ -1110,15 +1110,15 @@ @ cdecl -arch=arm ?_C_str@?$_Yarn@_W@std@@QBAPB_WXZ(ptr) _Yarn_wchar__C_str @ thiscall -arch=i386 ?_C_str@?$_Yarn@_W@std@@QBEPB_WXZ(ptr) _Yarn_wchar__C_str @ cdecl -arch=win64 ?_C_str@?$_Yarn@_W@std@@QEBAPEB_WXZ(ptr) _Yarn_wchar__C_str -@ stub -arch=arm ?_CallInContext@_ContextCallback@details@Concurrency@@QBAXV?$function@$$A6AXXZ@std@@_N@Z -@ stub -arch=i386 ?_CallInContext@_ContextCallback@details@Concurrency@@QBEXV?$function@$$A6AXXZ@std@@_N@Z -@ stub -arch=win64 ?_CallInContext@_ContextCallback@details@Concurrency@@QEBAXV?$function@$$A6AXXZ@std@@_N@Z +@ cdecl -arch=arm ?_CallInContext@_ContextCallback@details@Concurrency@@QBAXV?$function@$$A6AXXZ@std@@_N@Z(ptr ptr long) _ContextCallback__CallInContext +@ thiscall -arch=i386 ?_CallInContext@_ContextCallback@details@Concurrency@@QBEXV?$function@$$A6AXXZ@std@@_N@Z(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) _ContextCallback__CallInContext +@ cdecl -arch=win64 ?_CallInContext@_ContextCallback@details@Concurrency@@QEBAXV?$function@$$A6AXXZ@std@@_N@Z(ptr ptr long) _ContextCallback__CallInContext @ cdecl -arch=arm ?_Callfns@ios_base@std@@AAAXW4event@12@@Z(ptr long) ios_base_Callfns @ thiscall -arch=i386 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z(ptr long) ios_base_Callfns @ cdecl -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z(ptr long) ios_base_Callfns -@ stub -arch=arm ?_Capture@_ContextCallback@details@Concurrency@@AAAXXZ -@ stub -arch=i386 ?_Capture@_ContextCallback@details@Concurrency@@AAEXXZ -@ stub -arch=win64 ?_Capture@_ContextCallback@details@Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?_Capture@_ContextCallback@details@Concurrency@@AAAXXZ(ptr) _ContextCallback__Capture +@ thiscall -arch=i386 ?_Capture@_ContextCallback@details@Concurrency@@AAEXXZ(ptr) _ContextCallback__Capture +@ cdecl -arch=win64 ?_Capture@_ContextCallback@details@Concurrency@@AEAAXXZ(ptr) _ContextCallback__Capture @ extern -arch=win32 ?_Clocptr@_Locimp@locale@std@@0PAV123@A locale__Locimp__Clocptr @ extern -arch=win64 ?_Clocptr@_Locimp@locale@std@@0PEAV123@EA locale__Locimp__Clocptr @ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) locale_facet__Decref @@ -1442,7 +1442,7 @@ @ cdecl -arch=win64 ?_Iput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEAD_K@Z(ptr ptr ptr ptr long ptr long) num_put_short__Iput @ cdecl -arch=win32 ?_Iput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPADI@Z(ptr ptr long ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win64 ?_Iput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEAD_K@Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput -@ stub ?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ +@ cdecl ?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ(ptr) _ContextCallback__IsCurrentOriginSTA @ stub ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ @ cdecl -arch=win32 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPAV123@PAVfacet@23@I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPEAV123@PEAVfacet@23@_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @@ -1592,9 +1592,9 @@ @ stub ?_ReportUnobservedException@details@Concurrency@@YAXXZ @ stub -arch=win32 ?_Reschedule_chore@details@Concurrency@@YAHPBU_Threadpool_chore@12@@Z @ stub -arch=win64 ?_Reschedule_chore@details@Concurrency@@YAHPEBU_Threadpool_chore@12@@Z -@ stub -arch=arm ?_Reset@_ContextCallback@details@Concurrency@@AAAXXZ -@ stub -arch=i386 ?_Reset@_ContextCallback@details@Concurrency@@AAEXXZ -@ stub -arch=win64 ?_Reset@_ContextCallback@details@Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?_Reset@_ContextCallback@details@Concurrency@@AAAXXZ(ptr) _ContextCallback__Reset +@ thiscall -arch=i386 ?_Reset@_ContextCallback@details@Concurrency@@AAEXXZ(ptr) _ContextCallback__Reset +@ cdecl -arch=win64 ?_Reset@_ContextCallback@details@Concurrency@@AEAAXXZ(ptr) _ContextCallback__Reset @ stub ?_Rethrow_future_exception@std@@YAXVexception_ptr@1@@Z @ stub -arch=win32 ?_Rng_abort@std@@YAXPBD@Z @ stub -arch=win64 ?_Rng_abort@std@@YAXPEBD@Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index e819699..aa0a289 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1376,4 +1376,55 @@ task_continuation_context* __thiscall task_continuation_context_ctor(task_contin memset(this, 0, sizeof(*this)); return this; } + +typedef struct { + const vtable_ptr *vtable; + void (__cdecl *func)(void); + int unk[4]; + void *unk2[3]; + void *this; +} function_void_cdecl_void; + +/* ?_Assign@_ContextCallback@details@Concurrency@@AAEXPAX@Z */ +/* ?_Assign@_ContextCallback@details@Concurrency@@AEAAXPEAX@Z */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Assign, 8) +void __thiscall _ContextCallback__Assign(void *this, void *v) +{ + TRACE("(%p %p)\n", this, v); +} + +#define call_function_do_call(this) CALL_VTBL_FUNC(this, 8, void, (function_void_cdecl_void*), (this)) +#define call_function_do_clean(this,b) CALL_VTBL_FUNC(this, 16, void, (function_void_cdecl_void*,MSVCP_bool), (this, b)) +/* ?_CallInContext@_ContextCallback@details@Concurrency@@QBEXV?$function@$$A6AXXZ@std@@_N@Z */ +/* ?_CallInContext@_ContextCallback@details@Concurrency@@QEBAXV?$function@$$A6AXXZ@std@@_N@Z */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__CallInContext, 48) +void __thiscall _ContextCallback__CallInContext(const void *this, function_void_cdecl_void func, MSVCP_bool b) +{ + TRACE("(%p %p %x)\n", this, func.func, b); + call_function_do_call(func.this); + call_function_do_clean(func.this, func.this!=&func); +} + +/* ?_Capture@_ContextCallback@details@Concurrency@@AAEXXZ */ +/* ?_Capture@_ContextCallback@details@Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Capture, 4) +void __thiscall _ContextCallback__Capture(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_Reset@_ContextCallback@details@Concurrency@@AAEXXZ */ +/* ?_Reset@_ContextCallback@details@Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Reset, 4) +void __thiscall _ContextCallback__Reset(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ */ +MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this) +{ + TRACE("(%p)\n", this); + return FALSE; +} #endif

1 0

Piotr Caban : msvcp140: Add task_continuation_context constructor implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: stable Commit: 70f8d9aba7b666287abe47d96e377448f57c31cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f8d9aba7b666287abe47d96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 1 13:18:01 2017 +0100 msvcp140: Add task_continuation_context constructor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10b36e3977edb214f5451fcaf6f9c316465c01e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 6 ++-- dlls/msvcp140/tests/msvcp140.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 17 ++++++++++ 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 9ad393d..13df2e1 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -358,9 +358,9 @@ @ cdecl -arch=arm ??0ios_base@std@@IAA@XZ(ptr) ios_base_ctor @ thiscall -arch=i386 ??0ios_base@std@@IAE@XZ(ptr) ios_base_ctor @ cdecl -arch=win64 ??0ios_base@std@@IEAA@XZ(ptr) ios_base_ctor -@ stub -arch=arm ??0task_continuation_context@Concurrency@@AAA@XZ -@ stub -arch=i386 ??0task_continuation_context@Concurrency@@AAE@XZ -@ stub -arch=win64 ??0task_continuation_context@Concurrency@@AEAA@XZ +@ cdecl -arch=arm ??0task_continuation_context@Concurrency@@AAA@XZ(ptr) task_continuation_context_ctor +@ thiscall -arch=i386 ??0task_continuation_context@Concurrency@@AAE@XZ(ptr) task_continuation_context_ctor +@ cdecl -arch=win64 ??0task_continuation_context@Concurrency@@AEAA@XZ(ptr) task_continuation_context_ctor @ stub -arch=arm ??0time_base@std@@QAA@I@Z @ stub -arch=i386 ??0time_base@std@@QAE@I@Z @ stub -arch=win64 ??0time_base@std@@QEAA@_K@Z diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 82e2b34..db241ca 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -21,7 +21,57 @@ #include "wine/test.h" #include "winbase.h" +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) + +#endif /* __i386__ */ + +typedef struct { + void *unk0; + BYTE unk1; +} task_continuation_context; + static unsigned int (__cdecl *p__Thrd_id)(void); +static task_continuation_context* (__thiscall *p_task_continuation_context_ctor)(task_continuation_context*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -37,6 +87,17 @@ static BOOL init(void) SET(p__Thrd_id, "_Thrd_id"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AEAA@XZ"); + } else { +#ifdef __arm__ + SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAA@XZ"); +#else + SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAE@XZ"); +#endif + } + + init_thiscall_thunk(); return TRUE; } @@ -82,10 +143,21 @@ static void test_vbtable_size_exports(void) } } +static void test_task_continuation_context(void) +{ + task_continuation_context tcc; + + memset(&tcc, 0xdead, sizeof(tcc)); + call_func1(p_task_continuation_context_ctor, &tcc); + ok(!tcc.unk0, "tcc.unk0 != NULL (%p)\n", tcc.unk0); + ok(!tcc.unk1, "tcc.unk1 != 0 (%x)\n", tcc.unk1); +} + START_TEST(msvcp140) { if(!init()) return; test_thrd(); test_vbtable_size_exports(); + test_task_continuation_context(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 703ed9f..e819699 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1360,3 +1360,20 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) shared_ptr_lock = 0; } #endif + +#if _MSVCP_VER >= 140 +typedef struct { + void *unk0; + BYTE unk1; +} task_continuation_context; + +/* ??0task_continuation_context@Concurrency@@AAE@XZ */ +/* ??0task_continuation_context@Concurrency@@AEAA@XZ */ +DEFINE_THISCALL_WRAPPER(task_continuation_context_ctor, 4) +task_continuation_context* __thiscall task_continuation_context_ctor(task_continuation_context *this) +{ + TRACE("(%p)\n", this); + memset(this, 0, sizeof(*this)); + return this; +} +#endif

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017