Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
Add support for the Crossoverchina.com version of CrossOver 26.3
NotProtonNot976df858e63e
diff --git a/app/Sources/NotProtonApp/Model/RunnerStore.swift b/app/Sources/NotProtonApp/Model/RunnerStore.swiftindex 251ef7a..b75cfa1 100644--- a/app/Sources/NotProtonApp/Model/RunnerStore.swift+++ b/app/Sources/NotProtonApp/Model/RunnerStore.swift@@ -81,9 +81,17 @@ enum RunnerStore {static func installedBuilds(in runners: URL = SupportPaths.runners) -> [RunnerBuild] {clonedBuilds(in: runners)- .compactMap(SupportedRunners.build(id:))+ .compactMap { build(cloned: $0, runners: runners) }.filter { RunnerInstaller.hasClone(forBuild: $0.id, runners: runners) }}++ private static func build(cloned id: String, runners: URL) -> RunnerBuild? {+ guard let build = SupportedRunners.build(id: id) else { return nil }+ guard !build.rebuilds.isEmpty else { return build }+ let root = SupportPaths.clonedRoot(forBuild: id, runners: runners)+ let loader = Clean.copy(of: CrossOverSource.unixLoader(inRoot: root))+ return Digest.sha256IfPresent(loader).flatMap(build.matching(loaderSHA256:)) ?? build+ }}enum CompatToolList {diff --git a/app/Sources/NotProtonApp/Model/SupportedRunner.swift b/app/Sources/NotProtonApp/Model/SupportedRunner.swiftindex 8303559..2baa450 100644--- a/app/Sources/NotProtonApp/Model/SupportedRunner.swift+++ b/app/Sources/NotProtonApp/Model/SupportedRunner.swift@@ -30,13 +30,32 @@ struct RunnerBuild: Sendable, Equatable, Identifiable {var tools: [CompatTool] = []+ var rebuilds: [RunnerRebuild] = []+var id: String { flavor.map { "\(bundleVersion)-\($0)" } ?? bundleVersion }+ func matching(loaderSHA256 hash: String) -> RunnerBuild? {+ if hash == loaderSHA256 { return self }+ guard let rebuild = rebuilds.first(where: { $0.loaderSHA256 == hash }) else { return nil }+ return RunnerBuild(+ bundleVersion: bundleVersion, releaseVersion: releaseVersion, flavor: flavor,+ loaderSHA256: rebuild.loaderSHA256, cleanNtdll: rebuild.cleanNtdll,+ patchedNtdll: rebuild.patchedNtdll, tools: tools, rebuilds: rebuilds+ )+ }+var flavorName: String { flavor?.uppercased() ?? "Rosetta" }var displayVersion: String { "\(releaseVersion) \(flavorName)" }}+// The version of CrossOver offered in China has different hashes but is identical in the ways that matter+struct RunnerRebuild: Sendable, Equatable {+ let loaderSHA256: String+ let cleanNtdll: [WineArch: String]+ let patchedNtdll: [WineArch: String]+}+struct CompatTool: Sendable, Hashable, Identifiable {enum Flavor: String, Sendable, CaseIterable {case rosetta@@ -120,6 +139,20 @@ enum SupportedRunners {],tools: [CompatTool(name: "notproton-26.3", flavor: .rosetta, display: "CrossOver 26.3"),+ ],+ rebuilds: [+ // crossoverchina.com+ RunnerRebuild(+ loaderSHA256: "35aeb1a75a48f3b053dbf2395deac33c530a0b0b7db0bc6357362348af9514ce",+ cleanNtdll: [+ .x86_64Windows: "1c4799bb3769ba1392c2298e4904ce0b080f040940b2a273f4eaa0906b231a93",+ .i386Windows: "21e7d0a6d6868f1853489f5a9798e706509a20a65ee370f50b37ab7b1cdcaae3",+ ],+ patchedNtdll: [+ .x86_64Windows: "3725117cc103acd9d2713535e41733563f340e27604e1abdea5afbdc2c2be65a",+ .i386Windows: "6d9ef05089fea07d1f4cbebe27df1f9a92dbc8eb245033db9f5e40a943175d5b",+ ]+ ),]),RunnerBuild(@@ -199,7 +232,7 @@ enum SupportedRunners {]static func build(loaderSHA256 hash: String) -> RunnerBuild? {- all.first { $0.loaderSHA256 == hash }+ all.lazy.compactMap { $0.matching(loaderSHA256: hash) }.first}static func build(id: String) -> RunnerBuild? {diff --git a/app/Tests/NotProtonAppTests/DetectionTests.swift b/app/Tests/NotProtonAppTests/DetectionTests.swiftindex 096ee36..b54a488 100644--- a/app/Tests/NotProtonAppTests/DetectionTests.swift+++ b/app/Tests/NotProtonAppTests/DetectionTests.swift@@ -12,7 +12,10 @@ struct SupportedRunnerTests {func rowsAreComplete() {#expect(!SupportedRunners.all.isEmpty)- for build in SupportedRunners.all {+ let rebuilt = SupportedRunners.all.flatMap { build in+ build.rebuilds.compactMap { build.matching(loaderSHA256: $0.loaderSHA256) }+ }+ for build in SupportedRunners.all + rebuilt {expectSHA256(build.loaderSHA256, "loader for \(build.id)")#expect(!build.cleanNtdll.isEmpty, "\(build.id) patches nothing")#expect(Set(build.cleanNtdll.keys) == Set(build.patchedNtdll.keys), "\(build.id) is lopsided")@@ -36,10 +39,27 @@ struct SupportedRunnerTests {let ids = SupportedRunners.all.map(\.id)#expect(Set(ids).count == ids.count)- let loaders = SupportedRunners.all.map(\.loaderSHA256)+ let loaders = SupportedRunners.all.flatMap { [$0.loaderSHA256] + $0.rebuilds.map(\.loaderSHA256) }#expect(Set(loaders).count == loaders.count)}+ @Test("A rebuild is found as its build, carrying its own hashes")+ func rebuildResolvesToItsBuild() throws {+ let build = try #require(SupportedRunners.build(id: "26.3.0.39832"))+ let rebuild = try #require(build.rebuilds.first)++ let found = try #require(SupportedRunners.build(loaderSHA256: rebuild.loaderSHA256))+ #expect(found.id == build.id)+ #expect(found.tools == build.tools)+ #expect(found.loaderSHA256 == rebuild.loaderSHA256)+ #expect(found.cleanNtdll == rebuild.cleanNtdll)+ #expect(found.patchedNtdll == rebuild.patchedNtdll)+ #expect(NtdllPatcher.patches(for: found).map(\.arch) == NtdllPatcher.patches(for: build).map(\.arch))++ #expect(SupportedRunners.build(loaderSHA256: build.loaderSHA256) == build)+ #expect(build.matching(loaderSHA256: String(rebuild.loaderSHA256.dropLast())) == nil)+ }+@Test("The first supported build keeps a bare version as its id")func firstBuildKeepsBareVersionID() {// Its clone is already on disk as crossover-<version>, and a machine whose CrossOver