Minor code improvements, no functional change

Author: RatinCN

Source/Demo/Instruction.c

@@ -43,11 +43,10 @@ static FN_INSTRUCTION** g_apfnInstructionFunctions[] = {
 
 TEST_FUNC(Instruction)
 {
-    ULONG i;
     HRESULT hr;
     FN_INSTRUCTION *pfn1, *pfn2;
 
-    for (i = 0; i < ARRAYSIZE(g_apfnInstructionFunctions) && g_apfnInstructionFunctions[i] != NULL; i++)
+    for (ULONG i = 0; i < ARRAYSIZE(g_apfnInstructionFunctions) && g_apfnInstructionFunctions[i] != NULL; i++)
     {
         pfn2 = pfn1 = *g_apfnInstructionFunctions[i];
         if (pfn1() != (ULONG_PTR)PRESET_RETURN_VALUE)

Source/Demo/TwiceSimpleHook.c

@@ -48,22 +48,22 @@ TEST_FUNC(TwiceSimpleHook)
     }
 
     g_pfnEqualRect1 = g_pfnEqualRect2 = g_pfnEqualRect;
-    hr = SlimDetoursInlineHook(TRUE, (PVOID)&g_pfnEqualRect1, Hooked_EqualRect1);
+    hr = SlimDetoursInlineHook(TRUE, (PVOID*)&g_pfnEqualRect1, Hooked_EqualRect1);
     if (FAILED(hr))
     {
         TEST_SKIP("1st SlimDetoursInlineHook failed with 0x%08lX\n", hr);
         return;
     }
-    hr = SlimDetoursInlineHook(TRUE, (PVOID)&g_pfnEqualRect2, Hooked_EqualRect2);
+    hr = SlimDetoursInlineHook(TRUE, (PVOID*)&g_pfnEqualRect2, Hooked_EqualRect2);
     if (FAILED(hr))
     {
         TEST_SKIP("2nd SlimDetoursInlineHook failed with 0x%08lX\n", hr);
         return;
     }
 
-    g_pfnEqualRect(&rc, &rc);
+    TEST_OK(g_pfnEqualRect(&rc, &rc) != FALSE);
     TEST_OK(g_lEqualRect == 2);
 
-    TEST_OK(SUCCEEDED(SlimDetoursInlineHook(FALSE, (PVOID)&g_pfnEqualRect2, Hooked_EqualRect2)));
-    TEST_OK(SUCCEEDED(SlimDetoursInlineHook(FALSE, (PVOID)&g_pfnEqualRect1, Hooked_EqualRect1)));
+    TEST_OK(SUCCEEDED(SlimDetoursInlineHook(FALSE, (PVOID*)&g_pfnEqualRect2, Hooked_EqualRect2)));
+    TEST_OK(SUCCEEDED(SlimDetoursInlineHook(FALSE, (PVOID*)&g_pfnEqualRect1, Hooked_EqualRect1)));
 }

Source/SlimDetours/InlineHook.c

@@ -42,7 +42,7 @@ SlimDetoursInitInlineHooks(
 
     for (i = 0; i < ulCount; i++)
     {
-        if ((UINT_PTR)pHooks[i].pszFuncName > MAXWORD)
+        if ((ULONG_PTR)pHooks[i].pszFuncName > MAXWORD)
         {
             Status = RtlInitAnsiStringEx(&FuncName, pHooks[i].pszFuncName);
             if (!NT_SUCCESS(Status))
@@ -54,7 +54,7 @@ SlimDetoursInitInlineHooks(
         } else
         {
             pFuncName = NULL;
-            uOridinal = (ULONG)(UINT_PTR)pHooks[i].pszFuncName;
+            uOridinal = (ULONG)(ULONG_PTR)pHooks[i].pszFuncName;
         }
         Status = LdrGetProcedureAddress(hModule, pFuncName, uOridinal, pHooks[i].ppPointer);
         if (!NT_SUCCESS(Status))

Source/SlimDetours/Thread.c

@@ -248,7 +248,7 @@ detour_thread_suspend(
     goto _Suspend_next_thread;
 
 _Fail:
-    for (UINT i = 0; i < SuspendedCount; ++i)
+    for (ULONG i = 0; i < SuspendedCount; ++i)
     {
         NtResumeThread(Buffer[i], NULL);
         NtClose(Buffer[i]);
@@ -273,9 +273,7 @@ detour_thread_resume(
     _In_reads_(SuspendedHandleCount) _Frees_ptr_ PHANDLE SuspendedHandles,
     _In_ ULONG SuspendedHandleCount)
 {
-    ULONG i;
-
-    for (i = 0; i < SuspendedHandleCount; i++)
+    for (ULONG i = 0; i < SuspendedHandleCount; i++)
     {
         NtResumeThread(SuspendedHandles[i], NULL);
         NtClose(SuspendedHandles[i]);
@@ -293,7 +291,6 @@ detour_thread_update(
     _In_ PDETOUR_OPERATION PendingOperations)
 {
     NTSTATUS Status;
-    PDETOUR_OPERATION o;
     CONTEXT cxt;
     BOOL bUpdateContext;
 
@@ -316,7 +313,7 @@ detour_thread_update(
     }
 
     bUpdateContext = FALSE;
-    for (o = PendingOperations; o != NULL && !bUpdateContext; o = o->pNext)
+    for (PDETOUR_OPERATION o = PendingOperations; o != NULL && !bUpdateContext; o = o->pNext)
     {
         if (o->fIsRemove)
         {

Source/SlimDetours/Trampoline.c

@@ -432,9 +432,7 @@ detour_align_from_trampoline(
     _In_ PDETOUR_TRAMPOLINE pTrampoline,
     BYTE obTrampoline)
 {
-    ULONG n;
-
-    for (n = 0; n < ARRAYSIZE(pTrampoline->rAlign); n++)
+    for (ULONG n = 0; n < ARRAYSIZE(pTrampoline->rAlign); n++)
     {
         if (pTrampoline->rAlign[n].obTrampoline == obTrampoline)
         {
@@ -449,9 +447,7 @@ detour_align_from_target(
     _In_ PDETOUR_TRAMPOLINE pTrampoline,
     BYTE obTarget)
 {
-    ULONG n;
-
-    for (n = 0; n < ARRAYSIZE(pTrampoline->rAlign); n++)
+    for (ULONG n = 0; n < ARRAYSIZE(pTrampoline->rAlign); n++)
     {
         if (pTrampoline->rAlign[n].obTarget == obTarget)
         {