fix: complete imageFs.wineprefix migration in SteamUtils.kt

The cascade-fix commit (15716e2) said "every per-container write was
switched to container.getRootDir() + /.wine" but 13 sites in SteamUtils.kt
still resolved through imageFs.wineprefix or imageFs.rootDir+ImageFs.WINEPREFIX,
which both go through the global xuser symlink. ensureSteamCfg in particular
was called immediately after extractSteamFiles in the same launch flow that
just took pains to use the per-container path — the cfg write then pivoted
back through the symlink and was still cascade-vulnerable.

Migration strategy:

* appId-based functions (backupSteamclientFiles, restoreSteamclientFiles,
  restoreUnpackedExecutable, createAppManifest, restoreOriginalExecutable,
  migrateGSESavesToSteamUserdata, migrateSteamUserdataToGSESaves) now load
  the Container internally via ContainerUtils.getContainer(context,
  "STEAM_$steamAppId") and write through container.rootDir. No signature
  change, no caller updates needed.

* imageFs-only functions (setupLightweightSteamConfig, ensureSteamCfg,
  logSteamBinaryFingerprint, purgePhantomAppUserdata,
  cleanupExtractedSteamFiles) gained an optional Container? parameter. When
  passed (launch-flow callers do), writes go to the per-container path.
  imageFs.wineprefix is retained as a fallback for callers without a
  container in scope (notably the SteamTokenLogin flow), preserving
  pre-fix behavior for that path. Callers in XServerScreen.kt,
  MainViewModel.kt, replaceSteamApi, restoreSteamApi all pass container.

* updateOrModifyLocalConfig had container in scope already; just switched
  to use it.

After this, every active per-container write in SteamUtils.kt goes through
container.rootDir. The remaining imageFs.wineprefix references are either
comments or symlink fallbacks gated behind container == null.

Author: TideGear

app/src/main/java/app/gamenative/ui/model/MainViewModel.kt

@@ -463,7 +463,7 @@ class MainViewModel @Inject constructor(
                         container.putExtra("lastSteamMode", currentMode)
                         container.saveData()
                         if (previousMode == "real" && currentMode == "emu") {
-                            SteamUtils.cleanupExtractedSteamFiles(context)
+                            SteamUtils.cleanupExtractedSteamFiles(context, container)
                         }
                     }
                     if (container.isLaunchRealSteam()) {

app/src/main/java/app/gamenative/ui/screen/xserver/XServerScreen.kt

@@ -4138,9 +4138,9 @@ private fun setupWineSystemFiles(
             SteamUtils.deleteTreeNoFollowSymlinks(steamDir)
         }
         extractSteamFiles(context, container, onExtractFileListener)
-        SteamUtils.ensureSteamCfg(ImageFs.find(context))
-        SteamUtils.purgePhantomAppUserdata(ImageFs.find(context), "241100")
-        SteamUtils.logSteamBinaryFingerprint(ImageFs.find(context), "prepareContainer:realSteam")
+        SteamUtils.ensureSteamCfg(ImageFs.find(context), container)
+        SteamUtils.purgePhantomAppUserdata(ImageFs.find(context), "241100", container)
+        SteamUtils.logSteamBinaryFingerprint(ImageFs.find(context), "prepareContainer:realSteam", container)
         container.putExtra("steamExtractedForWine", steamExtractedKey)
         containerDataChanged = true
     }

app/src/main/java/app/gamenative/utils/SteamUtils.kt

@@ -306,7 +306,7 @@ object SteamUtils {
         // another concurrent launch and corrupt that game's prefix).
         val container = ContainerUtils.getContainer(context, appId)
         autoLoginUserChanges(imageFs, container)
-        setupLightweightSteamConfig(imageFs, SteamService.userSteamId?.toString())
+        setupLightweightSteamConfig(imageFs, SteamService.userSteamId?.toString(), container)
 
         val rootPath = Paths.get(appDirPath)
         // Get ticket once for all DLLs
@@ -435,15 +435,18 @@ object SteamUtils {
     }
 
     fun backupSteamclientFiles(context: Context, steamAppId: Int) {
-        val imageFs = ImageFs.find(context)
+        // Per-container path; imageFs.wineprefix resolves through the global xuser
+        // symlink which is unsafe for writes (see WineUtils.applySystemTweaks).
+        val container = ContainerUtils.getContainer(context, "STEAM_$steamAppId")
+        val steamDir = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam")
 
         var backupCount = 0
 
-        val backupDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/steamclient_backup")
+        val backupDir = File(steamDir, "steamclient_backup")
         backupDir.mkdirs()
 
         steamClientFiles().forEach { file ->
-            val dll = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/$file")
+            val dll = File(steamDir, file)
             if (dll.exists()) {
                 Files.copy(dll.toPath(), File(backupDir, "$file.orig").toPath(), StandardCopyOption.REPLACE_EXISTING)
                 backupCount++
@@ -479,13 +482,14 @@ object SteamUtils {
     }
 
     fun restoreSteamclientFiles(context: Context, steamAppId: Int) {
-        val imageFs = ImageFs.find(context)
+        // Per-container path; imageFs.wineprefix resolves through the global xuser
+        // symlink which is unsafe for writes (see WineUtils.applySystemTweaks).
+        val container = ContainerUtils.getContainer(context, "STEAM_$steamAppId")
+        val origDir = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam")
 
         var restoredCount = 0
 
-        val origDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam")
-
-        val backupDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/steamclient_backup")
+        val backupDir = File(origDir, "steamclient_backup")
         if (backupDir.exists()) {
             steamClientFiles().forEach { file ->
                 val dll = File(backupDir, "$file.orig")
@@ -496,7 +500,7 @@ object SteamUtils {
             }
         }
 
-        val extraDllDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/extra_dlls")
+        val extraDllDir = File(origDir, "extra_dlls")
         if (extraDllDir.exists()) {
             extraDllDir.deleteRecursively()
         }
@@ -599,10 +603,13 @@ object SteamUtils {
      * Creates configuration files that make Steam run in lightweight mode
      * with reduced resource usage and disabled community features
      */
-    private fun setupLightweightSteamConfig(imageFs: ImageFs, steamId64: String?) {
+    private fun setupLightweightSteamConfig(imageFs: ImageFs, steamId64: String?, container: Container? = null) {
         Timber.i("Setting up lightweight steam configs")
         try {
-            val steamPath = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam")
+            // Prefer per-container path. Fallback to imageFs.wineprefix (xuser
+            // symlink) is kept for non-launch callers that have no container.
+            val steamPath = container?.let { File(it.rootDir, ".wine/drive_c/Program Files (x86)/Steam") }
+                ?: File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam")
 
             // Create necessary directories
             val userDataPath = File(steamPath, "userdata/$steamId64")
@@ -681,7 +688,6 @@ object SteamUtils {
      */
     private fun restoreUnpackedExecutable(context: Context, steamAppId: Int) {
         try {
-            val imageFs = ImageFs.find(context)
             val appDirPath = SteamService.getAppDirPath(steamAppId)
 
             // Convert to Wine path format
@@ -697,8 +703,11 @@ object SteamUtils {
             }
             val executableFile = "$drive:\\${executablePath}"
 
-            val exe = File(imageFs.wineprefix + "/dosdevices/" + executableFile.replace("A:", "a:").replace('\\', '/'))
-            val unpackedExe = File(imageFs.wineprefix + "/dosdevices/" + executableFile.replace("A:", "a:").replace('\\', '/') + ".unpacked.exe")
+            // Per-container .wine path; imageFs.wineprefix resolves through the
+            // global xuser symlink which is unsafe for writes.
+            val winePrefix = File(container.rootDir, ".wine").absolutePath
+            val exe = File(winePrefix + "/dosdevices/" + executableFile.replace("A:", "a:").replace('\\', '/'))
+            val unpackedExe = File(winePrefix + "/dosdevices/" + executableFile.replace("A:", "a:").replace('\\', '/') + ".unpacked.exe")
 
             if (unpackedExe.exists()) {
                 // Check if files are different (compare size and last modified time for efficiency)
@@ -732,10 +741,10 @@ object SteamUtils {
                 return
             }
 
-            val imageFs = ImageFs.find(context)
-
-            // Create the steamapps folder structure
-            val steamappsDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/steamapps")
+            // Per-container path; imageFs.wineprefix resolves through the global
+            // xuser symlink which is unsafe for writes.
+            val container = ContainerUtils.getContainer(context, "STEAM_$steamAppId")
+            val steamappsDir = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam/steamapps")
             if (!steamappsDir.exists()) {
                 steamappsDir.mkdirs()
             }
@@ -1344,8 +1353,13 @@ object SteamUtils {
     }
 
     /** Writes steam.cfg with update-inhibit keys if missing. Both real-Steam and emu paths need it present. */
-    fun ensureSteamCfg(imageFs: ImageFs) {
-        val cfgFile = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/steam.cfg")
+    fun ensureSteamCfg(imageFs: ImageFs, container: Container? = null) {
+        // Per-container path; imageFs.wineprefix resolves through the global
+        // xuser symlink which is unsafe for writes. Fallback retained for
+        // legacy callers without a container in scope.
+        val cfgFile = container?.let {
+            File(it.rootDir, ".wine/drive_c/Program Files (x86)/Steam/steam.cfg")
+        } ?: File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/steam.cfg")
         if (cfgFile.exists()) return
         try {
             cfgFile.parentFile?.mkdirs()
@@ -1357,9 +1371,11 @@ object SteamUtils {
     }
 
     /** Logs size + mtime of the Steam binaries whose unexpected change breaks launches. Diagnostic-only. */
-    fun logSteamBinaryFingerprint(imageFs: ImageFs, tag: String) {
+    fun logSteamBinaryFingerprint(imageFs: ImageFs, tag: String, container: Container? = null) {
         try {
-            val steamDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam")
+            // Per-container path with symlink fallback for legacy callers.
+            val steamDir = container?.let { File(it.rootDir, ".wine/drive_c/Program Files (x86)/Steam") }
+                ?: File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam")
             val fmt = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).apply { timeZone = TimeZone.getDefault() }
             val parts = listOf("steam.exe", "steamclient.dll", "steamclient64.dll").map { name ->
                 val f = File(steamDir, name)
@@ -1379,8 +1395,8 @@ object SteamUtils {
         val steamAppId = ContainerUtils.extractGameIdFromContainerId(appId)
         val imageFs = ImageFs.find(context)
         val container = ContainerUtils.getOrCreateContainer(context, appId)
-        ensureSteamCfg(imageFs)
-        logSteamBinaryFingerprint(imageFs, "restoreSteamApi:emu:$steamAppId")
+        ensureSteamCfg(imageFs, container)
+        logSteamBinaryFingerprint(imageFs, "restoreSteamApi:emu:$steamAppId", container)
 
         // Update or modify localconfig.vdf
         updateOrModifyLocalConfig(imageFs, container, steamAppId.toString(), SteamService.userSteamId!!.accountID.toString())
@@ -1396,7 +1412,7 @@ object SteamUtils {
             MarkerUtils.removeMarker(appDirPath, Marker.STEAM_COLDCLIENT_USED)
 
             autoLoginUserChanges(imageFs, container)
-            setupLightweightSteamConfig(imageFs, SteamService.userSteamId!!.accountID.toString())
+            setupLightweightSteamConfig(imageFs, SteamService.userSteamId!!.accountID.toString(), container)
 
             putBackSteamDlls(appDirPath)
             restoreOriginalExecutable(context, steamAppId)
@@ -1488,8 +1504,10 @@ object SteamUtils {
         Timber.i("Checking directory: $appDirPath")
         var restoredCount = 0
 
-        val imageFs = ImageFs.find(context)
-        val dosDevicesPath = File(imageFs.wineprefix, "dosdevices/a:")
+        // Per-container path; imageFs.wineprefix resolves through the global
+        // xuser symlink which is unsafe.
+        val container = ContainerUtils.getContainer(context, "STEAM_$steamAppId")
+        val dosDevicesPath = File(container.rootDir, ".wine/dosdevices/a:")
 
         dosDevicesPath.walkTopDown().maxDepth(10)
             .filter { it.isFile && it.name.endsWith(".original.exe", ignoreCase = true) }
@@ -1523,7 +1541,6 @@ object SteamUtils {
      */
     fun migrateGSESavesToSteamUserdata(context: Context, appId: Int, isLaunchRealSteam: Boolean = true) {
         if (!isLaunchRealSteam) return
-        val imageFs = ImageFs.find(context)
         val accountId = SteamService.userSteamId?.accountID?.toInt()
             ?: PrefManager.steamUserAccountId.takeIf { it != 0 }
 
@@ -1532,15 +1549,13 @@ object SteamUtils {
             return
         }
 
-        val gseDir = File(
-            imageFs.rootDir,
-            "${ImageFs.WINEPREFIX}/drive_c/users/xuser/AppData/Roaming/GSE Saves/$appId"
-        )
+        // Per-container path; imageFs.rootDir + ImageFs.WINEPREFIX resolves through
+        // the global xuser symlink which is unsafe for writes.
+        val container = ContainerUtils.getContainer(context, "STEAM_$appId")
+        val winePrefix = File(container.rootDir, ".wine")
 
-        val steamUserdataDir = File(
-            imageFs.rootDir,
-            "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/userdata/$accountId/$appId"
-        )
+        val gseDir = File(winePrefix, "drive_c/users/xuser/AppData/Roaming/GSE Saves/$appId")
+        val steamUserdataDir = File(winePrefix, "drive_c/Program Files (x86)/Steam/userdata/$accountId/$appId")
 
         fun isDirectoryEmpty(file: File): Boolean {
             return file.isDirectory && file.list()?.isEmpty() ?: true
@@ -1613,7 +1628,6 @@ object SteamUtils {
      */
     fun migrateSteamUserdataToGSESaves(context: Context, appId: Int, isLaunchRealSteam: Boolean = false) {
         if (isLaunchRealSteam) return
-        val imageFs = ImageFs.find(context)
         val accountId = SteamService.userSteamId?.accountID?.toInt()
             ?: PrefManager.steamUserAccountId.takeIf { it != 0 }
 
@@ -1622,14 +1636,13 @@ object SteamUtils {
             return
         }
 
-        val steamUserdataDir = File(
-            imageFs.rootDir,
-            "${ImageFs.WINEPREFIX}/drive_c/Program Files (x86)/Steam/userdata/$accountId/$appId"
-        )
-        val gseDir = File(
-            imageFs.rootDir,
-            "${ImageFs.WINEPREFIX}/drive_c/users/xuser/AppData/Roaming/GSE Saves/$appId"
-        )
+        // Per-container path; imageFs.rootDir + ImageFs.WINEPREFIX resolves through
+        // the global xuser symlink which is unsafe.
+        val container = ContainerUtils.getContainer(context, "STEAM_$appId")
+        val winePrefix = File(container.rootDir, ".wine")
+
+        val steamUserdataDir = File(winePrefix, "drive_c/Program Files (x86)/Steam/userdata/$accountId/$appId")
+        val gseDir = File(winePrefix, "drive_c/users/xuser/AppData/Roaming/GSE Saves/$appId")
 
         fun isDirectoryEmpty(file: File): Boolean {
             return file.isDirectory && file.list()?.isEmpty() ?: true
@@ -1716,10 +1729,12 @@ object SteamUtils {
         })
     }
 
-    fun cleanupExtractedSteamFiles(context: Context) {
+    fun cleanupExtractedSteamFiles(context: Context, container: Container? = null) {
         try {
-            val imageFs = ImageFs.find(context)
-            val steamDir = File(imageFs.rootDir, ImageFs.WINEPREFIX + "/drive_c/Program Files (x86)/Steam")
+            // Per-container path; imageFs.WINEPREFIX resolves through the
+            // global xuser symlink which is unsafe for writes.
+            val steamDir = container?.let { File(it.rootDir, ".wine/drive_c/Program Files (x86)/Steam") }
+                ?: File(ImageFs.find(context).rootDir, ImageFs.WINEPREFIX + "/drive_c/Program Files (x86)/Steam")
             if (!steamDir.exists()) return
             val steamExe = File(steamDir, "steam.exe")
             if (!steamExe.exists()) return
@@ -1737,9 +1752,11 @@ object SteamUtils {
      * Deleting userdata/<steamId>/<phantomAppId>/ breaks the association so
      * shutdown completes promptly for subsequent real-Steam launches.
      */
-    fun purgePhantomAppUserdata(imageFs: ImageFs, phantomAppId: String) {
+    fun purgePhantomAppUserdata(imageFs: ImageFs, phantomAppId: String, container: Container? = null) {
         try {
-            val userdataRoot = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/userdata")
+            // Per-container path with symlink fallback for legacy callers.
+            val userdataRoot = container?.let { File(it.rootDir, ".wine/drive_c/Program Files (x86)/Steam/userdata") }
+                ?: File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/userdata")
             if (!userdataRoot.isDirectory) return
             val victims = userdataRoot.listFiles { f -> f.isDirectory }?.mapNotNull { userDir ->
                 File(userDir, phantomAppId).takeIf { it.exists() }
@@ -2126,7 +2143,9 @@ object SteamUtils {
         try {
             val exeCommandLine = container.execArgs
 
-            val steamPath = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam")
+            // Per-container path; imageFs.wineprefix resolves through the global
+            // xuser symlink which is unsafe for writes.
+            val steamPath = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam")
 
             // Create necessary directories
             val userDataPath = File(steamPath, "userdata/$steamUserId64")