Vitaliy Margolen : dinput: Remove duplicate Keyboard-> Poll it is the same as base class.

[Alexandre Julliard]

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

Author: Vitaliy Margolen <wine-patches(a)kievinfo.com>
Date:   Tue Jan  9 13:36:59 2007 -0700

dinput: Remove duplicate Keyboard->Poll it is the same as base class.

---

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

diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index 08c6cd8..dcdcca3 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -483,16 +483,6 @@ 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;
-    return DI_NOEFFECT;
-}
-
 static const IDirectInputDevice8AVtbl SysKeyboardAvt =
 {
 	IDirectInputDevice2AImpl_QueryInterface,
@@ -520,7 +510,7 @@ static const IDirectInputDevice8AVtbl Sy
 	IDirectInputDevice2AImpl_SendForceFeedbackCommand,
 	IDirectInputDevice2AImpl_EnumCreatedEffectObjects,
 	IDirectInputDevice2AImpl_Escape,
-        SysKeyboardAImpl_Poll,
+        IDirectInputDevice2AImpl_Poll,
         IDirectInputDevice2AImpl_SendDeviceData,
         IDirectInputDevice7AImpl_EnumEffectsInFile,
         IDirectInputDevice7AImpl_WriteEffectToFile,
@@ -562,7 +552,7 @@ static const IDirectInputDevice8WVtbl Sy
 	XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand,
 	XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects,
 	XCAST(Escape)IDirectInputDevice2AImpl_Escape,
-        XCAST(Poll)SysKeyboardAImpl_Poll,
+        XCAST(Poll)IDirectInputDevice2AImpl_Poll,
         XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData,
         IDirectInputDevice7WImpl_EnumEffectsInFile,
         IDirectInputDevice7WImpl_WriteEffectToFile,