From c1195fdb2b44819311ab5f31417914c1fbcd49c4 Mon Sep 17 00:00:00 2001 From: Lander Gallastegi Date: Sun, 6 Oct 2024 13:45:21 +0200 Subject: [PATCH] Fix building on windows --- src/core/libraries/dialogs/ime_dialog.h | 4 ++-- src/core/libraries/dialogs/ime_dialog_ui.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/core/libraries/dialogs/ime_dialog.h b/src/core/libraries/dialogs/ime_dialog.h index 24ca8b340..b26e4489e 100755 --- a/src/core/libraries/dialogs/ime_dialog.h +++ b/src/core/libraries/dialogs/ime_dialog.h @@ -180,10 +180,10 @@ struct OrbisImeKeycode { u64 timestamp; }; -typedef int (*OrbisImeTextFilter)(char16_t* outText, u32* outTextLength, const char16_t* srcText, +typedef PS4_SYSV_ABI int (*OrbisImeTextFilter)(char16_t* outText, u32* outTextLength, const char16_t* srcText, u32 srcTextLength); -typedef int (*OrbisImeExtKeyboardFilter)(const OrbisImeKeycode* srcKeycode, u16* outKeycode, +typedef PS4_SYSV_ABI int (*OrbisImeExtKeyboardFilter)(const OrbisImeKeycode* srcKeycode, u16* outKeycode, u32* outStatus, void* reserved); struct OrbisImeDialogParam { diff --git a/src/core/libraries/dialogs/ime_dialog_ui.cpp b/src/core/libraries/dialogs/ime_dialog_ui.cpp index 083907d32..f50f7a98a 100755 --- a/src/core/libraries/dialogs/ime_dialog_ui.cpp +++ b/src/core/libraries/dialogs/ime_dialog_ui.cpp @@ -303,9 +303,9 @@ bool ImeDialogState::ConvertOrbisCharToUTF8(const char16_t orbis_char, char* utf UNREACHABLE_MSG("UTF-8 character is never more than 4 bytes"); } - *utf8_char_len = WideCharToMultiByte(CP_UTF8, 0, reinterpret_cast(&orbis_char), 1, utf8_char, 4, nullptr, nullptr); + utf8_char_len = WideCharToMultiByte(CP_UTF8, 0, reinterpret_cast(&orbis_char), 1, utf8_char, 4, nullptr, nullptr); - return *utf8_char_len != 0; + return utf8_char_len != 0; #endif } @@ -469,12 +469,10 @@ void ImeDialogUi::DrawInputText() { } void ImeDialogUi::DrawMultiLineInputText() { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" - if (InputTextEx("##ImeDialogInput", state->placeholder, state->current_text, state->max_text_length, ImVec2(380.0f, 100.0f), ImGuiInputTextFlags_CallbackCharFilter | ImGuiInputTextFlags_Multiline, InputTextCallback, this)) { + ImGuiInputTextFlags flags = ImGuiInputTextFlags_CallbackCharFilter | static_cast(ImGuiInputTextFlags_Multiline); + if (InputTextEx("##ImeDialogInput", state->placeholder, state->current_text, state->max_text_length, ImVec2(380.0f, 100.0f), flags, InputTextCallback, this)) { state->input_changed = true; } -#pragma clang diagnostic pop } int ImeDialogUi::InputTextCallback(ImGuiInputTextCallbackData* data) {