comctl32/tests: Some cleanup for SysLink tests.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
084e772db1
commit
8138ac9a3c
|
@ -180,65 +180,15 @@ static HWND create_syslink(DWORD style, HWND parent)
|
||||||
return hWndSysLink;
|
return hWndSysLink;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_create_syslink(void)
|
||||||
START_TEST(syslink)
|
|
||||||
{
|
{
|
||||||
ULONG_PTR ctx_cookie;
|
|
||||||
HANDLE hCtx;
|
|
||||||
HMODULE hComctl32;
|
|
||||||
BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*);
|
|
||||||
INITCOMMONCONTROLSEX iccex;
|
|
||||||
BOOL rc;
|
|
||||||
HWND hWndSysLink;
|
HWND hWndSysLink;
|
||||||
LONG oldstyle;
|
LONG oldstyle;
|
||||||
POINT orig_pos;
|
|
||||||
|
|
||||||
if (!load_v6_module(&ctx_cookie, &hCtx))
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* LoadLibrary is needed. This file has no reference to functions in comctl32 */
|
|
||||||
hComctl32 = LoadLibraryA("comctl32.dll");
|
|
||||||
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
|
|
||||||
if (!pInitCommonControlsEx)
|
|
||||||
{
|
|
||||||
win_skip("InitCommonControlsEx() is missing. Skipping the tests\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
iccex.dwSize = sizeof(iccex);
|
|
||||||
iccex.dwICC = ICC_LINK_CLASS;
|
|
||||||
rc = pInitCommonControlsEx(&iccex);
|
|
||||||
ok(rc, "InitCommonControlsEx failed (le %u)\n", GetLastError());
|
|
||||||
if (!rc)
|
|
||||||
{
|
|
||||||
skip("Could not register ICC_LINK_CLASS\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Move the cursor off the parent window */
|
|
||||||
GetCursorPos(&orig_pos);
|
|
||||||
SetCursorPos(400, 400);
|
|
||||||
|
|
||||||
init_msg_sequences(sequences, NUM_MSG_SEQUENCE);
|
|
||||||
|
|
||||||
/* Create parent window */
|
|
||||||
hWndParent = create_parent_window();
|
|
||||||
ok(hWndParent != NULL, "Failed to create parent Window!\n");
|
|
||||||
if (!hWndParent)
|
|
||||||
{
|
|
||||||
skip("Parent window not present\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
flush_events();
|
|
||||||
|
|
||||||
/* Create an invisible SysLink control */
|
/* Create an invisible SysLink control */
|
||||||
flush_sequences(sequences, NUM_MSG_SEQUENCE);
|
flush_sequences(sequences, NUM_MSG_SEQUENCE);
|
||||||
hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent);
|
hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent);
|
||||||
ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError());
|
ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError());
|
||||||
if (!hWndSysLink)
|
|
||||||
{
|
|
||||||
skip("SysLink control not present?\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
flush_events();
|
flush_events();
|
||||||
ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE);
|
ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE);
|
||||||
ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE);
|
ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE);
|
||||||
|
@ -253,6 +203,35 @@ START_TEST(syslink)
|
||||||
ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE);
|
ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE);
|
||||||
|
|
||||||
DestroyWindow(hWndSysLink);
|
DestroyWindow(hWndSysLink);
|
||||||
|
}
|
||||||
|
|
||||||
|
START_TEST(syslink)
|
||||||
|
{
|
||||||
|
ULONG_PTR ctx_cookie;
|
||||||
|
HMODULE hComctl32;
|
||||||
|
POINT orig_pos;
|
||||||
|
HANDLE hCtx;
|
||||||
|
|
||||||
|
if (!load_v6_module(&ctx_cookie, &hCtx))
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* LoadLibrary is needed. This file has no reference to functions in comctl32 */
|
||||||
|
hComctl32 = LoadLibraryA("comctl32.dll");
|
||||||
|
ok(hComctl32 != NULL, "Failed to load comctl32.dll.\n");
|
||||||
|
|
||||||
|
/* Move the cursor off the parent window */
|
||||||
|
GetCursorPos(&orig_pos);
|
||||||
|
SetCursorPos(400, 400);
|
||||||
|
|
||||||
|
init_msg_sequences(sequences, NUM_MSG_SEQUENCE);
|
||||||
|
|
||||||
|
/* Create parent window */
|
||||||
|
hWndParent = create_parent_window();
|
||||||
|
ok(hWndParent != NULL, "Failed to create parent Window!\n");
|
||||||
|
flush_events();
|
||||||
|
|
||||||
|
test_create_syslink();
|
||||||
|
|
||||||
DestroyWindow(hWndParent);
|
DestroyWindow(hWndParent);
|
||||||
unload_v6_module(ctx_cookie, hCtx);
|
unload_v6_module(ctx_cookie, hCtx);
|
||||||
SetCursorPos(orig_pos.x, orig_pos.y);
|
SetCursorPos(orig_pos.x, orig_pos.y);
|
||||||
|
|
Loading…
Reference in New Issue