Skip to content

Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit

fix(controllers): clear the retired payload files and call codesign by path

Raystormb9a231d6ae3b
diff --git a/Makefile b/Makefile
index 59c4a6e..599311f 100644
--- a/Makefile
+++ b/Makefile
@@ -666,6 +666,8 @@ fonts:
app-payload: $(TARGET) $(OVERLAY_SHIM) $(ICONMAKER) $(APPINFO)
@mkdir -p "$(APP_PAYLOAD)/signatures/macos.arm64"
@mkdir -p "$(APP_PAYLOAD)/bridge"
+ @# Staged by 0.7.51 and earlier; left behind they fail the PAYLOAD_SIGN_IDS check.
+ @rm -rf "$(APP_PAYLOAD)/controllers" "$(APP_PAYLOAD)/game-host.dylib" "$(APP_PAYLOAD)/prepare-game-loader"
cp -f $(TARGET) "$(APP_PAYLOAD)/notproton.dylib"
cp -f $(OVERLAY_SHIM) "$(APP_PAYLOAD)/overlay-shim.dylib"
cp -f $(ICONMAKER) "$(APP_PAYLOAD)/iconmaker"
diff --git a/app/Sources/BridgeplayApp/Model/GameReport.swift b/app/Sources/BridgeplayApp/Model/GameReport.swift
index a54f61d..ea121ac 100644
--- a/app/Sources/BridgeplayApp/Model/GameReport.swift
+++ b/app/Sources/BridgeplayApp/Model/GameReport.swift
@@ -137,6 +137,7 @@ enum GameReport {
// Reports are public. Besides the home folder, run logs carry the Steam account name
// and a video token in the passed-through Steam environment, the SteamID64 in Steam API
// lines, the macOS user name in lsof output, and external drive names in library paths.
+ // DSB_TOKEN only appears in logs from 0.7.51 and earlier, which can still be attached.
static func redacted(_ log: String, home: String = NSHomeDirectory(), user: String = NSUserName(),
computerNames: [String] = thisMacNames) -> String {
var text = home.isEmpty ? log : log.replacingOccurrences(of: home, with: "~")
diff --git a/dylib/feats/compat_run.sh b/dylib/feats/compat_run.sh
index 3a4728d..381bf07 100755
--- a/dylib/feats/compat_run.sh
+++ b/dylib/feats/compat_run.sh
@@ -2652,7 +2652,7 @@ if [ -x "$loader_macos/wine" ]; then
# A loader with com.apple.developer.* entitlements (CrossOver 27's, backed by a
# provisioning profile in its own wine.app) is killed when run from the game's bundle,
# so it runs where it is.
- if codesign -d --entitlements - "$loader_macos/wine" 2>/dev/null | grep -q 'com\.apple\.developer\.'; then
+ if /usr/bin/codesign -d --entitlements - "$loader_macos/wine" 2>/dev/null | grep -q 'com\.apple\.developer\.'; then
WINELOADER=$original_loader
echo "loader needs its own wine.app; running the engine's own loader" >> "$log" 2>&1 || true
else