preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

DirectInput: Zero-initialize some variables.

Browse Source
This commit is contained in:
Henrik Rydgård
2026-05-05 01:51:22 +02:00
parent 075a1037fd
commit 8b58cce009
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Windows/DinputDevice.cpp
+8 -9
View File
@@ -135,8 +135,7 @@ DinputDevice::DinputDevice(int devnum) {
}
getDevices(needsCheck_);
if ( (devnum >= (int)devices.size()) || FAILED(getPDI()->CreateDevice(devices.at(devnum).guidInstance, &pJoystick, NULL)))
{
if ((devnum >= (int)devices.size()) || FAILED(getPDI()->CreateDevice(devices.at(devnum).guidInstance, &pJoystick, NULL))) {
return;
}
@@ -193,7 +192,7 @@ DinputDevice::~DinputDevice() {
}
void DinputDevice::ReleaseAllKeys() {
KeyInput key;
KeyInput key{};
key.deviceId = DEVICE_ID_PAD_0 + pDevNum;
key.flags = KeyInputFlags::UP;
for (int i = 0; i < ARRAY_SIZE(dinput_buttons); ++i) {
@@ -236,7 +235,7 @@ void DinputDevice::ReleaseAllKeys() {
void SendNativeAxis(InputDeviceID deviceId, int value, int &lastValue, InputAxis axisId) {
if (value != lastValue && g_Config.bAllowDInput) {
AxisInput axis;
AxisInput axis{};
axis.deviceId = deviceId;
axis.axisId = axisId;
axis.value = (float)value * (1.0f / 10000.0f); // Convert axis to normalised float
@@ -258,16 +257,17 @@ static LONG *ValueForAxisId(DIJOYSTATE2 &js, int axisId) {
}
int DinputDevice::UpdateState() {
if (!pJoystick) return -1;
if (!pJoystick)
return -1;
DIJOYSTATE2 js;
DIJOYSTATE2 js{};
if (FAILED(pJoystick->Poll())) {
if(pJoystick->Acquire() == DIERR_INPUTLOST)
return -1;
}
if(FAILED(pJoystick->GetDeviceState(sizeof(DIJOYSTATE2), &js)))
if (FAILED(pJoystick->GetDeviceState(sizeof(DIJOYSTATE2), &js)))
return -1;
ApplyButtons(js);
@@ -359,8 +359,7 @@ void DinputDevice::ApplyButtons(DIJOYSTATE2 &state) {
}
}
size_t DinputDevice::getNumPads()
{
size_t DinputDevice::getNumPads() {
getDevices(needsCheck_);
needsCheck_ = false;
return devices.size();
Windows/DinputDevice.h
+13 -13
View File
@@ -59,21 +59,21 @@ private:
static unsigned int pInstances;
static std::vector<DIDEVICEINSTANCE> devices;
static Microsoft::WRL::ComPtr<IDirectInput8> pDI;
static Microsoft::WRL::ComPtr<IDirectInput8> pDI;
static bool needsCheck_;
static std::set<u32> ignoreDevices_;
int pDevNum;
Microsoft::WRL::ComPtr<IDirectInputDevice8> pJoystick;
DIJOYSTATE2 pPrevState;
bool analog;
BYTE lastButtons_[128]{};
WORD lastPOV_[4]{};
int last_lX_;
int last_lY_;
int last_lZ_;
int last_lRx_;
int last_lRy_;
int last_lRz_;
int pDevNum = 0;
Microsoft::WRL::ComPtr<IDirectInputDevice8> pJoystick;
DIJOYSTATE2 pPrevState{};
bool analog{};
BYTE lastButtons_[128]{};
WORD lastPOV_[4]{};
int last_lX_ = 0;
int last_lY_ = 0;
int last_lZ_ = 0;
int last_lRx_ = 0;
int last_lRy_ = 0;
int last_lRz_ = 0;
};
struct DInputMetaDevice : public InputDevice {