Vitaliy Margolen : dinput: Fix device enumeration by DX8 device type.

[Alexandre Julliard]

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

Author: Vitaliy Margolen 
Date:   Thu Dec  1 21:08:14 2011 -0700

dinput: Fix device enumeration by DX8 device type.

---

dlls/dinput/dinput_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index e69bbf0..6350a18 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -359,7 +359,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices(

if (!lpCallback ||
         dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) ||
-        dwDevType > 4)
+        (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL)
         return DIERR_INVALIDPARAM;

if (!This->initialized)
@@ -398,7 +398,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices(

if (!lpCallback ||
         dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) ||
-        dwDevType > 4)
+        (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL)
         return DIERR_INVALIDPARAM;

if (!This->initialized)