Changeset 62673 in vbox for trunk/src/VBox/ValidationKit/utils/nt

Timestamp:

Jul 29, 2016 11:04:35 AM (8 years ago)

Author:

vboxsync

Message:

ValidationKit/utils: warnings.

Location:

trunk/src/VBox/ValidationKit/utils/nt

Files:

• ntsetfreq.cpp (modified) (5 diffs)
• nttimesources.cpp (modified) (2 diffs)

trunk/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#define _WIN32_WINNT 0x0500
-#include <Windows.h>
+#include <iprt/nt/nt.h>
 
 #include <iprt/initterm.h>
@@ -39 +38 @@
 #include <iprt/thread.h>
 #include <iprt/err.h>
-
-RT_C_DECLS_BEGIN
-/* from sysinternals. */
-NTSYSAPI LONG NTAPI NtSetTimerResolution(IN ULONG DesiredResolution, IN BOOLEAN SetResolution, OUT PULONG CurrentResolution);
-NTSYSAPI LONG NTAPI NtQueryTimerResolution(OUT PULONG MinimumResolution, OUT PULONG MaximumResolution, OUT PULONG CurrentResolution);
-RT_C_DECLS_END
-
 
 
@@ -109 +101 @@
      * Query the current resolution.
      */
-    ULONG   Cur = ~0;
-    ULONG   Min = ~0;
-    ULONG   Max = ~0;
-    LONG    Status;
+    ULONG    Cur = UINT32_MAX;
+    ULONG    Min = UINT32_MAX;
+    ULONG    Max = UINT32_MAX;
+    NTSTATUS rcNt = STATUS_SUCCESS;
     if (fVerbose || !u32NewRes)
     {
-        Status = NtQueryTimerResolution(&Min, &Max, &Cur);
-        if (Status >= 0)
+        rcNt = NtQueryTimerResolution(&Min, &Max, &Cur);
+        if (NT_SUCCESS(rcNt))
             RTMsgInfo("cur: %u (%u.%02u Hz)  min: %u (%u.%02u Hz)  max: %u (%u.%02u Hz)\n",
                       Cur, 10000000 / Cur, (10000000 / (Cur * 100)) % 100,
@@ -122 +114 @@
                       Max, 10000000 / Max, (10000000 / (Max * 100)) % 100);
         else
-            RTMsgError("NTQueryTimerResolution failed with status %#x\n", Status);
+            RTMsgError("NTQueryTimerResolution failed with status %#x\n", rcNt);
     }
 
     if (u32NewRes)
     {
-        Status = NtSetTimerResolution(u32NewRes, TRUE, &Cur);
-        if (Status < 0)
-            RTMsgError("NTSetTimerResolution(%RU32,,) failed with status %#x\n", u32NewRes, Status);
+        rcNt = NtSetTimerResolution(u32NewRes, TRUE, &Cur);
+        if (!NT_SUCCESS(rcNt))
+            RTMsgError("NTSetTimerResolution(%RU32,,) failed with status %#x\n", u32NewRes, rcNt);
         else if (fVerbose)
         {
-            Cur = Min = Max = ~0;
-            Status = NtQueryTimerResolution(&Min, &Max, &Cur);
-            if (Status >= 0)
+            Cur = Min = Max = UINT32_MAX;
+            rcNt = NtQueryTimerResolution(&Min, &Max, &Cur);
+            if (NT_SUCCESS(rcNt))
                 RTMsgInfo("new: %u (%u.%02u Hz) requested %RU32 (%u.%02u Hz)\n",
                           Cur, 10000000 / Cur, (10000000 / (Cur * 100)) % 100,
                           u32NewRes, 10000000 / u32NewRes, (10000000 / (u32NewRes * 100)) % 100);
             else
-                RTMsgError("NTSetTimerResolution succeeded but the NTQueryTimerResolution call failed with status %#x (ignored)\n", Status);
-            Status = 0;
+                RTMsgError("NTSetTimerResolution succeeded but the NTQueryTimerResolution call failed with status %#x (ignored)\n",
+                           rcNt);
+            rcNt = STATUS_SUCCESS;
         }
     }
 
-    if (u32NewRes && Status >= 0)
+    if (u32NewRes && NT_SUCCESS(rcNt))
     {
         if (cSecsSleep == UINT32_MAX)
@@ -154 +147 @@
     }
 
-    return Status >= 0 ? 0 : 1;
+    return NT_SUCCESS(rcNt) ? 0 : 1;
 }
 

trunk/src/VBox/ValidationKit/utils/nt/nttimesources.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <Windows.h>
+#include <iprt/win/windows.h>
 
 #include <iprt/asm.h>
@@ -84 +84 @@
 int main(int argc, char **argv)
 {
+    RT_NOREF1(argv);
+
     /*
      * Init, create a test instance and "parse" arguments.