linting fixups

Author: apple1417

src/unrealsdk/game/bl2/antidebug.cpp

@@ -22,17 +22,9 @@ typedef NTSTATUS(WINAPI* NtQueryInformationProcess_func)(HANDLE ProcessHandle,
                                                          ULONG ProcessInformationLength,
                                                          PULONG ReturnLength);
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wenum-constexpr-conversion"
-#endif
-
-constexpr auto ThreadHideFromDebugger = static_cast<THREAD_INFORMATION_CLASS>(17);
-constexpr auto ProcessDebugObjectHandle = static_cast<PROCESSINFOCLASS>(30);
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
+// These are undocumented values, not in the header, treat as size_t to avoid enum conversion errors
+constexpr size_t ThreadHideFromDebugger = 17;
+constexpr size_t ProcessDebugObjectHandle = 30;
 
 // NOLINTEND(readability-identifier-naming)
 
@@ -43,7 +35,7 @@ NTSTATUS NTAPI NtSetInformationThread_hook(HANDLE ThreadHandle,
                                            PVOID ThreadInformation,
                                            ULONG ThreadInformationLength) {
     // NOLINTEND(readability-identifier-naming)
-    if (ThreadInformationClass == ThreadHideFromDebugger) {
+    if (static_cast<size_t>(ThreadInformationClass) == ThreadHideFromDebugger) {
         return STATUS_SUCCESS;
     }
 
@@ -61,7 +53,7 @@ NTSTATUS WINAPI NtQueryInformationProcess_hook(HANDLE ProcessHandle,
                                                ULONG ProcessInformationLength,
                                                PULONG ReturnLength) {
     // NOLINTEND(readability-identifier-naming)
-    if (ProcessInformationClass == ProcessDebugObjectHandle) {
+    if (static_cast<size_t>(ProcessInformationClass) == ProcessDebugObjectHandle) {
         return STATUS_PORT_NOT_SET;
     }
 

src/unrealsdk/game/selector.cpp

@@ -37,7 +37,7 @@ using all_known_games = std::tuple<BL2Hook, TPSHook>;
  * @tparam i Index of the game class being tested this iteration. Picked up automatically.
  * @param executable The executable name to match against.
  */
-template <int i = 0>
+template <size_t i = 0>
 std::unique_ptr<AbstractHook> find_correct_hook(std::string_view executable) {
     if constexpr (i >= std::tuple_size_v<all_known_games>) {
         throw std::runtime_error("Failed to find compatible game hook!");

src/unrealsdk/hook_manager.cpp

@@ -89,7 +89,7 @@ namespace {
 thread_local bool should_inject_next_call = false;
 
 bool should_log_all_calls = false;
-std::unique_ptr<std::wostream> log_all_calls_stream;
+std::wofstream log_all_calls_stream{};
 std::mutex log_all_calls_stream_mutex{};
 
 std::unordered_map<FName, utils::StringViewMap<std::wstring, List>> hooks{};
@@ -98,17 +98,17 @@ void log_all_calls(bool should_log) {
     // Only keep this file stream open while we need it
     if (should_log) {
         const std::lock_guard<std::mutex> lock(log_all_calls_stream_mutex);
-        log_all_calls_stream = std::make_unique<std::wofstream>(
+        log_all_calls_stream.open(
             utils::get_this_dll().parent_path()
                 / config::get_str("unrealsdk.log_all_calls_file").value_or("unrealsdk.calls.tsv"),
-            std::ofstream::trunc);
+            std::wofstream::trunc);
     }
 
     should_log_all_calls = should_log;
 
     if (!should_log) {
         const std::lock_guard<std::mutex> lock(log_all_calls_stream_mutex);
-        log_all_calls_stream = nullptr;
+        log_all_calls_stream.close();
     }
 }
 
@@ -219,11 +219,14 @@ const List* preprocess_hook(std::wstring_view source, const UFunction* func, con
     std::wstring func_name{};
 
     if (should_log_all_calls) {
-        func_name = func->get_path_name();
-        auto obj_name = obj->get_path_name();
+        // Extra safety check
+        if (log_all_calls_stream.is_open()) {
+            func_name = func->get_path_name();
+            auto obj_name = obj->get_path_name();
 
-        const std::lock_guard<std::mutex> lock(log_all_calls_stream_mutex);
-        *log_all_calls_stream << source << L'\t' << func_name << L'\t' << obj_name << L'\n';
+            const std::lock_guard<std::mutex> lock(log_all_calls_stream_mutex);
+            log_all_calls_stream << source << L'\t' << func_name << L'\t' << obj_name << L'\n';
+        }
     }
 
     // Check if anything matches the function FName

src/unrealsdk/unreal/structs/fname.cpp

@@ -70,7 +70,7 @@ FName::operator std::wstring() const {
     return stream.str();
 }
 
-FName operator"" _fn(const wchar_t* str, size_t /*len*/) {
+FName operator""_fn(const wchar_t* str, size_t /*len*/) {
     return FName{str};
 }
 

src/unrealsdk/unreal/structs/fname.h

@@ -63,7 +63,7 @@ struct FName {
  * @param str The string to create a name of.
  * @param len The length of the string.
  */
-FName operator"" _fn(const wchar_t* str, size_t len);
+FName operator""_fn(const wchar_t* str, size_t len);
 
 }  // namespace unrealsdk::unreal
 

src/unrealsdk/unreal/structs/gnames.cpp

@@ -11,7 +11,7 @@ bool FNameEntry::is_wide(void) const {
 #ifdef UE4
 
 FNameEntry* TStaticIndirectArrayThreadSafeRead_FNameEntry::at(size_t idx) const {
-    if (idx >= (size_t)this->Count) {
+    if (std::cmp_greater_equal(idx, this->Count)) {
         throw std::out_of_range("FNameEntry index out of range");
     }
     // NOLINTBEGIN(cppcoreguidelines-pro-bounds-pointer-arithmetic,

src/unrealsdk/unreal/structs/gobjects.cpp

@@ -7,7 +7,7 @@ namespace unrealsdk::unreal {
 #ifdef UE4
 
 FUObjectItem* FChunkedFixedUObjectArray::at(size_t idx) const {
-    if (idx >= (size_t)this->Count) {
+    if (std::cmp_greater_equal(idx, this->Count)) {
         throw std::out_of_range("FChunkedFixedUObjectArray index out of range");
     }
     // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)

src/unrealsdk/unreal/structs/tpersistentobjectptr.cpp

@@ -17,7 +17,7 @@ template <typename T>
 const TPersistentObjectPtr<T>* get_addr_from(const UObject* obj,
                                              const UObjectProperty* prop,
                                              size_t idx) {
-    if (idx >= (size_t)prop->ArrayDim) {
+    if (std::cmp_greater_equal(idx, prop->ArrayDim)) {
         throw std::out_of_range("Property index out of range");
     }
 
@@ -29,7 +29,7 @@ template <typename T>
 const TPersistentObjectPtr<T>* get_addr_from(const WrappedStruct& wrapped_struct,
                                              const UObjectProperty* prop,
                                              size_t idx) {
-    if (idx >= (size_t)prop->ArrayDim) {
+    if (std::cmp_greater_equal(idx, prop->ArrayDim)) {
         throw std::out_of_range("Property index out of range");
     }
 
@@ -44,7 +44,7 @@ const TPersistentObjectPtr<T>* get_addr_from_array(const WrappedArray& array, si
         throw std::invalid_argument("WrappedArray property was of invalid type "
                                     + (std::string)array.type->Class->Name);
     }
-    if (idx >= (size_t)array.base->count) {
+    if (std::cmp_greater_equal(idx, array.base->count)) {
         throw std::out_of_range("WrappedArray index out of range");
     }
 

src/unrealsdk/unreal/wrappers/gnames.cpp

@@ -15,7 +15,7 @@ size_t GNames::size(void) const {
 }
 
 FNameEntry* GNames::at(size_t idx) const {
-    if (idx >= (size_t)this->internal->Count) {
+    if (std::cmp_greater_equal(idx, this->internal->Count)) {
         throw std::out_of_range("GObjects index out of range");
     }
     return this->internal->at(idx);

src/unrealsdk/unreal/wrappers/gobjects.cpp

@@ -77,7 +77,7 @@ size_t GObjects::size(void) const {
 }
 
 UObject* GObjects::obj_at(size_t idx) const {
-    if (idx >= (size_t)this->internal->ObjObjects.Count) {
+    if (std::cmp_greater_equal(idx, this->internal->ObjObjects.Count)) {
         throw std::out_of_range("GObjects index out of range");
     }
     return this->internal->ObjObjects.at(idx)->Object;