From bd8818c335da210fd465c674207adf6a2e803e96 Mon Sep 17 00:00:00 2001 From: Igor Pissolati Date: Tue, 22 Apr 2025 02:35:54 -0300 Subject: [PATCH] Fix failing checks --- src/common/platform/kernel_mapped.hpp | 1 + src/windows-emulator/syscalls.cpp | 2 +- src/windows-emulator/syscalls/locale.cpp | 2 +- src/windows-emulator/syscalls/port.cpp | 2 +- src/windows-emulator/syscalls/system.cpp | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/platform/kernel_mapped.hpp b/src/common/platform/kernel_mapped.hpp index f0677a3f..e58e3b3b 100644 --- a/src/common/platform/kernel_mapped.hpp +++ b/src/common/platform/kernel_mapped.hpp @@ -453,6 +453,7 @@ union TEB_SAME_TEB_FLAGS_UNION #ifndef OS_WINDOWS using LCID = DWORD; +using LANGID = WORD; #endif typedef struct _TEB64 diff --git a/src/windows-emulator/syscalls.cpp b/src/windows-emulator/syscalls.cpp index 358128c3..fce2ce37 100644 --- a/src/windows-emulator/syscalls.cpp +++ b/src/windows-emulator/syscalls.cpp @@ -187,7 +187,7 @@ namespace syscalls emulator_object>> server_port_name, emulator_object security_qos, emulator_object client_shared_memory, - emulator_object /*server_sid*/, + emulator_pointer /*server_sid*/, emulator_object server_shared_memory, emulator_object maximum_message_length, emulator_pointer connection_info, emulator_object connection_info_length); diff --git a/src/windows-emulator/syscalls/locale.cpp b/src/windows-emulator/syscalls/locale.cpp index cb4fac79..0cf09022 100644 --- a/src/windows-emulator/syscalls/locale.cpp +++ b/src/windows-emulator/syscalls/locale.cpp @@ -42,7 +42,7 @@ namespace syscalls { c.win_emu.log.print(color::dark_gray, "--> Code Page: %d\n", section_data); - const auto file_path = std::format(R"(C:\Windows\System32\C_{}.NLS)", section_data); + const auto file_path = R"(C:\Windows\System32\C_)" + std::to_string(section_data) + ".NLS"; const auto locale_file = utils::io::read_file(c.win_emu.file_sys.translate(file_path)); if (locale_file.empty()) { diff --git a/src/windows-emulator/syscalls/port.cpp b/src/windows-emulator/syscalls/port.cpp index a2a765d2..c557c15d 100644 --- a/src/windows-emulator/syscalls/port.cpp +++ b/src/windows-emulator/syscalls/port.cpp @@ -80,7 +80,7 @@ namespace syscalls emulator_object>> server_port_name, emulator_object security_qos, emulator_object client_shared_memory, - emulator_object /*server_sid*/, + emulator_pointer /*server_sid*/, emulator_object server_shared_memory, emulator_object maximum_message_length, emulator_pointer connection_info, emulator_object connection_info_length) diff --git a/src/windows-emulator/syscalls/system.cpp b/src/windows-emulator/syscalls/system.cpp index 37ead1ef..991f1aa9 100644 --- a/src/windows-emulator/syscalls/system.cpp +++ b/src/windows-emulator/syscalls/system.cpp @@ -124,7 +124,8 @@ namespace syscalls case SystemTimeZoneInformation: case SystemCurrentTimeZoneInformation: return handle_query( - c.emu, system_information, system_information_length, return_length, [&](SYSTEM_TIMEZONE_INFORMATION& tzi) { + c.emu, system_information, system_information_length, return_length, + [&](SYSTEM_TIMEZONE_INFORMATION& tzi) { memset(&tzi, 0, sizeof(tzi)); tzi.Bias = -60;