ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DInputSource: Limit the amount of reported buttons and POV hats to what the data format supports 

Fixes a crash when the device reports more buttons than what
DIJOYSTATE2 can handle.
This commit is contained in:
Silent 2023-10-22 13:22:00 +02:00 committed by Connor McLaughlin
parent 82f09bdb81
commit 775f1a042d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcsx2/Input/DInputSource.cpp
View File

@ -210,12 +210,6 @@ bool DInputSource::AddDevice(ControllerData& cd, const std::string& name)
return false; return false;
} }
if (caps.dwButtons == 0)
{
Console.Error("Ignoring device '%s' because it has no buttons (%u axes, %u POVs).", name.c_str(), caps.dwAxes, caps.dwPOVs);
return false;
}
static constexpr const u32 axis_offsets[] = {offsetof(DIJOYSTATE2, lX), offsetof(DIJOYSTATE2, lY), offsetof(DIJOYSTATE2, lZ), static constexpr const u32 axis_offsets[] = {offsetof(DIJOYSTATE2, lX), offsetof(DIJOYSTATE2, lY), offsetof(DIJOYSTATE2, lZ),
offsetof(DIJOYSTATE2, lRz), offsetof(DIJOYSTATE2, lRx), offsetof(DIJOYSTATE2, lRy), offsetof(DIJOYSTATE2, rglSlider[0]), offsetof(DIJOYSTATE2, lRz), offsetof(DIJOYSTATE2, lRx), offsetof(DIJOYSTATE2, lRy), offsetof(DIJOYSTATE2, rglSlider[0]),
offsetof(DIJOYSTATE2, rglSlider[1])}; offsetof(DIJOYSTATE2, rglSlider[1])};
@ -246,8 +240,8 @@ bool DInputSource::AddDevice(ControllerData& cd, const std::string& name)
if (hr != DI_OK) if (hr != DI_OK)
Console.Warning("GetDeviceState() for '%s' failed: %08X", name.c_str(), hr); Console.Warning("GetDeviceState() for '%s' failed: %08X", name.c_str(), hr);
cd.num_buttons = caps.dwButtons; cd.num_buttons = std::min<u32>(caps.dwButtons, std::size(cd.last_state.rgbButtons));
cd.num_hats = caps.dwPOVs; cd.num_hats = std::min<u32>(caps.dwPOVs, std::size(cd.last_state.rgdwPOV));
Console.WriteLn( Console.WriteLn(
"%s has %u buttons, %u axes, %u hats", name.c_str(), cd.num_buttons, static_cast<u32>(cd.axis_offsets.size()), cd.num_hats); "%s has %u buttons, %u axes, %u hats", name.c_str(), cd.num_buttons, static_cast<u32>(cd.axis_offsets.size()), cd.num_hats);