Mirror-bot/AnyPS5
1
0 Fork 0
mirror of https://github.com/boykopovar/AnyPS5.git synced 2026-11-05 13:20:11 +00:00
Code Issues Projects Releases Activity

fix(libSceConvertKeycode): apply the SDK rules instead of throwing for layouts 31-39 and Y/Z

Browse Source 
GetVirtualKeycode and GetCharacter threw for keyboard layouts 31 to 39,
and GetVirtualKeycode for the Y and Z keys of layouts 2, 3 and 12, which
ended the title. GetImeKeyboardType returns layouts 31 to 37 for seven
system languages, and layout 2 for another.

They now follow firmware 13.42's module: a layout the title's SDK does not
know returns INVALID_KEYBOARD_TYPE, and below PS5 SDK 0x04000000 or PS4
SDK 0x09000000 the Y and Z keys of layouts 2, 3 and 12 are swapped.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
BunnyFlandClaude Opus 5.5 committed 2026-10-29 11:14:39 +01:00
1 parent f99d7fece3
commit 525bc94840
3 files changed
+52 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/libs/tests/GuestConvertKeycode.cpp
+23 -9
View File
@@ -139,16 +139,28 @@ int main() {
Require(sceConvertKeycodeGetVirtualKeycode(100, 4, &virtualKey) == 0 && virtualKey == 255);
Require(sceConvertKeycodeGetVirtualKeycode(136, 24, &virtualKey) == 0 && virtualKey == 21);
Require(sceConvertKeycodeGetVirtualKeycode(65535, 4, &virtualKey) == 0 && virtualKey == 255);
for (std::uint32_t layout : {2u, 3u, 12u, 31u, 39u}) {
virtualKey = 0xABCD;
bool rejected = false;
try {
sceConvertKeycodeGetVirtualKeycode(28, layout, &virtualKey);
} catch (const std::runtime_error&) {
rejected = true;
for (std::uint32_t layout : {2u, 3u, 12u}) {
Require(sceConvertKeycodeGetVirtualKeycode(28, layout, &virtualKey) == 0 && virtualKey == 90);
Require(sceConvertKeycodeGetVirtualKeycode(29, layout, &virtualKey) == 0 && virtualKey == 89);
}
for (std::uint32_t layout : {31u, 38u, 39u}) {
Require(sceConvertKeycodeGetVirtualKeycode(28, layout, &virtualKey) == 0 && virtualKey == 89);
}
{
constexpr std::uint32_t oldSdkVersion = 0x03000000u;
std::memcpy(process.data() + 16, &oldSdkVersion, sizeof(oldSdkVersion));
for (std::uint32_t layout : {2u, 3u, 12u}) {
Require(sceConvertKeycodeGetVirtualKeycode(28, layout, &virtualKey) == 0 && virtualKey == 89);
Require(sceConvertKeycodeGetVirtualKeycode(29, layout, &virtualKey) == 0 && virtualKey == 90);
}
Require(rejected && virtualKey == 0xABCD);
Require(sceConvertKeycodeGetVirtualKeycode(28, 31, &virtualKey) == 0 && virtualKey == 89);
char16_t rejectedCharacter = u'?';
for (std::uint32_t layout : {38u, 39u}) {
virtualKey = 0xABCD;
Require(sceConvertKeycodeGetVirtualKeycode(28, layout, &virtualKey) == static_cast<int>(0x80BC001Du) && virtualKey == 0xABCD);
Require(sceConvertKeycodeGetCharacter(28, 0, layout, &rejectedCharacter) == static_cast<int>(0x80BC001Du) && rejectedCharacter == u'?');
}
std::memcpy(process.data() + 16, &sdkVersion, sizeof(sdkVersion));
}
// The exported function with the real UserService: unknown users fail, the initial user reports the US-English default (keyboard type 20 -> IME 4).
@@ -208,6 +220,8 @@ int main() {
Require(sceConvertKeycodeGetCharacter(31, 0x4000300, 30, &character) == 0 && character == 0x200C);
Require(sceConvertKeycodeGetCharacter(32, 0x4000300, 30, &character) == 0 && character == 0x200E);
Require(sceConvertKeycodeGetCharacter(33, 0x4000300, 30, &character) == 0 && character == 0x200F);
Require(sceConvertKeycodeGetCharacter(28, 0, 31, &character) == 0 && character == u'y');
Require(sceConvertKeycodeGetCharacter(29, 0, 39, &character) == 0 && character == u'z');
for (std::uint32_t layout = 1; layout <= 30; ++layout) {
for (std::uint16_t key : {83, 224, 225, 226, 227, 228, 229, 230, 231}) {
Require(sceConvertKeycodeGetCharacter(key, 0xFFFFFFFFu, layout, &character) == 0 && character == 0);