ntdll/tests: revert a patch and fix it on win7

[André Hentschel]

revert the patch(4bc7a3eb9276c6286119516bda833bd7f3fe9c4a) and really fix it on win7
---
 dlls/ntdll/tests/info.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 6e3851d..ea510f1 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -121,21 +121,21 @@ static void test_query_cpu(void)
 static void test_query_performance(void)
 {
     NTSTATUS status;
-    ULONG FullLength;
     ULONG ReturnLength;
     SYSTEM_PERFORMANCE_INFORMATION spi;
-    BYTE Buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 2];
 
-    status = pNtQuerySystemInformation(SystemPerformanceInformation, Buffer, 0, &FullLength);
+    status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, 0, &ReturnLength);
     ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
 
-    status = pNtQuerySystemInformation(SystemPerformanceInformation, Buffer, sizeof(spi), &ReturnLength);
+    status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, sizeof(spi), &ReturnLength);
     ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
     ok( sizeof(spi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
 
-    status = pNtQuerySystemInformation(SystemPerformanceInformation, &Buffer, sizeof(Buffer), &ReturnLength);
+    status = pNtQuerySystemInformation(SystemPerformanceInformation, &spi, sizeof(spi) + 2, &ReturnLength);
     ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
-    ok( ReturnLength == min(FullLength, sizeof(Buffer)), "Inconsistent length %d\n", ReturnLength);
+    ok( sizeof(spi) == ReturnLength ||
+        (sizeof(spi) + 2) == ReturnLength, /* Win7 */
+        "Inconsistent length %d\n", ReturnLength);
 
     /* Not return values yet, as struct members are unknown */
 }
-- 

Best Regards, André Hentschel