dinput: consistently use GetCurrentTime()
Austin English
austinenglish at gmail.com
Tue Dec 10 18:45:28 CST 2013
For http://bugs.winehq.org/show_bug.cgi?id=8320
--
-Austin
-------------- next part --------------
diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c
index 669db42..ce04986 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 951690d..3bf922f 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;
More information about the wine-patches
mailing list