Skip to content

W
wine-winehq
Commit fa8d7a0f authored by Lionel Ulmer's avatar Lionel Ulmer Committed by Alexandre Julliard
Browse files
Options

- more pretty print for the types flag

- more Windows-aligned check for object instances
parent 8480f39f
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
dlls/dinput/device.c
View file @ fa8d7a0f
...@@ -80,7 +80,10 @@ void _dump_EnumObjects_flags(DWORD dwFlags) { ...@@ -80,7 +80,10 @@ void _dump_EnumObjects_flags(DWORD dwFlags) {
FE(DIDFT_NODATA), FE(DIDFT_NODATA),
FE(DIDFT_FFACTUATOR), FE(DIDFT_FFACTUATOR),
FE(DIDFT_FFEFFECTTRIGGER), FE(DIDFT_FFEFFECTTRIGGER),
FE(DIDFT_OUTPUT) FE(DIDFT_OUTPUT),
FE(DIDFT_VENDORDEFINED),
FE(DIDFT_ALIAS),
FE(DIDFT_OPTIONAL)
#undef FE #undef FE
}; };
type = (dwFlags & 0xFF0000FF); type = (dwFlags & 0xFF0000FF);
...@@ -315,8 +318,12 @@ DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT a ...@@ -315,8 +318,12 @@ DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT a
(/* Then check if it accepts any instance id, and if not, if it matches Wine's (/* Then check if it accepts any instance id, and if not, if it matches Wine's
* instance id. * instance id.
*/ */
((asked_format->rgodf[j].dwType & 0x00FFFF00) == DIDFT_ANYINSTANCE) || (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0xFFFF) ||
(wine_format->rgodf[i].dwType & asked_format->rgodf[j].dwType))) { (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == 0x00FF) || /* This is mentionned in no DX docs, but it works fine - tested on WinXP */
(DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == DIDFT_GETINSTANCE(wine_format->rgodf[i].dwType)))
&&
( /* Then if the asked type matches the one Wine provides */
wine_format->rgodf[i].dwType & asked_format->rgodf[j].dwType)) {
done[j] = 1; done[j] = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment