[3RDPARTY] Update KNSoft.NDK to 1.2.0-beta

KNSoft · Sep 19, 2024 · 092a097 · 092a097
1 parent 0003ba4
commit 092a097
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/Source/Demo/Demo.vcxproj b/Source/Demo/Demo.vcxproj
@@ -188,12 +188,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\KNSoft.NDK.1.1.0-beta\build\KNSoft.NDK.targets" Condition="Exists('..\packages\KNSoft.NDK.1.1.0-beta\build\KNSoft.NDK.targets')" />
+    <Import Project="..\packages\KNSoft.NDK.1.2.0-beta\build\KNSoft.NDK.targets" Condition="Exists('..\packages\KNSoft.NDK.1.2.0-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.1.0-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.NDK.1.1.0-beta\build\KNSoft.NDK.targets'))" />
+    <Error Condition="!Exists('..\packages\KNSoft.NDK.1.2.0-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.NDK.1.2.0-beta\build\KNSoft.NDK.targets'))" />
   </Target>
 </Project>
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.1.0-beta" targetFramework="native" />
+  <package id="KNSoft.NDK" version="1.2.0-beta" targetFramework="native" />
 </packages>
diff --git a/Source/KNSoft.SlimDetours.vcxproj b/Source/KNSoft.SlimDetours.vcxproj
@@ -220,12 +220,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="packages\KNSoft.NDK.1.1.0-beta\build\KNSoft.NDK.targets" Condition="Exists('packages\KNSoft.NDK.1.1.0-beta\build\KNSoft.NDK.targets')" />
+    <Import Project="packages\KNSoft.NDK.1.2.0-beta\build\KNSoft.NDK.targets" Condition="Exists('packages\KNSoft.NDK.1.2.0-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.1.0-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\KNSoft.NDK.1.1.0-beta\build\KNSoft.NDK.targets'))" />
+    <Error Condition="!Exists('packages\KNSoft.NDK.1.2.0-beta\build\KNSoft.NDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\KNSoft.NDK.1.2.0-beta\build\KNSoft.NDK.targets'))" />
   </Target>
 </Project>
diff --git a/Source/SlimDetours/Memory.c b/Source/SlimDetours/Memory.c
@@ -76,7 +76,7 @@ detour_memory_init(VOID)
 
         NtdllLdrEntry = CONTAINING_RECORD(NtCurrentPeb()->Ldr->InInitializationOrderModuleList.Flink,
                                           LDR_DATA_TABLE_ENTRY,
-                                          InInitializationOrderModuleList);
+                                          InInitializationOrderLinks);
         s_ulSystemRegionLowUpperBound = (ULONG_PTR)NtdllLdrEntry->DllBase + NtdllLdrEntry->SizeOfImage - 1;
         s_ulSystemRegionLowLowerBound = s_ulSystemRegionLowUpperBound - _1GB + 1;
         if (s_ulSystemRegionLowLowerBound < SYSTEM_RESERVED_REGION_LOWEST)

diff --git a/Source/SlimDetours/SlimDetours.NDK.inl b/Source/SlimDetours/SlimDetours.NDK.inl
@@ -74,9 +74,9 @@
 
 #endif
 
-#define NtGetCurrentProcessId() (NtCurrentTeb()->ClientId.UniqueProcess)
-#define NtGetCurrentThreadId() (NtCurrentTeb()->ClientId.UniqueThread)
+#define NtCurrentProcessId() ((HANDLE)ReadTeb(ClientId.UniqueProcess))
+#define NtCurrentThreadId() ((HANDLE)ReadTeb(ClientId.UniqueThread))
 #define NtGetProcessHeap() (NtCurrentPeb()->ProcessHeap)
-#define NtGetNtdllBase() (CONTAINING_RECORD(NtCurrentPeb()->Ldr->InInitializationOrderModuleList.Flink, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList)->DllBase)
+#define NtGetNtdllBase() (CONTAINING_RECORD(NtCurrentPeb()->Ldr->InInitializationOrderModuleList.Flink, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks)->DllBase)
 
 #endif
diff --git a/Source/SlimDetours/Thread.c b/Source/SlimDetours/Thread.c
@@ -39,7 +39,7 @@ detour_thread_suspend(
     }
 
     /* Find current process and threads */
-    CurrentPID = NtGetCurrentProcessId();
+    CurrentPID = NtCurrentProcessId();
     pCurrentSPI = pSPI;
     while (pCurrentSPI->UniqueProcessId != CurrentPID)
     {
@@ -72,7 +72,7 @@ detour_thread_suspend(
 
     /* Suspend threads */
     SuspendedCount = 0;
-    CurrentTID = NtGetCurrentThreadId();
+    CurrentTID = NtCurrentThreadId();
     for (i = 0; i < pCurrentSPI->NumberOfThreads; i++)
     {
         if (pSTI[i].ClientId.UniqueThread == CurrentTID ||

diff --git a/Source/SlimDetours/Transaction.c b/Source/SlimDetours/Transaction.c
@@ -58,7 +58,7 @@ SlimDetoursTransactionBegin(VOID)
     NTSTATUS Status;
 
     // Make sure only one thread can start a transaction.
-    if (_InterlockedCompareExchangePointer(&s_nPendingThreadId, NtGetCurrentThreadId(), 0) != 0)
+    if (_InterlockedCompareExchangePointer(&s_nPendingThreadId, NtCurrentThreadId(), 0) != 0)
     {
         return HRESULT_FROM_NT(STATUS_TRANSACTIONAL_CONFLICT);
     }
@@ -99,7 +99,7 @@ SlimDetoursTransactionAbort(VOID)
     SIZE_T sMem;
     DWORD dwOld;
 
-    if (s_nPendingThreadId != NtGetCurrentThreadId())
+    if (s_nPendingThreadId != NtCurrentThreadId())
     {
         return HRESULT_FROM_NT(STATUS_TRANSACTIONAL_CONFLICT);
     }
@@ -152,7 +152,7 @@ SlimDetoursTransactionCommit(VOID)
     BOOL freed = FALSE;
     ULONG i;
 
-    if (s_nPendingThreadId != NtGetCurrentThreadId())
+    if (s_nPendingThreadId != NtCurrentThreadId())
     {
         return HRESULT_FROM_NT(STATUS_TRANSACTIONAL_CONFLICT);
     }
@@ -281,7 +281,7 @@ SlimDetoursAttach(
     SIZE_T sMem;
     DWORD dwOld;
 
-    if (s_nPendingThreadId != NtGetCurrentThreadId())
+    if (s_nPendingThreadId != NtCurrentThreadId())
     {
         return HRESULT_FROM_NT(STATUS_TRANSACTIONAL_CONFLICT);
     }
@@ -484,7 +484,7 @@ SlimDetoursDetach(
     SIZE_T sMem;
     DWORD dwOld;
 
-    if (s_nPendingThreadId != NtGetCurrentThreadId())
+    if (s_nPendingThreadId != NtCurrentThreadId())
     {
         return HRESULT_FROM_NT(STATUS_TRANSACTIONAL_CONFLICT);
     }
@@ -622,7 +622,7 @@ detour_dll_notify_proc(
     while (pAttach != NULL)
     {
         /* Match Dll name */
-        if (!RtlEqualUnicodeString(&pAttach->usDllName, NotificationData->Loaded.BaseDllName, FALSE))
+        if (!RtlEqualUnicodeString(&pAttach->usDllName, (PUNICODE_STRING)NotificationData->Loaded.BaseDllName, FALSE))
         {
             pPrevAttach = pAttach;
             pAttach = pAttach->pNext;

diff --git a/Source/packages.config b/Source/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="KNSoft.NDK" version="1.1.0-beta" targetFramework="native" />
+  <package id="KNSoft.NDK" version="1.2.0-beta" targetFramework="native" />
 </packages>