Rémi Bernon : ntoskrnl.exe/tests: Wait for second report first.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a2c902e68ddafc4541a543dcf6eda9807cbea5f9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a2c902e68ddafc4541a543dcf...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Fri Aug  6 09:49:33 2021 +0200

ntoskrnl.exe/tests: Wait for second report first.

And increasing the polling period, so that first queued read is unlikely
to complete before we queued the second one.

This was meant to test that all pending reads are satisfied at once
after a poll, but it causes some spurious failures as they aren't
satisfied atomically (especially on Wine). As there's an increasing seq
counter in each poll it should be enough to compare the report data.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index f5ebf21b7f9..6c4dacf3a2d 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -2710,12 +2710,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled
         ok(!ret, "ReadFile succeded\n");
         ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError());
 
-        /* wait for first report to be ready */
-        ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE);
+        /* wait for second report to be ready */
+        ret = GetOverlappedResult(async_file, &overlapped2, &value, TRUE);
         ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError());
         ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value);
-        /* second report should be ready and the same */
-        ret = GetOverlappedResult(async_file, &overlapped2, &value, FALSE);
+        /* first report should be ready and the same */
+        ret = GetOverlappedResult(async_file, &overlapped, &value, FALSE);
         ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError());
         ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value);
         ok(memcmp(report, buffer + caps.InputReportByteLength, caps.InputReportByteLength),
@@ -2839,7 +2839,7 @@ static void test_hid_device(DWORD report_id, DWORD polled)
         todo_wine ok(poll_freq == 5, "got poll_freq %u, expected 5\n", poll_freq);
 
         out_len = 0;
-        poll_freq = 50;
+        poll_freq = 500;
         SetLastError(0xdeadbeef);
         ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len);
         ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError());
@@ -2850,14 +2850,14 @@ static void test_hid_device(DWORD report_id, DWORD polled)
         ret = sync_ioctl(file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len);
         ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError());
         ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len);
-        ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq);
+        ok(poll_freq == 500, "got poll_freq %u, expected 100\n", poll_freq);
 
         out_len = sizeof(ULONG);
         SetLastError(0xdeadbeef);
         ret = sync_ioctl(async_file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len);
         ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError());
         ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len);
-        ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq);
+        ok(poll_freq == 500, "got poll_freq %u, expected 100\n", poll_freq);
     }
 
     test_hidp(file, async_file, report_id, polled);