From 742aa5423d5e2173554b0afb16130e4b2a154537 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 18 Mar 2026 05:11:28 +0000 Subject: [PATCH] windows 1 --- src/core/hle/ipc.h | 5 ++++- src/core/hle/kernel/k_server_session.cpp | 4 ++-- src/core/hle/service/bcat/news/builtin_news.cpp | 6 ++++-- src/core/hle/service/fatal/fatal.cpp | 8 ++++---- src/core/hle/service/hle_ipc.cpp | 2 +- src/frontend_common/update_checker.cpp | 4 +++- src/qt_common/discord/discord_impl.cpp | 4 +++- src/web_service/web_backend.cpp | 4 +++- src/yuzu/configuration/configure_system.cpp | 7 +++---- 9 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h index 416da15ecb..bc82daec9d 100644 --- a/src/core/hle/ipc.h +++ b/src/core/hle/ipc.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2016 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -166,7 +169,7 @@ static_assert(sizeof(DataPayloadHeader) == 8, "DataPayloadHeader size is incorre struct DomainMessageHeader { enum class CommandType : u32_le { - SendMessage = 1, + SendMessageWith = 1, CloseVirtualHandle = 2, }; diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index 4c91235ac9..42b50b9945 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -859,7 +859,7 @@ Result ProcessSendMessagePointerDescriptors(int& offset, int& pointer_key, R_SUCCEED(); } -Result SendMessage(KernelCore& kernel, uint64_t src_message_buffer, size_t src_buffer_size, +Result SendMessageWith(KernelCore& kernel, uint64_t src_message_buffer, size_t src_buffer_size, KPhysicalAddress src_message_paddr, KThread& dst_thread, uint64_t dst_message_buffer, size_t dst_buffer_size, KServerSession* session, KSessionRequest* request) { @@ -1263,7 +1263,7 @@ Result KServerSession::SendReply(uintptr_t server_message, uintptr_t server_buff // HLE servers write directly to a pointer to the thread command buffer. Therefore // the reply has already been written in this case. } else { - result = SendMessage(m_kernel, server_message, server_buffer_size, server_message_paddr, + result = SendMessageWith(m_kernel, server_message, server_buffer_size, server_message_paddr, *client_thread, client_message, client_buffer_size, this, request); } } else if (!is_hle) { diff --git a/src/core/hle/service/bcat/news/builtin_news.cpp b/src/core/hle/service/bcat/news/builtin_news.cpp index dd27723a90..f582da4fd6 100644 --- a/src/core/hle/service/bcat/news/builtin_news.cpp +++ b/src/core/hle/service/bcat/news/builtin_news.cpp @@ -16,8 +16,10 @@ #include #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -#include -#undef INVALID_SOCKET +# include +# ifndef _WIN32 +# undef INVALID_SOCKET +# endif #endif #include diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 5b281a725a..f5659369c1 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp @@ -8,8 +8,8 @@ #include #include #include -#include "common/logging.h" #include "common/scm_rev.h" +#include "common/logging.h" #include "common/swap.h" #include "core/core.h" #include "core/hle/service/fatal/fatal.h" @@ -44,7 +44,7 @@ struct FatalInfo { u64_le afsr0{}; u64_le afsr1{}; u64_le esr{}; - u64_le far{}; + u64_le far_{}; //windows defines far std::array backtrace{}; u64_le program_entry_point{}; @@ -90,7 +90,7 @@ static void GenerateErrorReport(Core::System& system, Result error_code, const F crash_report += fmt::format(" AFSR0: {:016x}\n", info.afsr0); crash_report += fmt::format(" AFSR1: {:016x}\n", info.afsr1); crash_report += fmt::format(" ESR: {:016x}\n", info.esr); - crash_report += fmt::format(" FAR: {:016x}\n", info.far); + crash_report += fmt::format(" FAR: {:016x}\n", info.far_); crash_report += "\nBacktrace:\n"; for (u32 i = 0; i < std::min(info.backtrace_size, 32); i++) { crash_report += @@ -105,7 +105,7 @@ static void GenerateErrorReport(Core::System& system, Result error_code, const F system.GetReporter().SaveCrashReport( title_id, error_code, info.set_flags, info.program_entry_point, info.sp, info.pc, - info.pstate, info.afsr0, info.afsr1, info.esr, info.far, info.registers, info.backtrace, + info.pstate, info.afsr0, info.afsr1, info.esr, info.far_, info.registers, info.backtrace, info.backtrace_size, info.ArchAsString(), info.unk10); } diff --git a/src/core/hle/service/hle_ipc.cpp b/src/core/hle/service/hle_ipc.cpp index 8569d2bad8..f42b473980 100644 --- a/src/core/hle/service/hle_ipc.cpp +++ b/src/core/hle/service/hle_ipc.cpp @@ -96,7 +96,7 @@ Result SessionRequestManager::HandleDomainSyncRequest(Kernel::KServerSession* se const auto& domain_message_header = context.GetDomainMessageHeader(); const u32 object_id{domain_message_header.object_id}; switch (domain_message_header.command) { - case IPC::DomainMessageHeader::CommandType::SendMessage: + case IPC::DomainMessageHeader::CommandType::SendMessageWith: if (object_id > this->DomainHandlerCount()) { LOG_CRITICAL(IPC, "object_id {} is too big! This probably means a recent service call " diff --git a/src/frontend_common/update_checker.cpp b/src/frontend_common/update_checker.cpp index 68aadb0e0a..3594486e9d 100644 --- a/src/frontend_common/update_checker.cpp +++ b/src/frontend_common/update_checker.cpp @@ -14,7 +14,9 @@ #include "update_checker.h" #include -#undef INVALID_SOCKET +#ifndef _WIN32 +# undef INVALID_SOCKET +#endif #ifdef YUZU_BUNDLED_OPENSSL #include diff --git a/src/qt_common/discord/discord_impl.cpp b/src/qt_common/discord/discord_impl.cpp index 8d03a7a407..b48eb9448d 100644 --- a/src/qt_common/discord/discord_impl.cpp +++ b/src/qt_common/discord/discord_impl.cpp @@ -10,7 +10,9 @@ #include #include #include -#undef INVALID_SOCKET +#ifndef _WIN32 +# undef INVALID_SOCKET +#endif #include #include diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp index 08413cbeb8..98f9ade9ad 100644 --- a/src/web_service/web_backend.cpp +++ b/src/web_service/web_backend.cpp @@ -17,7 +17,9 @@ #endif #endif #include -#undef INVALID_SOCKET +#ifndef _WIN32 +# undef INVALID_SOCKET +#endif #ifdef __GNUC__ #pragma GCC diagnostic pop #endif diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 36920b1ff9..896fee2cc2 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -41,10 +41,9 @@ constexpr std::array LOCALE_BLOCKLIST{ 0b0100111100001000000, // Taiwan }; -static bool IsValidLocale(u32 region_index, u32 language_index) { - if (region_index >= LOCALE_BLOCKLIST.size()) { +static bool IsValidSystemLocale(u32 region_index, u32 language_index) { + if (region_index >= LOCALE_BLOCKLIST.size()) return false; - } return ((LOCALE_BLOCKLIST.at(region_index) >> language_index) & 1) == 0; } @@ -64,7 +63,7 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, const auto locale_check = [this]() { const auto region_index = combo_region->currentIndex(); const auto language_index = combo_language->currentIndex(); - const bool valid_locale = IsValidLocale(region_index, language_index); + const bool valid_locale = IsValidSystemLocale(region_index, language_index); ui->label_warn_invalid_locale->setVisible(!valid_locale); if (!valid_locale) { ui->label_warn_invalid_locale->setText(