[SLIMDETOURS] Code improvements, no functional changes

KNSoft · Aug 9, 2024 · b68c239 · b68c239
1 parent 0939099
commit b68c239
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Source/Demo/Main.c b/Source/Demo/Main.c
@@ -68,7 +68,7 @@ Hooked_EqualRect(
     BOOL Ret;
 
     InterlockedIncrement(&g_lEqualRectCount);
-    UnitTest_FormatMessage("Hooked EqualRect enter: lprc1 = (%d, %d, %d, %d), lprc2 = (%d, %d, %d, %d)\n",
+    UnitTest_FormatMessage("Hooked EqualRect enter: lprc1 = (%ld, %ld, %ld, %ld), lprc2 = (%ld, %ld, %ld, %ld)\n",
                            lprc1->top,
                            lprc1->right,
                            lprc1->bottom,

diff --git a/Source/SlimDetours/SlimDetours.inl b/Source/SlimDetours/SlimDetours.inl
@@ -9,8 +9,6 @@
 
 /* Use ReactOS NDK with addendum on ReactOS */
 
-#include "SlimDetours.NDK.Addendum.inl"
-
 #define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
@@ -25,6 +23,8 @@
 
 #include <suppress.h>
 
+#include "SlimDetours.NDK.Addendum.inl"
+
 #endif
 
 #include "SlimDetours.h"

diff --git a/Source/SlimDetours/Transaction.c b/Source/SlimDetours/Transaction.c
@@ -36,15 +36,6 @@ struct _DETOUR_DELAY_ATTACH
     PVOID Context;
 };
 
-#endif /* (NTDDI_VERSION >= NTDDI_WIN6) */
-
-static HANDLE s_nPendingThreadId = 0; // Thread owning pending transaction.
-static PHANDLE s_phSuspendedThreads = NULL;
-static ULONG s_ulSuspendedThreadCount = 0;
-static PDETOUR_OPERATION s_pPendingOperations = NULL;
-
-#if (NTDDI_VERSION >= NTDDI_WIN6)
-
 static const ANSI_STRING g_asLdrRegisterDllNotification = RTL_CONSTANT_STRING("LdrRegisterDllNotification");
 static FN_LdrRegisterDllNotification* g_pfnLdrRegisterDllNotification = NULL;
 static NTSTATUS g_lDelayAttachStatus = STATUS_UNSUCCESSFUL;
@@ -55,6 +46,11 @@ static PDETOUR_DELAY_ATTACH g_DelayedAttaches = NULL;
 
 #endif /* (NTDDI_VERSION >= NTDDI_WIN6) */
 
+static HANDLE s_nPendingThreadId = 0; // Thread owning pending transaction.
+static PHANDLE s_phSuspendedThreads = NULL;
+static ULONG s_ulSuspendedThreadCount = 0;
+static PDETOUR_OPERATION s_pPendingOperations = NULL;
+
 HRESULT
 NTAPI
 SlimDetoursTransactionBegin(VOID)
@@ -696,9 +692,13 @@ SlimDetoursDelayAttach(
     PDETOUR_DELAY_ATTACH NewNode;
 
     /* Don't need try/except */
+#ifdef _MSC_VER
 #pragma warning(disable: __WARNING_PROBE_NO_TRY)
+#endif
     Status = RtlRunOnceExecuteOnce(&g_stInitDelayAttach, detour_init_delay_attach, NULL, NULL);
+#ifdef _MSC_VER
 #pragma warning(default: __WARNING_PROBE_NO_TRY)
+#endif
     if (!NT_SUCCESS(Status))
     {
         return HRESULT_FROM_NT(Status);