system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

user32/tests: Fix a few more input test failures on Windows.

Browse source
This commit is contained in:
Alexandre Julliard 2009-02-25 12:24:53 +01:00
parent 2dc90652fb
commit 0db3d3cd2e
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/user32/input.c
View file

@ -1168,7 +1168,7 @@ int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOI
return -1;
}
if(!ptin || !ptout) {
if(!ptin || (!ptout && count)) {
SetLastError(ERROR_NOACCESS);
return -1;
}

31
dlls/user32/tests/input.c
View file

@ -885,7 +885,7 @@ static void test_Input_blackbox(void)
pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT));
empty_message_queue();
GetKeyboardState(ks2);
if (!ii && !sent_messages_cnt && !memcmp( ks1, ks2, sizeof(ks1) ))
if (!ii && sent_messages_cnt <= 1 && !memcmp( ks1, ks2, sizeof(ks1) ))
{
win_skip( "window doesn't receive the queued input\n" );
break;
@ -913,7 +913,7 @@ static void test_keynames(void)
static POINT pt_old, pt_new;
static BOOL clipped;
#define STEP 20
#define STEP 3
static LRESULT CALLBACK hook_proc1( int code, WPARAM wparam, LPARAM lparam )
{
@ -1097,11 +1097,10 @@ static void test_GetMouseMovePointsEx(void)
SetLastError(MYERROR);
count = 0;
retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, NULL, count, GMMP_USE_DISPLAY_POINTS);
todo_wine {
ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval);
ok(MYERROR == GetLastError(),
"expected error %d, got %u\n", MYERROR, GetLastError());
}
if (retval == -1)
ok(GetLastError() == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", GetLastError());
else
ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval);
/* test fourth parameter
* a value higher than 64 is expected to fail with ERROR_INVALID_PARAMETER
@ -1116,20 +1115,18 @@ static void test_GetMouseMovePointsEx(void)
SetLastError(MYERROR);
count = 0;
retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS);
todo_wine {
ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval);
ok(MYERROR == GetLastError(),
"expected error %d, got %u\n", MYERROR, GetLastError());
}
if (retval == -1)
ok(GetLastError() == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", GetLastError());
else
ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval);
SetLastError(MYERROR);
count = BUFLIM;
retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS);
todo_wine {
ok((0 <= retval) && (retval <= count), "expected GetMouseMovePointsEx to succeed, got %d\n", retval);
ok(MYERROR == GetLastError(),
"expected error %d, got %u\n", MYERROR, GetLastError());
}
if (retval == -1)
ok(GetLastError() == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", GetLastError());
else
ok((0 <= retval) && (retval <= count), "expected GetMouseMovePointsEx to succeed, got %d\n", retval);
SetLastError(MYERROR);
retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM+1, GMMP_USE_DISPLAY_POINTS);