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

Data Type Fixes

Browse Source 
- Replaced the use of the type alias OrbisUserServiceUserId = s32 with Libraries::UserService::OrbisUserServiceUserId directly.
This commit is contained in:
w1naenator 2025-07-16 10:25:38 +03:00
parent 0d0ae7c72b
commit 6d1d760682
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,7 +283,7 @@ Error PS4_SYSV_ABI sceImeGetPanelSize(const OrbisImeParam* param, u32* width, u3
return Error::OK; return Error::OK;
} }
Error PS4_SYSV_ABI sceImeKeyboardClose(OrbisUserServiceUserId userId) { Error PS4_SYSV_ABI sceImeKeyboardClose(Libraries::UserService::OrbisUserServiceUserId userId) {
LOG_INFO(Lib_Ime, "called"); LOG_INFO(Lib_Ime, "called");
if (!g_keyboard_handler) { if (!g_keyboard_handler) {
@ -304,7 +304,7 @@ int PS4_SYSV_ABI sceImeKeyboardGetResourceId() {
return ORBIS_OK; return ORBIS_OK;
} }
Error PS4_SYSV_ABI sceImeKeyboardOpen(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");

4
src/core/libraries/ime/ime.h
View File

@ -33,10 +33,10 @@ int PS4_SYSV_ABI sceImeFilterText();
int PS4_SYSV_ABI sceImeForTestFunction(); int PS4_SYSV_ABI sceImeForTestFunction();
int PS4_SYSV_ABI sceImeGetPanelPositionAndForm(); int PS4_SYSV_ABI sceImeGetPanelPositionAndForm();
Error PS4_SYSV_ABI sceImeGetPanelSize(const OrbisImeParam* param, u32* width, u32* height); Error PS4_SYSV_ABI sceImeGetPanelSize(const OrbisImeParam* param, u32* width, u32* height);
Error PS4_SYSV_ABI sceImeKeyboardClose(OrbisUserServiceUserId userId); Error PS4_SYSV_ABI sceImeKeyboardClose(Libraries::UserService::OrbisUserServiceUserId userId);
int PS4_SYSV_ABI sceImeKeyboardGetInfo(); int PS4_SYSV_ABI sceImeKeyboardGetInfo();
int PS4_SYSV_ABI sceImeKeyboardGetResourceId(); int PS4_SYSV_ABI sceImeKeyboardGetResourceId();
Error PS4_SYSV_ABI sceImeKeyboardOpen(OrbisUserServiceUserId userId, Error PS4_SYSV_ABI sceImeKeyboardOpen(Libraries::UserService::OrbisUserServiceUserId userId,
const OrbisImeKeyboardParam* param); const OrbisImeKeyboardParam* param);
int PS4_SYSV_ABI sceImeKeyboardOpenInternal(); int PS4_SYSV_ABI sceImeKeyboardOpenInternal();
int PS4_SYSV_ABI sceImeKeyboardSetMode(); int PS4_SYSV_ABI sceImeKeyboardSetMode();

11
src/core/libraries/ime/ime_common.h
View File

@ -3,6 +3,7 @@
#pragma once #pragma once
#include <core/libraries/system/userservice.h>
#include <magic_enum/magic_enum.hpp> #include <magic_enum/magic_enum.hpp>
#include "common/enum.h" #include "common/enum.h"
#include "common/types.h" #include "common/types.h"
@ -11,8 +12,6 @@
constexpr u32 ORBIS_IME_MAX_TEXT_LENGTH = 2048; constexpr u32 ORBIS_IME_MAX_TEXT_LENGTH = 2048;
constexpr u32 ORBIS_IME_DIALOG_MAX_TEXT_LENGTH = 2048; constexpr u32 ORBIS_IME_DIALOG_MAX_TEXT_LENGTH = 2048;
using OrbisUserServiceUserId = s32;
template <typename E> template <typename E>
constexpr std::underlying_type_t<E> generate_full_mask() { constexpr std::underlying_type_t<E> generate_full_mask() {
static_assert(std::is_enum_v<E>, "E must be an enum type."); static_assert(std::is_enum_v<E>, "E must be an enum type.");
@ -425,13 +424,13 @@ struct OrbisImeKeycode {
char16_t character; char16_t character;
u32 status; u32 status;
OrbisImeKeyboardType type; OrbisImeKeyboardType type;
OrbisUserServiceUserId user_id; Libraries::UserService::OrbisUserServiceUserId user_id;
u32 resource_id; u32 resource_id;
Libraries::Rtc::OrbisRtcTick timestamp; Libraries::Rtc::OrbisRtcTick timestamp;
}; };
struct OrbisImeKeyboardResourceIdArray { struct OrbisImeKeyboardResourceIdArray {
OrbisUserServiceUserId user_id; Libraries::UserService::OrbisUserServiceUserId user_id;
u32 resource_id[5]; u32 resource_id[5];
}; };
@ -496,7 +495,7 @@ struct OrbisImeKeyboardParam {
}; };
struct OrbisImeParam { struct OrbisImeParam {
OrbisUserServiceUserId user_id; Libraries::UserService::OrbisUserServiceUserId user_id;
OrbisImeType type; OrbisImeType type;
OrbisImeLanguage supported_languages; OrbisImeLanguage supported_languages;
OrbisImeEnterLabel enter_label; OrbisImeEnterLabel enter_label;
@ -523,7 +522,7 @@ struct OrbisImeCaret {
}; };
struct OrbisImeDialogParam { struct OrbisImeDialogParam {
OrbisUserServiceUserId user_id; Libraries::UserService::OrbisUserServiceUserId user_id;
OrbisImeType type; OrbisImeType type;
OrbisImeLanguage supported_languages; OrbisImeLanguage supported_languages;
OrbisImeEnterLabel enter_label; OrbisImeEnterLabel enter_label;