From 6d1d760682637af3b663edce74c6d874fb1144dc Mon Sep 17 00:00:00 2001
From: w1naenator <valdis.bogdans@hotmail.com>
Date: Wed, 16 Jul 2025 10:25:38 +0300
Subject: [PATCH] Data Type Fixes

- Replaced the use of the type alias OrbisUserServiceUserId = s32 with Libraries::UserService::OrbisUserServiceUserId directly.
---
 src/core/libraries/ime/ime.cpp      |  4 ++--
 src/core/libraries/ime/ime.h        |  4 ++--
 src/core/libraries/ime/ime_common.h | 11 +++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/core/libraries/ime/ime.cpp b/src/core/libraries/ime/ime.cpp
index e144a622c..bc6234db7 100644
--- a/src/core/libraries/ime/ime.cpp
+++ b/src/core/libraries/ime/ime.cpp
@@ -283,7 +283,7 @@ Error PS4_SYSV_ABI sceImeGetPanelSize(const OrbisImeParam* param, u32* width, u3
     return Error::OK;
 }
 
-Error PS4_SYSV_ABI sceImeKeyboardClose(OrbisUserServiceUserId userId) {
+Error PS4_SYSV_ABI sceImeKeyboardClose(Libraries::UserService::OrbisUserServiceUserId userId) {
     LOG_INFO(Lib_Ime, "called");
 
     if (!g_keyboard_handler) {
@@ -304,7 +304,7 @@ int PS4_SYSV_ABI sceImeKeyboardGetResourceId() {
     return ORBIS_OK;
 }
 
-Error PS4_SYSV_ABI sceImeKeyboardOpen(OrbisUserServiceUserId userId,
+Error PS4_SYSV_ABI sceImeKeyboardOpen(Libraries::UserService::OrbisUserServiceUserId userId,
                                       const OrbisImeKeyboardParam* param) {
     LOG_INFO(Lib_Ime, "called");
 
diff --git a/src/core/libraries/ime/ime.h b/src/core/libraries/ime/ime.h
index 5fd6943a6..228544af5 100644
--- a/src/core/libraries/ime/ime.h
+++ b/src/core/libraries/ime/ime.h
@@ -33,10 +33,10 @@ int PS4_SYSV_ABI sceImeFilterText();
 int PS4_SYSV_ABI sceImeForTestFunction();
 int PS4_SYSV_ABI sceImeGetPanelPositionAndForm();
 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 sceImeKeyboardGetResourceId();
-Error PS4_SYSV_ABI sceImeKeyboardOpen(OrbisUserServiceUserId userId,
+Error PS4_SYSV_ABI sceImeKeyboardOpen(Libraries::UserService::OrbisUserServiceUserId userId,
                                       const OrbisImeKeyboardParam* param);
 int PS4_SYSV_ABI sceImeKeyboardOpenInternal();
 int PS4_SYSV_ABI sceImeKeyboardSetMode();
diff --git a/src/core/libraries/ime/ime_common.h b/src/core/libraries/ime/ime_common.h
index 941a8f910..c1b18422d 100644
--- a/src/core/libraries/ime/ime_common.h
+++ b/src/core/libraries/ime/ime_common.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <core/libraries/system/userservice.h>
 #include <magic_enum/magic_enum.hpp>
 #include "common/enum.h"
 #include "common/types.h"
@@ -11,8 +12,6 @@
 constexpr u32 ORBIS_IME_MAX_TEXT_LENGTH = 2048;
 constexpr u32 ORBIS_IME_DIALOG_MAX_TEXT_LENGTH = 2048;
 
-using OrbisUserServiceUserId = s32;
-
 template <typename E>
 constexpr std::underlying_type_t<E> generate_full_mask() {
     static_assert(std::is_enum_v<E>, "E must be an enum type.");
@@ -425,13 +424,13 @@ struct OrbisImeKeycode {
     char16_t character;
     u32 status;
     OrbisImeKeyboardType type;
-    OrbisUserServiceUserId user_id;
+    Libraries::UserService::OrbisUserServiceUserId user_id;
     u32 resource_id;
     Libraries::Rtc::OrbisRtcTick timestamp;
 };
 
 struct OrbisImeKeyboardResourceIdArray {
-    OrbisUserServiceUserId user_id;
+    Libraries::UserService::OrbisUserServiceUserId user_id;
     u32 resource_id[5];
 };
 
@@ -496,7 +495,7 @@ struct OrbisImeKeyboardParam {
 };
 
 struct OrbisImeParam {
-    OrbisUserServiceUserId user_id;
+    Libraries::UserService::OrbisUserServiceUserId user_id;
     OrbisImeType type;
     OrbisImeLanguage supported_languages;
     OrbisImeEnterLabel enter_label;
@@ -523,7 +522,7 @@ struct OrbisImeCaret {
 };
 
 struct OrbisImeDialogParam {
-    OrbisUserServiceUserId user_id;
+    Libraries::UserService::OrbisUserServiceUserId user_id;
     OrbisImeType type;
     OrbisImeLanguage supported_languages;
     OrbisImeEnterLabel enter_label;