mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 13:55:58 +00:00
fix(desktop): run a store game's exe through its launcher so the EA environment and Origin process are set up (#2486)
* fix(desktop): run a store game's exe through its launcher so the EA environment and Origin process are set up * fix(desktop): keep a store game's prefix and resolve its launcher through symlinks and deep folders * fix(desktop): keep the exe's resolved compatdata folder when running its launcher and find the sidecar beside a symlinked exe
This commit is contained in:
1 parent
2953739f1e
commit
8961d088f2
5 files changed
+130
-7
No files matched your search
@@ -136,6 +136,30 @@ class CommandTest(Temp):
|
||||
self.assertEqual(OPEN["command"](script, [], "x86 script")[0],
|
||||
[OPEN["FEX"], "run", "--mode", "on", "--for", str(self.tmp), "--", "/bin/sh", script])
|
||||
|
||||
def test_a_store_games_exe_runs_through_its_launcher(self):
|
||||
exe, launcher = str(self.tmp / "game.exe"), str(self.tmp / "launch.bat")
|
||||
with mock.patch.dict(OPEN, {"store_launcher": lambda path: launcher if path == exe else None,
|
||||
"exe_prefix": lambda path: ["--prefix", "4242", "--compatdata", "/c/4242"]}):
|
||||
keep = ["--prefix", "4242", "--compatdata", "/c/4242"]
|
||||
self.assertEqual(OPEN["command"](exe, [], "windows")[0], [OPEN["PROTON_RUN"]] + keep + [launcher])
|
||||
self.assertEqual(OPEN["command"](exe, [], "windows", True)[0],
|
||||
[OPEN["PROTON_RUN"], "--window"] + keep + [launcher])
|
||||
self.assertEqual(OPEN["command"](exe, ["-x"], "windows")[0], [OPEN["PROTON_RUN"], exe, "-x"])
|
||||
other = str(self.tmp / "other.exe")
|
||||
self.assertEqual(OPEN["command"](other, [], "windows")[0], [OPEN["PROTON_RUN"], other])
|
||||
|
||||
def test_a_store_games_launcher_keeps_the_exes_prefix(self):
|
||||
exe = self.tmp / "game.exe"
|
||||
exe.write_text("x")
|
||||
root = str(self.tmp / "steam")
|
||||
with mock.patch.dict(os.environ, {"STEAM_COMPAT_CLIENT_INSTALL_PATH": root}), \
|
||||
mock.patch.dict(OPEN, {"PROTON_RUN": str(BIN / "droiddeck-proton-run"),
|
||||
"store_launcher": lambda path: str(self.tmp / "launch.bat")}):
|
||||
command = OPEN["command"](str(exe), [], "windows")[0]
|
||||
located = RUN["locate"](str(exe), root)
|
||||
self.assertEqual(command[1:5], ["--prefix", located.appid, "--compatdata", located.compatdata])
|
||||
self.assertEqual(str(RUN["own_id"](str(exe))), str(RUN["locate"](str(exe), root).appid))
|
||||
|
||||
def test_a_native_program_on_noexec_storage_runs_from_a_copy(self):
|
||||
program = self.write("storage/tool", elf(183))
|
||||
x86 = self.write("storage/game.x86_64", elf(62))
|
||||
@@ -737,6 +761,20 @@ class ProtonRunTest(Temp):
|
||||
self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(signed))
|
||||
self.assertFalse((self.root / "steamapps/compatdata/2733369024").exists())
|
||||
|
||||
def test_a_launcher_run_keeps_the_resolved_compatdata_folder(self):
|
||||
bat = self.write("Games/Epic/Game/.droiddeck-launch.bat", b"@echo off")
|
||||
signed = self.root / "steamapps/compatdata/-1561598272"
|
||||
signed.mkdir(parents=True)
|
||||
other = self.tmp / "Library2/steamapps/compatdata/555"
|
||||
other.mkdir(parents=True)
|
||||
for compatdata, appid in ((signed, "2733369024"), (other, "555")):
|
||||
with self.subTest(compatdata=str(compatdata)):
|
||||
code, calls, dirs = self.run_main(["--prefix", appid, "--compatdata", str(compatdata), str(bat)])
|
||||
self.assertIsNone(code)
|
||||
self.assertEqual(calls[0][2]["STEAM_COMPAT_DATA_PATH"], str(compatdata))
|
||||
code, calls, dirs = self.run_main(["--prefix", "555", str(bat)])
|
||||
self.assertEqual(calls[0][2]["STEAM_COMPAT_DATA_PATH"], str(self.root / "steamapps/compatdata/555"))
|
||||
|
||||
def test_prefix_folder_prefers_initialized_unsigned_over_empty_signed(self):
|
||||
signed = self.root / "steamapps/compatdata/-1561598272"
|
||||
signed.mkdir(parents=True)
|
||||
|
||||
@@ -35,6 +35,52 @@ class EaHook(unittest.TestCase):
|
||||
self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Game', 'DisplayName', 'Mass Effect 3'), entries)
|
||||
self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\Respawn\Titanfall2', 'DisplayName', 'Mass Effect 3'), entries)
|
||||
|
||||
def test_the_games_exe_maps_to_its_launcher_only(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
folder = Path(tmp) / 'Game'
|
||||
(folder / 'bin').mkdir(parents=True)
|
||||
for name in ('bin/Game.exe', 'bin/Other.exe', store.LAUNCHER):
|
||||
(folder / name).write_text('x')
|
||||
sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'bin/Game.exe', 'launcher': store.LAUNCHER}
|
||||
(folder / store.SIDECAR).write_text(json.dumps(sidecar))
|
||||
self.assertEqual(store.store_launcher(str(folder / 'bin/Game.exe')), str(folder / store.LAUNCHER))
|
||||
self.assertEqual(store.store_launcher(str(folder / 'bin/game.exe')), str(folder / store.LAUNCHER))
|
||||
self.assertIsNone(store.store_launcher(str(folder / 'bin/Other.exe')))
|
||||
self.assertIsNone(store.store_launcher(str(Path(tmp) / 'Elsewhere.exe')))
|
||||
(folder / store.SIDECAR).write_text(json.dumps(dict(sidecar, launcher='')))
|
||||
self.assertIsNone(store.store_launcher(str(folder / 'bin/Game.exe')))
|
||||
|
||||
def test_a_symlinked_or_deep_exe_still_finds_its_launcher(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
folder = Path(tmp) / 'Game'
|
||||
deep = folder / 'a/b/c/d/e/f'
|
||||
deep.mkdir(parents=True)
|
||||
(deep / 'Game.exe').write_text('x')
|
||||
(folder / store.LAUNCHER).write_text('x')
|
||||
sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'a/b/c/d/e/f/Game.exe', 'launcher': store.LAUNCHER}
|
||||
(folder / store.SIDECAR).write_text(json.dumps(sidecar))
|
||||
link = Path(tmp) / 'x/y/z/Link.exe'
|
||||
link.parent.mkdir(parents=True)
|
||||
link.symlink_to(deep / 'Game.exe')
|
||||
expected = str(folder.resolve() / store.LAUNCHER)
|
||||
self.assertEqual(store.store_launcher(str(deep / 'Game.exe')), expected)
|
||||
self.assertEqual(store.store_launcher(str(link)), expected)
|
||||
self.assertIsNone(store.find_store_game([str(deep / 'Game.exe')]))
|
||||
|
||||
def test_a_symlinked_exe_finds_the_sidecar_beside_the_link(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
outside = Path(tmp) / 'Real/Game.exe'
|
||||
outside.parent.mkdir()
|
||||
outside.write_text('x')
|
||||
folder = Path(tmp) / 'Game'
|
||||
folder.mkdir()
|
||||
(folder / store.LAUNCHER).write_text('x')
|
||||
(folder / 'Game.exe').symlink_to(outside)
|
||||
sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'Game.exe', 'launcher': store.LAUNCHER}
|
||||
(folder / store.SIDECAR).write_text(json.dumps(sidecar))
|
||||
self.assertEqual(store.store_launcher(str(folder / 'Game.exe')), str(folder / store.LAUNCHER))
|
||||
self.assertIsNone(store.store_launcher(str(outside)))
|
||||
|
||||
def test_legacy_games_are_registered_by_content_id(self):
|
||||
sidecar = {'id': 'Origin.OFR.50.0005237', 'title': 'Mass Effect 3 (2012)',
|
||||
'extra': {'contentIds': '71073,71183, bad id', 'displayName': 'Mass Effect 3', 'locale': 'fr_FR'}}
|
||||
|
||||
Reference in new issue
Block a user