commit 9d44303a2963bdcd4a2c6ae107e248f2fdfef9ee
author Austin English <austinenglish@gmail.com> Tue Dec 10 16:45:28 2013 -0800
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 08 21:27:30 2014 +0100
tree 5f78b037a768eeca650c4458630868866749414b
parent 18175bbc8524c30d6a6e051bdfc46c817af215ac

dinput: Consistently use GetCurrentTime().

(cherry picked from commit bfafb1ffc5a102966025b5b9f3acb81fea5435d1)

dlls/dinput/joystick_linux.c

diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c
index d973a84..dc6e9e3 100644
--- a/dlls/dinput/joystick_linux.c
+++ b/dlls/dinput/joystick_linux.c
@@ -689,8 +689,7 @@
             }
         }
         if (inst_id >= 0)
-            queue_event(iface, inst_id,
-                        value, jse.time, This->generic.base.dinput->evsequence++);
+            queue_event(iface, inst_id, value, GetCurrentTime(), This->generic.base.dinput->evsequence++);
     }
 }
 

dlls/dinput/joystick_linuxinput.c

diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 5d1cacc..23d8d45 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -873,7 +873,7 @@
 	}
         if (inst_id >= 0)
             queue_event(iface, inst_id,
-                        value, ie.time.tv_usec, This->generic.base.dinput->evsequence++);
+                        value, GetCurrentTime(), This->generic.base.dinput->evsequence++);
     }
 }
 

dlls/dinput/keyboard.c

diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index e8e7515..a5967d7 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -126,7 +126,7 @@
 
     EnterCriticalSection(&This->base.crit);
     queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON,
-                new_diks, hook->time, This->base.dinput->evsequence++);
+                new_diks, GetCurrentTime(), This->base.dinput->evsequence++);
     LeaveCriticalSection(&This->base.crit);
 
     return ret;