[SYNC] Update KNSoft.NDK and minor code improvements, no functional changes

RatinCN · RatinCN · commit 42d380817b73 · 2025-12-25T17:55:59.000+08:00
diff --git a/Source/Demo/COMHook.c b/Source/Demo/COMHook.c
@@ -7,6 +7,7 @@
  * This demo may crash on ARM64 host, see opening issues:
  *   https://github.com/microsoft/Detours/issues/292
  *   https://github.com/microsoft/Detours/issues/355
+ * it may be related to ARM64 emulators, there’s nothing we can do.
  */
 
 #include "Demo.h"
@@ -15,17 +16,8 @@
 
 #pragma comment(lib, "shlwapi.lib")
 
-typedef
-HRESULT
-STDMETHODCALLTYPE
-FN_IStream_Read(
-    IStream* This,
-    _Out_writes_bytes_to_(cb, *pcbRead) void* pv,
-    _In_ ULONG cb,
-    _Out_opt_ ULONG* pcbRead);
-
 static IStream* g_pStream = NULL;
-static FN_IStream_Read* g_pfnIStream_Read = NULL;
+static FIELD_TYPE(IStream, lpVtbl->Read) g_pfnIStream_Read = NULL;
 static LONG volatile g_lCount = 0;
 static ULONG g_ulValue = 123, g_ulRead = 0;
 
@@ -50,12 +42,13 @@ Hooked_IStream_Read(
 
 TEST_FUNC(COMHook)
 {
-    /* FIXME: Skip in incompatible cases, see issues mentioned in the head */
-    if (SharedUserData->NativeProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64)
+    /* FIXME: Skip incompatible cases, see issues mentioned in the head */
+    if (GET_NT_VERSION() >= NT_VERSION_WIN10 &&
+        SharedUserData->NativeProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64 &&
+        NtReadTeb(WowTebOffset) != 0)
     {
-#if defined(_M_IX86) || defined(_M_X64)
         TEST_SKIP("FIXME: COM Hook has issues in non-native environments on ARM64\n");
-#endif
+        return;
     }
 
     HRESULT hr;
diff --git a/Source/Demo/DelayHook.c b/Source/Demo/DelayHook.c
@@ -14,7 +14,7 @@
 #pragma comment(lib, "KNSoft.NDK.WinAPI.lib") // For Ldr(Register/Unregister)DllNotification imports
 
 static HRESULT g_hrDelayAttach = E_FAIL;
-static FN_EqualRect* g_pfnOrgEqualRect = NULL;
+static typeof(&EqualRect) g_pfnOrgEqualRect = NULL;
 
 static
 _Function_class_(LDR_DLL_NOTIFICATION_FUNCTION)
diff --git a/Source/Demo/Demo.h b/Source/Demo/Demo.h
@@ -9,21 +9,14 @@
 
 EXTERN_C_START
 
-typedef
-BOOL
-WINAPI
-FN_EqualRect(
-    _In_ CONST RECT *lprc1,
-    _In_ CONST RECT *lprc2);
-
 typedef enum _DEMO_ENGINE_TYPE
 {
     EngineInvalid,
     EngineSlimDetours,
     EngineMicrosoftDetours
 } DEMO_ENGINE_TYPE, *PDEMO_ENGINE_TYPE;
 
-EXTERN_C FN_EqualRect* g_pfnEqualRect;
+EXTERN_C typeof(&EqualRect) g_pfnEqualRect;
 EXTERN_C UNICODE_STRING g_usUser32;
 EXTERN_C ANSI_STRING g_asEqualRect;
 EXTERN_C LONG volatile g_lEqualRectCount;
diff --git a/Source/Demo/Demo.vcxproj b/Source/Demo/Demo.vcxproj
@@ -229,12 +229,12 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\marmasm.targets" />
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-    <Import Project="..\packages\KNSoft.NDK.1.2.38-beta\build\KNSoft.NDK.targets" Condition="Exists('..\packages\KNSoft.NDK.1.2.38-beta\build\KNSoft.NDK.targets')" />
+    <Import Project="..\packages\KNSoft.NDK.1.2.47-beta\build\KNSoft.NDK.targets" Condition="Exists('..\packages\KNSoft.NDK.1.2.47-beta\build\KNSoft.NDK.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\KNSoft.NDK.1.2.38-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.NDK.1.2.38-beta\build\KNSoft.NDK.targets'))" />
+    <Error Condition="!Exists('..\packages\KNSoft.NDK.1.2.47-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.NDK.1.2.47-beta\build\KNSoft.NDK.targets'))" />
   </Target>
 </Project>
diff --git a/Source/Demo/Instruction.x86.asm b/Source/Demo/Instruction.x86.asm
@@ -1,3 +1,5 @@
+.MODEL FLAT, C
+
 INCLUDE Instruction.inc
 
 .CODE
diff --git a/Source/Demo/Main.c b/Source/Demo/Main.c
@@ -23,7 +23,7 @@ CONST UNITTEST_ENTRY UnitTestList[] = {
 
 #define DEMO_SWITCH_ENGINE L"-Engine="
 
-FN_EqualRect* g_pfnEqualRect = NULL;
+typeof(&EqualRect) g_pfnEqualRect = NULL;
 UNICODE_STRING g_usUser32 = RTL_CONSTANT_STRING(L"user32.dll");
 ANSI_STRING g_asEqualRect = RTL_CONSTANT_STRING("EqualRect");
 LONG volatile g_lEqualRectCount = 0;
diff --git a/Source/Demo/TwiceSimpleHook.c b/Source/Demo/TwiceSimpleHook.c
@@ -7,8 +7,8 @@
 #include "Demo.h"
 
 static LONG volatile g_lEqualRect = 0;
-static FN_EqualRect* g_pfnEqualRect1 = NULL;
-static FN_EqualRect* g_pfnEqualRect2 = NULL;
+static typeof(&EqualRect) g_pfnEqualRect1 = NULL;
+static typeof(&EqualRect) g_pfnEqualRect2 = NULL;
 
 static
 BOOL
diff --git a/Source/Demo/packages.config b/Source/Demo/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="KNSoft.NDK" version="1.2.38-beta" targetFramework="native" />
+  <package id="KNSoft.NDK" version="1.2.47-beta" targetFramework="native" />
 </packages>
diff --git a/Source/KNSoft.SlimDetours/KNSoft.SlimDetours.vcxproj b/Source/KNSoft.SlimDetours/KNSoft.SlimDetours.vcxproj
@@ -47,6 +47,7 @@
     <ClInclude Include="SlimDetours.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="SlimDetours.inl" />
     <None Include="SlimDetours.NDK.inl" />
   </ItemGroup>
@@ -200,12 +201,12 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\KNSoft.NDK.1.2.38-beta\build\KNSoft.NDK.targets" Condition="Exists('..\packages\KNSoft.NDK.1.2.38-beta\build\KNSoft.NDK.targets')" />
+    <Import Project="..\packages\KNSoft.NDK.1.2.47-beta\build\KNSoft.NDK.targets" Condition="Exists('..\packages\KNSoft.NDK.1.2.47-beta\build\KNSoft.NDK.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\KNSoft.NDK.1.2.38-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.NDK.1.2.38-beta\build\KNSoft.NDK.targets'))" />
+    <Error Condition="!Exists('..\packages\KNSoft.NDK.1.2.47-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.NDK.1.2.47-beta\build\KNSoft.NDK.targets'))" />
   </Target>
 </Project>
diff --git a/Source/KNSoft.SlimDetours/KNSoft.SlimDetours.vcxproj.filters b/Source/KNSoft.SlimDetours/KNSoft.SlimDetours.vcxproj.filters
@@ -15,5 +15,6 @@
   <ItemGroup>
     <None Include="SlimDetours.inl" />
     <None Include="SlimDetours.NDK.inl" />
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/Source/KNSoft.SlimDetours/Memory.c b/Source/KNSoft.SlimDetours/Memory.c
@@ -70,9 +70,9 @@ static HANDLE _detour_memory_heap = NULL;
 static
 _Success_(return != NULL)
 PVOID
-GetNtdllBase(VOID)
+detour_memory_get_ntdll(VOID)
 {
-    /* Get the first loaded entry */
+    /* Get the first initialized entry */
     PLDR_DATA_TABLE_ENTRY Entry = CONTAINING_RECORD(NtCurrentPeb()->Ldr->InInitializationOrderModuleList.Flink,
                                                     LDR_DATA_TABLE_ENTRY,
                                                     InInitializationOrderLinks);
@@ -144,7 +144,7 @@ detour_memory_init(VOID)
         {
 #if defined(_WIN64)
             /* 1GB after Ntdll.dll */
-            PVOID NtdllBase = GetNtdllBase();
+            PVOID NtdllBase = detour_memory_get_ntdll();
 
             /*
              * Ntdll.dll is expected to be loaded in the system reserved region.
diff --git a/Source/KNSoft.SlimDetours/SlimDetours.NDK.inl b/Source/KNSoft.SlimDetours/SlimDetours.NDK.inl
@@ -76,7 +76,6 @@ C_ASSERT((ULONG_PTR)MI_ASLR_HIGHEST_SYSTEM_RANGE_ADDRESS - (ULONG_PTR)MI_ASLR_LO
 
 #define NtCurrentProcessId() ((HANDLE)NtCurrentTeb()->ClientId.UniqueProcess)
 #define NtCurrentThreadId() ((HANDLE)NtCurrentTeb()->ClientId.UniqueThread)
-#define NtGetNtdllBase() (CONTAINING_RECORD(NtCurrentPeb()->Ldr->InInitializationOrderModuleList.Flink, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks)->DllBase)
 
 #define RtlProcessHeap() (NtCurrentPeb()->ProcessHeap)
 
diff --git a/Source/KNSoft.SlimDetours/Thread.c b/Source/KNSoft.SlimDetours/Thread.c
@@ -238,8 +238,10 @@ detour_thread_suspend(
         }
     }
 
-    // Perform a synchronous operation to make sure the thread really is suspended.
-    // https://devblogs.microsoft.com/oldnewthing/20150205-00/?p=44743
+    /*
+     * Perform a synchronous operation to make sure the thread really is suspended.
+     * See also: https://devblogs.microsoft.com/oldnewthing/20150205-00/?p=44743
+     */
     CONTEXT cxt;
     cxt.ContextFlags = CONTEXT_CONTROL;
     NtGetContextThread(ThreadHandle, &cxt);
diff --git a/Source/KNSoft.SlimDetours/packages.config b/Source/KNSoft.SlimDetours/packages.config
@@ -0,0 +1,4 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="KNSoft.NDK" version="1.2.47-beta" targetFramework="native" />
+</packages>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+.MODEL FLAT, C`
	`2`	`+`
`1`	`3`	`INCLUDE Instruction.inc`
`2`	`4`
`3`	`5`	`.CODE`