From ef8a9dae6ef46bb568502729fddc29fa0e38d377 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 18 Mar 2025 19:50:13 +0100 Subject: [PATCH] Fix warnings --- src/common/platform/file_management.hpp | 4 ++++ src/common/platform/kernel_mapped.hpp | 12 ++++++++---- src/common/platform/memory.hpp | 4 ++++ src/common/platform/platform.hpp | 12 ++++++++---- src/common/platform/primitives.hpp | 8 ++++++-- src/common/platform/process.hpp | 4 ++++ src/common/platform/registry.hpp | 4 ++++ src/common/platform/synchronisation.hpp | 4 ++++ src/common/platform/threading.hpp | 4 ++++ src/common/platform/unicode.hpp | 2 +- src/common/platform/win_pefile.hpp | 4 ++++ src/common/utils/string.hpp | 2 +- src/emulator/memory_permission.hpp | 8 ++++---- src/emulator/serialization.hpp | 4 ++-- 14 files changed, 58 insertions(+), 18 deletions(-) diff --git a/src/common/platform/file_management.hpp b/src/common/platform/file_management.hpp index 528965f5..bbef40df 100644 --- a/src/common/platform/file_management.hpp +++ b/src/common/platform/file_management.hpp @@ -1,5 +1,7 @@ #pragma once +// NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + #define ACCESS_MASK DWORD #define DEVICE_TYPE DWORD @@ -408,3 +410,5 @@ typedef struct _REMOTE_PORT_VIEW64 EMULATOR_CAST(std::int64_t, SIZE_T) ViewSize; EmulatorTraits::PVOID ViewBase; } REMOTE_PORT_VIEW64, *PREMOTE_PORT_VIEW64; + +// NOLINTEND(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) diff --git a/src/common/platform/kernel_mapped.hpp b/src/common/platform/kernel_mapped.hpp index 2dae3215..83dd548e 100644 --- a/src/common/platform/kernel_mapped.hpp +++ b/src/common/platform/kernel_mapped.hpp @@ -2,6 +2,8 @@ #include +// NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + #define PROCESSOR_FEATURE_MAX 64 #define GDI_HANDLE_BUFFER_SIZE64 60 #define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_RELEASE_ON_DEACTIVATION 0x00000001 @@ -388,10 +390,10 @@ typedef struct _GDI_TEB_BATCH64 #ifndef OS_WINDOWS typedef struct _GUID { - unsigned long Data1; - unsigned short Data2; - unsigned short Data3; - unsigned char Data4[8]; + uint32_t Data1; + uint16_t Data2; + uint16_t Data3; + uint8_t Data4[8]; } GUID; typedef struct _PROCESSOR_NUMBER @@ -913,3 +915,5 @@ struct PROCESS_TLS_INFO }; static_assert(sizeof(PROCESS_TLS_INFO) - sizeof(THREAD_TLS_INFO) == 0x10); + +// NOLINTEND(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) diff --git a/src/common/platform/memory.hpp b/src/common/platform/memory.hpp index 7d2dcbd0..13779235 100644 --- a/src/common/platform/memory.hpp +++ b/src/common/platform/memory.hpp @@ -1,5 +1,7 @@ #pragma once +// NOLINTBEGIN(modernize-use-using) + #define PAGE_EXECUTE 0x10 #define PAGE_EXECUTE_READ 0x20 #define PAGE_EXECUTE_READWRITE 0x40 @@ -127,3 +129,5 @@ typedef struct _MEMORY_REGION_INFORMATION DWORD64 PartitionId; // 19H1 DWORD64 NodePreference; // 20H1 } MEMORY_REGION_INFORMATION64, *PMEMORY_REGION_INFORMATION64; + +// NOLINTEND(modernize-use-using) diff --git a/src/common/platform/platform.hpp b/src/common/platform/platform.hpp index 91490952..f26dc677 100644 --- a/src/common/platform/platform.hpp +++ b/src/common/platform/platform.hpp @@ -4,7 +4,9 @@ #pragma warning(push) #pragma warning(disable : 4201) // nameless struct/union #pragma warning(disable : 4702) // unreachable code -#else +#endif + +#if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpedantic" #endif @@ -24,8 +26,10 @@ #include "network.hpp" #include "threading.hpp" -#ifdef OS_WINDOWS -#pragma warning(pop) -#else +#if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic pop #endif + +#ifdef OS_WINDOWS +#pragma warning(pop) +#endif diff --git a/src/common/platform/primitives.hpp b/src/common/platform/primitives.hpp index 9db43fb5..b30f7373 100644 --- a/src/common/platform/primitives.hpp +++ b/src/common/platform/primitives.hpp @@ -2,6 +2,8 @@ #include +// NOLINTBEGIN(modernize-use-using) + #ifdef OS_WINDOWS #define WIN32_LEAN_AND_MEAN @@ -51,10 +53,10 @@ using BYTE = std::uint8_t; using WORD = std::uint16_t; -#define UCHAR unsigned char +#define UCHAR uint8_t #define BOOLEAN UCHAR -using CSHORT = short; +using CSHORT = int16_t; using USHORT = WORD; #define DUMMYSTRUCTNAME @@ -63,3 +65,5 @@ using USHORT = WORD; #define TRUE 1 #define FALSE 0 #endif + +// NOLINTEND(modernize-use-using) diff --git a/src/common/platform/process.hpp b/src/common/platform/process.hpp index 8b989f65..88d4712c 100644 --- a/src/common/platform/process.hpp +++ b/src/common/platform/process.hpp @@ -1,5 +1,7 @@ #pragma once +// NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + #define CONTEXT_X86_MAIN 0x00010000 #define CONTEXT_AMD64_MAIN 0x100000 #define CONTEXT_CONTROL_32 (CONTEXT_X86_MAIN | 0x1L) @@ -1005,3 +1007,5 @@ _Struct_size_bytes_(Size) struct EMU_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX64 EMU_GROUP_RELATIONSHIP64 Group; }; }; + +// NOLINTEND(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) diff --git a/src/common/platform/registry.hpp b/src/common/platform/registry.hpp index e2ec50cd..7f76d0ae 100644 --- a/src/common/platform/registry.hpp +++ b/src/common/platform/registry.hpp @@ -1,5 +1,7 @@ #pragma once +// NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + typedef enum _KEY_INFORMATION_CLASS { KeyBasicInformation, // KEY_BASIC_INFORMATION @@ -77,3 +79,5 @@ struct KEY_VALUE_FULL_INFORMATION ULONG NameLength; char16_t Name[1]; }; + +// NOLINTEND(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) diff --git a/src/common/platform/synchronisation.hpp b/src/common/platform/synchronisation.hpp index a04037b0..bca5bf09 100644 --- a/src/common/platform/synchronisation.hpp +++ b/src/common/platform/synchronisation.hpp @@ -1,5 +1,7 @@ #pragma once +// NOLINTBEGIN(modernize-use-using) + typedef enum _EVENT_TYPE { NotificationEvent, @@ -14,3 +16,5 @@ typedef enum _WAIT_TYPE WaitDequeue, WaitDpc, } WAIT_TYPE; + +// NOLINTEND(modernize-use-using) diff --git a/src/common/platform/threading.hpp b/src/common/platform/threading.hpp index f3fe70fd..96e61816 100644 --- a/src/common/platform/threading.hpp +++ b/src/common/platform/threading.hpp @@ -1,5 +1,7 @@ #pragma once +// NOLINTBEGIN(modernize-use-using) + typedef enum _THREADINFOCLASS { ThreadBasicInformation, // q: THREAD_BASIC_INFORMATION @@ -87,3 +89,5 @@ typedef struct _THREAD_TEB_INFORMATION ULONG TebOffset; // Offset in TEB to begin reading from. ULONG BytesToRead; // Number of bytes to read. } THREAD_TEB_INFORMATION, *PTHREAD_TEB_INFORMATION; + +// NOLINTEND(modernize-use-using) diff --git a/src/common/platform/unicode.hpp b/src/common/platform/unicode.hpp index e232958a..f76bac36 100644 --- a/src/common/platform/unicode.hpp +++ b/src/common/platform/unicode.hpp @@ -13,7 +13,7 @@ struct UNICODE_STRING inline std::u16string u8_to_u16(const std::string_view view) { - return std::u16string(view.begin(), view.end()); + return {view.begin(), view.end()}; } inline std::string u16_to_u8(const std::u16string_view u16_view) diff --git a/src/common/platform/win_pefile.hpp b/src/common/platform/win_pefile.hpp index 24acb4ab..d73222af 100644 --- a/src/common/platform/win_pefile.hpp +++ b/src/common/platform/win_pefile.hpp @@ -2,6 +2,8 @@ #include +// NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 // Export Directory #define IMAGE_DIRECTORY_ENTRY_IMPORT 1 // Import Directory #define IMAGE_DIRECTORY_ENTRY_RESOURCE 2 // Resource Directory @@ -339,3 +341,5 @@ struct SECTION_IMAGE_INFORMATION ULONG ImageFileSize; ULONG CheckSum; }; + +// NOLINTEND(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) diff --git a/src/common/utils/string.hpp b/src/common/utils/string.hpp index 401738b7..d52fb816 100644 --- a/src/common/utils/string.hpp +++ b/src/common/utils/string.hpp @@ -24,7 +24,7 @@ namespace utils::string inline wchar_t char_to_lower(const wchar_t val) { - return std::towlower(val); + return static_cast(std::towlower(val)); } template diff --git a/src/emulator/memory_permission.hpp b/src/emulator/memory_permission.hpp index 4c044563..00e7628b 100644 --- a/src/emulator/memory_permission.hpp +++ b/src/emulator/memory_permission.hpp @@ -15,22 +15,22 @@ enum class memory_permission : uint8_t * ****************************************************************************/ -inline constexpr memory_permission operator&(const memory_permission x, const memory_permission y) +constexpr memory_permission operator&(const memory_permission x, const memory_permission y) { return static_cast(static_cast(x) & static_cast(y)); } -inline constexpr memory_permission operator|(const memory_permission x, const memory_permission y) +constexpr memory_permission operator|(const memory_permission x, const memory_permission y) { return static_cast(static_cast(x) | static_cast(y)); } -inline constexpr memory_permission operator^(const memory_permission x, const memory_permission y) +constexpr memory_permission operator^(const memory_permission x, const memory_permission y) { return static_cast(static_cast(x) ^ static_cast(y)); } -inline constexpr memory_permission operator~(memory_permission x) +constexpr memory_permission operator~(memory_permission x) { return static_cast(~static_cast(x)); } diff --git a/src/emulator/serialization.hpp b/src/emulator/serialization.hpp index 4693ce3e..53fab16a 100644 --- a/src/emulator/serialization.hpp +++ b/src/emulator/serialization.hpp @@ -499,8 +499,8 @@ namespace utils std::optional get_diff(const buffer_serializer& other) const { - auto& b1 = this->get_buffer(); - auto& b2 = other.get_buffer(); + const auto& b1 = this->get_buffer(); + const auto& b2 = other.get_buffer(); const auto s1 = b1.size(); const auto s2 = b2.size();