code style fixes

This commit is contained in:
2026-05-04 19:42:31 +03:00
parent e25b1b3fc8
commit 57c834ded4
3 changed files with 193 additions and 169 deletions

View File

@@ -1,3 +1,4 @@
#include "omath/hooks/hooks_manager.hpp"
#include <Windows.h> #include <Windows.h>
#include <d3d11.h> #include <d3d11.h>
#include <dxgi.h> #include <dxgi.h>
@@ -5,8 +6,6 @@
#include <imgui_impl_dx11.h> #include <imgui_impl_dx11.h>
#include <imgui_impl_win32.h> #include <imgui_impl_win32.h>
#include "omath/hooks/hooks_manager.hpp"
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND, UINT, WPARAM, LPARAM); extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND, UINT, WPARAM, LPARAM);
namespace namespace
@@ -51,12 +50,14 @@ namespace
ImGui_ImplDX11_Init(g_device, g_context); ImGui_ImplDX11_Init(g_device, g_context);
auto& mgr = omath::hooks::HooksManager::get(); auto& mgr = omath::hooks::HooksManager::get();
mgr.set_on_wnd_proc([](HWND h, UINT msg, WPARAM wp, LPARAM lp) -> std::optional<LRESULT> { mgr.set_on_wnd_proc(
[](HWND h, UINT msg, WPARAM wp, LPARAM lp) -> std::optional<LRESULT>
{
if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp)) if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp))
return 0; return 0;
return std::nullopt; return std::nullopt;
}); });
mgr.hook_wnd_proc(desc.OutputWindow); std::ignore = mgr.hook_wnd_proc(desc.OutputWindow);
g_initialized = true; g_initialized = true;
} }
@@ -105,7 +106,9 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
if (reason == DLL_PROCESS_ATTACH) if (reason == DLL_PROCESS_ATTACH)
{ {
DisableThreadLibraryCalls(h_instance); DisableThreadLibraryCalls(h_instance);
CreateThread(nullptr, 0, [](LPVOID) -> DWORD CreateThread(
nullptr, 0,
[](LPVOID) -> DWORD
{ {
while (!GetModuleHandle("d3d11.dll")) while (!GetModuleHandle("d3d11.dll"))
Sleep(100); Sleep(100);
@@ -115,7 +118,8 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
mgr.set_on_resize_buffers(on_resize_buffers); mgr.set_on_resize_buffers(on_resize_buffers);
mgr.hook_dx11(); mgr.hook_dx11();
return 0; return 0;
}, nullptr, 0, nullptr); },
nullptr, 0, nullptr);
} }
else if (reason == DLL_PROCESS_DETACH) else if (reason == DLL_PROCESS_DETACH)
{ {
@@ -130,9 +134,21 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
ImGui::DestroyContext(); ImGui::DestroyContext();
} }
if (g_render_target_view) { g_render_target_view->Release(); g_render_target_view = nullptr; } if (g_render_target_view)
if (g_context) { g_context->Release(); g_context = nullptr; } {
if (g_device) { g_device->Release(); g_device = nullptr; } g_render_target_view->Release();
g_render_target_view = nullptr;
}
if (g_context)
{
g_context->Release();
g_context = nullptr;
}
if (g_device)
{
g_device->Release();
g_device = nullptr;
}
} }
return TRUE; return TRUE;
} }

View File

@@ -1,10 +1,10 @@
#pragma once #pragma once
#ifdef OMATH_ENABLE_HOOKING #ifdef OMATH_ENABLE_HOOKING
#include <cstdint>
#include <functional> #include <functional>
#include <optional> #include <optional>
#include <shared_mutex> #include <shared_mutex>
#include <cstdint>
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@@ -13,9 +13,9 @@
#define NOMINMAX #define NOMINMAX
#endif #endif
#include <Windows.h> #include <Windows.h>
#include <dxgi.h>
#include <d3d9.h>
#include <d3d12.h> #include <d3d12.h>
#include <d3d9.h>
#include <dxgi.h>
#include <safetyhook.hpp> #include <safetyhook.hpp>
namespace omath::hooks namespace omath::hooks
@@ -23,14 +23,17 @@ namespace omath::hooks
class HooksManager final class HooksManager final
{ {
HooksManager() = default; HooksManager() = default;
public: public:
// IDXGISwapChain callbacks — shared between DX11 and DX12 (same interface, same signature). // IDXGISwapChain callbacks — shared between DX11 and DX12 (same interface, same signature).
using present_callback = std::function<void(IDXGISwapChain*, UINT, UINT)>; using present_callback = std::function<void(IDXGISwapChain*, UINT, UINT)>;
using resize_buffers_callback = std::function<void(IDXGISwapChain*, UINT, UINT, UINT, DXGI_FORMAT, UINT)>; using resize_buffers_callback = std::function<void(IDXGISwapChain*, UINT, UINT, UINT, DXGI_FORMAT, UINT)>;
using execute_command_lists_callback = std::function<void(ID3D12CommandQueue*, UINT, ID3D12CommandList* const*)>; using execute_command_lists_callback =
std::function<void(ID3D12CommandQueue*, UINT, ID3D12CommandList* const*)>;
// IDirect3DDevice9 callbacks — DX9 only. // IDirect3DDevice9 callbacks — DX9 only.
using dx9_present_callback = std::function<void(IDirect3DDevice9*, const RECT*, const RECT*, HWND, const RGNDATA*)>; using dx9_present_callback =
std::function<void(IDirect3DDevice9*, const RECT*, const RECT*, HWND, const RGNDATA*)>;
using dx9_reset_callback = std::function<void(IDirect3DDevice9*, D3DPRESENT_PARAMETERS*)>; using dx9_reset_callback = std::function<void(IDirect3DDevice9*, D3DPRESENT_PARAMETERS*)>;
using dx9_end_scene_callback = std::function<void(IDirect3DDevice9*)>; using dx9_end_scene_callback = std::function<void(IDirect3DDevice9*)>;
@@ -64,26 +67,31 @@ namespace omath::hooks
void set_on_wnd_proc(wnd_proc_callback callback); void set_on_wnd_proc(wnd_proc_callback callback);
private: private:
[[nodiscard]]
static HRESULT __stdcall dx9_present_detour(IDirect3DDevice9* p_device, const RECT* p_source_rect, static HRESULT __stdcall dx9_present_detour(IDirect3DDevice9* p_device, const RECT* p_source_rect,
const RECT* p_dest_rect, HWND h_dest_window_override, const RECT* p_dest_rect, HWND h_dest_window_override,
const RGNDATA* p_dirty_region); const RGNDATA* p_dirty_region);
[[nodiscard]]
static HRESULT __stdcall dx9_reset_detour(IDirect3DDevice9* p_device, static HRESULT __stdcall dx9_reset_detour(IDirect3DDevice9* p_device,
D3DPRESENT_PARAMETERS* p_presentation_parameters); D3DPRESENT_PARAMETERS* p_presentation_parameters);
[[nodiscard]]
static HRESULT __stdcall dx9_end_scene_detour(IDirect3DDevice9* p_device); static HRESULT __stdcall dx9_end_scene_detour(IDirect3DDevice9* p_device);
[[nodiscard]]
static HRESULT __stdcall dx11_present_detour(IDXGISwapChain* p_swap_chain, UINT sync_interval, UINT flags); static HRESULT __stdcall dx11_present_detour(IDXGISwapChain* p_swap_chain, UINT sync_interval, UINT flags);
static HRESULT __stdcall dx11_resize_buffers_detour(IDXGISwapChain* p_swap_chain, UINT buffer_count, [[nodiscard]]
UINT width, UINT height, DXGI_FORMAT new_format, static HRESULT __stdcall dx11_resize_buffers_detour(IDXGISwapChain* p_swap_chain, UINT buffer_count, UINT width,
UINT swap_chain_flags); UINT height, DXGI_FORMAT new_format, UINT swap_chain_flags);
[[nodiscard]]
static HRESULT __stdcall dx12_present_detour(IDXGISwapChain* p_swap_chain, UINT sync_interval, UINT flags); static HRESULT __stdcall dx12_present_detour(IDXGISwapChain* p_swap_chain, UINT sync_interval, UINT flags);
static HRESULT __stdcall dx12_resize_buffers_detour(IDXGISwapChain* p_swap_chain, UINT buffer_count, [[nodiscard]]
UINT width, UINT height, DXGI_FORMAT new_format, static HRESULT __stdcall dx12_resize_buffers_detour(IDXGISwapChain* p_swap_chain, UINT buffer_count, UINT width,
UINT swap_chain_flags); UINT height, DXGI_FORMAT new_format, UINT swap_chain_flags);
static void __stdcall dx12_execute_command_lists_detour(ID3D12CommandQueue* p_command_queue, static void __stdcall dx12_execute_command_lists_detour(ID3D12CommandQueue* p_command_queue,
UINT num_command_lists, UINT num_command_lists,
ID3D12CommandList* const* pp_command_lists); ID3D12CommandList* const* pp_command_lists);
[[nodiscard]]
static LRESULT __stdcall wnd_proc_detour(HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_param); static LRESULT __stdcall wnd_proc_detour(HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_param);
mutable std::shared_mutex m_mutex; mutable std::shared_mutex m_mutex;
@@ -116,7 +124,7 @@ namespace omath::hooks
execute_command_lists_callback m_execute_command_lists_cb; execute_command_lists_callback m_execute_command_lists_cb;
wnd_proc_callback m_wnd_proc_cb; wnd_proc_callback m_wnd_proc_cb;
}; };
} } // namespace omath::hooks
#else // !OMATH_ENABLE_HOOKING #else // !OMATH_ENABLE_HOOKING
@@ -125,11 +133,12 @@ namespace omath::hooks
class HooksManager final class HooksManager final
{ {
HooksManager() = default; HooksManager() = default;
public: public:
[[nodiscard]] static HooksManager& get(); [[nodiscard]] static HooksManager& get();
HooksManager(const HooksManager&) = delete; HooksManager(const HooksManager&) = delete;
~HooksManager(); ~HooksManager();
}; };
} } // namespace omath::hooks
#endif #endif

View File

@@ -19,8 +19,8 @@ namespace
m_window_class.hInstance = GetModuleHandle(nullptr); m_window_class.hInstance = GetModuleHandle(nullptr);
m_window_class.lpszClassName = "OM"; m_window_class.lpszClassName = "OM";
RegisterClassEx(&m_window_class); RegisterClassEx(&m_window_class);
m_window_handle = CreateWindow(m_window_class.lpszClassName, "Dummy", WS_OVERLAPPEDWINDOW, m_window_handle = CreateWindow(m_window_class.lpszClassName, "Dummy", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100,
0, 0, 100, 100, nullptr, nullptr, m_window_class.hInstance, nullptr); nullptr, nullptr, m_window_class.hInstance, nullptr);
} }
~DummyWindow() ~DummyWindow()
{ {
@@ -28,8 +28,14 @@ namespace
DestroyWindow(m_window_handle); DestroyWindow(m_window_handle);
UnregisterClass(m_window_class.lpszClassName, m_window_class.hInstance); UnregisterClass(m_window_class.lpszClassName, m_window_class.hInstance);
} }
[[nodiscard]] HWND handle() const { return m_window_handle; } [[nodiscard]] HWND handle() const
[[nodiscard]] bool valid() const { return m_window_handle != nullptr; } {
return m_window_handle;
}
[[nodiscard]] bool valid() const
{
return m_window_handle != nullptr;
}
}; };
void* vtable_fn(void* com_obj, std::size_t index) void* vtable_fn(void* com_obj, std::size_t index)
@@ -60,12 +66,18 @@ namespace
~dx12_com_objects() ~dx12_com_objects()
{ {
if (swap_chain) swap_chain->Release(); if (swap_chain)
if (command_list) command_list->Release(); swap_chain->Release();
if (command_allocator) command_allocator->Release(); if (command_list)
if (command_queue) command_queue->Release(); command_list->Release();
if (device) device->Release(); if (command_allocator)
if (factory) factory->Release(); command_allocator->Release();
if (command_queue)
command_queue->Release();
if (device)
device->Release();
if (factory)
factory->Release();
} }
}; };
@@ -79,10 +91,10 @@ namespace
if (!d3d12_module || !dxgi_module) if (!d3d12_module || !dxgi_module)
return std::nullopt; return std::nullopt;
const auto create_dxgi_factory = reinterpret_cast<create_dxgi_factory_fn>( const auto create_dxgi_factory =
GetProcAddress(dxgi_module, "CreateDXGIFactory")); reinterpret_cast<create_dxgi_factory_fn>(GetProcAddress(dxgi_module, "CreateDXGIFactory"));
const auto d3d12_create_device = reinterpret_cast<d3d12_create_device_fn>( const auto d3d12_create_device =
GetProcAddress(d3d12_module, "D3D12CreateDevice")); reinterpret_cast<d3d12_create_device_fn>(GetProcAddress(d3d12_module, "D3D12CreateDevice"));
if (!create_dxgi_factory || !d3d12_create_device) if (!create_dxgi_factory || !d3d12_create_device)
return std::nullopt; return std::nullopt;
@@ -96,8 +108,7 @@ namespace
if (objs.factory->EnumAdapters(0, &adapter) == DXGI_ERROR_NOT_FOUND) if (objs.factory->EnumAdapters(0, &adapter) == DXGI_ERROR_NOT_FOUND)
return std::nullopt; return std::nullopt;
const HRESULT device_hr = d3d12_create_device(adapter, D3D_FEATURE_LEVEL_11_0, const HRESULT device_hr = d3d12_create_device(adapter, D3D_FEATURE_LEVEL_11_0, __uuidof(ID3D12Device),
__uuidof(ID3D12Device),
reinterpret_cast<void**>(&objs.device)); reinterpret_cast<void**>(&objs.device));
adapter->Release(); adapter->Release();
if (FAILED(device_hr)) if (FAILED(device_hr))
@@ -110,13 +121,12 @@ namespace
reinterpret_cast<void**>(&objs.command_queue)))) reinterpret_cast<void**>(&objs.command_queue))))
return std::nullopt; return std::nullopt;
if (FAILED(objs.device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, if (FAILED(objs.device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, __uuidof(ID3D12CommandAllocator),
__uuidof(ID3D12CommandAllocator),
reinterpret_cast<void**>(&objs.command_allocator)))) reinterpret_cast<void**>(&objs.command_allocator))))
return std::nullopt; return std::nullopt;
if (FAILED(objs.device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, objs.command_allocator, if (FAILED(objs.device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, objs.command_allocator, nullptr,
nullptr, __uuidof(ID3D12GraphicsCommandList), __uuidof(ID3D12GraphicsCommandList),
reinterpret_cast<void**>(&objs.command_list)))) reinterpret_cast<void**>(&objs.command_list))))
return std::nullopt; return std::nullopt;
@@ -176,8 +186,8 @@ namespace omath::hooks
return false; return false;
using direct3d_create9_fn = IDirect3D9*(__stdcall*)(UINT); using direct3d_create9_fn = IDirect3D9*(__stdcall*)(UINT);
const auto direct3d_create9 = reinterpret_cast<direct3d_create9_fn>( const auto direct3d_create9 =
GetProcAddress(d3d9_module, "Direct3DCreate9")); reinterpret_cast<direct3d_create9_fn>(GetProcAddress(d3d9_module, "Direct3DCreate9"));
if (!direct3d_create9) if (!direct3d_create9)
return false; return false;
@@ -202,17 +212,13 @@ namespace omath::hooks
// Reset = 16 // Reset = 16
// Present = 17 // Present = 17
// EndScene = 42 // EndScene = 42
m_dx9_present_hook = safetyhook::create_inline( m_dx9_present_hook =
vtable_fn(device, 17), safetyhook::create_inline(vtable_fn(device, 17), reinterpret_cast<void*>(&dx9_present_detour));
reinterpret_cast<void*>(&dx9_present_detour));
m_dx9_reset_hook = safetyhook::create_inline( m_dx9_reset_hook = safetyhook::create_inline(vtable_fn(device, 16), reinterpret_cast<void*>(&dx9_reset_detour));
vtable_fn(device, 16),
reinterpret_cast<void*>(&dx9_reset_detour));
m_dx9_end_scene_hook = safetyhook::create_inline( m_dx9_end_scene_hook =
vtable_fn(device, 42), safetyhook::create_inline(vtable_fn(device, 42), reinterpret_cast<void*>(&dx9_end_scene_detour));
reinterpret_cast<void*>(&dx9_end_scene_detour));
device->Release(); device->Release();
d3d9->Release(); d3d9->Release();
@@ -271,10 +277,9 @@ namespace omath::hooks
return false; return false;
using d3d11_create_device_and_swap_chain_fn = using d3d11_create_device_and_swap_chain_fn =
HRESULT(__stdcall*)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, HRESULT(__stdcall*)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, const D3D_FEATURE_LEVEL*, UINT, UINT,
const D3D_FEATURE_LEVEL*, UINT, UINT, const DXGI_SWAP_CHAIN_DESC*, IDXGISwapChain**, ID3D11Device**, D3D_FEATURE_LEVEL*,
const DXGI_SWAP_CHAIN_DESC*, IDXGISwapChain**, ID3D11DeviceContext**);
ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
const auto create_device_and_swap_chain = reinterpret_cast<d3d11_create_device_and_swap_chain_fn>( const auto create_device_and_swap_chain = reinterpret_cast<d3d11_create_device_and_swap_chain_fn>(
GetProcAddress(d3d11_module, "D3D11CreateDeviceAndSwapChain")); GetProcAddress(d3d11_module, "D3D11CreateDeviceAndSwapChain"));
@@ -298,18 +303,16 @@ namespace omath::hooks
ID3D11DeviceContext* device_context = nullptr; ID3D11DeviceContext* device_context = nullptr;
IDXGISwapChain* swap_chain = nullptr; IDXGISwapChain* swap_chain = nullptr;
if (FAILED(create_device_and_swap_chain(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, 0, if (FAILED(create_device_and_swap_chain(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, 0, feature_levels, 1,
feature_levels, 1, D3D11_SDK_VERSION, D3D11_SDK_VERSION, &swap_chain_desc, &swap_chain, &device, nullptr,
&swap_chain_desc, &swap_chain, &device_context)))
&device, nullptr, &device_context)))
return false; return false;
m_dx11_present_hook = safetyhook::create_inline( m_dx11_present_hook = safetyhook::create_inline(vtable_fn(swap_chain, 8), // IDXGISwapChain::Present
vtable_fn(swap_chain, 8), // IDXGISwapChain::Present
reinterpret_cast<void*>(&dx11_present_detour)); reinterpret_cast<void*>(&dx11_present_detour));
m_dx11_resize_buffers_hook = safetyhook::create_inline( m_dx11_resize_buffers_hook =
vtable_fn(swap_chain, 13), // IDXGISwapChain::ResizeBuffers safetyhook::create_inline(vtable_fn(swap_chain, 13), // IDXGISwapChain::ResizeBuffers
reinterpret_cast<void*>(&dx11_resize_buffers_detour)); reinterpret_cast<void*>(&dx11_resize_buffers_detour));
swap_chain->Release(); swap_chain->Release();
@@ -349,17 +352,13 @@ namespace omath::hooks
if (!fns) if (!fns)
return false; return false;
m_dx12_present_hook = safetyhook::create_inline( m_dx12_present_hook = safetyhook::create_inline(fns->present, reinterpret_cast<void*>(&dx12_present_detour));
fns->present,
reinterpret_cast<void*>(&dx12_present_detour));
m_dx12_resize_buffers_hook = safetyhook::create_inline( m_dx12_resize_buffers_hook =
fns->resize_buffers, safetyhook::create_inline(fns->resize_buffers, reinterpret_cast<void*>(&dx12_resize_buffers_detour));
reinterpret_cast<void*>(&dx12_resize_buffers_detour));
m_dx12_execute_command_lists_hook = safetyhook::create_inline( m_dx12_execute_command_lists_hook = safetyhook::create_inline(
fns->execute_command_lists, fns->execute_command_lists, reinterpret_cast<void*>(&dx12_execute_command_lists_detour));
reinterpret_cast<void*>(&dx12_execute_command_lists_detour));
if (!m_dx12_present_hook || !m_dx12_resize_buffers_hook || !m_dx12_execute_command_lists_hook) if (!m_dx12_present_hook || !m_dx12_resize_buffers_hook || !m_dx12_execute_command_lists_hook)
{ {
@@ -450,8 +449,8 @@ namespace omath::hooks
} }
if (cb) if (cb)
cb(p_device, p_source_rect, p_dest_rect, h_dest_window_override, p_dirty_region); cb(p_device, p_source_rect, p_dest_rect, h_dest_window_override, p_dirty_region);
return mgr.m_dx9_present_hook.call<HRESULT>(p_device, p_source_rect, p_dest_rect, return mgr.m_dx9_present_hook.call<HRESULT>(p_device, p_source_rect, p_dest_rect, h_dest_window_override,
h_dest_window_override, p_dirty_region); p_dirty_region);
} }
HRESULT __stdcall HooksManager::dx9_reset_detour(IDirect3DDevice9* p_device, HRESULT __stdcall HooksManager::dx9_reset_detour(IDirect3DDevice9* p_device,
@@ -506,8 +505,8 @@ namespace omath::hooks
} }
if (cb) if (cb)
cb(p_swap_chain, buffer_count, width, height, new_format, swap_chain_flags); cb(p_swap_chain, buffer_count, width, height, new_format, swap_chain_flags);
return mgr.m_dx11_resize_buffers_hook.call<HRESULT>(p_swap_chain, buffer_count, width, height, return mgr.m_dx11_resize_buffers_hook.call<HRESULT>(p_swap_chain, buffer_count, width, height, new_format,
new_format, swap_chain_flags); swap_chain_flags);
} }
HRESULT __stdcall HooksManager::dx12_present_detour(IDXGISwapChain* p_swap_chain, UINT sync_interval, UINT flags) HRESULT __stdcall HooksManager::dx12_present_detour(IDXGISwapChain* p_swap_chain, UINT sync_interval, UINT flags)
@@ -535,8 +534,8 @@ namespace omath::hooks
} }
if (cb) if (cb)
cb(p_swap_chain, buffer_count, width, height, new_format, swap_chain_flags); cb(p_swap_chain, buffer_count, width, height, new_format, swap_chain_flags);
return mgr.m_dx12_resize_buffers_hook.call<HRESULT>(p_swap_chain, buffer_count, width, height, return mgr.m_dx12_resize_buffers_hook.call<HRESULT>(p_swap_chain, buffer_count, width, height, new_format,
new_format, swap_chain_flags); swap_chain_flags);
} }
void __stdcall HooksManager::dx12_execute_command_lists_detour(ID3D12CommandQueue* p_command_queue, void __stdcall HooksManager::dx12_execute_command_lists_detour(ID3D12CommandQueue* p_command_queue,