mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-22 10:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clang fox, second try.

Browse Source
This commit is contained in:
w1naenator 2025-07-19 14:27:53 +03:00
parent b76300241b
commit b9507359d9
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/libraries/ime/ime.cpp
View File

@ -329,23 +329,19 @@ int PS4_SYSV_ABI sceImeKeyboardGetResourceId() {
Error PS4_SYSV_ABI sceImeKeyboardOpen(Libraries::UserService::OrbisUserServiceUserId userId, Error PS4_SYSV_ABI sceImeKeyboardOpen(Libraries::UserService::OrbisUserServiceUserId userId,
const OrbisImeKeyboardParam* param) { const OrbisImeKeyboardParam* param) {
LOG_INFO(Lib_Ime, "called"); LOG_INFO(Lib_Ime, "called");
if (!param) { if (!param) {
LOG_ERROR(Lib_Ime, "Invalid param: NULL"); LOG_ERROR(Lib_Ime, "Invalid param: NULL");
return Error::INVALID_ADDRESS; return Error::INVALID_ADDRESS;
} }
if (!param->handler) { if (!param->handler) {
LOG_ERROR(Lib_Ime, "Invalid param->handler: NULL"); LOG_ERROR(Lib_Ime, "Invalid param->handler: NULL");
return Error::INVALID_HANDLER; return Error::INVALID_HANDLER;
} }
// seems like arg is optional, need to check if it is used in the handler // seems like arg is optional, need to check if it is used in the handler
if (!param->arg && false) { // Todo: check if arg is used in the handler, temporarily disabled if (!param->arg && false) { // Todo: check if arg is used in the handler, temporarily disabled
LOG_ERROR(Lib_Ime, "Invalid param->arg: NULL"); LOG_ERROR(Lib_Ime, "Invalid param->arg: NULL");
return Error::INVALID_ARG; return Error::INVALID_ARG;
} }
if (static_cast<u32>(param->option) & ~kValidOrbisImeKeyboardOptionMask) { if (static_cast<u32>(param->option) & ~kValidOrbisImeKeyboardOptionMask) {
LOG_ERROR(Lib_Ime, LOG_ERROR(Lib_Ime,
"Invalid param->option\n" "Invalid param->option\n"
@ -354,42 +350,35 @@ Error PS4_SYSV_ABI sceImeKeyboardOpen(Libraries::UserService::OrbisUserServiceUs
static_cast<u32>(param->option), kValidOrbisImeKeyboardOptionMask); static_cast<u32>(param->option), kValidOrbisImeKeyboardOptionMask);
return Error::INVALID_OPTION; return Error::INVALID_OPTION;
} }
if (userId < 0 || userId > 4) { // Todo: check valid user IDs if (userId < 0 || userId > 4) { // Todo: check valid user IDs
LOG_ERROR(Lib_Ime, "Invalid userId: {}", userId); LOG_ERROR(Lib_Ime, "Invalid userId: {}", userId);
return Error::INVALID_USER_ID; return Error::INVALID_USER_ID;
} }
for (size_t i = 0; i < sizeof(param->reserved1); ++i) { for (size_t i = 0; i < sizeof(param->reserved1); ++i) {
if (param->reserved1[i] != 0) { if (param->reserved1[i] != 0) {
LOG_ERROR(Lib_Ime, "Invalid reserved1: not zeroed"); LOG_ERROR(Lib_Ime, "Invalid reserved1: not zeroed");
return Error::INVALID_RESERVED; return Error::INVALID_RESERVED;
} }
} }
for (size_t i = 0; i < sizeof(param->reserved2); ++i) { for (size_t i = 0; i < sizeof(param->reserved2); ++i) {
if (param->reserved2[i] != 0) { if (param->reserved2[i] != 0) {
LOG_ERROR(Lib_Ime, "Invalid reserved2: not zeroed"); LOG_ERROR(Lib_Ime, "Invalid reserved2: not zeroed");
return Error::INVALID_RESERVED; return Error::INVALID_RESERVED;
} }
} }
if (false) { // Todo: check if usb keyboard is connected, always true for now if (false) { // Todo: check if usb keyboard is connected, always true for now
LOG_ERROR(Lib_Ime, "USB keyboard is not connected"); LOG_ERROR(Lib_Ime, "USB keyboard is not connected");
return Error::CONNECTION_FAILED; return Error::CONNECTION_FAILED;
} }
if (g_keyboard_handler) { if (g_keyboard_handler) {
LOG_ERROR(Lib_Ime, "Keyboard handler is already open"); LOG_ERROR(Lib_Ime, "Keyboard handler is already open");
return Error::BUSY; return Error::BUSY;
} }
g_keyboard_handler = std::make_unique<ImeHandler>(param); g_keyboard_handler = std::make_unique<ImeHandler>(param);
if (!g_keyboard_handler) { if (!g_keyboard_handler) {
LOG_ERROR(Lib_Ime, "Failed to create keyboard handler"); LOG_ERROR(Lib_Ime, "Failed to create keyboard handler");
return Error::INTERNAL; // or Error::NO_MEMORY; return Error::INTERNAL; // or Error::NO_MEMORY;
} }
LOG_INFO(Lib_Ime, "Keyboard handler created successfully for user ID: {}", userId); LOG_INFO(Lib_Ime, "Keyboard handler created successfully for user ID: {}", userId);
return Error::OK; return Error::OK;
} }