Run Windows games on Apple Silicon — free, open source, with an open compatibility database that tells you what actually works.
Swift apple-silicond3dmetaldxmtdxvkfexgame-porting-toolkitgamingmac-gamingmacosmetalmoltenvksteamswiftuivkd3d-protonwhisky-alternativewindows-gameswinewine-wrapper
Recipes: a copy step gives one game a file from the engine (#77)
Gauthier Piarrette4c64226ff5ff
diff --git a/Sources/HighballKit/GamePageCopy.swift b/Sources/HighballKit/GamePageCopy.swiftindex ee78a3b..75912df 100644--- a/Sources/HighballKit/GamePageCopy.swift+++ b/Sources/HighballKit/GamePageCopy.swift@@ -131,6 +131,7 @@ public enum GamePageCopy {case let .sync(m): return "Set the environment's sync mode to \(m.rawValue)"case let .winver(v): return "Report Windows \(v.rawValue) to the game"case let .file(path, _): return "Write \(URL(fileURLWithPath: path).lastPathComponent)"+ case let .copy(from, _, _): return "Give the game its own \(URL(fileURLWithPath: from).lastPathComponent) from the engine"case .pin: return nilcase let .note(text): return textcase let .dllOverride(v): return "Set the Windows library override \(v)"diff --git a/Sources/HighballKit/Recipe.swift b/Sources/HighballKit/Recipe.swiftindex 33b3e07..40ff2e7 100644--- a/Sources/HighballKit/Recipe.swift+++ b/Sources/HighballKit/Recipe.swift@@ -26,6 +26,16 @@ public struct Recipe: Codable, Sendable, Identifiable {case winver(WindowsVersion)/// Write a text file inside drive_c.case file(path: String, contents: String)+ /// Copies one file from the engine into the environment: `from` is relative to the+ /// engine's directory and must stay inside it, `to` is relative to `drive_c`. A DLL put+ /// beside a game's executable is what its loader takes first, so this gives one game a+ /// Direct3D of its own (wined3d's d3d9 for legacy CS:GO) while the environment, and the+ /// Steam client in it, keep their graphics mode.+ /// With `asNative`, the copy loses Wine's builtin marker, so a per-application load order+ /// of `n,b` (a `registry` step under `AppDefaults\<exe>\DllOverrides`) makes the game's+ /// loader take it. A Direct3D imported by name from a DLL in the game's own `bin` folder+ /// is found there and nowhere else (legacy CS:GO's shaderapidx9.dll).+ case copy(from: String, to: String, asNative: Bool)/// Add a pinned program to the bottle.case pin(Pin)/// Free-text instruction the UI surfaces to the user after install.@@ -40,7 +50,7 @@ public struct Recipe: Codable, Sendable, Identifiable {/// DXVK knowledge ships as data instead of app code.case dxvkConfig(exe: String, options: [String: String])- private enum CodingKeys: String, CodingKey { case type, url, sha256, arguments, label, slow, okExitCodes, key, name, value, valueType, data, verbs, renderer, sync, winver, path, contents, pin, text, exe, options }+ private enum CodingKeys: String, CodingKey { case type, url, sha256, arguments, label, slow, okExitCodes, key, name, value, valueType, data, verbs, renderer, sync, winver, path, contents, from, to, asNative, pin, text, exe, options }public init(from decoder: Decoder) throws {let c = try decoder.container(keyedBy: CodingKeys.self)@@ -62,6 +72,8 @@ public struct Recipe: Codable, Sendable, Identifiable {case "sync": self = .sync(try c.decode(SyncMode.self, forKey: .sync))case "winver": self = .winver(try c.decode(WindowsVersion.self, forKey: .winver))case "file": self = .file(path: try c.decode(String.self, forKey: .path), contents: try c.decode(String.self, forKey: .contents))+ case "copy": self = .copy(from: try c.decode(String.self, forKey: .from), to: try c.decode(String.self, forKey: .to),+ asNative: try c.decodeIfPresent(Bool.self, forKey: .asNative) ?? false)case "pin": self = .pin(try c.decode(Pin.self, forKey: .pin))case "note": self = .note(try c.decode(String.self, forKey: .text))case "dlloverride": self = .dllOverride(try c.decode(String.self, forKey: .value))@@ -90,6 +102,9 @@ public struct Recipe: Codable, Sendable, Identifiable {case let .sync(m): try c.encode("sync", forKey: .type); try c.encode(m, forKey: .sync)case let .winver(v): try c.encode("winver", forKey: .type); try c.encode(v, forKey: .winver)case let .file(path, contents): try c.encode("file", forKey: .type); try c.encode(path, forKey: .path); try c.encode(contents, forKey: .contents)+ case let .copy(from, to, asNative):+ try c.encode("copy", forKey: .type); try c.encode(from, forKey: .from); try c.encode(to, forKey: .to)+ if asNative { try c.encode(true, forKey: .asNative) }case let .pin(p): try c.encode("pin", forKey: .type); try c.encode(p, forKey: .pin)case let .note(t): try c.encode("note", forKey: .type); try c.encode(t, forKey: .text)case let .dllOverride(v): try c.encode("dlloverride", forKey: .type); try c.encode(v, forKey: .value)@@ -105,7 +120,7 @@ public struct Recipe: Codable, Sendable, Identifiable {case let .installer(_, _, _, label, _, _): return labelcase let .winetricks(verbs, _): return verbs.joined(separator: " ")case .registry: return nil- case .environment, .renderer, .sync, .winver, .file, .pin, .note, .dxvkConfig, .dllOverride: return nil+ case .environment, .renderer, .sync, .winver, .file, .copy, .pin, .note, .dxvkConfig, .dllOverride: return nil}}@@ -141,7 +156,7 @@ public struct Recipe: Codable, Sendable, Identifiable {/// takes no meaningful time (installer/winetricks can take 20-40 minutes).public var isAutoApplicable: Bool {switch self {- case .file, .renderer, .sync, .environment, .pin, .note, .dxvkConfig, .dllOverride: return true+ case .file, .copy, .renderer, .sync, .environment, .pin, .note, .dxvkConfig, .dllOverride: return truecase .installer, .winetricks, .registry, .winver: return false}}@@ -259,6 +274,26 @@ public struct RecipeRunner: Sendable {self.paths = paths; self.engine = engine; self.bottle = bottle; self.store = EngineStore(paths: paths)}+ /// The file a `copy` step reads, or nil when `from` is absolute, climbs out of the engine+ /// with `..`, or does not exist. Recipes are data from the database, so a step must not be+ /// able to read anything but the engine it was written for.+ /// Wine stamps its builtin PE DLLs with "Wine builtin DLL" at offset 0x40; blanking it makes+ /// the loader treat the file as native, which is what a per-application `n,b` order selects.+ static func withoutBuiltinMarker(_ data: Data) -> Data {+ let marker = Data("Wine builtin DLL\0".utf8)+ guard data.count >= 0x40 + marker.count, data[0x40..<0x40 + marker.count] == marker else { return data }+ var out = data; out.replaceSubrange(0x40..<0x40 + marker.count, with: Data(count: marker.count)); return out+ }++ public static func copySource(engineRoot: URL, _ from: String) -> URL? {+ guard !from.hasPrefix("/"), !from.split(separator: "/").contains("..") else { return nil }+ let url = engineRoot.appending(path: from).standardizedFileURL+ guard url.path.hasPrefix(engineRoot.standardizedFileURL.path + "/") else { return nil }+ var isDir: ObjCBool = false+ guard FileManager.default.fileExists(atPath: url.path, isDirectory: &isDir), !isDir.boolValue else { return nil }+ return url+ }+/// The renderer a recipe may set, or nil when the user's explicit choice must stand (#29) or/// the bottle's engine cannot run it (#61: a fix recipe set D3DMetal on a bottle whose engine/// had no licence accepted for it, and every later launch in that bottle died before Wine).@@ -365,6 +400,19 @@ public struct RecipeRunner: Sendable {let url = bottle.driveC.appending(path: path)try FileManager.default.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)try contents.write(to: url, atomically: true, encoding: .utf8)+ case let .copy(from, to, asNative):+ guard let source = Self.copySource(engineRoot: engine.root, from) else {+ throw HighballError.invalid("copy step: '\(from)' is not a file inside the engine")+ }+ let dest = bottle.driveC.appending(path: to)+ try FileManager.default.createDirectory(at: dest.deletingLastPathComponent(), withIntermediateDirectories: true)+ if FileManager.default.fileExists(atPath: dest.path) { try FileManager.default.removeItem(at: dest) }+ if asNative {+ try Self.withoutBuiltinMarker(Data(contentsOf: source)).write(to: dest)+ } else {+ try FileManager.default.copyItem(at: source, to: dest)+ }+ log?("copied \(source.lastPathComponent) from the engine to \(to)\(asNative ? " as a native DLL" : "")")case let .pin(p):if !bottle.settings.pins.contains(where: { $0.path == p.path }) { bottle.settings.pins.append(p) }case let .note(t):diff --git a/Tests/HighballKitTests/RecipeCopyStepTests.swift b/Tests/HighballKitTests/RecipeCopyStepTests.swiftnew file mode 100644index 0000000..75cc087--- /dev/null+++ b/Tests/HighballKitTests/RecipeCopyStepTests.swift@@ -0,0 +1,47 @@+import XCTest+@testable import HighballKit++/// A `copy` step gives one game a file from the engine (wined3d's d3d9.dll beside csgo.exe, so+/// that game runs on wined3d while the Steam client in the same environment keeps DXMT). It+/// reads only inside the engine, and it is harmless enough to run at Play time.+final class RecipeCopyStepTests: XCTestCase {+ func testDecodesEncodesAndIsHarmless() throws {+ let json = """+ {"id": "csgo-legacy", "kind": "game", "title": "CS:GO", "steps": [+ {"type": "copy", "from": "engine/lib/wine/i386-windows/d3d9.dll", "to": "Program Files (x86)/Steam/steamapps/common/csgo legacy/bin/d3d9.dll", "asNative": true}]}+ """+ let r = try JSONDecoder().decode(Recipe.self, from: Data(json.utf8))+ guard case let .copy(from, to, asNative) = r.steps[0] else { return XCTFail("not a copy step") }+ XCTAssertEqual(from, "engine/lib/wine/i386-windows/d3d9.dll")+ XCTAssertTrue(to.hasSuffix("/bin/d3d9.dll"))+ XCTAssertTrue(asNative)+ XCTAssertTrue(r.isAutoApplicable, "a file copy touches no wine process")+ XCTAssertFalse(r.changesLaunchEnvironment, "the game reads the file when it starts, a running Steam is fine")+ let again = try JSONDecoder().decode(Recipe.self, from: JSONEncoder().encode(r))+ guard case let .copy(_, _, nativeAgain) = again.steps[0], nativeAgain else { return XCTFail("round trip lost the step or the flag") }+ }++ func testAsNativeBlanksTheBuiltinMarkerAndLeavesOtherFilesAlone() {+ var pe = Data(count: 0x80); pe[0] = 0x4D; pe[1] = 0x5A+ pe.replaceSubrange(0x40..<0x51, with: Data("Wine builtin DLL\0".utf8))+ let out = RecipeRunner.withoutBuiltinMarker(pe)+ XCTAssertEqual(out[0x40..<0x51], Data(count: 17))+ XCTAssertEqual(out[0..<2], pe[0..<2])+ let plain = Data("not a dll".utf8)+ XCTAssertEqual(RecipeRunner.withoutBuiltinMarker(plain), plain)+ }++ func testCopySourceStaysInsideTheEngine() throws {+ let root = FileManager.default.temporaryDirectory.appending(path: "engine-\(UUID().uuidString)")+ let dir = root.appending(path: "engine/lib/wine/i386-windows")+ try FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)+ try Data("x".utf8).write(to: dir.appending(path: "d3d9.dll"))+ defer { try? FileManager.default.removeItem(at: root) }+ XCTAssertNotNil(RecipeRunner.copySource(engineRoot: root, "engine/lib/wine/i386-windows/d3d9.dll"))+ XCTAssertNil(RecipeRunner.copySource(engineRoot: root, "engine/lib/wine/i386-windows/missing.dll"), "must exist")+ XCTAssertNil(RecipeRunner.copySource(engineRoot: root, "engine/lib/wine"), "a directory is not a file")+ XCTAssertNil(RecipeRunner.copySource(engineRoot: root, "../../etc/passwd"), "no climbing out")+ XCTAssertNil(RecipeRunner.copySource(engineRoot: root, "engine/../../outside"), "no climbing out from inside either")+ XCTAssertNil(RecipeRunner.copySource(engineRoot: root, "/etc/passwd"), "no absolute paths")+ }+}