[pkg-wine-party] [wine] 127/132: dinput: Consistently use GetCurrentTime().

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository wine.

commit 9d44303a2963bdcd4a2c6ae107e248f2fdfef9ee
Author: Austin English <austinenglish at gmail.com>
Date:   Tue Dec 10 16:45:28 2013 -0800

    dinput: Consistently use GetCurrentTime().
    
    (cherry picked from commit bfafb1ffc5a102966025b5b9f3acb81fea5435d1)
---
 dlls/dinput/joystick_linux.c      | 3 +--
 dlls/dinput/joystick_linuxinput.c | 2 +-
 dlls/dinput/keyboard.c            | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

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 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
             }
         }
         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++);
     }
 }
 
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 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
 	}
         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++);
     }
 }
 
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 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM
 
     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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git