mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 05:46:03 +00:00
fix(xbox): report a failed class registration in the launch log
This commit is contained in:
1 parent
fee8ce91f3
commit
aefd8a3b60
2 files changed
+18
-3
No files matched your search
@@ -129,10 +129,12 @@ def register_classes(proton, prefix, env):
|
|||||||
source = Path(temporary) / 'classes.reg'
|
source = Path(temporary) / 'classes.reg'
|
||||||
source.write_bytes(b'\xff\xfe' + text.encode('utf-16-le'))
|
source.write_bytes(b'\xff\xfe' + text.encode('utf-16-le'))
|
||||||
try:
|
try:
|
||||||
subprocess.run([proton, 'run', 'reg.exe', 'import', 'Z:' + str(source).replace('/', '\\')],
|
failed = subprocess.run([proton, 'run', 'reg.exe', 'import', 'Z:' + str(source).replace('/', '\\')],
|
||||||
stdout=sys.stderr, env=env, timeout=90)
|
stdout=sys.stderr, env=env, timeout=90).returncode != 0
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
print('droiddeck-xbox: Windows Runtime class registration timed out', file=sys.stderr)
|
failed = True
|
||||||
|
if failed:
|
||||||
|
print('droiddeck-xbox: Windows Runtime class registration failed; launching without it', file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def wine(argv, source_env=None):
|
def wine(argv, source_env=None):
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
|
import io
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import runpy
|
import runpy
|
||||||
import socket
|
import socket
|
||||||
|
import subprocess
|
||||||
import tempfile
|
import tempfile
|
||||||
import threading
|
import threading
|
||||||
import unittest
|
import unittest
|
||||||
@@ -140,6 +142,7 @@ class XboxLaunchTest(unittest.TestCase):
|
|||||||
imported = []
|
imported = []
|
||||||
def run(argv, **kwargs):
|
def run(argv, **kwargs):
|
||||||
imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le'))
|
imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le'))
|
||||||
|
return subprocess.CompletedProcess(argv, 0)
|
||||||
with patch('subprocess.run', side_effect=run) as child:
|
with patch('subprocess.run', side_effect=run) as child:
|
||||||
xbox['register_classes']('/selected/proton', prefix, {'A': '1'})
|
xbox['register_classes']('/selected/proton', prefix, {'A': '1'})
|
||||||
self.assertEqual(child.call_args.args[0][:4], ['/selected/proton', 'run', 'reg.exe', 'import'])
|
self.assertEqual(child.call_args.args[0][:4], ['/selected/proton', 'run', 'reg.exe', 'import'])
|
||||||
@@ -154,3 +157,13 @@ class XboxLaunchTest(unittest.TestCase):
|
|||||||
(prefix / 'system.reg').unlink()
|
(prefix / 'system.reg').unlink()
|
||||||
xbox['register_classes']('/selected/proton', prefix, {})
|
xbox['register_classes']('/selected/proton', prefix, {})
|
||||||
child.assert_not_called()
|
child.assert_not_called()
|
||||||
|
|
||||||
|
def test_failed_class_registration_is_reported_and_launch_continues(self):
|
||||||
|
with tempfile.TemporaryDirectory() as root:
|
||||||
|
prefix = Path(root)
|
||||||
|
(prefix / 'system.reg').write_text('')
|
||||||
|
for outcome in ({'return_value': subprocess.CompletedProcess([], 1)},
|
||||||
|
{'side_effect': subprocess.TimeoutExpired('reg.exe', 90)}):
|
||||||
|
with patch('subprocess.run', **outcome), patch('sys.stderr', new_callable=io.StringIO) as err:
|
||||||
|
self.assertIsNone(xbox['register_classes']('/selected/proton', prefix, {}))
|
||||||
|
self.assertIn('registration failed', err.getvalue())
|
||||||
Reference in new issue
Block a user