Build two editions of launcher; Improve script extender compatability.

Author: Force67

Code/immersive_launcher/Launcher.cpp

@@ -1,15 +1,18 @@
 
 #include <BuildInfo.h>
+#include <MinHook.h>
 #include <TiltedCore/Initializer.hpp>
 
 #include "Launcher.h"
 #include "TargetConfig.h"
+
 #include "loader/ExeLoader.h"
+#include "loader/PathRerouting.h"
 
+#include "Utils/Error.h"
 #include "oobe/InstallCheckFlow.h"
 #include "oobe/ViabilityChecks.h"
 #include "steam/SteamLoader.h"
-#include "Utils/Error.h"
 
 static LaunchContext* g_context = nullptr;
 
@@ -21,27 +24,11 @@ LaunchContext* GetLaunchContext()
     return g_context;
 }
 
-static void InitEnvironment()
-{
-    auto& gamePath = g_context->gamePath;
-    auto appPath = TiltedPhoques::GetPath();
-
-    SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_USER_DIRS);
-    AddDllDirectory(appPath.c_str());
-    AddDllDirectory(gamePath.c_str());
-    SetCurrentDirectoryW(gamePath.c_str());
-
-    std::wstring pathBuf;
-    pathBuf.resize(32768);
-    GetEnvironmentVariableW(L"PATH", pathBuf.data(), static_cast<DWORD>(pathBuf.length()));
-
-    // append bin & game directories
-    std::wstring newPath = appPath.native() + L";" + gamePath.native() + L";" + pathBuf;
-    SetEnvironmentVariableW(L"PATH", newPath.c_str());
-}
-
 void Bootstrap()
 {
+    //LdrGetKnownDllSectionHandle = reinterpret_cast<decltype(LdrGetKnownDllSectionHandle)>(
+    //    GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "LdrGetKnownDllSectionHandle"));
+
     auto LC = std::make_unique<LaunchContext>();
     g_context = LC.get();
 
@@ -57,22 +44,30 @@ void Bootstrap()
     }
 
     // Bind path environment.
-    InitEnvironment();
-    steam::Load(g_context->gamePath);
+    loader::InstallPathRouting(LC->gamePath);
+    steam::Load(LC->gamePath);
 
     {
         ExeLoader loader(CurrentTarget.loadLimit, GetProcAddress);
-        if (!loader.Load(g_context->exePath))
+        if (!loader.Load(LC->exePath))
             return;
 
-        g_context->gameMain = loader.GetEntryPoint();
+        LC->gameMain = loader.GetEntryPoint();
     }
 
     TiltedPhoques::Initializer::RunAll();
-    g_context->gameMain();
+    LC->gameMain();
 }
 
 void RunClient()
 {
-    // LdrLoadDll at fixed address
+    LoadLibraryA(
+        R"(C:\Users\vince\Documents\Development\Tilted\TiltedEvolution\build\windows\x64\debug\SkyrimTogether.dll)");
+
+    #if 0
+    __debugbreak();
+    LoadLibraryA(
+        R"(C:\Users\vince\Documents\Development\Tilted\TiltedEvolution\build\windows\x64\debug\SkyrimTogether.dll)");
+        __debugbreak();
+        #endif
 }

Code/immersive_launcher/Main.cpp

@@ -28,15 +28,14 @@ struct ComScope
 
 int main(int argc, char** argv)
 {
-    CoreStubsInit();
-
     // memory block for Script Extender reserved as early as we can
     script_extender::SEMemoryBlock b;
     if (!b.Good())
     {
-        Die("Failed to initialize SE block zone.\nCannot continue!");
+        Die("Failed to pre-reserve script extender zone.\nCannot continue!");
         return -1;
     }
+    CoreStubsInit();
 
     ComScope cs;
     TP_UNUSED(cs);

Code/immersive_launcher/TargetConfig.h

@@ -20,14 +20,18 @@ struct TargetConfig
 
 #include <BranchInfo.h>
 
-
-#if (1)
-#define IS_SKYRIM_TYPE
-static const TargetConfig CurrentTarget{
+#if defined(TARGET_ST)
+static constexpr TargetConfig CurrentTarget{
     L"SkyrimTogether.dll", 
     L"Skyrim Special Edition", 
     L"Skyrim Special Edition", 
     489830, kGenericLoadLimit};
+#elif defined(TARGET_FT)
+static constexpr TargetConfig CurrentTarget{
+    L"FalloutTogether.dll", 
+    L"Fallout4", 
+    L"Fallout4", 
+    377160, kGenericLoadLimit};
 #endif
 
 // clang-format on

Code/immersive_launcher/loader/PathRerouting.cpp

@@ -0,0 +1,27 @@
+// Copyright (C) 2021 TiltedPhoques SRL.
+// For licensing information see LICENSE at the root of this distribution.
+
+#include "PathRerouting.h"
+#include <TiltedCore/Filesystem.hpp>
+#include <Windows.h>
+
+namespace loader
+{
+void InstallPathRouting(const std::filesystem::path& gamePath)
+{
+    auto appPath = TiltedPhoques::GetPath();
+
+    SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_USER_DIRS);
+    AddDllDirectory(appPath.c_str());
+    AddDllDirectory(gamePath.c_str());
+    SetCurrentDirectoryW(gamePath.c_str());
+
+    std::wstring pathBuf;
+    pathBuf.resize(32768);
+    GetEnvironmentVariableW(L"PATH", pathBuf.data(), static_cast<DWORD>(pathBuf.length()));
+
+    // append bin & game directories
+    std::wstring newPath = appPath.native() + L";" + gamePath.native() + L";" + pathBuf;
+    SetEnvironmentVariableW(L"PATH", newPath.c_str());
+}
+} // namespace loader

Code/immersive_launcher/loader/PathRerouting.h

@@ -0,0 +1,10 @@
+// Copyright (C) 2021 TiltedPhoques SRL.
+// For licensing information see LICENSE at the root of this distribution.
+#pragma once
+
+#include <filesystem>
+
+namespace loader
+{
+void InstallPathRouting(const std::filesystem::path&);
+}

Code/immersive_launcher/ntdll_x64.lib

@@ -9,14 +9,18 @@
 
 namespace oobe
 {
+    // D3D11 Test
+
 bool TestPlatformViability(Policy apolicyLevel)
 {
     // Test hardware
-    if (!IsWindows8OrGreater())
+    if (!IsWindows8OrGreater() && apolicyLevel != Policy::kLax)
     {
         return false;
     }
 
+    // TODO: should also query hardware support for AES
+
     // Test install
     auto cefDll = TiltedPhoques::GetPath() / L"libcef.dll";
     if (!std::filesystem::exists(cefDll))

Code/immersive_launcher/oobe/ViabilityChecks.cpp

@@ -32,6 +32,9 @@ END
 
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "launcher.manifest"
 
+// THERE IS NO NICER WAY
+
+#if defined(TARGET_ST)
 #if (IS_MASTER)
 102 ICON "st_logo.ico"
 #elif (IS_BRANCH_BETA)
@@ -41,3 +44,14 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "launcher.manifest"
 #else
 102 ICON "st_logo_dev.ico"
 #endif
+#elif defined(TARGET_FT)
+#if (IS_MASTER)
+102 ICON "ft_logo.ico"
+#elif (IS_BRANCH_BETA)
+102 ICON "ft_logo_beta.ico"
+#elif (IS_BRANCH_PREREL)
+102 ICON "ft_logo_pre.ico"
+#else
+102 ICON "ft_logo_dev.ico"
+#endif
+#endif

Code/immersive_launcher/resources/launcher.rc

@@ -1,52 +1,45 @@
 // Copyright (C) 2021 TiltedPhoques SRL.
 // For licensing information see LICENSE at the root of this distribution.
 
+#include "SEMemoryBlock.h"
 #include <Windows.h>
 #include <cstdint>
-#include "SEMemoryBlock.h"
 
 namespace script_extender
 {
-static constexpr uint32_t kBlockLength = 1024 * 64;
+constexpr uintptr_t kLowRipZoneSize = 0x10000; // 1024 * 64
+constexpr uintptr_t kHighRipSize = 0x100000;   // 1024 * 1024
+constexpr uintptr_t kLowRipStart = 0x80000000 + (kHighRipSize * 128);
 
 SEMemoryBlock::SEMemoryBlock()
 {
-    uintptr_t moduleBase = reinterpret_cast<uintptr_t>(GetModuleHandleW(nullptr));
-    uintptr_t addr = moduleBase;
-    uintptr_t maxDisplacement =
-        0x80000000 - (1024 * 1024 * 128); // largest 32-bit displacement with 128MB scratch space
-    uintptr_t lowestOKAddress = (moduleBase >= maxDisplacement) ? moduleBase - maxDisplacement : 0;
-    addr--;
-
-    while (!m_pBlock)
+    uintptr_t mainAddress = reinterpret_cast<uintptr_t>(GetModuleHandleW(nullptr)) - 1;
+
+    MEMORY_BASIC_INFORMATION info{};
+
+    // we go bottom to top
+    uintptr_t ripAddress = kLowRipStart;
+    while ((ripAddress + kLowRipZoneSize) < mainAddress)
     {
-        MEMORY_BASIC_INFORMATION info;
-        if (!VirtualQuery((void*)addr, &info, sizeof(info)))
-        {
-            break;
-        }
+        void* pRipSegment = reinterpret_cast<void*>(ripAddress);
+        if (!VirtualQuery(pRipSegment, &info, sizeof(info)))
+            return;
 
         if (info.State == MEM_FREE)
         {
-            if (info.RegionSize >= kBlockLength)
-            {
-                // try to allocate it
-                addr = ((uintptr_t)info.BaseAddress) + info.RegionSize - kBlockLength;
-                m_pBlock = (void*)VirtualAlloc((void*)addr, kBlockLength, MEM_RESERVE, PAGE_EXECUTE_READWRITE);
-            }
+            if (m_pBlock = VirtualAlloc(pRipSegment, kLowRipZoneSize, MEM_RESERVE, PAGE_EXECUTE_READWRITE))
+                return;
         }
 
-        // move back and try again
-        if (!m_pBlock)
-        {
-            addr = ((uintptr_t)info.BaseAddress) - 1;
-        }
+        ripAddress += kLowRipZoneSize;
     }
+
+    m_lastCanidate = ripAddress;
 }
 
 SEMemoryBlock::~SEMemoryBlock()
 {
     if (m_pBlock)
-        VirtualFree(m_pBlock, kBlockLength, MEM_RELEASE);
-}
+        VirtualFree(m_pBlock, kLowRipZoneSize, MEM_RELEASE);
 }
+} // namespace script_extender

Code/immersive_launcher/script_extender/SEMemoryBlock.cpp

@@ -2,6 +2,8 @@
 // For licensing information see LICENSE at the root of this distribution.
 #pragma once
 
+#include <cstdint>
+
 namespace script_extender
 {
     class SEMemoryBlock final 
@@ -14,8 +16,14 @@ namespace script_extender
         {
             return m_pBlock;
         }
+
+        inline uintptr_t LastRip() const
+        {
+            return m_lastCanidate;
+        }
 
     private:
       void* m_pBlock = nullptr;
+      uintptr_t m_lastCanidate = 0;
     };
 }