Aric Stewart : ntdll/tests: handle info behavior for vista and 2008 properly.

Alexandre Julliard julliard at winehq.org
Thu Oct 23 08:38:15 CDT 2008


Module: wine
Branch: master
Commit: 589d7eaa93710e9bb42a419e1917c509e1bd7bf0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=589d7eaa93710e9bb42a419e1917c509e1bd7bf0

Author: Aric Stewart <aric at codeweavers.com>
Date:   Thu Oct 23 07:49:04 2008 -0500

ntdll/tests:  handle info behavior for vista and 2008 properly.

---

 dlls/ntdll/tests/info.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index d93e0bc..f61196e 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -376,9 +376,18 @@ static void test_query_procperf(void)
     ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH /* vista */,
         "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
     ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength);
-    ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n");
-    ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n");
-    ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n");
+    if (status == STATUS_SUCCESS)
+    {
+        ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n");
+        ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n");
+        ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n");
+    }
+    else /* vista and 2008 */
+    {
+        ok (sppi->KernelTime.QuadPart == 0xdeaddead, "KernelTime changed\n");
+        ok (sppi->UserTime.QuadPart == 0xdeaddead, "UserTime changed\n");
+        ok (sppi->IdleTime.QuadPart == 0xdeaddead, "IdleTime changed\n");
+    }
 
     HeapFree( GetProcessHeap(), 0, sppi);
 }




More information about the wine-cvs mailing list