[PATCH 2/5] ntdll/tests: Simplify a couple of ok() conditions.

Zebediah Figura z.figura12 at gmail.com
Fri Jul 17 17:40:22 CDT 2020


With the current structure it's easy to miss if the bug is fixed in Wine.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/ntdll/tests/info.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 6c9d35a982b..e8ba602a164 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -737,12 +737,8 @@ static void test_query_logicalproc(void)
     GetSystemInfo(&si);
 
     status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, NULL, 0, &len);
-    if(status == STATUS_NOT_IMPLEMENTED)
-    {
-        todo_wine ok(0, "SystemLogicalProcessorInformation is not implemented\n");
-        return;
-    }
-    ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+    todo_wine ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+    if (status == STATUS_NOT_IMPLEMENTED) return;
     ok(len%sizeof(*slpi) == 0, "Incorrect length %d\n", len);
 
     slpi = HeapAlloc(GetProcessHeap(), 0, len);
@@ -2185,8 +2181,7 @@ static void test_queryvirtualmemory(void)
     ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
     ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
     ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
-    if (mbi.Protect != PAGE_READONLY)
-        todo_wine ok( mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY);
+    todo_wine ok( mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY);
 
     trace("Check flags of read-write data at %p\n", datatestbuf);
     status = pNtQueryVirtualMemory(NtCurrentProcess(), datatestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
-- 
2.27.0




More information about the wine-devel mailing list