BlackMark
c7be4eeb9a
The render-hook only installed IAudioClient/IAudioRenderClient hooks reactively, when it saw the game call IMMDevice::Activate -> GetService. But we attach to a game that is already running and playing audio, so its render client was created before injection: those calls never fire again, no primary stream is ever registered, nothing is captured, and the host always falls back to process loopback (the echo). Every game tested did so. Fix: at anchor time, build our own probe IAudioClient + IAudioRenderClient with raw calls and hook GetBuffer/ReleaseBuffer (plus Initialize/GetService) on their vtables. Every instance of a COM coclass shares one vtable, so this patches the shared vtables and intercepts the game's pre-existing render client too. The first render client seen actively releasing buffers is adopted as primary on the audio thread (try-lock, one-time) using the device mix format as its assumed format (we never saw its Initialize). Streams created after injection still register via the reactive path with their real format. Also fixes a self-deadlock: installing the Activate hook before the probe's own device->Activate call re-entered hk_Activate -> install_audioclient_hooks, which blocked on the setup mutex the installer already held, freezing the worker (and any game thread that later called Activate -> crash). The probe objects are now created raw, before any hook is installed. Validated against Phantom Brave (injected while already playing): the pre-existing 48 kHz/2ch/float render client is detected and registered as primary, real non-silent audio reaches the ring (peak tracks the game's levels), and a draining consumer sees zero overruns. Tooling for iterating on real games without Steam/RPT/the host UI: - tools/audio_probe: creates the IPC block + audio ring, injects the hook, drains the ring and prints stream/format/peak/overrun diagnostics by pid. - hook/src/debug_log: opt-in file trace (%TEMP%\coop_hook.log), enabled by the COOP_HOOK_LOG env var or the %TEMP%\coop_hook.log.on sentinel the probe drops; off in normal use. All four tests still pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
59 lines
2.3 KiB
CMake
59 lines
2.3 KiB
CMake
# Self-contained verification of the forwarding core (IPC + XInput hook).
|
|
# Reuses the hook's xinput_hook.cpp directly so it exercises the shipping code.
|
|
add_executable(hook_selftest
|
|
hook_selftest.cpp
|
|
${CMAKE_SOURCE_DIR}/hook/src/xinput_hook.cpp)
|
|
|
|
target_include_directories(hook_selftest PRIVATE ${CMAKE_SOURCE_DIR}/hook/src)
|
|
|
|
target_link_libraries(hook_selftest PRIVATE
|
|
coop_common
|
|
safetyhook::safetyhook
|
|
xinput)
|
|
|
|
add_test(NAME hook_selftest COMMAND hook_selftest)
|
|
|
|
# Unit test for the shared audio ring (lock-free SPSC push/pop, wrap-around,
|
|
# format handshake, overrun policy). Header-only, no hook or audio device.
|
|
add_executable(audio_ring_test audio_ring_test.cpp)
|
|
target_link_libraries(audio_ring_test PRIVATE coop_common)
|
|
add_test(NAME audio_ring_test COMMAND audio_ring_test)
|
|
|
|
# Integration test for WASAPI process-loopback capture. Reuses the shipping
|
|
# capture code and captures from coop_tone (a known sine-wave render process).
|
|
add_executable(audio_loopback_test
|
|
audio_loopback_test.cpp
|
|
${CMAKE_SOURCE_DIR}/host/src/audio/process_loopback_capture.cpp)
|
|
|
|
target_include_directories(audio_loopback_test PRIVATE ${CMAKE_SOURCE_DIR}/host/src)
|
|
|
|
# Process loopback needs the Windows 10 20H1 (NTDDI_WIN10_CO) headers.
|
|
target_compile_definitions(audio_loopback_test PRIVATE NTDDI_VERSION=0x0A00000B)
|
|
|
|
target_link_libraries(audio_loopback_test PRIVATE mmdevapi ole32)
|
|
|
|
add_dependencies(audio_loopback_test coop_tone)
|
|
add_test(NAME audio_loopback_test COMMAND audio_loopback_test)
|
|
|
|
# In-process self-test for the WASAPI render-hook. Reuses the shipping
|
|
# audio_hook.cpp and drives a real WASAPI render path in the same process, so it
|
|
# exercises COM vtable discovery + GetBuffer/ReleaseBuffer interception with no
|
|
# game and no second Steam account (the audio analogue of hook_selftest).
|
|
add_executable(audio_hook_test
|
|
audio_hook_test.cpp
|
|
${CMAKE_SOURCE_DIR}/hook/src/audio_hook.cpp
|
|
${CMAKE_SOURCE_DIR}/hook/src/debug_log.cpp)
|
|
|
|
target_include_directories(audio_hook_test PRIVATE ${CMAKE_SOURCE_DIR}/hook/src)
|
|
|
|
# IAudioClient3 / process-audio APIs want the Windows 10 20H1 (NTDDI_WIN10_CO) headers.
|
|
target_compile_definitions(audio_hook_test PRIVATE NTDDI_VERSION=0x0A00000B)
|
|
|
|
target_link_libraries(audio_hook_test PRIVATE
|
|
coop_common
|
|
safetyhook::safetyhook
|
|
ole32
|
|
mmdevapi)
|
|
|
|
add_test(NAME audio_hook_test COMMAND audio_hook_test)
|