[PATCH v3 1/5] ntdll/tests: Remove some workarounds for no longer supported versions of Windows.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/info.c | 187 +++++++++------------------------------- 1 file changed, 41 insertions(+), 146 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e399757b85d..c57de307b2d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -70,12 +70,6 @@ static BOOL InitFunctionPtrs(void) HMODULE hntdll = GetModuleHandleA("ntdll"); HMODULE hkernel32 = GetModuleHandleA("kernel32"); - if (!hntdll) - { - win_skip("Not running on NT\n"); - return FALSE; - } - NTDLL_GET_PROC(NtQuerySystemInformation); NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); @@ -228,7 +222,7 @@ static void test_query_performance(void) status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size + 2, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( ReturnLength == size || ReturnLength == size + 2, + ok( ReturnLength == size || ReturnLength == size + 2 /* win8+ */, "Inconsistent length %d\n", ReturnLength); /* Not return values yet, as struct members are unknown */ @@ -250,64 +244,30 @@ static void test_query_timeofday(void) SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE sti; - /* The struct size for NT (32 bytes) and Win2K/XP (48 bytes) differ. - * - * Windows 2000 and XP return STATUS_INFO_LENGTH_MISMATCH if the given buffer size is greater - * then 48 and 0 otherwise - * Windows NT returns STATUS_INFO_LENGTH_MISMATCH when the given buffer size is not correct - * and 0 otherwise - * - * Windows 2000 and XP copy the given buffer size into the provided buffer, if the return code is STATUS_SUCCESS - * NT only fills the buffer if the return code is STATUS_SUCCESS - * - */ + status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 0, &ReturnLength ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%d)\n", ReturnLength); - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, sizeof(sti), &ReturnLength); + sti.uCurrentTimeZoneId = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 24, &ReturnLength ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( 24 == ReturnLength, "ReturnLength should be 24, it is (%d)\n", ReturnLength); + ok( 0xdeadbeef == sti.uCurrentTimeZoneId, "This part of the buffer should not have been filled\n"); - if (status == STATUS_INFO_LENGTH_MISMATCH) - { - trace("Windows version is NT, we have to cater for differences with W2K/WinXP\n"); - - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%d)\n", ReturnLength); - - sti.uCurrentTimeZoneId = 0xdeadbeef; - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 28, &ReturnLength); - ok(status == STATUS_SUCCESS || broken(status == STATUS_INFO_LENGTH_MISMATCH /* NT4 */), "Expected STATUS_SUCCESS, got %08x\n", status); - ok( 0xdeadbeef == sti.uCurrentTimeZoneId, "This part of the buffer should not have been filled\n"); - - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 32, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( 32 == ReturnLength, "ReturnLength should be 0, it is (%d)\n", ReturnLength); - } - else - { - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 0, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%d)\n", ReturnLength); - - sti.uCurrentTimeZoneId = 0xdeadbeef; - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 24, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( 24 == ReturnLength, "ReturnLength should be 24, it is (%d)\n", ReturnLength); - ok( 0xdeadbeef == sti.uCurrentTimeZoneId, "This part of the buffer should not have been filled\n"); - - sti.uCurrentTimeZoneId = 0xdeadbeef; - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 32, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( 32 == ReturnLength, "ReturnLength should be 32, it is (%d)\n", ReturnLength); - ok( 0xdeadbeef != sti.uCurrentTimeZoneId, "Buffer should have been partially filled\n"); - - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 49, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength == 0 || ReturnLength == sizeof(sti) /* vista */, - "ReturnLength should be 0, it is (%d)\n", ReturnLength); - - status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, sizeof(sti), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sti) == ReturnLength, "Inconsistent length %d\n", ReturnLength); - } + sti.uCurrentTimeZoneId = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 32, &ReturnLength ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( 32 == ReturnLength, "ReturnLength should be 32, it is (%d)\n", ReturnLength); + ok( 0xdeadbeef != sti.uCurrentTimeZoneId, "Buffer should have been partially filled\n"); + + status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 49, &ReturnLength ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( ReturnLength == 0 || ReturnLength == sizeof(sti) /* vista */, + "ReturnLength should be 0, it is (%d)\n", ReturnLength); + + status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, sizeof(sti), &ReturnLength ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( sizeof(sti) == ReturnLength, "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ trace("uCurrentTimeZoneId : (%d)\n", sti.uCurrentTimeZoneId); @@ -319,7 +279,6 @@ static void test_query_process(void) DWORD last_pid; ULONG ReturnLength; int i = 0, k = 0; - BOOL is_nt = FALSE; SYSTEM_BASIC_INFORMATION sbi; PROCESS_BASIC_INFORMATION pbi; THREAD_BASIC_INFORMATION tbi; @@ -354,8 +313,7 @@ static void test_query_process(void) ReturnLength = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status); - ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, - "Expected a ReturnLength to show the needed length\n"); + ok( ReturnLength > 0, "got 0 length\n"); /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ for (;;) @@ -369,59 +327,26 @@ static void test_query_process(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); spi = spi_buf; - /* Get the first NextEntryOffset, from this we can deduce the OS version we're running - * - * W2K/WinXP/W2K3: - * NextEntryOffset for a process is 184 + (no. of threads) * sizeof(SYSTEM_THREAD_INFORMATION) - * NT: - * NextEntryOffset for a process is 136 + (no. of threads) * sizeof(SYSTEM_THREAD_INFORMATION) - * Wine (with every windows version): - * NextEntryOffset for a process is 0 if just this test is running - * NextEntryOffset for a process is 184 + (no. of threads) * sizeof(SYSTEM_THREAD_INFORMATION) + - * ProcessName.MaximumLength - * if more wine processes are running - * - * Note : On windows the first process is in fact the Idle 'process' with a thread for every processor - */ - pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); - is_nt = ( spi->NextEntryOffset - (sbi.NumberOfProcessors * sizeof(SYSTEM_THREAD_INFORMATION)) == 136); - - if (is_nt) win_skip("Windows version is NT, we will skip thread tests\n"); - - /* Check if we have some return values - * - * On windows there will be several processes running (Including the always present Idle and System) - * On wine we only have one (if this test is the only wine process running) - */ - - /* Loop through the processes */ - for (;;) { + DWORD_PTR tid; + DWORD j; + i++; last_pid = (DWORD_PTR)spi->UniqueProcessId; - - /* Loop through the threads, skip NT4 for now */ - - if (!is_nt) + ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); + for (j = 0; j < spi->dwThreadCount; j++) { - DWORD_PTR tid; - DWORD j; - - ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); - for ( j = 0; j < spi->dwThreadCount; j++) - { - k++; - ok ( spi->ti[j].ClientId.UniqueProcess == spi->UniqueProcessId, - "The owning pid of the thread (%p) doesn't equal the pid (%p) of the process\n", - spi->ti[j].ClientId.UniqueProcess, spi->UniqueProcessId); + k++; + ok ( spi->ti[j].ClientId.UniqueProcess == spi->UniqueProcessId, + "The owning pid of the thread (%p) doesn't equal the pid (%p) of the process\n", + spi->ti[j].ClientId.UniqueProcess, spi->UniqueProcessId); - tid = (DWORD_PTR)spi->ti[j].ClientId.UniqueThread; - ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); - } + tid = (DWORD_PTR)spi->ti[j].ClientId.UniqueThread; + ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } if (!spi->NextEntryOffset) break; @@ -431,18 +356,12 @@ static void test_query_process(void) spi = (SYSTEM_PROCESS_INFORMATION_PRIVATE*)((char*)spi + spi->NextEntryOffset); } trace("Total number of running processes : %d\n", i); - if (!is_nt) trace("Total number of running threads : %d\n", k); + trace("Total number of running threads : %d\n", k); if (one_before_last_pid == 0) one_before_last_pid = last_pid; HeapFree( GetProcessHeap(), 0, spi_buf); - if (is_nt) - { - win_skip("skipping ptids low bits tests\n"); - return; - } - for (i = 1; i < 4; ++i) { InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); @@ -635,10 +554,6 @@ static void test_query_handle(void) ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); ok( found, "Expected to find event handle %p (pid %x) in handle list\n", EventHandle, GetCurrentProcessId() ); - if (!found) - for (i = 0; i < shi->Count; i++) - trace( "%d: handle %x pid %x\n", i, shi->Handle[i].HandleValue, shi->Handle[i].OwnerPid ); - CloseHandle(EventHandle); ReturnLength = 0xdeadbeef; @@ -822,7 +737,7 @@ static void test_query_logicalproc(void) GetSystemInfo(&si); status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, NULL, 0, &len); - if(status == STATUS_INVALID_INFO_CLASS) + if (status == STATUS_INVALID_INFO_CLASS) /* wow64 win8+ */ { win_skip("SystemLogicalProcessorInformation is not supported\n"); return; @@ -1441,7 +1356,7 @@ static void test_query_process_vm(void) status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength == sizeof(VM_COUNTERS) || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); + todo_wine ok( ReturnLength == sizeof(VM_COUNTERS), "wrong size %d\n", ReturnLength); /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcess", &pvi); @@ -1524,14 +1439,6 @@ static void test_query_process_io(void) ULONG ReturnLength; IO_COUNTERS pii; - /* NT4 doesn't support this information class, so check for it */ - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, sizeof(pii), &ReturnLength); - if (status == STATUS_NOT_SUPPORTED) - { - win_skip("ProcessIoCounters information class is not supported\n"); - return; - } - status = pNtQueryInformationProcess(NULL, ProcessIoCounters, NULL, sizeof(pii), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); @@ -1637,8 +1544,7 @@ static void test_query_process_debug_port(int argc, char **argv) status = pNtQueryInformationProcess(NULL, ProcessDebugPort, NULL, sizeof(debug_port), NULL); - ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION, - "Expected STATUS_INVALID_HANDLE, got %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION /* XP */, "got %#x\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, NULL, sizeof(debug_port), NULL); @@ -1776,11 +1682,6 @@ static void test_query_process_image_file_name(void) UNICODE_STRING *buffer = NULL; status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL); - if (status == STATUS_INVALID_INFO_CLASS) - { - win_skip("ProcessImageFileName is not supported\n"); - return; - } ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, 2, &ReturnLength); @@ -1868,11 +1769,6 @@ static void test_query_process_debug_object_handle(int argc, char **argv) status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL, 0, NULL); - if (status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED) - { - win_skip("ProcessDebugObjectHandle is not supported\n"); - return; - } ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status); @@ -2122,7 +2018,7 @@ static void test_readvirtualmemory(void) /* illegal remote address */ todo_wine{ status = pNtReadVirtualMemory(process, (void *) 0x1234, buffer, 12, &readcount); - ok( status == STATUS_PARTIAL_COPY || broken(status == STATUS_ACCESS_VIOLATION), "Expected STATUS_PARTIAL_COPY, got %08x\n", status); + ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08x\n", status); if (status == STATUS_PARTIAL_COPY) ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount); } @@ -2419,8 +2315,7 @@ static void test_affinity(void) { status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( broken(tbi.AffinityMask == 1) || tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, - "Unexpected thread affinity\n" ); + ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "unexpected affinity %#lx\n", tbi.AffinityMask ); } else skip("Cannot test thread affinity mask for 'all processors' flag\n"); -- 2.27.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: I thought I tested this... dlls/ntdll/tests/info.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c57de307b2d..780b223990a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -742,11 +742,6 @@ static void test_query_logicalproc(void) win_skip("SystemLogicalProcessorInformation is not supported\n"); return; } - 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); ok(len%sizeof(*slpi) == 0, "Incorrect length %d\n", len); @@ -2190,8 +2185,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); + 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
We're not testing anything interesting in this case. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/info.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 780b223990a..03d8b265036 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2367,19 +2367,20 @@ static void test_HideFromDebugger(void) dummy = 0; status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); if (status == STATUS_INVALID_INFO_CLASS) - win_skip("ThreadHideFromDebugger not available\n"); - else { - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); - dummy = 0; - status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); - dummy = 0; - status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL ); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); - if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + win_skip("ThreadHideFromDebugger not available\n"); + return; } + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + stop_event = CreateEventA( NULL, FALSE, FALSE, NULL ); ok( stop_event != NULL, "CreateEvent failed\n" ); thread = CreateThread( NULL, 0, hide_from_debugger_thread, stop_event, 0, NULL ); @@ -2387,18 +2388,16 @@ static void test_HideFromDebugger(void) dummy = 0; status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL ); - ok( status == STATUS_SUCCESS || status == STATUS_INVALID_INFO_CLASS, - "Expected STATUS_SUCCESS, got %08x\n", status ); - if (status == STATUS_SUCCESS) ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy ); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy ); status = pNtSetInformationThread( thread, ThreadHideFromDebugger, NULL, 0 ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); dummy = 0; status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL ); - ok( status == STATUS_SUCCESS || status == STATUS_INVALID_INFO_CLASS, - "Expected STATUS_SUCCESS, got %08x\n", status ); - if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); SetEvent( stop_event ); WaitForSingleObject( thread, INFINITE ); -- 2.27.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/info.c | 277 ++++++++++++++++++---------------------- 1 file changed, 124 insertions(+), 153 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 03d8b265036..f2755e65a55 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -774,6 +774,7 @@ static void test_query_logicalprocex(void) SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *infoex, *infoex_public, *infoex_core, *infoex_numa, *infoex_cache, *infoex_package, *infoex_group, *ex; DWORD relationship, len, len_public, len_core, len_numa, len_cache, len_package, len_group, len_union; + unsigned int i, j; NTSTATUS status; BOOL ret; @@ -821,180 +822,150 @@ static void test_query_logicalprocex(void) ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); ok(len == len_public, "got %u, expected %u\n", len_public, len); - if (len && len == len_public) { - int j, i; + infoex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + infoex_public = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_public); + infoex_core = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_core); + infoex_numa = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_numa); + infoex_cache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_cache); + infoex_package = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_package); + infoex_group = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_group); - infoex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); - infoex_public = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_public); - infoex_core = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_core); - infoex_numa = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_numa); - infoex_cache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_cache); - infoex_package = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_package); - infoex_group = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_group); - - relationship = RelationAll; - status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + relationship = RelationAll; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ret = pGetLogicalProcessorInformationEx(RelationAll, infoex_public, &len_public); - ok(ret, "got %d, error %d\n", ret, GetLastError()); - ok(!memcmp(infoex, infoex_public, len), "returned info data mismatch\n"); + ret = pGetLogicalProcessorInformationEx(RelationAll, infoex_public, &len_public); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(!memcmp(infoex, infoex_public, len), "returned info data mismatch\n"); - /* Test for RelationAll. */ - for(i = 0; status == STATUS_SUCCESS && i < len; ){ - ex = (void*)(((char *)infoex) + i); + /* Test for RelationAll. */ + for (i = 0; status == STATUS_SUCCESS && i < len; ) + { + ex = (void *)(((char *)infoex) + i); + ok(ex->Size, "%u: got size 0\n", i); - if (!ex->Size) + trace("infoex[%u].Size: %u\n", i, ex->Size); + switch (ex->Relationship) + { + case RelationProcessorCore: + case RelationProcessorPackage: + trace("infoex[%u].Relationship: 0x%x (%s)\n", i, ex->Relationship, ex->Relationship == RelationProcessorCore ? "Core" : "Package"); + trace("infoex[%u].Processor.Flags: 0x%x\n", i, ex->Processor.Flags); + trace("infoex[%u].Processor.EfficiencyClass: 0x%x\n", i, ex->Processor.EfficiencyClass); + trace("infoex[%u].Processor.GroupCount: 0x%x\n", i, ex->Processor.GroupCount); + for (j = 0; j < ex->Processor.GroupCount; ++j) { - ok(0, "got infoex[%u].Size=0\n", i); - break; + trace("infoex[%u].Processor.GroupMask[%u].Mask: 0x%lx\n", i, j, ex->Processor.GroupMask[j].Mask); + trace("infoex[%u].Processor.GroupMask[%u].Group: 0x%x\n", i, j, ex->Processor.GroupMask[j].Group); } - - trace("infoex[%u].Size: %u\n", i, ex->Size); - switch(ex->Relationship){ - case RelationProcessorCore: - case RelationProcessorPackage: - trace("infoex[%u].Relationship: 0x%x (%s)\n", i, ex->Relationship, ex->Relationship == RelationProcessorCore ? "Core" : "Package"); - trace("infoex[%u].Processor.Flags: 0x%x\n", i, ex->Processor.Flags); - trace("infoex[%u].Processor.EfficiencyClass: 0x%x\n", i, ex->Processor.EfficiencyClass); - trace("infoex[%u].Processor.GroupCount: 0x%x\n", i, ex->Processor.GroupCount); - for(j = 0; j < ex->Processor.GroupCount; ++j){ - trace("infoex[%u].Processor.GroupMask[%u].Mask: 0x%lx\n", i, j, ex->Processor.GroupMask[j].Mask); - trace("infoex[%u].Processor.GroupMask[%u].Group: 0x%x\n", i, j, ex->Processor.GroupMask[j].Group); - } - break; - case RelationNumaNode: - trace("infoex[%u].Relationship: 0x%x (NumaNode)\n", i, ex->Relationship); - trace("infoex[%u].NumaNode.NodeNumber: 0x%x\n", i, ex->NumaNode.NodeNumber); - trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%lx\n", i, ex->NumaNode.GroupMask.Mask); - trace("infoex[%u].NumaNode.GroupMask.Group: 0x%x\n", i, ex->NumaNode.GroupMask.Group); - break; - case RelationCache: - trace("infoex[%u].Relationship: 0x%x (Cache)\n", i, ex->Relationship); - trace("infoex[%u].Cache.Level: 0x%x\n", i, ex->Cache.Level); - trace("infoex[%u].Cache.Associativity: 0x%x\n", i, ex->Cache.Associativity); - trace("infoex[%u].Cache.LineSize: 0x%x\n", i, ex->Cache.LineSize); - trace("infoex[%u].Cache.CacheSize: 0x%x\n", i, ex->Cache.CacheSize); - trace("infoex[%u].Cache.Type: 0x%x\n", i, ex->Cache.Type); - trace("infoex[%u].Cache.GroupMask.Mask: 0x%lx\n", i, ex->Cache.GroupMask.Mask); - trace("infoex[%u].Cache.GroupMask.Group: 0x%x\n", i, ex->Cache.GroupMask.Group); - break; - case RelationGroup: - trace("infoex[%u].Relationship: 0x%x (Group)\n", i, ex->Relationship); - trace("infoex[%u].Group.MaximumGroupCount: 0x%x\n", i, ex->Group.MaximumGroupCount); - trace("infoex[%u].Group.ActiveGroupCount: 0x%x\n", i, ex->Group.ActiveGroupCount); - for(j = 0; j < ex->Group.ActiveGroupCount; ++j){ - trace("infoex[%u].Group.GroupInfo[%u].MaximumProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].MaximumProcessorCount); - trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorCount); - trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorMask: 0x%lx\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorMask); - } - break; - default: - ok(0, "Got invalid relationship value: 0x%x\n", ex->Relationship); - break; + break; + case RelationNumaNode: + trace("infoex[%u].Relationship: 0x%x (NumaNode)\n", i, ex->Relationship); + trace("infoex[%u].NumaNode.NodeNumber: 0x%x\n", i, ex->NumaNode.NodeNumber); + trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%lx\n", i, ex->NumaNode.GroupMask.Mask); + trace("infoex[%u].NumaNode.GroupMask.Group: 0x%x\n", i, ex->NumaNode.GroupMask.Group); + break; + case RelationCache: + trace("infoex[%u].Relationship: 0x%x (Cache)\n", i, ex->Relationship); + trace("infoex[%u].Cache.Level: 0x%x\n", i, ex->Cache.Level); + trace("infoex[%u].Cache.Associativity: 0x%x\n", i, ex->Cache.Associativity); + trace("infoex[%u].Cache.LineSize: 0x%x\n", i, ex->Cache.LineSize); + trace("infoex[%u].Cache.CacheSize: 0x%x\n", i, ex->Cache.CacheSize); + trace("infoex[%u].Cache.Type: 0x%x\n", i, ex->Cache.Type); + trace("infoex[%u].Cache.GroupMask.Mask: 0x%lx\n", i, ex->Cache.GroupMask.Mask); + trace("infoex[%u].Cache.GroupMask.Group: 0x%x\n", i, ex->Cache.GroupMask.Group); + break; + case RelationGroup: + trace("infoex[%u].Relationship: 0x%x (Group)\n", i, ex->Relationship); + trace("infoex[%u].Group.MaximumGroupCount: 0x%x\n", i, ex->Group.MaximumGroupCount); + trace("infoex[%u].Group.ActiveGroupCount: 0x%x\n", i, ex->Group.ActiveGroupCount); + for (j = 0; j < ex->Group.ActiveGroupCount; ++j) + { + trace("infoex[%u].Group.GroupInfo[%u].MaximumProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].MaximumProcessorCount); + trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorCount); + trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorMask: 0x%lx\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorMask); } - - i += ex->Size; + break; + default: + ok(0, "Got invalid relationship value: 0x%x\n", ex->Relationship); + break; } - /* Test Relationship filtering. */ - - relationship = RelationProcessorCore; - status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_core, len_core, &len_core); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + i += ex->Size; + } - for(i = 0; status == STATUS_SUCCESS && i < len_core;) { - ex = (void*)(((char*)infoex_core) + i); - if (ex->Size == 0) { - ok(0, "Got infoex_core[%u].Size=0\n", i); - break; - } - if (ex->Relationship != RelationProcessorCore) { - ok(0, "Expected 0x%x, got 0x%x\n", RelationProcessorCore, ex->Relationship); - break; - } - i += ex->Size; - } + /* Test Relationship filtering. */ - relationship = RelationNumaNode; - status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_numa, len_numa, &len_numa); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + relationship = RelationProcessorCore; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_core, len_core, &len_core); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - for(i = 0; status == STATUS_SUCCESS && i < len_numa;) { - ex = (void*)(((char*)infoex_numa) + i); - if (ex->Size == 0) { - ok(0, "Got infoex_numa[%u].Size=0\n", i); - break; - } - if (ex->Relationship != RelationNumaNode) { - ok(0, "Expected 0x%x, got 0x%x\n", RelationNumaNode, ex->Relationship); - break; - } - i += ex->Size; - } + for (i = 0; status == STATUS_SUCCESS && i < len_core;) + { + ex = (void *)(((char*)infoex_core) + i); + ok(ex->Size, "%u: got size 0\n", i); + ok(ex->Relationship == RelationProcessorCore, "%u: got relationship %#x\n", i, ex->Relationship); + i += ex->Size; + } - relationship = RelationCache; - status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_cache, len_cache, &len_cache); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + relationship = RelationNumaNode; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_numa, len_numa, &len_numa); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - for(i = 0; status == STATUS_SUCCESS && i < len_cache;) { - ex = (void*)(((char*)infoex_cache) + i); - if (ex->Size == 0) { - ok(0, "Got infoex_cache[%u].Size=0\n", i); - break; - } - if (ex->Relationship != RelationCache) { - ok(0, "Expected 0x%x, got 0x%x\n", RelationCache, ex->Relationship); - break; - } - i += ex->Size; - } + for (i = 0; status == STATUS_SUCCESS && i < len_numa;) + { + ex = (void *)(((char*)infoex_numa) + i); + ok(ex->Size, "%u: got size 0\n", i); + ok(ex->Relationship == RelationNumaNode, "%u: got relationship %#x\n", i, ex->Relationship); + i += ex->Size; + } - relationship = RelationProcessorPackage; - status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_package, len_package, &len_package); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + relationship = RelationCache; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_cache, len_cache, &len_cache); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - for(i = 0; status == STATUS_SUCCESS && i < len_package;) { - ex = (void*)(((char*)infoex_package) + i); - if (ex->Size == 0) { - ok(0, "Got infoex_package[%u].Size=0\n", i); - break; - } - if (ex->Relationship != RelationProcessorPackage) { - ok(0, "Expected 0x%x, got 0x%x\n", RelationProcessorPackage, ex->Relationship); - break; - } - i += ex->Size; - } + for (i = 0; status == STATUS_SUCCESS && i < len_cache;) + { + ex = (void *)(((char*)infoex_cache) + i); + ok(ex->Size, "%u: got size 0\n", i); + ok(ex->Relationship == RelationCache, "%u: got relationship %#x\n", i, ex->Relationship); + i += ex->Size; + } - relationship = RelationGroup; - status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_group, len_group, &len_group); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + relationship = RelationProcessorPackage; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_package, len_package, &len_package); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - for(i = 0; status == STATUS_SUCCESS && i < len_group;) { - ex = (void*)(((char *)infoex_group) + i); - if (ex->Size == 0) { - ok(0, "Got infoex_group[%u].Size=0\n", i); - break; - } - if (ex->Relationship != RelationGroup) { - ok(0, "Expected 0x%x, got 0x%x\n", RelationGroup, ex->Relationship); - break; - } - i += ex->Size; - } + for (i = 0; status == STATUS_SUCCESS && i < len_package;) + { + ex = (void *)(((char*)infoex_package) + i); + ok(ex->Size, "%u: got size 0\n", i); + ok(ex->Relationship == RelationProcessorPackage, "%u: got relationship %#x\n", i, ex->Relationship); + i += ex->Size; + } - len_union = len_core + len_numa + len_cache + len_package + len_group; - ok(len == len_union, "Expected 0x%x, got 0x%0x\n", len, len_union); + relationship = RelationGroup; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_group, len_group, &len_group); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - HeapFree(GetProcessHeap(), 0, infoex); - HeapFree(GetProcessHeap(), 0, infoex_public); - HeapFree(GetProcessHeap(), 0, infoex_core); - HeapFree(GetProcessHeap(), 0, infoex_numa); - HeapFree(GetProcessHeap(), 0, infoex_cache); - HeapFree(GetProcessHeap(), 0, infoex_package); - HeapFree(GetProcessHeap(), 0, infoex_group); + for (i = 0; status == STATUS_SUCCESS && i < len_group;) + { + ex = (void *)(((char *)infoex_group) + i); + ok(ex->Size, "%u: got size 0\n", i); + ok(ex->Relationship == RelationGroup, "%u: got relationship %#x\n", i, ex->Relationship); + i += ex->Size; } + + len_union = len_core + len_numa + len_cache + len_package + len_group; + ok(len == len_union, "Expected 0x%x, got 0x%0x\n", len, len_union); + + HeapFree(GetProcessHeap(), 0, infoex); + HeapFree(GetProcessHeap(), 0, infoex_public); + HeapFree(GetProcessHeap(), 0, infoex_core); + HeapFree(GetProcessHeap(), 0, infoex_numa); + HeapFree(GetProcessHeap(), 0, infoex_cache); + HeapFree(GetProcessHeap(), 0, infoex_package); + HeapFree(GetProcessHeap(), 0, infoex_group); } static void test_query_firmware(void) -- 2.27.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/info.c | 230 +++++++++------------------------------- 1 file changed, 53 insertions(+), 177 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f2755e65a55..e5137ef5a45 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -116,40 +116,34 @@ static void test_query_basic(void) */ /* Use a nonexistent info class */ - trace("Check nonexistent info class\n"); status = pNtQuerySystemInformation(-1, NULL, 0, NULL); ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */, "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status); /* Use an existing class but with a zero-length buffer */ - trace("Check zero-length buffer\n"); status = pNtQuerySystemInformation(SystemBasicInformation, NULL, 0, NULL); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); /* Use an existing class, correct length but no SystemInformation buffer */ - trace("Check no SystemInformation buffer\n"); status = pNtQuerySystemInformation(SystemBasicInformation, NULL, sizeof(sbi), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* vista */, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got %08x\n", status); /* Use an existing class, correct length, a pointer to a buffer but no ReturnLength pointer */ - trace("Check no ReturnLength pointer\n"); status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); /* Check a too large buffer size */ - trace("Check a too large buffer size\n"); status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi) * 2, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); /* Finally some correct calls */ - trace("Check with correct parameters\n"); status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( sizeof(sbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ - trace("Number of Processors : %d\n", sbi.NumberOfProcessors); + if (winetest_debug > 1) trace("Number of Processors : %d\n", sbi.NumberOfProcessors); ok( sbi.NumberOfProcessors > 0, "Expected more than 0 processors, got %d\n", sbi.NumberOfProcessors); memset(&sbi2, 0, sizeof(sbi2)); @@ -196,7 +190,7 @@ static void test_query_cpu(void) ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ - trace("Processor FeatureSet : %08x\n", sci.FeatureSet); + if (winetest_debug > 1) trace("Processor FeatureSet : %08x\n", sci.FeatureSet); ok( sci.FeatureSet != 0, "Expected some features for this processor, got %08x\n", sci.FeatureSet); } @@ -270,7 +264,7 @@ static void test_query_timeofday(void) ok( sizeof(sti) == ReturnLength, "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ - trace("uCurrentTimeZoneId : (%d)\n", sti.uCurrentTimeZoneId); + if (winetest_debug > 1) trace("uCurrentTimeZoneId : (%d)\n", sti.uCurrentTimeZoneId); } static void test_query_process(void) @@ -355,8 +349,7 @@ static void test_query_process(void) spi = (SYSTEM_PROCESS_INFORMATION_PRIVATE*)((char*)spi + spi->NextEntryOffset); } - trace("Total number of running processes : %d\n", i); - trace("Total number of running threads : %d\n", k); + if (winetest_debug > 1) trace("%u processes, %u threads\n", i, k); if (one_before_last_pid == 0) one_before_last_pid = last_pid; @@ -844,6 +837,12 @@ static void test_query_logicalprocex(void) ex = (void *)(((char *)infoex) + i); ok(ex->Size, "%u: got size 0\n", i); + if (winetest_debug <= 1) + { + i += ex->Size; + continue; + } + trace("infoex[%u].Size: %u\n", i, ex->Size); switch (ex->Relationship) { @@ -1033,18 +1032,21 @@ static void test_query_battery(void) } ok(status == STATUS_SUCCESS, "expected success\n"); - trace("Battery state:\n"); - trace("AcOnLine : %u\n", bs.AcOnLine); - trace("BatteryPresent : %u\n", bs.BatteryPresent); - trace("Charging : %u\n", bs.Charging); - trace("Discharging : %u\n", bs.Discharging); - trace("Tag : %u\n", bs.Tag); - trace("MaxCapacity : %u\n", bs.MaxCapacity); - trace("RemainingCapacity : %u\n", bs.RemainingCapacity); - trace("Rate : %d\n", (LONG)bs.Rate); - trace("EstimatedTime : %u\n", bs.EstimatedTime); - trace("DefaultAlert1 : %u\n", bs.DefaultAlert1); - trace("DefaultAlert2 : %u\n", bs.DefaultAlert2); + if (winetest_debug > 1) + { + trace("Battery state:\n"); + trace("AcOnLine : %u\n", bs.AcOnLine); + trace("BatteryPresent : %u\n", bs.BatteryPresent); + trace("Charging : %u\n", bs.Charging); + trace("Discharging : %u\n", bs.Discharging); + trace("Tag : %u\n", bs.Tag); + trace("MaxCapacity : %u\n", bs.MaxCapacity); + trace("RemainingCapacity : %u\n", bs.RemainingCapacity); + trace("Rate : %d\n", (LONG)bs.Rate); + trace("EstimatedTime : %u\n", bs.EstimatedTime); + trace("DefaultAlert1 : %u\n", bs.DefaultAlert1); + trace("DefaultAlert2 : %u\n", bs.DefaultAlert2); + } ok(bs.MaxCapacity >= bs.RemainingCapacity, "expected MaxCapacity %u to be greater than or equal to RemainingCapacity %u\n", @@ -1172,7 +1174,6 @@ static void test_query_process_wow64(void) pbi[0] = pbi[1] = dummy; status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - trace( "Platform is_wow64 %d, ProcessInformation of ProcessWow64Information %lx\n", is_wow64, pbi[0]); ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); ok( pbi[0] != dummy, "pbi[0] %lx\n", pbi[0]); ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); @@ -1231,52 +1232,35 @@ static void test_query_process_basic(void) * every information class */ - /* Use a nonexistent info class */ - trace("Check nonexistent info class\n"); status = pNtQueryInformationProcess(NULL, -1, NULL, 0, NULL); ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */, "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status); - /* Do not give a handle and buffer */ - trace("Check NULL handle and buffer and zero-length buffersize\n"); status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, NULL, 0, NULL); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - /* Use a correct info class and buffer size, but still no handle and buffer */ - trace("Check NULL handle and buffer\n"); status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, NULL, sizeof(pbi), NULL); ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); - /* Use a correct info class and buffer size, but still no handle */ - trace("Check NULL handle\n"); status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); - /* Use a greater buffer size */ - trace("Check NULL handle and too large buffersize\n"); status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, &pbi, sizeof(pbi) * 2, NULL); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - /* Use no ReturnLength */ - trace("Check NULL ReturnLength\n"); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - /* Finally some correct calls */ - trace("Check with correct parameters\n"); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( sizeof(pbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); - /* Everything is correct except a too large buffersize */ - trace("Too large buffersize\n"); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi) * 2, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); ok( sizeof(pbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); - - /* Check if we have some return values */ - trace("ProcessID : %lx\n", pbi.UniqueProcessId); + + if (winetest_debug > 1) trace("ProcessID : %lx\n", pbi.UniqueProcessId); ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n"); } @@ -1325,7 +1309,8 @@ static void test_query_process_vm(void) todo_wine ok( ReturnLength == sizeof(VM_COUNTERS), "wrong size %d\n", ReturnLength); /* Check if we have some return values */ - dump_vm_counters("VM counters for GetCurrentProcess", &pvi); + if (winetest_debug > 1) + dump_vm_counters("VM counters for GetCurrentProcess", &pvi); ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); ok( pvi.PagefileUsage > 0, "Expected a PagefileUsage > 0\n"); @@ -1346,7 +1331,8 @@ static void test_query_process_vm(void) ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); /* Check if we have some return values */ - dump_vm_counters("VM counters for GetCurrentProcessId", &pvi); + if (winetest_debug > 1) + dump_vm_counters("VM counters for GetCurrentProcessId", &pvi); ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); ok( pvi.PagefileUsage > 0, "Expected a PagefileUsage > 0\n"); @@ -1424,7 +1410,7 @@ static void test_query_process_io(void) ok( sizeof(pii) == ReturnLength, "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ - trace("OtherOperationCount : 0x%s\n", wine_dbgstr_longlong(pii.OtherOperationCount)); + if (winetest_debug > 1) trace("OtherOperationCount : 0x%s\n", wine_dbgstr_longlong(pii.OtherOperationCount)); todo_wine { ok( pii.OtherOperationCount > 0, "Expected an OtherOperationCount > 0\n"); @@ -1452,9 +1438,8 @@ static void test_query_process_times(void) process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid); if (!process) { - trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError()); + if (winetest_debug > 1) trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError()); process = GetCurrentProcess(); - trace("ProcessTimes for current process\n"); } else trace("ProcessTimes for process with ID : %d\n", one_before_last_pid); @@ -1466,19 +1451,19 @@ static void test_query_process_times(void) FileTimeToSystemTime((const FILETIME *)&spti.CreateTime, &UTC); SystemTimeToTzSpecificLocalTime(NULL, &UTC, &Local); - trace("CreateTime : %02d/%02d/%04d %02d:%02d:%02d\n", Local.wMonth, Local.wDay, Local.wYear, + if (winetest_debug > 1) trace("CreateTime : %02d/%02d/%04d %02d:%02d:%02d\n", Local.wMonth, Local.wDay, Local.wYear, Local.wHour, Local.wMinute, Local.wSecond); FileTimeToSystemTime((const FILETIME *)&spti.ExitTime, &UTC); SystemTimeToTzSpecificLocalTime(NULL, &UTC, &Local); - trace("ExitTime : %02d/%02d/%04d %02d:%02d:%02d\n", Local.wMonth, Local.wDay, Local.wYear, + if (winetest_debug > 1) trace("ExitTime : %02d/%02d/%04d %02d:%02d:%02d\n", Local.wMonth, Local.wDay, Local.wYear, Local.wHour, Local.wMinute, Local.wSecond); FileTimeToSystemTime((const FILETIME *)&spti.KernelTime, &Local); - trace("KernelTime : %02d:%02d:%02d.%03d\n", Local.wHour, Local.wMinute, Local.wSecond, Local.wMilliseconds); + if (winetest_debug > 1) trace("KernelTime : %02d:%02d:%02d.%03d\n", Local.wHour, Local.wMinute, Local.wSecond, Local.wMilliseconds); FileTimeToSystemTime((const FILETIME *)&spti.UserTime, &Local); - trace("UserTime : %02d:%02d:%02d.%03d\n", Local.wHour, Local.wMinute, Local.wSecond, Local.wMilliseconds); + if (winetest_debug > 1) trace("UserTime : %02d:%02d:%02d.%03d\n", Local.wHour, Local.wMinute, Local.wSecond, Local.wMilliseconds); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, sizeof(spti) * 2, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); @@ -1616,10 +1601,9 @@ static void test_query_process_handlecount(void) { trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError()); process = GetCurrentProcess(); - trace("ProcessHandleCount for current process\n"); } else - trace("ProcessHandleCount for process with ID : %d\n", one_before_last_pid); + if (winetest_debug > 1) trace("ProcessHandleCount for process with ID : %d\n", one_before_last_pid); status = pNtQueryInformationProcess( process, ProcessHandleCount, &handlecount, sizeof(handlecount), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); @@ -1632,7 +1616,7 @@ static void test_query_process_handlecount(void) ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ - trace("HandleCount : %d\n", handlecount); + if (winetest_debug > 1) trace("HandleCount : %d\n", handlecount); todo_wine { ok( handlecount > 0, "Expected some handles, got 0\n"); @@ -2031,7 +2015,7 @@ static void test_mapprotection(void) return; } ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); - trace("Process execute flags %08x\n", oldflags); + if (winetest_debug > 1) trace("Process execute flags %08x\n", oldflags); if (!(oldflags & MEM_EXECUTE_OPTION_ENABLE)) { @@ -2080,9 +2064,9 @@ static void test_mapprotection(void) #else ok(0, "Add a return opcode for your architecture or expect a crash in this test\n"); #endif - trace("trying to execute code in the readwrite only mapped anon file...\n"); + if (winetest_debug > 1) trace("trying to execute code in the readwrite only mapped anon file...\n"); f = addr;f(); - trace("...done.\n"); + if (winetest_debug > 1) trace("...done.\n"); status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); @@ -2110,7 +2094,6 @@ static void test_queryvirtualmemory(void) void *user_shared_data = (void *)0x7ffe0000; module = GetModuleHandleA( "ntdll.dll" ); - trace("Check flags of the PE header of NTDLL.DLL at %p\n", module); status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -2120,7 +2103,6 @@ static void test_queryvirtualmemory(void) ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READONLY); ok (mbi.Type == MEM_IMAGE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_IMAGE); - trace("Check flags of a function entry in NTDLL.DLL at %p\n", pNtQueryVirtualMemory); module = GetModuleHandleA( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); @@ -2130,7 +2112,6 @@ static void test_queryvirtualmemory(void) ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ); - trace("Check flags of heap at %p\n", GetProcessHeap()); status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -2140,7 +2121,6 @@ static void test_queryvirtualmemory(void) ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_EXECUTE_READWRITE, "mbi.Protect is 0x%x\n", mbi.Protect); - trace("Check flags of stack at %p\n", stackbuf); status = pNtQueryVirtualMemory(NtCurrentProcess(), stackbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -2148,7 +2128,6 @@ static void test_queryvirtualmemory(void) ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE); - trace("Check flags of read-only data at %p\n", teststring); module = GetModuleHandleA( NULL ); status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); @@ -2158,7 +2137,6 @@ static void test_queryvirtualmemory(void) ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); 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); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -2168,7 +2146,6 @@ static void test_queryvirtualmemory(void) ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY, "mbi.Protect is 0x%x\n", mbi.Protect); - trace("Check flags of read-write uninitialized data (.bss) at %p\n", rwtestbuf); status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -2181,7 +2158,6 @@ static void test_queryvirtualmemory(void) } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ - trace("Check flags of user shared data at %p\n", user_shared_data); status = pNtQueryVirtualMemory(NtCurrentProcess(), user_shared_data, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok(readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); @@ -2395,7 +2371,7 @@ static void test_NtGetCurrentProcessorNumber(void) GetSystemInfo(&si); current_cpu = pNtGetCurrentProcessorNumber(); - trace("dwNumberOfProcessors: %d, current processor: %d\n", si.dwNumberOfProcessors, current_cpu); + if (winetest_debug > 1) trace("dwNumberOfProcessors: %d, current processor: %d\n", si.dwNumberOfProcessors, current_cpu); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL); old_process_mask = pbi.AffinityMask; @@ -2609,153 +2585,53 @@ START_TEST(info) if (argc >= 3) return; /* Child */ /* NtQuerySystemInformation */ - - /* 0x0 SystemBasicInformation */ - trace("Starting test_query_basic()\n"); test_query_basic(); - - /* 0x1 SystemCpuInformation */ - trace("Starting test_query_cpu()\n"); test_query_cpu(); - - /* 0x2 SystemPerformanceInformation */ - trace("Starting test_query_performance()\n"); test_query_performance(); - - /* 0x3 SystemTimeOfDayInformation */ - trace("Starting test_query_timeofday()\n"); test_query_timeofday(); - - /* 0x5 SystemProcessInformation */ - trace("Starting test_query_process()\n"); test_query_process(); - - /* 0x8 SystemProcessorPerformanceInformation */ - trace("Starting test_query_procperf()\n"); test_query_procperf(); - - /* 0xb SystemModuleInformation */ - trace("Starting test_query_module()\n"); test_query_module(); - - /* 0x10 SystemHandleInformation */ - trace("Starting test_query_handle()\n"); test_query_handle(); - - /* 0x15 SystemCacheInformation */ - trace("Starting test_query_cache()\n"); test_query_cache(); - - /* 0x17 SystemInterruptInformation */ - trace("Starting test_query_interrupt()\n"); test_query_interrupt(); - - /* 0x1c SystemTimeAdjustmentInformation */ - trace("Starting test_time_adjustment()\n"); test_time_adjustment(); - - /* 0x23 SystemKernelDebuggerInformation */ - trace("Starting test_query_kerndebug()\n"); test_query_kerndebug(); - - /* 0x25 SystemRegistryQuotaInformation */ - trace("Starting test_query_regquota()\n"); test_query_regquota(); - - /* 0x49 SystemLogicalProcessorInformation */ - trace("Starting test_query_logicalproc()\n"); test_query_logicalproc(); test_query_logicalprocex(); + test_query_firmware(); + test_query_data_alignment(); /* NtPowerInformation */ - - /* 0x5 SystemBatteryState */ - trace("Starting test_query_battery()\n"); test_query_battery(); - - /* 0xb ProcessorInformation */ - trace("Starting test_query_processor_power_info()\n"); test_query_processor_power_info(); /* NtQueryInformationProcess */ - - /* 0x0 ProcessBasicInformation */ - trace("Starting test_query_process_basic()\n"); test_query_process_basic(); - - /* 0x2 ProcessIoCounters */ - trace("Starting test_query_process_io()\n"); test_query_process_io(); - - /* 0x3 ProcessVmCounters */ - trace("Starting test_query_process_vm()\n"); test_query_process_vm(); - - /* 0x4 ProcessTimes */ - trace("Starting test_query_process_times()\n"); test_query_process_times(); - - /* 0x7 ProcessDebugPort */ - trace("Starting test_process_debug_port()\n"); test_query_process_debug_port(argc, argv); - - /* 0x12 ProcessPriorityClass */ - trace("Starting test_query_process_priority()\n"); test_query_process_priority(); - - /* 0x14 ProcessHandleCount */ - trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); - - /* 0x1A ProcessWow64Information */ - trace("Starting test_query_process_wow64()\n"); test_query_process_wow64(); - - /* 0x1B ProcessImageFileName */ - trace("Starting test_query_process_image_file_name()\n"); test_query_process_image_file_name(); - - /* 0x1E ProcessDebugObjectHandle */ - trace("Starting test_query_process_debug_object_handle()\n"); test_query_process_debug_object_handle(argc, argv); - - /* 0x1F ProcessDebugFlags */ - trace("Starting test_process_debug_flags()\n"); test_query_process_debug_flags(argc, argv); - - /* 0x25 ProcessImageInformation */ - trace("Starting test_process_image_info()\n"); test_query_process_image_info(); - - /* 0x4C SystemFirmwareTableInformation */ - trace("Starting test_query_firmware()\n"); - test_query_firmware(); - - /* belongs to its own file */ - trace("Starting test_readvirtualmemory()\n"); - test_readvirtualmemory(); - - trace("Starting test_queryvirtualmemory()\n"); - test_queryvirtualmemory(); - - trace("Starting test_mapprotection()\n"); test_mapprotection(); - trace("Starting test_affinity()\n"); - test_affinity(); - - trace("Starting test_HideFromDebugger()\n"); + /* NtQueryInformationThread */ + test_thread_info(); test_HideFromDebugger(); - - trace("Starting test_NtGetCurrentProcessorNumber()\n"); - test_NtGetCurrentProcessorNumber(); - - trace("Starting test_thread_start_address()\n"); test_thread_start_address(); + test_thread_lookup(); - trace("Starting test_query_data_alignment()\n"); - test_query_data_alignment(); + test_affinity(); - test_thread_lookup(); - test_thread_info(); + /* belongs to its own file */ + test_readvirtualmemory(); + test_queryvirtualmemory(); + test_NtGetCurrentProcessorNumber(); } -- 2.27.0
participants (1)
-
Zebediah Figura