From 956e73d839e0607bee18163b4472b2ff0076bdf8 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Wed, 4 Jun 2025 20:45:48 +0200 Subject: [PATCH] Some fixes --- src/analyzer/analysis.cpp | 2 +- src/common/platform/primitives.hpp | 4 ++++ src/windows-emulator/generic_logger.hpp | 2 +- src/windows-emulator/syscalls/thread.cpp | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/analyzer/analysis.cpp b/src/analyzer/analysis.cpp index 1316a29c..9d449519 100644 --- a/src/analyzer/analysis.cpp +++ b/src/analyzer/analysis.cpp @@ -17,7 +17,7 @@ namespace void handle_suspicious_activity(windows_emulator& win_emu, const std::string_view details) { const auto rip = win_emu.emu().read_instruction_pointer(); - win_emu.log.print(color::pink, "Suspicious: %.*s (0x%" PRIX64 ")\n", STR_VIEW_VA(details), rip); + win_emu.log.print(color::pink, "Suspicious: %.*s (0x%" PRIx64 ")\n", STR_VIEW_VA(details), rip); } emulator_callbacks::continuation handle_syscall(windows_emulator& win_emu, const uint32_t syscall_id, diff --git a/src/common/platform/primitives.hpp b/src/common/platform/primitives.hpp index ad5fa657..419e61d9 100644 --- a/src/common/platform/primitives.hpp +++ b/src/common/platform/primitives.hpp @@ -66,4 +66,8 @@ using USHORT = WORD; #define FALSE 0 #endif +static_assert(sizeof(DWORD) == 4); +static_assert(sizeof(ULONG) == 4); +static_assert(sizeof(int) == 4); + // NOLINTEND(modernize-use-using) diff --git a/src/windows-emulator/generic_logger.hpp b/src/windows-emulator/generic_logger.hpp index 54c48a50..d212dc4c 100644 --- a/src/windows-emulator/generic_logger.hpp +++ b/src/windows-emulator/generic_logger.hpp @@ -1,7 +1,7 @@ #pragma once #include -#if defined(__clang__) || defined(__GNUC__) +#if (defined(__clang__) || defined(__GNUC__)) && !defined(__MINGW64__) #define FORMAT_ATTRIBUTE(fmt_pos, var_pos) __attribute__((format(printf, fmt_pos, var_pos))) #else #define FORMAT_ATTRIBUTE(fmt_pos, var_pos) diff --git a/src/windows-emulator/syscalls/thread.cpp b/src/windows-emulator/syscalls/thread.cpp index 83a615fb..322220e3 100644 --- a/src/windows-emulator/syscalls/thread.cpp +++ b/src/windows-emulator/syscalls/thread.cpp @@ -425,7 +425,7 @@ namespace syscalls if (flags != 0) { - c.win_emu.log.error("NtGetNextThread flags %X not supported\n", flags); + c.win_emu.log.error("NtGetNextThread flags %X not supported\n", static_cast(flags)); c.emu.stop(); return STATUS_NOT_SUPPORTED; }