[PATCH 4/4] psapi/tests: Call GetPerformanceInfo() after NtQuerySystemInformation().
Zebediah Figura
z.figura12 at gmail.com
Thu Jul 5 17:05:39 CDT 2018
For some reason, this gives consistently much more accurate results.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/psapi/tests/psapi_main.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index 99d081f..e61cf02 100644
--- a/dlls/psapi/tests/psapi_main.c
+++ b/dlls/psapi/tests/psapi_main.c
@@ -238,11 +238,6 @@ static void test_GetPerformanceInfo(void)
ok(!ret, "GetPerformanceInfo unexpectedly succeeded\n");
ok(GetLastError() == ERROR_BAD_LENGTH, "expected error=ERROR_BAD_LENGTH but got %d\n", GetLastError());
- SetLastError(0xdeadbeef);
- ret = GetPerformanceInfo(&info, sizeof(info));
- ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError());
- ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb);
-
if (!pNtQuerySystemInformation)
win_skip("NtQuerySystemInformation not found, skipping tests\n");
else
@@ -259,6 +254,10 @@ static void test_GetPerformanceInfo(void)
ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size);
+ SetLastError(0xdeadbeef);
+ ret = GetPerformanceInfo(&info, sizeof(info));
+ ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError());
+ ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb);
ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 288),
"expected approximately %ld but got %d\n", info.CommitTotal, sys_performance_info->TotalCommittedPages);
--
2.7.4
More information about the wine-devel
mailing list