diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index e8b9d8f21..b9a200970 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -211,6 +211,13 @@ bl_idtech3() { """ BL_DIRECTAUDIO_SETUP = """ +bl_is_steam_installscript_target() { + local target=${1:-} + local steam_root=${STEAM_COMPAT_CLIENT_INSTALL_PATH:-${XDG_DATA_HOME:-$HOME/.local/share}/Steam} + local helper="$steam_root/legacycompat/iscriptevaluator.exe" + [ -f "$helper" ] && [[ -n "$target" && "$target" -ef "$helper" ]] +} + bl_directaudio() { case "${verb:-}" in run|waitforexitandrun|runinprefix) ;; @@ -219,6 +226,10 @@ bl_directaudio() { base=$1 [ -n "${BL_DIRECTAUDIO:-}" ] || return 0 [ -d "$BL_DIRECTAUDIO" ] || return 0 + if bl_is_steam_installscript_target "${2:-}"; then + echo "droiddeck-proton: DirectAudio skipped for Steam's install-script evaluator" >&2 + return 0 + fi version=$("$base/files/bin-arm64/wine" --version 2>/dev/null) major=${version#wine-} major=${major%%.*} @@ -306,7 +317,7 @@ for name in %s; do done if [ -n "$depot" ]; then bl_components "$depot" - bl_directaudio "$depot" + bl_directaudio "$depot" "$@" bl_game_cpus bl_idtech3 "$@" bl_libpath @@ -360,7 +371,7 @@ if [ -n "${PROOT_FP_KEY:-}" ] && [ -f "$audit" ]; then esac fi bl_components "$here" -bl_directaudio "$here" +bl_directaudio "$here" "$@" bl_game_cpus bl_idtech3 "$@" bl_libpath diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 2aa12c75d..475d93e03 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -455,6 +455,8 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(changes, {"42": COMPAT["TOOL"]}) def test_both_proton_wrappers_call_environment_launcher(self): + self.assertIn('bl_directaudio "$depot" "$@"', COMPAT["LAUNCHER_SH"]) + self.assertIn('bl_directaudio "$here" "$@"', COMPAT["EXTRA_WRAPPER_SH"] % "proton") for script in (COMPAT["LAUNCHER_SH"], COMPAT["EXTRA_WRAPPER_SH"] % "proton"): subprocess.run(["bash", "-n"], input=script, text=True, check=True) self.assertIn('bl_run ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env', script) @@ -870,12 +872,15 @@ class DirectAudioPrefixTest(unittest.TestCase): (self.windows / folder).mkdir(parents=True) self.reg = self.compat / "pfx/user.reg" - def run_setup(self, verb="waitforexitandrun"): - script = COMPAT["BL_DIRECTAUDIO_SETUP"] + '\nverb=$2\nbl_directaudio "$1"\necho "WINEDLLPATH=$WINEDLLPATH"\necho "WINE_AUDIO_DRIVER=${WINE_AUDIO_DRIVER:-}"\n' - env = dict(os.environ, BL_DIRECTAUDIO=str(self.sets), STEAM_COMPAT_DATA_PATH=str(self.compat)) + def run_setup(self, target="game.exe", cwd=None, verb="waitforexitandrun"): + script = COMPAT["BL_DIRECTAUDIO_SETUP"] + '\nverb=$3\nbl_directaudio "$1" "$2"\necho "WINEDLLPATH=$WINEDLLPATH"\necho "WINE_AUDIO_DRIVER=${WINE_AUDIO_DRIVER:-}"\n' + steam = self.compat.parent / "Steam" + env = dict(os.environ, BL_DIRECTAUDIO=str(self.sets), STEAM_COMPAT_DATA_PATH=str(self.compat), + STEAM_COMPAT_CLIENT_INSTALL_PATH=str(steam)) env.pop("WINEDLLPATH", None) env.pop("WINE_AUDIO_DRIVER", None) - return subprocess.run(["bash", "-c", script, "bash", str(self.tool), verb], env=env, capture_output=True, text=True, check=True) + return subprocess.run(["bash", "-c", script, "bash", str(self.tool), target, verb], cwd=cwd, env=env, + capture_output=True, text=True, check=True) def audio_values(self): found, current = [], None @@ -895,7 +900,7 @@ class DirectAudioPrefixTest(unittest.TestCase): with self.subTest(verb=verb): self.reg.write_text('WINE REGISTRY Version 2\n\n[Software\\\\Wine\\\\Drivers] 1\n"Audio"="pulse"\n') before = self.reg.read_bytes() - result = self.run_setup(verb) + result = self.run_setup(verb=verb) self.assertEqual(self.reg.read_bytes(), before) self.assertIsNone(self.link("system32")) self.assertIsNone(self.link("syswow64")) @@ -906,11 +911,41 @@ class DirectAudioPrefixTest(unittest.TestCase): self.reg.write_text("WINE REGISTRY Version 2\n") for verb in ("run", "runinprefix"): with self.subTest(verb=verb): - result = self.run_setup(verb) + result = self.run_setup(verb=verb) self.assertIn("DirectAudio ready", result.stderr) self.assertIn("WINE_AUDIO_DRIVER=directaudio,pulse\n", result.stdout) self.assertEqual(self.link("system32"), str(self.audio / "lib/wine/aarch64-windows/winedirectaudio.drv")) + def test_steam_installscript_evaluator_does_not_change_prefix_audio(self): + legacycompat = self.compat.parent / "Steam/legacycompat" + legacycompat.mkdir(parents=True) + (legacycompat / "iscriptevaluator.exe").write_bytes(b"Steam install-script evaluator") + self.reg.write_text("WINE REGISTRY Version 2\n\n#arch=win64\n") + + result = self.run_setup("iscriptevaluator.exe", cwd=legacycompat) + + self.assertIn("DirectAudio skipped for Steam's install-script evaluator", result.stderr) + self.assertIn("WINEDLLPATH=\n", result.stdout) + self.assertIn("WINE_AUDIO_DRIVER=\n", result.stdout) + self.assertEqual(self.reg.read_text(), "WINE REGISTRY Version 2\n\n#arch=win64\n") + self.assertIsNone(self.link("system32")) + self.assertIsNone(self.link("syswow64")) + + def test_same_basename_outside_steam_legacycompat_keeps_normal_setup(self): + legacycompat = self.compat.parent / "Steam/legacycompat" + legacycompat.mkdir(parents=True) + (legacycompat / "iscriptevaluator.exe").write_bytes(b"Steam install-script evaluator") + other = self.compat.parent / "other" + other.mkdir() + (other / "iscriptevaluator.exe").write_bytes(b"unrelated executable") + self.reg.write_text("WINE REGISTRY Version 2\n\n#arch=win64\n") + + result = self.run_setup("iscriptevaluator.exe", cwd=other) + + self.assertIn("DirectAudio selected", result.stderr) + self.assertEqual(self.link("system32"), str(self.audio / "lib/wine/aarch64-windows/winedirectaudio.drv")) + self.assertEqual(self.audio_values(), [("[Software\\\\Wine\\\\Drivers]", '"Audio"="directaudio,pulse"')]) + def test_the_driver_is_placed_and_selected_the_way_wine_reads_it(self): self.reg.write_text("WINE REGISTRY Version 2\n;; All keys relative to \\\\User\\\\S-1-5-21-0-0-0-1000\n\n#arch=win64\n") result = self.run_setup()