mirror of
https://github.com/orange-cpp/omath.git
synced 2026-05-06 23:03:27 +00:00
code style fixes
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#ifdef OMATH_ENABLE_HOOKING
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
#include <optional>
|
||||
#include <shared_mutex>
|
||||
#include <cstdint>
|
||||
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
@@ -13,9 +13,9 @@
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#include <Windows.h>
|
||||
#include <dxgi.h>
|
||||
#include <d3d9.h>
|
||||
#include <d3d12.h>
|
||||
#include <d3d9.h>
|
||||
#include <dxgi.h>
|
||||
#include <safetyhook.hpp>
|
||||
|
||||
namespace omath::hooks
|
||||
@@ -23,22 +23,25 @@ namespace omath::hooks
|
||||
class HooksManager final
|
||||
{
|
||||
HooksManager() = default;
|
||||
|
||||
public:
|
||||
// IDXGISwapChain callbacks — shared between DX11 and DX12 (same interface, same signature).
|
||||
using present_callback = std::function<void(IDXGISwapChain*, UINT, 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 present_callback = std::function<void(IDXGISwapChain*, UINT, 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*)>;
|
||||
|
||||
// IDirect3DDevice9 callbacks — DX9 only.
|
||||
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_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_end_scene_callback = std::function<void(IDirect3DDevice9*)>;
|
||||
|
||||
// Return nullopt to pass the message to the original WndProc; return a value to intercept it.
|
||||
using wnd_proc_callback = std::function<std::optional<LRESULT>(HWND, UINT, WPARAM, LPARAM)>;
|
||||
|
||||
[[nodiscard]] static HooksManager& get();
|
||||
HooksManager(const HooksManager&) = delete;
|
||||
HooksManager(const HooksManager&) = delete;
|
||||
HooksManager& operator=(const HooksManager&) = delete;
|
||||
~HooksManager();
|
||||
|
||||
@@ -64,36 +67,41 @@ namespace omath::hooks
|
||||
void set_on_wnd_proc(wnd_proc_callback callback);
|
||||
|
||||
private:
|
||||
[[nodiscard]]
|
||||
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 RGNDATA* p_dirty_region);
|
||||
[[nodiscard]]
|
||||
static HRESULT __stdcall dx9_reset_detour(IDirect3DDevice9* p_device,
|
||||
D3DPRESENT_PARAMETERS* p_presentation_parameters);
|
||||
[[nodiscard]]
|
||||
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_resize_buffers_detour(IDXGISwapChain* p_swap_chain, UINT buffer_count,
|
||||
UINT width, UINT height, DXGI_FORMAT new_format,
|
||||
UINT swap_chain_flags);
|
||||
|
||||
[[nodiscard]]
|
||||
static HRESULT __stdcall dx11_resize_buffers_detour(IDXGISwapChain* p_swap_chain, UINT buffer_count, UINT width,
|
||||
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_resize_buffers_detour(IDXGISwapChain* p_swap_chain, UINT buffer_count,
|
||||
UINT width, UINT height, DXGI_FORMAT new_format,
|
||||
UINT swap_chain_flags);
|
||||
[[nodiscard]]
|
||||
static HRESULT __stdcall dx12_resize_buffers_detour(IDXGISwapChain* p_swap_chain, UINT buffer_count, UINT width,
|
||||
UINT height, DXGI_FORMAT new_format, UINT swap_chain_flags);
|
||||
static void __stdcall dx12_execute_command_lists_detour(ID3D12CommandQueue* p_command_queue,
|
||||
UINT num_command_lists,
|
||||
ID3D12CommandList* const* pp_command_lists);
|
||||
|
||||
[[nodiscard]]
|
||||
static LRESULT __stdcall wnd_proc_detour(HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_param);
|
||||
|
||||
mutable std::shared_mutex m_mutex;
|
||||
|
||||
bool m_is_dx9_hooked = false;
|
||||
bool m_is_dx11_hooked = false;
|
||||
bool m_is_dx12_hooked = false;
|
||||
bool m_is_dx9_hooked = false;
|
||||
bool m_is_dx11_hooked = false;
|
||||
bool m_is_dx12_hooked = false;
|
||||
bool m_is_wnd_proc_hooked = false;
|
||||
|
||||
HWND m_hooked_hwnd = nullptr;
|
||||
HWND m_hooked_hwnd = nullptr;
|
||||
WNDPROC m_original_wndproc = nullptr;
|
||||
|
||||
safetyhook::InlineHook m_dx9_present_hook;
|
||||
@@ -107,16 +115,16 @@ namespace omath::hooks
|
||||
safetyhook::InlineHook m_dx12_resize_buffers_hook;
|
||||
safetyhook::InlineHook m_dx12_execute_command_lists_hook;
|
||||
|
||||
dx9_present_callback m_dx9_present_cb;
|
||||
dx9_reset_callback m_dx9_reset_cb;
|
||||
dx9_present_callback m_dx9_present_cb;
|
||||
dx9_reset_callback m_dx9_reset_cb;
|
||||
dx9_end_scene_callback m_dx9_end_scene_cb;
|
||||
|
||||
present_callback m_present_cb;
|
||||
resize_buffers_callback m_resize_buffers_cb;
|
||||
present_callback m_present_cb;
|
||||
resize_buffers_callback m_resize_buffers_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
|
||||
|
||||
@@ -125,11 +133,12 @@ namespace omath::hooks
|
||||
class HooksManager final
|
||||
{
|
||||
HooksManager() = default;
|
||||
|
||||
public:
|
||||
[[nodiscard]] static HooksManager& get();
|
||||
HooksManager(const HooksManager&) = delete;
|
||||
~HooksManager();
|
||||
};
|
||||
}
|
||||
} // namespace omath::hooks
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user