fix: ship Windows executables as add-on packs and keep them out of the APK (#2676)

* fix(rockstar): ship the launcher service as an add-on pack, not inside the APK

* fix: ship the DiRT ws2_32 stand-in as an add-on pack and reject Windows executables in the APK

* fix(release): reject APK entries under a packed path even when the manifest omits them

* fix(dirt): fetch the ws2_32 stand-in pack once the Linux runtime is installed
This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-11-15 13:28:38 -05:00
1 parent 946e9c41e0
commit 9375ed0948
17 files changed
+185 -38

No files matched your search

@@ -314,6 +314,7 @@ UBISOFT_DIR = "drive_c/Program Files (x86)/Ubisoft/Ubisoft Game Launcher"
UBISOFT_WINDOWS_DIR = "C:\\Program Files (x86)\\Ubisoft\\Ubisoft Game Launcher\\"
UBISOFT_INSTALLER_URL = "https://static3.cdn.ubi.com/orbit/launcher_installer/UbisoftConnectInstaller.exe"
ROCKSTAR_SERVICE = Path("/usr/local/lib/droiddeck-rockstar")
SERVICE_WAIT = 300.0
ROCKSTAR_FOLDER = "drive_c/Program Files/Rockstar Games/Launcher"
ROCKSTAR_TITLES = {"gta3": "Grand Theft Auto III", "gtavc": "Grand Theft Auto: Vice City", "gtasa": "GTA: San Andreas",
"gta4": "Grand Theft Auto IV", "lanoire": "LANoireMTL"}
@@ -446,6 +447,15 @@ def rockstar_runtime(folder, exe, compat_data, arch):
return "installed"
def fetch_service(service, store, launch_dir, ask_app=None):
if service.is_file():
return True
if not launch_dir:
return False
answer = (ask_app or ask)(Path(launch_dir) / "stores", {"op": "store-service", "store": store}, timeout=SERVICE_WAIT)
return isinstance(answer, dict) and bool(answer.get("ok")) and service.is_file()
def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_app=None):
if not compat_data:
return "no-prefix"
@@ -481,7 +491,7 @@ def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_ap
if len(signature) != 6 or signature[:4] != b"PE\0\0" or signature[4:] not in (b"\x4c\x01", b"\x64\x86"):
return "invalid-game-exe"
service = ROCKSTAR_SERVICE / ("Launcher32.exe" if signature[4:] == b"\x4c\x01" else "Launcher64.exe")
if not service.is_file():
if not fetch_service(service, "rockstar", launch_dir, ask_app):
return "no-service"
made = "present" if (Path(compat_data) / "pfx/user.reg").is_file() else create_prefix(compat_data, proton)
if made not in ("created", "present"):
@@ -723,7 +733,7 @@ def prepare_ubisoft(folder, sidecar, compat_data, launch_dir, proton="", ask_app
product = ubisoft_product(sidecar)
if product is None:
return "no-product"
if not UBISOFT_SERVICE.is_file():
if not fetch_service(UBISOFT_SERVICE, "ubisoft", launch_dir, ask_app):
return "no-service"
made = create_prefix(compat_data, proton) if not (Path(compat_data) / "pfx/user.reg").is_file() else "present"
if made not in ("present", "created"):