feat: integrate kiero2 for D3D11 vtable detection

- Add kiero2 as git submodule for graphics API method location
- Replace manual dummy-device vtable extraction with kiero2::locate()
- Integrate kiero2 with CMake build (D3D11 only, MinGW WIN32 fix)

Author: StArray

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "StArray.ModManager.Windows/Native/minhook"]
 	path = StArray.ModManager.Windows/Native/minhook
 	url = https://github.com/TsudaKageyu/minhook
+[submodule "StArray.ModManager.Windows/Native/kiero2"]
+	path = StArray.ModManager.Windows/Native/kiero2
+	url = https://github.com/kirchesz/kiero2

StArray.ModManager.Windows/Managed.cs

@@ -82,24 +82,51 @@ public static int Entry(int argc, IntPtr argv)
         Writer.AutoFlush = true;
         Logger.Info($"{nameof(Managed)}-Benchmark", $"Path resolve: {Benchmark.End():F3}s");
 
-        Il2CppFunctions.SetIl2CppLibraryPath(Path.Combine(new DirectoryInfo(modsPath).Parent.Parent.FullName,"GameAssembly.dll"));
-        // 检测运行时后端 + 图形设备类型
-        //RuntimeManager.Detect();
+        Il2CppFunctions.SetIl2CppLibraryPath(Path.Combine(AppContext.BaseDirectory,"..","..", "GameAssembly.dll"));
+        // 检测运行时后端 (IL2CPP / Mono)
+        RuntimeManager.Detect();
         Logger.Info("Runtime", $"Detected backend: {RuntimeManager.Backend}");
 
-        ModManagerUI modManagerUI = new(new ModLoader(modsPath), managedDir);
-
-        // Detect backend and pick renderer
-        var renderer = Renderer.D3D11;
+        // 检测图形设备类型
+        var renderer = GetGameRenderer();
         Logger.Info("Backend", $"Detected renderer: {renderer}");
 
-        if ((renderer & Renderer.D3D11) != 0)
+        ModManagerUI modManagerUI = new(new ModLoader(modsPath), managedDir);
+
+        NativeApi.SetBackend(1); // D3D11
+        ImGuiDXRenderer.OnRender += modManagerUI.Render;
+        ImGuiDXRenderer.Install();
+        /*if ((renderer & Renderer.D3D11) != 0)
         {
             NativeApi.SetBackend(1); // D3D11
-            ImGuiDXRenderer.OnRender += modManagerUI.Render;
-            ImGuiDXRenderer.Install();
-            return 0;
+            ImGuiRenderer.OnRender += modManagerUI.Render;
+            ImGuiRenderer.Install();
+        }
+        else if ((renderer & Renderer.D3D12) != 0)
+        {
+            NativeApi.SetBackend(0); // D3D12
+            ImGuiRenderer.OnRender += modManagerUI.Render;
+            ImGuiRenderer.Install();
         }
+        else if ((renderer & Renderer.D3D9) != 0)
+        {
+            NativeApi.SetBackend(2); // D3D9
+            ImGuiRenderer.OnRender += modManagerUI.Render;
+            ImGuiRenderer.Install();
+        }
+        else if ((renderer & Renderer.Vulkan) != 0 ||
+                 (renderer & Renderer.OpenGL) != 0)
+        {
+            // GL/VK: native handles Win32 init only, C# handles ImGui backend
+            ImGuiRenderer.OnRender += modManagerUI.Render;
+            ImGuiRenderer.Install();
+        }
+        else
+        {
+            Logger.Error("Backend", "No supported renderer found");
+            return 1;
+        }*/
+
         totalSw.Stop();
         Logger.Info($"{nameof(Managed)}-Benchmark", $"=== Startup total: {totalSw.Elapsed.TotalSeconds:F3}s ===");
         return 0;

StArray.ModManager.Windows/Native/CMakeLists.txt

@@ -25,6 +25,20 @@ add_library(MinHook STATIC
 target_include_directories(MinHook PUBLIC minhook/include)
 target_compile_definitions(MinHook PRIVATE _CRT_SECURE_NO_WARNINGS)
 
+# ---- kiero2: locate graphics API methods at runtime ----
+set(KIERO_BUILD_D3D9 OFF CACHE BOOL "" FORCE)
+set(KIERO_BUILD_D3D10 OFF CACHE BOOL "" FORCE)
+set(KIERO_BUILD_D3D11 ON CACHE BOOL "" FORCE)
+set(KIERO_BUILD_D3D12 OFF CACHE BOOL "" FORCE)
+set(KIERO_BUILD_OPENGL OFF CACHE BOOL "" FORCE)
+set(KIERO_BUILD_VULKAN OFF CACHE BOOL "" FORCE)
+add_subdirectory(kiero2)
+# MinGW in C++17 strict mode doesn't define the bare `WIN32` macro,
+# but kiero headers rely on it to enable Win32 code paths.
+if(MINGW)
+    target_compile_definitions(kiero PRIVATE WIN32)
+endif()
+
 # ---- cimgui: build from source as static library ----
 set(IMGUI_STATIC ON CACHE BOOL "" FORCE)
 set(CIMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cimgui)
@@ -40,11 +54,13 @@ add_library(${PROJECT_NAME} SHARED
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 target_include_directories(${PROJECT_NAME} PRIVATE
     minhook/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/kiero2
+    ${CMAKE_CURRENT_BINARY_DIR}/kiero2
     ${CIMGUI_DIR}
     ${CIMGUI_DIR}/imgui
     ${CIMGUI_DIR}/imgui/backends
 )
-target_link_libraries(${PROJECT_NAME} PRIVATE MinHook d3d11 d3dcompiler dxgi dwmapi gdi32 cimgui)
+target_link_libraries(${PROJECT_NAME} PRIVATE MinHook kiero d3d11 d3dcompiler dxgi dwmapi gdi32 cimgui)
 
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_SOURCE_DIR}/../bin/${CMAKE_BUILD_TYPE}/net10.0"

StArray.ModManager.Windows/Native/dx11hook.cpp

@@ -1,5 +1,8 @@
 // DX11 Present hook — cimgui-based ImGui overlay
 #include "hook_common.h"
+#include "cimgui.h"
+#include "kiero.hpp"
+#include "kiero_d3d11.hpp"
 
 typedef HRESULT(APIENTRY* PresentFn)(IDXGISwapChain*, UINT, UINT);
 
@@ -38,6 +41,8 @@ namespace DX11Hook {
         return CallWindowProcW(g_OriginalWndProc, h, m, w, l);
     }
 
+    ID3D11RenderTargetView *MainRTV = nullptr;
+
     HRESULT HookPresent(IDXGISwapChain* swapChain, UINT syncInterval, UINT flags) {
         if (!Initialised) {
             DXGI_SWAP_CHAIN_DESC desc;
@@ -48,6 +53,7 @@ namespace DX11Hook {
             swapChain->GetDevice(__uuidof(ID3D11Device), (void**)&device);
             device->GetImmediateContext(&DeviceContext);
             if (imgui_callbacks.init_callback) imgui_callbacks.init_callback();
+
             if (ImGui_ImplWin32_Init(g_GameWindow) && ImGui_ImplDX11_Init(device, DeviceContext)) {
                 SwapChain = swapChain;
                 g_OriginalWndProc = (WNDPROC)SetWindowLongPtrW(g_GameWindow,
@@ -56,68 +62,59 @@ namespace DX11Hook {
                 ImGui_Initialised = true;
                 DEBUG_LOG("DX11Hook: ImGui initialised, hwnd=%p", g_GameWindow);
             }
-
-            device->Release();
         }
 
         if (Initialised) {
+            /*if (MainRTV) { MainRTV->Release(); MainRTV = nullptr; }
+            ID3D11Texture2D* bb = nullptr;
+            swapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (void**)&bb);
+            ID3D11Device* device = nullptr;
+            swapChain->GetDevice(__uuidof(ID3D11Device), (void**)&device);
+            if (bb) { device->CreateRenderTargetView(bb, nullptr, &MainRTV); bb->Release(); }
+            */
+
             ImGui_ImplDX11_NewFrame();
             ImGui_ImplWin32_NewFrame();
+            auto io = igGetIO();
+            DXGI_SWAP_CHAIN_DESC desc;
+            swapChain->GetDesc(&desc);
+            io->DisplaySize.x = desc.BufferDesc.Width;
+            io->DisplaySize.y = desc.BufferDesc.Height;
             if (imgui_callbacks.render_callback) imgui_callbacks.render_callback();
             ImGui_ImplDX11_RenderDrawData(igGetDrawData());
+
+            //if (MainRTV) DeviceContext->OMSetRenderTargets(1, &MainRTV, nullptr);
         }
 
         return OriginalPresent(swapChain, syncInterval, flags);
     }
 
     bool InstallHook() {
-        DEBUG_LOG("DX11Hook::InstallHook: creating dummy device...");
-
-        WNDCLASSEXW wc = {};
-        wc.cbSize = sizeof(wc);
-        wc.lpfnWndProc = DefWindowProcW;
-        wc.hInstance = GetModuleHandleW(nullptr);
-        wc.lpszClassName = L"DX11HookDummy";
-        RegisterClassExW(&wc);
-
-        HWND dummy = CreateWindowExW(0, L"DX11HookDummy", L"", WS_POPUP,
-            0, 0, 1, 1, nullptr, nullptr, wc.hInstance, nullptr);
-
-        DXGI_SWAP_CHAIN_DESC scd = {};
-        scd.BufferCount = 1;
-        scd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-        scd.BufferDesc.Width = 1;
-        scd.BufferDesc.Height = 1;
-        scd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-        scd.OutputWindow = dummy;
-        scd.SampleDesc.Count = 1;
-        scd.Windowed = TRUE;
-
-        ID3D11Device* tmpDevice = nullptr;
-        IDXGISwapChain* tmpSwapChain = nullptr;
-        ID3D11DeviceContext* tmpContext = nullptr;
-
-        bool ok = false;
-        if (SUCCEEDED(D3D11CreateDeviceAndSwapChain(
-                nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, 0,
-                nullptr, 0, D3D11_SDK_VERSION,
-                &scd, &tmpSwapChain, &tmpDevice, nullptr, &tmpContext))) {
-
-            MH_Initialize();
-            void** vt = *(void***)tmpSwapChain;
-            ok = (MH_CreateHook(vt[8], (void*)HookPresent, (void**)&OriginalPresent) == MH_OK)
-              && (MH_EnableHook(vt[8]) == MH_OK);
-            DEBUG_LOG("DX11Hook::InstallHook: Present hook %s", ok ? "OK" : "FAILED");
-
-            tmpSwapChain->Release();
-            tmpContext->Release();
-            tmpDevice->Release();
-        } else {
-            DEBUG_LOG("DX11Hook::InstallHook: D3D11CreateDeviceAndSwapChain FAILED");
+        DEBUG_LOG("DX11Hook::InstallHook: locating D3D11 methods via kiero...");
+
+        kiero::D3D11Output output;
+        auto err = kiero::locate<kiero::Implementation_D3D11>(nullptr, &output);
+        if (err != kiero::Error_Nil) {
+            DEBUG_LOG("DX11Hook::InstallHook: kiero locate failed (err=%d)", err);
+            return false;
+        }
+
+        if (output.swapchain_methods.size() <= 8 || !output.swapchain_methods[8]) {
+            DEBUG_LOG("DX11Hook::InstallHook: Present method not found in vtable");
+            return false;
+        }
+
+        auto presentAddr = output.swapchain_methods[8];
+        DEBUG_LOG("DX11Hook::InstallHook: Present found at %p", presentAddr);
+
+        MH_Initialize();
+        if (MH_CreateHook(presentAddr, (void*)HookPresent, (void**)&OriginalPresent) != MH_OK
+            || MH_EnableHook(presentAddr) != MH_OK) {
+            DEBUG_LOG("DX11Hook::InstallHook: MinHook failed");
+            return false;
         }
 
-        DestroyWindow(dummy);
-        UnregisterClassW(L"DX11HookDummy", wc.hInstance);
-        return ok;
+        DEBUG_LOG("DX11Hook::InstallHook: hook installed successfully");
+        return true;
     }
 }