re-add static linking + fix crash for dui unloading

wiktorwiktor12 · Jun 29, 2024 · a78f8fe · a78f8fe
1 parent a8fc4d8
commit a78f8fe
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 30 deletions.
diff --git a/ConsoleLogonHook/ConsoleLogonHook.vcxproj b/ConsoleLogonHook/ConsoleLogonHook.vcxproj
@@ -23,7 +23,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{6cc17286-2fe3-4bcb-899b-76d1eacd3469}</ProjectGuid>
     <RootNamespace>ConsoleLogonHook</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -118,7 +118,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <AdditionalIncludeDirectories>$(ProjectDir);detours;imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -142,7 +142,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <AdditionalIncludeDirectories>$(ProjectDir);detours;imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/ConsoleLogonHook/util/memory_man.h b/ConsoleLogonHook/util/memory_man.h
@@ -11,6 +11,7 @@
 
 namespace memory
 {
+    inline const int VersionNumber = 104;
     inline const std::string offsetCacheFileName = "ConsoleLogonHookOffsetCache.txt";
 
     inline std::vector<std::pair<std::string, uintptr_t>> offsetCache;
@@ -53,6 +54,8 @@ namespace memory
 
         std::ofstream file(offsetCacheFileName);
 
+        file << "VersionNumber" << ":" << VersionNumber << "\n";
+
         for (int i = 0; i < offsetCache.size(); ++i)
         {
             file << offsetCache[i].first << ":" << offsetCache[i].second << "\n";
@@ -231,6 +234,12 @@ namespace memory
 
     static void CheckCache()
     {
+        uintptr_t savedVersion = FindInOffsetCache("VersionNumber");
+        if (savedVersion != VersionNumber)
+        {
+            offsetCache.clear();
+            SPDLOG_INFO("Version Number does not match! clearing offset cache");
+        }
         //return;
         //auto SecurityOptionsView__RuntimeClassIntialise = (uint8_t*)(baseaddress + 0x36EB4);
         auto SecurityOptionsView__RuntimeClassIntialise = FindPatternCached<uint8_t*>("SecurityOptionsViewRuntimeClassIntialise", { "55 56 57 41 56 41 57 48 8B EC 48 83 EC 30" });

diff --git a/ConsoleLogonUI/ConsoleLogonUI.vcxproj b/ConsoleLogonUI/ConsoleLogonUI.vcxproj
@@ -23,7 +23,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{e624c20f-a41a-4bc5-b312-257ed4aecfb9}</ProjectGuid>
     <RootNamespace>ConsoleLogonUI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -115,7 +115,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -137,7 +137,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/ConsoleLogonUI/ui/dui_manager.cpp b/ConsoleLogonUI/ui/dui_manager.cpp
@@ -183,30 +183,7 @@ void duiManager::UnloadDUI()
     auto pDuiManager = Get();
 
     UnregisterHotKey(pDuiManager->pWndHost->GetHWND(), hotkeyid);
-
-    if (pDuiManager->pUIElement)
-    {
-        pDuiManager->pUIElement->DestroyAll(true);
-    }
-    if (pDuiManager->pWndElement)
-    {
-        pDuiManager->pWndElement->DestroyAll(true);
-
-    }
-    if (pDuiManager->pWndHost)
-    {
-        pDuiManager->pWndHost->DestroyWindow();
-        pDuiManager->pWndHost->Destroy();
-    }
-    if (pDuiManager->pParser)
-        pDuiManager->pParser->Destroy();
-
-    pDuiManager->pParser = NULL;
-    pDuiManager->pWndHost = NULL;
-    pDuiManager->pUIElement = NULL;
-    pDuiManager->pWndElement = NULL;
-    pDuiManager->pageContainerElement = NULL;
-
+    pDuiManager->pWndHost->DestroyWindow();
 
     DirectUI::UnInitThread();
     DirectUI::UnInitProcessPriv(0);