commit 288ebd3244fe0e00b1c9c7c4f5baa4092bb28a6c
author Rein Klazes <wijn@wanadoo.nl> Wed Feb 23 20:29:17 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Feb 23 20:29:17 2005 +0000
tree 58cd4d46276ae6fa91c24d82fbe6de45f1046ee5
parent 494a34bfdad45bf0afca38530b573c263f9905d3

NtQueryPerformanceCounter should return a frequency of 1193182Hz and
counts like in Windows. Some applications depend on that.
Simplify QueryPerformanceCounter a bit.

dlls/kernel/cpu.c

diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c
index 2812afb..227e10c 100644
--- a/dlls/kernel/cpu.c
+++ b/dlls/kernel/cpu.c
@@ -192,8 +192,7 @@
  */
 BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter)
 {
-    LARGE_INTEGER frequency;
-    NtQueryPerformanceCounter( counter, &frequency );
+    NtQueryPerformanceCounter( counter, NULL );
     return TRUE;
 }
 

dlls/ntdll/nt.c

diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 93da87e..6e677c4 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -37,6 +37,9 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
+/* FIXME: fixed at 2005/2/22 */
+static LONGLONG boottime = (LONGLONG)1275356510 * 100000000;
+
 /* Structures used by NtConnectPort */
 
 typedef struct LpcSectionInfo
@@ -512,8 +515,10 @@
 /******************************************************************************
  *  NtQueryPerformanceCounter	[NTDLL.@]
  *
- *  Note: Windows uses a timer clocked at a multiple of 1193182 Hz.
- *  
+ *  Note: Windows uses a timer clocked at a multiple of 1193182 Hz. There is a
+ *  good number of applications that crash when the returned frequency is either
+ *  lower or higher then what Windows gives. Also too high counter values are
+ *  reported to give problems.
  */
 NTSTATUS WINAPI NtQueryPerformanceCounter(
 	OUT PLARGE_INTEGER Counter,
@@ -523,9 +528,14 @@
 
     if (!Counter) return STATUS_ACCESS_VIOLATION;
     NtQuerySystemTime( &time );
-    Counter->QuadPart = time.QuadPart;
+    time.QuadPart -= boottime;
+    /* convert a counter that increments at a rate of 10 MHz
+     * to one of 1193182 Hz, with some care for arithmetic
+     * overflow ( will not overflow until 3396 or so ) and
+     * good accuracy ( 21/176 = 0.119318182) */
+    Counter->QuadPart = (time.QuadPart * 21) / 176;
     if (Frequency)
-        Frequency->QuadPart = 10000000;
+        Frequency->QuadPart = 1193182;
     return 0;
 }
 
@@ -625,7 +635,7 @@
             SYSTEM_TIMEOFDAY_INFORMATION* sti = (SYSTEM_TIMEOFDAY_INFORMATION*)SystemInformation;
             if (Length >= sizeof(*sti))
             {
-                sti->liKeBootTime.QuadPart = 0; /* FIXME */
+                sti->liKeBootTime.QuadPart = boottime;
                 sti->liKeSystemTime.QuadPart = 0; /* FIXME */
                 sti->liExpTimeZoneBias.QuadPart  = 0; /* FIXME */
                 sti->uCurrentTimeZoneId = 0; /* FIXME */