Commit df6bc20b authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

dinput: Clear DIA_APPNOMAP BuildActionMap flag with specific device semantic.

parent 5b648e7e
......@@ -1851,6 +1851,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
if (action->dwFlags & DIA_APPMAPPED) action->dwHow = DIAH_APPREQUESTED;
else action->dwHow = 0;
if (action->dwHow == DIAH_APPREQUESTED || action->dwHow == DIAH_USERCONFIG) continue;
if ((action->dwSemantic & 0xf0000000) == 0x80000000) action->dwFlags &= ~DIA_APPNOMAP;
if (!(action->dwFlags & DIA_APPNOMAP)) action->guidInstance = GUID_NULL;
}
......
......@@ -1727,17 +1727,13 @@ static void check_diactionA_( int line, const DIACTIONA *actual, const DIACTIONA
{
check_member_( __FILE__, line, *actual, *expected, "%#Ix", uAppData );
check_member_( __FILE__, line, *actual, *expected, "%#lx", dwSemantic );
todo_wine_if( expected->dwSemantic == 0x810004c8 )
check_member_( __FILE__, line, *actual, *expected, "%#lx", dwFlags );
if (actual->lptszActionName && expected->lptszActionName)
check_member_str_( __FILE__, line, *actual, *expected, lptszActionName );
else
check_member_( __FILE__, line, *actual, *expected, "%p", lptszActionName );
todo_wine_if( expected->dwSemantic == 0x810004c8 )
check_member_guid_( __FILE__, line, *actual, *expected, guidInstance );
todo_wine_if( expected->dwSemantic == 0x810004c8 )
check_member_( __FILE__, line, *actual, *expected, "%#lx", dwObjID );
todo_wine_if( expected->dwSemantic == 0x810004c8 )
check_member_( __FILE__, line, *actual, *expected, "%#lx", dwHow );
}
......
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