Apply clang-format across the whole tree
Run clang-format (the repo's .clang-format: LLVM base, 120 cols, tabs, Allman functions) over every source file so the tree is formatter-clean. Whitespace only -- no behavior change; full x64 + x86 suites pass. Also set SortIncludes: false in .clang-format. Windows include order is load-bearing (windows.h must precede tlhelp32.h / mmreg.h / xinput.h / dinput.h; winsock2.h must precede windows.h), and the default alphabetical sort reorders tlhelp32.h ahead of windows.h -- a build break. Leaving order alone keeps the manual, correct grouping.
This commit is contained in:
@@ -7,8 +7,7 @@
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
|
||||
namespace coop
|
||||
{
|
||||
namespace coop {
|
||||
|
||||
// Bump whenever the layout of SharedBlock or CoopPadState changes. The hook
|
||||
// refuses to attach to a host with a mismatched version.
|
||||
@@ -27,12 +26,11 @@ inline constexpr wchar_t kSharedMemoryPrefix[] = L"Local\\coop_ipc_";
|
||||
// One controller's state, laid out to map 1:1 onto XINPUT_GAMEPAD plus the
|
||||
// metadata the hook needs. Field names/types match XINPUT_GAMEPAD so the hook
|
||||
// can memcpy the trailing region straight into an XINPUT_STATE.
|
||||
struct CoopPadState
|
||||
{
|
||||
struct CoopPadState {
|
||||
std::uint8_t connected; // 1 if a guest/host pad is mapped to this slot
|
||||
std::uint8_t reserved[3];
|
||||
std::uint32_t packet; // bumps on change -> XINPUT_STATE::dwPacketNumber
|
||||
std::uint16_t buttons; // XINPUT_GAMEPAD_* bitmask
|
||||
std::uint32_t packet; // bumps on change -> XINPUT_STATE::dwPacketNumber
|
||||
std::uint16_t buttons; // XINPUT_GAMEPAD_* bitmask
|
||||
std::uint8_t left_trigger;
|
||||
std::uint8_t right_trigger;
|
||||
std::int16_t thumb_lx;
|
||||
@@ -56,30 +54,27 @@ inline constexpr std::uint32_t kMaxAudioStreams = 4;
|
||||
// we injected (the common case) was never seen at Initialize, so its format starts as a
|
||||
// guess (the device mix format) and its true sample rate is measured from the render
|
||||
// cadence; a stream we watched get created carries its exact Initialize format.
|
||||
enum AudioFormatState : std::uint32_t
|
||||
{
|
||||
AudioFormat_Unknown = 0, // no format determined yet
|
||||
AudioFormat_Exact = 1, // taken from the game's own IAudioClient::Initialize
|
||||
AudioFormat_Measuring = 2, // guessed (device mix format); true sample rate being measured
|
||||
AudioFormat_Measured = 3, // guessed rate measured (consensus on a standard rate); ch/bits assumed
|
||||
enum AudioFormatState : std::uint32_t {
|
||||
AudioFormat_Unknown = 0, // no format determined yet
|
||||
AudioFormat_Exact = 1, // taken from the game's own IAudioClient::Initialize
|
||||
AudioFormat_Measuring = 2, // guessed (device mix format); true sample rate being measured
|
||||
AudioFormat_Measured = 3, // guessed rate measured (consensus on a standard rate); ch/bits assumed
|
||||
AudioFormat_LowConfidence = 4, // rate never reached consensus; best estimate published -- verify/override
|
||||
AudioFormat_Override = 5, // operator set this format manually (see the per-stream op channel)
|
||||
AudioFormat_Override = 5, // operator set this format manually (see the per-stream op channel)
|
||||
};
|
||||
|
||||
struct AudioStreamInfo
|
||||
{
|
||||
std::uint32_t is_primary; // 1 = the stream the hook captures/silences
|
||||
struct AudioStreamInfo {
|
||||
std::uint32_t is_primary; // 1 = the stream the hook captures/silences
|
||||
std::uint32_t sample_rate;
|
||||
std::uint16_t channels;
|
||||
std::uint16_t bits;
|
||||
std::uint32_t format_tag; // WAVE_FORMAT_* of this stream
|
||||
std::uint32_t format_tag; // WAVE_FORMAT_* of this stream
|
||||
std::uint64_t frames_rendered;
|
||||
std::uint32_t format_state; // AudioFormatState: how the format above was determined
|
||||
};
|
||||
|
||||
// Orthogonal hook subsystems the host can install/remove independently.
|
||||
enum HookSubsystem : std::uint32_t
|
||||
{
|
||||
enum HookSubsystem : std::uint32_t {
|
||||
HookSubsys_Input = 0, // XInput hooks (forward the guest pad)
|
||||
HookSubsys_Focus = 1, // focus spoof (keep the game running unfocused)
|
||||
HookSubsys_Audio = 2, // WASAPI render-hook (audio mirror without echo)
|
||||
@@ -93,17 +88,15 @@ inline constexpr std::uint32_t kMaxHookEntries = 24;
|
||||
|
||||
// One installed hook, for the Injection panel's hook list. POD diagnostics, like
|
||||
// AudioStreamInfo: the hook is the sole writer; benign cross-process races are ok.
|
||||
struct HookEntry
|
||||
{
|
||||
char name[40]; // e.g. "XInputGetState"
|
||||
struct HookEntry {
|
||||
char name[40]; // e.g. "XInputGetState"
|
||||
std::uint32_t subsystem; // HookSubsystem
|
||||
std::uint32_t installed; // 1 if currently hooked
|
||||
std::uint64_t calls; // cumulative times the detour ran
|
||||
};
|
||||
|
||||
// Indices into HookStatus::focus_query_calls.
|
||||
enum FocusApi : std::uint32_t
|
||||
{
|
||||
enum FocusApi : std::uint32_t {
|
||||
FocusApi_Foreground = 0, // GetForegroundWindow
|
||||
FocusApi_Active = 1, // GetActiveWindow
|
||||
FocusApi_Focus = 2, // GetFocus
|
||||
@@ -115,17 +108,16 @@ enum FocusApi : std::uint32_t
|
||||
// polling, does it use the focus APIs, and does it read input through a
|
||||
// focus-gated path (Raw Input / DirectInput)? Diagnostics only, so the non-atomic
|
||||
// fields tolerate benign cross-process races.
|
||||
struct HookStatus
|
||||
{
|
||||
std::atomic<std::uint32_t> heartbeat; // DLL bumps ~4x/sec while alive
|
||||
std::atomic<std::uint64_t> get_state_calls[kMaxPads]; // XInputGetState/Ex per slot
|
||||
std::atomic<std::uint64_t> get_caps_calls[kMaxPads]; // XInputGetCapabilities per slot
|
||||
struct HookStatus {
|
||||
std::atomic<std::uint32_t> heartbeat; // DLL bumps ~4x/sec while alive
|
||||
std::atomic<std::uint64_t> get_state_calls[kMaxPads]; // XInputGetState/Ex per slot
|
||||
std::atomic<std::uint64_t> get_caps_calls[kMaxPads]; // XInputGetCapabilities per slot
|
||||
std::atomic<std::uint64_t> focus_query_calls[FocusApi_Count]; // focus API calls, see FocusApi
|
||||
|
||||
std::uint32_t attached; // 1 once XInput hooks are installed
|
||||
std::uint32_t focus_spoof; // 1 once focus spoofing is active
|
||||
std::uint32_t game_pid; // the DLL's own pid (sanity check)
|
||||
std::uint64_t game_hwnd; // window the DLL subclassed (0 if none yet)
|
||||
std::uint32_t attached; // 1 once XInput hooks are installed
|
||||
std::uint32_t focus_spoof; // 1 once focus spoofing is active
|
||||
std::uint32_t game_pid; // the DLL's own pid (sanity check)
|
||||
std::uint64_t game_hwnd; // window the DLL subclassed (0 if none yet)
|
||||
|
||||
// Input-path diagnostics: which focus-gated mechanism (if any) the game uses.
|
||||
std::uint32_t raw_input_registered; // process has any Raw Input registration
|
||||
@@ -141,8 +133,8 @@ struct HookStatus
|
||||
// Audio render-hook diagnostics. Stream counting runs whenever the DLL is
|
||||
// injected, independent of whether audio mirroring is enabled, so a
|
||||
// multi-stream game is visible before/without turning the mirror on.
|
||||
std::uint32_t audio_streams_seen; // distinct render clients ever created
|
||||
AudioStreamInfo audio_streams[kMaxAudioStreams]; // per-slot detail, [0] is primary
|
||||
std::uint32_t audio_streams_seen; // distinct render clients ever created
|
||||
AudioStreamInfo audio_streams[kMaxAudioStreams]; // per-slot detail, [0] is primary
|
||||
|
||||
// Hook registry: every individual hook the DLL has installed, with a running
|
||||
// call count. Lets the Injection panel list exactly what's hooked and how busy.
|
||||
@@ -163,8 +155,7 @@ struct HookStatus
|
||||
// Host -> hook control channel. The host requests which hook subsystems should be
|
||||
// installed; the hook reconciles each tick. 0 = install (the zero-filled default,
|
||||
// so a fresh mapping installs everything as before), 1 = remove.
|
||||
struct HookControl
|
||||
{
|
||||
struct HookControl {
|
||||
std::atomic<std::uint32_t> subsystem_disabled[HookSubsys_Count];
|
||||
|
||||
// Cursor handling for cursor-clipping games (part of the Focus subsystem).
|
||||
@@ -181,17 +172,16 @@ struct HookControl
|
||||
// is the sole writer. `generation` bumps on every published frame (0 = nothing
|
||||
// shared yet); width/height/format describe the currently shared texture, so the
|
||||
// host reopens it whenever they change. The keyed mutex uses key 0 on both sides.
|
||||
struct VideoShare
|
||||
{
|
||||
struct VideoShare {
|
||||
std::atomic<std::uint32_t> generation; // bumps per published frame; 0 = none yet
|
||||
std::uint32_t width; // shared texture dimensions / DXGI format
|
||||
std::uint32_t height;
|
||||
std::uint32_t format; // DXGI_FORMAT of the shared texture
|
||||
std::uint64_t present_calls; // cumulative Present() detours (diagnostic)
|
||||
std::int64_t present_qpc; // QueryPerformanceCounter at the last publish
|
||||
std::uint64_t frames_dropped; // cumulative captures skipped because the shared
|
||||
// keyed mutex was busy (host mid-copy) -- a frame
|
||||
// the game produced that never reached the mirror
|
||||
std::uint32_t format; // DXGI_FORMAT of the shared texture
|
||||
std::uint64_t present_calls; // cumulative Present() detours (diagnostic)
|
||||
std::int64_t present_qpc; // QueryPerformanceCounter at the last publish
|
||||
std::uint64_t frames_dropped; // cumulative captures skipped because the shared
|
||||
// keyed mutex was busy (host mid-copy) -- a frame
|
||||
// the game produced that never reached the mirror
|
||||
// present_calls / frames_dropped stay plain uint64_t (POD layout) but are read/written via
|
||||
// std::atomic_ref so the host's cross-process read isn't torn (an x86 DLL stores 64 bits in two
|
||||
// halves). Kept as fields, not std::atomic, only so the layout/offset asserts stay simple.
|
||||
@@ -203,8 +193,7 @@ struct VideoShare
|
||||
// the matching window messages to the game, and maintains a synthesized state the
|
||||
// GetAsyncKeyState/GetKeyboardState/GetCursorPos hooks report to polling games.
|
||||
|
||||
enum MkbEventType : std::uint32_t
|
||||
{
|
||||
enum MkbEventType : std::uint32_t {
|
||||
Mkb_KeyDown = 0, // code = Win32 virtual-key
|
||||
Mkb_KeyUp = 1, // code = Win32 virtual-key
|
||||
Mkb_Char = 2, // code = UTF-16 code unit (WM_CHAR)
|
||||
@@ -213,8 +202,7 @@ enum MkbEventType : std::uint32_t
|
||||
Mkb_Wheel = 5, // code = signed wheel delta (WHEEL_DELTA units); x,y = game client px
|
||||
};
|
||||
|
||||
struct MkbEvent
|
||||
{
|
||||
struct MkbEvent {
|
||||
std::uint32_t type; // MkbEventType
|
||||
std::uint32_t code; // see per-type meaning above
|
||||
std::int32_t x; // game-client x (mouse events)
|
||||
@@ -227,8 +215,7 @@ static_assert(sizeof(MkbEvent) == 16, "MkbEvent must stay byte-identical across
|
||||
inline constexpr std::uint32_t kMkbQueueSize = 128;
|
||||
|
||||
// Lock-free SPSC ring: host produces, hook consumes. Free-running 32-bit indices.
|
||||
struct MkbRing
|
||||
{
|
||||
struct MkbRing {
|
||||
std::atomic<std::uint32_t> head; // producer (host) write position
|
||||
std::atomic<std::uint32_t> tail; // consumer (hook) read position
|
||||
MkbEvent events[kMkbQueueSize];
|
||||
@@ -244,8 +231,7 @@ inline constexpr std::uint64_t kVideoMutexKey = 0;
|
||||
// Top-level shared block. The host is the sole writer of pad state; the hook is
|
||||
// the sole reader. A seqlock (even = stable, odd = write in progress) lets the
|
||||
// reader grab a torn-free snapshot without a kernel lock on the hot path.
|
||||
struct SharedBlock
|
||||
{
|
||||
struct SharedBlock {
|
||||
std::uint32_t magic;
|
||||
std::uint32_t version;
|
||||
std::uint32_t pad_count; // number of populated slots, <= kMaxPads
|
||||
@@ -297,20 +283,17 @@ static_assert(sizeof(MkbRing) == 2056, "MkbRing size changed -- wire-protocol ch
|
||||
// Writer side: publish a fresh set of pad states. Called from the host.
|
||||
inline void publish_pads(SharedBlock& block, const CoopPadState* pads, std::uint32_t count)
|
||||
{
|
||||
if (count > kMaxPads)
|
||||
{
|
||||
if (count > kMaxPads) {
|
||||
count = kMaxPads;
|
||||
}
|
||||
const std::uint32_t seq = block.sequence.load(std::memory_order_relaxed);
|
||||
block.sequence.store(seq + 1, std::memory_order_release); // -> odd: write begins
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
block.pad_count = count;
|
||||
for (std::uint32_t i = 0; i < count; ++i)
|
||||
{
|
||||
for (std::uint32_t i = 0; i < count; ++i) {
|
||||
block.pads[i] = pads[i];
|
||||
}
|
||||
for (std::uint32_t i = count; i < kMaxPads; ++i)
|
||||
{
|
||||
for (std::uint32_t i = count; i < kMaxPads; ++i) {
|
||||
block.pads[i] = CoopPadState{};
|
||||
}
|
||||
block.sequence.store(seq + 2, std::memory_order_release); // -> even: write done
|
||||
@@ -320,26 +303,21 @@ inline void publish_pads(SharedBlock& block, const CoopPadState* pads, std::uint
|
||||
// if a write is in flight; bounded so a crashed writer can't hang the game.
|
||||
inline bool read_pads(const SharedBlock& block, CoopPadState (&out)[kMaxPads], std::uint32_t& out_count)
|
||||
{
|
||||
for (int attempt = 0; attempt < 64; ++attempt)
|
||||
{
|
||||
for (int attempt = 0; attempt < 64; ++attempt) {
|
||||
const std::uint32_t before = block.sequence.load(std::memory_order_acquire);
|
||||
if (before & 1u)
|
||||
{
|
||||
if (before & 1u) {
|
||||
continue; // writer mid-update, retry
|
||||
}
|
||||
std::uint32_t count = block.pad_count;
|
||||
if (count > kMaxPads)
|
||||
{
|
||||
if (count > kMaxPads) {
|
||||
count = kMaxPads;
|
||||
}
|
||||
for (std::uint32_t i = 0; i < kMaxPads; ++i)
|
||||
{
|
||||
for (std::uint32_t i = 0; i < kMaxPads; ++i) {
|
||||
out[i] = block.pads[i];
|
||||
}
|
||||
std::atomic_thread_fence(std::memory_order_acquire);
|
||||
const std::uint32_t after = block.sequence.load(std::memory_order_acquire);
|
||||
if (before == after)
|
||||
{
|
||||
if (before == after) {
|
||||
out_count = count;
|
||||
return true;
|
||||
}
|
||||
@@ -354,8 +332,7 @@ inline bool push_mkb_event(MkbRing& ring, const MkbEvent& ev)
|
||||
{
|
||||
const std::uint32_t head = ring.head.load(std::memory_order_relaxed);
|
||||
const std::uint32_t tail = ring.tail.load(std::memory_order_acquire);
|
||||
if (head - tail >= kMkbQueueSize)
|
||||
{
|
||||
if (head - tail >= kMkbQueueSize) {
|
||||
return false; // full -> drop (host should always drain faster than it fills)
|
||||
}
|
||||
ring.events[head & (kMkbQueueSize - 1)] = ev;
|
||||
@@ -368,8 +345,7 @@ inline bool pop_mkb_event(MkbRing& ring, MkbEvent& out)
|
||||
{
|
||||
const std::uint32_t tail = ring.tail.load(std::memory_order_relaxed);
|
||||
const std::uint32_t head = ring.head.load(std::memory_order_acquire);
|
||||
if (tail == head)
|
||||
{
|
||||
if (tail == head) {
|
||||
return false; // empty
|
||||
}
|
||||
out = ring.events[tail & (kMkbQueueSize - 1)];
|
||||
|
||||
Reference in New Issue
Block a user