The-Homebrew-Cloud/hid_to_vpad
2
0
Fork 0
mirror of https://github.com/Maschell/hid_to_vpad.git synced 2024-11-24 23:36:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding more NULL checks before using pointer

Browse Source
This commit is contained in:
Maschell 2017-04-11 14:41:59 +02:00
parent 92f7f08b3f
commit ec822df6c4
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controller_patcher

@ -1 +1 @@
Subproject commit 41012b4543bc798e47e15c8b5e1b7cd12fec1977 Subproject commit bb6964cd6f474e6c04135310548f00cc2d3fe8c3

23
src/patcher/hid_controller_function_patcher.cpp
View File

@ -53,7 +53,6 @@ DECL(void, __PPCExit, void){
DECL(s32, VPADRead, s32 chan, VPADData *buffer, u32 buffer_size, s32 *error) { DECL(s32, VPADRead, s32 chan, VPADData *buffer, u32 buffer_size, s32 *error) {
s32 result = real_VPADRead(chan, buffer, buffer_size, error); s32 result = real_VPADRead(chan, buffer, buffer_size, error);
if(gHIDAttached && buffer_size > 0){ if(gHIDAttached && buffer_size > 0){
ControllerPatcher::setRumble(UController_Type_Gamepad,!!VPADBASEGetMotorOnRemainingCount(0)); ControllerPatcher::setRumble(UController_Type_Gamepad,!!VPADBASEGetMotorOnRemainingCount(0));
@ -63,11 +62,10 @@ DECL(s32, VPADRead, s32 chan, VPADData *buffer, u32 buffer_size, s32 *error) {
//You can open the home menu this way, but not close it. Need a proper way to close it using the same button... //You can open the home menu this way, but not close it. Need a proper way to close it using the same button...
//OSSendAppSwitchRequest(5,0,0); //Open the home menu! //OSSendAppSwitchRequest(5,0,0); //Open the home menu!
} }
if(error != NULL){
*error = 0; *error = 0;
result = 1; // We want the WiiU to ignore everything else. result = 1; // We want the WiiU to ignore everything else.
}else{ }
} }
} }
@ -88,8 +86,10 @@ DECL(s32,KPADReadEx, s32 chan, KPADData * buffer, u32 buffer_count, s32 *error )
if(buffer[0].pro.btns_h & WPAD_PRO_BUTTON_HOME){ //Pro controller doesn't work in home menu so it's okay to let this enabled. if(buffer[0].pro.btns_h & WPAD_PRO_BUTTON_HOME){ //Pro controller doesn't work in home menu so it's okay to let this enabled.
OSSendAppSwitchRequest(5,0,0); //Open the home menu! OSSendAppSwitchRequest(5,0,0); //Open the home menu!
} }
*error = 0; //No error if(error != NULL){
return 1; // We have saved one set of data. Should be enough because its no wireless communication. *error = 0;
return 1; // We have saved one set of data. Should be enough because its no wireless communication.
}
}else if(res != CONTROLLER_PATCHER_ERROR_MAPPING_DISABLED){ }else if(res != CONTROLLER_PATCHER_ERROR_MAPPING_DISABLED){
//log_printf("KPADReadEx error: %d\n",res); //log_printf("KPADReadEx error: %d\n",res);
} }
@ -103,8 +103,10 @@ DECL(s32, WPADProbe, s32 chan, u32 * result ){
(ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro2) && chan == 1) || (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro2) && chan == 1) ||
(ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro3) && chan == 2) || (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro3) && chan == 2) ||
(ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro4) && chan == 3)){ (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro4) && chan == 3)){
*result = WPAD_EXT_PRO_CONTROLLER; if(result != NULL){
return 0; *result = WPAD_EXT_PRO_CONTROLLER;
return 0;
}
} }
return real_WPADProbe(chan,result); return real_WPADProbe(chan,result);
@ -165,7 +167,6 @@ DECL(void,WPADRead,s32 chan, WPADReadData *data ){
(ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro3) && chan == 2) || (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro3) && chan == 2) ||
(ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro4) && chan == 3)){ (ControllerPatcher::isControllerConnectedAndActive(UController_Type_Pro4) && chan == 3)){
ControllerPatcher::setProControllerDataFromHID((void*)data,chan,PRO_CONTROLLER_MODE_WPADReadData); ControllerPatcher::setProControllerDataFromHID((void*)data,chan,PRO_CONTROLLER_MODE_WPADReadData);
}else{ }else{
real_WPADRead(chan,data); real_WPADRead(chan,data);
} }