dlls/ntdll/tests/info.c -- fix type of status variables

Gerald Pfeifer gerald at pfeifer.com
Sun Jul 13 06:49:22 CDT 2008


pNtQuerySystemInformation and friends are declared to return NTSTATUS,
yet all the variables we use are of type DWORD.  This patch fixes this.
and sheds off a couple dozen of warnings.

Gerald

ChangeLog:
Use NTSTATUS instead of DWORD for status variables.

Index: dlls/ntdll/tests/info.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/tests/info.c,v
retrieving revision 1.30
diff -u -3 -p -r1.30 info.c
--- dlls/ntdll/tests/info.c	20 Jun 2008 11:23:18 -0000	1.30
+++ dlls/ntdll/tests/info.c	13 Jul 2008 11:46:29 -0000
@@ -57,7 +57,7 @@ static BOOL InitFunctionPtrs(void)
 
 static void test_query_basic(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     SYSTEM_BASIC_INFORMATION sbi;
 
@@ -118,7 +118,7 @@ static void test_query_cpu(void)
 
 static void test_query_performance(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     SYSTEM_PERFORMANCE_INFORMATION spi;
 
@@ -138,7 +138,7 @@ static void test_query_performance(void)
 
 static void test_query_timeofday(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
 
     /* Copy of our winternl.h structure turned into a private one */
@@ -215,7 +215,7 @@ static void test_query_timeofday(void)
 
 static void test_query_process(void)
 {
-    DWORD status;
+    NTSTATUS status;
     DWORD last_pid;
     ULONG ReturnLength;
     int i = 0, k = 0;
@@ -325,7 +325,7 @@ static void test_query_process(void)
 
 static void test_query_procperf(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     ULONG NeededLength;
     SYSTEM_BASIC_INFORMATION sbi;
@@ -363,7 +363,7 @@ static void test_query_procperf(void)
 
 static void test_query_module(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     ULONG ModuleCount, i;
 
@@ -398,7 +398,7 @@ static void test_query_module(void)
 
 static void test_query_handle(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     ULONG SystemInformationLength = sizeof(SYSTEM_HANDLE_INFORMATION);
     SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength);
@@ -431,7 +431,7 @@ static void test_query_handle(void)
 
 static void test_query_cache(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     SYSTEM_CACHE_INFORMATION sci;
 
@@ -449,7 +449,7 @@ static void test_query_cache(void)
 
 static void test_query_interrupt(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     ULONG NeededLength;
     SYSTEM_BASIC_INFORMATION sbi;
@@ -477,7 +477,7 @@ static void test_query_interrupt(void)
 
 static void test_query_kerndebug(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi;
 
@@ -495,7 +495,7 @@ static void test_query_kerndebug(void)
 
 static void test_query_regquota(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     SYSTEM_REGISTRY_QUOTA_INFORMATION srqi;
 
@@ -513,7 +513,7 @@ static void test_query_regquota(void)
 
 static void test_query_process_basic(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
 
     typedef struct _PROCESS_BASIC_INFORMATION_PRIVATE {
@@ -581,7 +581,7 @@ static void test_query_process_basic(voi
 
 static void test_query_process_vm(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     VM_COUNTERS pvi;
 
@@ -619,7 +619,7 @@ static void test_query_process_vm(void)
 
 static void test_query_process_io(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     IO_COUNTERS pii;
 
@@ -659,7 +659,7 @@ static void test_query_process_io(void)
 
 static void test_query_process_times(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     HANDLE process;
     SYSTEMTIME UTC, Local;
@@ -713,7 +713,7 @@ static void test_query_process_times(voi
 
 static void test_query_process_handlecount(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     DWORD handlecount;
     HANDLE process;
@@ -757,7 +757,7 @@ static void test_query_process_handlecou
 
 static void test_query_process_image_file_name(void)
 {
-    DWORD status;
+    NTSTATUS status;
     ULONG ReturnLength;
     UNICODE_STRING image_file_name;
     void *buffer;
@@ -795,7 +795,7 @@ static void test_query_process_image_fil
 static void test_readvirtualmemory(void)
 {
     HANDLE process;
-    DWORD status;
+    NTSTATUS status;
     SIZE_T readcount;
     static const char teststring[] = "test string";
     char buffer[12];



More information about the wine-patches mailing list