Vitaliy Margolen : dinput: Implement Poll for keyboard.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Dec 4 07:17:03 CST 2006


Module: wine
Branch: master
Commit: 429c8ac94818eca9daa5987685d8a23a4f659ed5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=429c8ac94818eca9daa5987685d8a23a4f659ed5

Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date:   Fri Dec  1 10:56:30 2006 -0700

dinput: Implement Poll for keyboard.

---

 dlls/dinput/keyboard.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index c29c444..f8ac0c9 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -669,6 +669,18 @@ static HRESULT WINAPI SysKeyboardWImpl_G
     return DI_OK;
 }
 
+static HRESULT WINAPI SysKeyboardAImpl_Poll(LPDIRECTINPUTDEVICE8A iface)
+{
+    SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
+
+    TRACE("(%p)\n",This);
+
+    if (!This->base.acquired) return DIERR_NOTACQUIRED;
+
+    MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0);
+    return DI_OK;
+}
+
 static const IDirectInputDevice8AVtbl SysKeyboardAvt =
 {
 	IDirectInputDevice2AImpl_QueryInterface,
@@ -696,7 +708,7 @@ static const IDirectInputDevice8AVtbl Sy
 	IDirectInputDevice2AImpl_SendForceFeedbackCommand,
 	IDirectInputDevice2AImpl_EnumCreatedEffectObjects,
 	IDirectInputDevice2AImpl_Escape,
-	IDirectInputDevice2AImpl_Poll,
+        SysKeyboardAImpl_Poll,
         IDirectInputDevice2AImpl_SendDeviceData,
         IDirectInputDevice7AImpl_EnumEffectsInFile,
         IDirectInputDevice7AImpl_WriteEffectToFile,
@@ -738,7 +750,7 @@ static const IDirectInputDevice8WVtbl Sy
 	XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand,
 	XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects,
 	XCAST(Escape)IDirectInputDevice2AImpl_Escape,
-	XCAST(Poll)IDirectInputDevice2AImpl_Poll,
+        XCAST(Poll)SysKeyboardAImpl_Poll,
         XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData,
         IDirectInputDevice7WImpl_EnumEffectsInFile,
         IDirectInputDevice7WImpl_WriteEffectToFile,




More information about the wine-cvs mailing list