Changeset 52822 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Sep 23, 2014 10:25:34 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96224

Message:

Runtime: Fix RTTimeMilliTS() on FreeBSD. Use macros for time units rather than hardcoded values.

File:

• trunk/src/VBox/Runtime/r3/win/time-win.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r3/win/time-win.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -79 +79 @@
      * This would work if it didn't flip over every 49 (or so) days.
      */
-    return (uint64_t)GetTickCount() * (uint64_t)1000000;
+    return (uint64_t)GetTickCount() * RT_NS_1MS_64;
 
 #elif defined USE_PERFORMANCE_COUNTER
@@ -90 +90 @@
     {
         if (!QueryPerformanceFrequency(&llFreq))
-            return (uint64_t)GetTickCount() * (uint64_t)1000000;
+            return (uint64_t)GetTickCount() * RT_NS_1MS_64;
         llFreq.QuadPart /=    1000;
         uMult            = 1000000;     /* no math genius, but this seemed to help avoiding floating point. */
@@ -98 +98 @@
     if (QueryPerformanceCounter(&ll))
         return (ll.QuadPart * uMult) / llFreq.QuadPart;
-    return (uint64_t)GetTickCount() * (uint64_t)1000000;
+    return (uint64_t)GetTickCount() * RT_NS_1MS_64;
 
 #elif defined USE_FILE_TIME
@@ -149 +149 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 
@@ -196 +196 @@
     Tzi.Bias = 0;
     if (GetTimeZoneInformation(&Tzi) != TIME_ZONE_ID_INVALID)
-        return -(int64_t)Tzi.Bias * 60*1000*1000*1000;
+        return -(int64_t)Tzi.Bias * 60 * RT_NS_1MS_64;
     return 0;
 }