[dinput] fix regression in Fallout game

[Carlos Lozano]

El lun, 31 de ene de 2005, a las 21:36, Lionel Ulmer wrote:
> I promise that one of these days I will look into it and try to understand
> exactly what the problem is (basically what I tried to do or which
> application to fix to introduce a more stringent check for correspondance
> between Wine's and the required data types)...

> While waiting for this day (i.e. when the snow melts, it's too good for now
> to miss any possible day out :-) ), this patch can go in.

Regression in patch:
http://www.winehq.org/hypermail/wine-cvs/2004/07/0350.html

Regards,
Carlos.

-- 
 ___         _          \  |  /  Consulting
| . |._ _  _| | ___  ___  ___    http://www.andago.com
|   || ' |/ . |<_> |/ . |/ . \__ GNU/Linux
|_|_||_|_|\___|<___|\_. |\___/     _ \  __|\ \  /
 Carlos A. Lozano   <___'/ | \ -_) __/\__ \ >  <  -_)
 [ carlos.lozano at andago.com ]\___|_|  ____/ _/\_\___|
 [ calb at epsxe.com           ]  http://www.ePSXe.com
-------------- next part --------------
Index: dlls/dinput/device.c
===================================================================
RCS file: /home/wine/wine/dlls/dinput/device.c,v
retrieving revision 1.23
diff -u -r1.23 device.c
--- dlls/dinput/device.c	17 Sep 2004 18:10:41 -0000	1.23
+++ dlls/dinput/device.c	29 Jan 2005 17:39:44 -0000
@@ -316,7 +316,7 @@
 		  * instance id.
 		  */
 		 ((asked_format->rgodf[j].dwType & 0x00FFFF00) == DIDFT_ANYINSTANCE) ||
-		 (DIDFT_GETINSTANCE(wine_format->rgodf[i].dwType) == DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType)))) {
+		 (wine_format->rgodf[i].dwType & asked_format->rgodf[j].dwType))) {
 		
 		done[j] = 1;