fix: per-container .arch and Wine prefix paths to stop cross-game cascade

Launching one container with a different Wine version reverted another
container's installed redists (d3dx9_*, d3dcompiler_*, msvc) back to Wine
builtins, shrinking the registry hives and black-screening the second game.

Two interlocking causes, both inherited from Winlator's single-container
origins:

1. The launch-time gate compared container.wineVersion against the global
   <imagefs>/.winlator/.arch file (imageFs.getArch()). That file stores
   whichever container's wineVersion launched most recently, so a foreign
   launch flipped it and the next unrelated container saw a fake mismatch
   and ran applyGeneralPatches -> extractContainerPatternFile ->
   extractCommonDlls, deleting and re-extracting every entry in
   common_dlls.json (which includes all d3dx9_* / d3dcompiler_* /
   msvc100 / atl100 / dsound) from Wine's bundle, replacing
   installed-redist DLLs with Wine builtins.

2. Many per-container writes (system.reg, user.reg, DXVK/XAudio extraction,
   Steam install dir, OpenAL DLLs, theme writes, registry-key gamefixes,
   Steam install-script shim, autoLogin / firstTimeSetup) resolved through
   ImageFs.WINEPREFIX = "/home/xuser/.wine" or imageFs.wineprefix, both
   of which go through the global xuser symlink. The symlink points at
   whichever container ContainerManager.activateContainer touched last,
   so writes during a transition or from a SIGKILL'd leftover wineserver
   landed in the wrong container's prefix.

Switch every per-container path to container.getRootDir() + "/.wine" and
record the last-applied wineVersion / variant in container.extraData
("lastAppliedWineVersion", "lastAppliedVariant") instead of reading the
global .arch / .variant files. The xuser symlink stays in place for
display / login-flow fallback, but no per-container write resolves
through it.

Touched: WineUtils.applySystemTweaks (now takes Container);
WineThemeManager.apply (now takes Container); RegistryKeyFix;
SteamUtils.autoLoginUserChanges / skipFirstTimeSteamSetup /
applySteamInstallScriptShim; XServerScreen WINEPREFIX env var, the
applyGeneralPatches gate, extractDXWrapperFiles, cloneOriginalDllFiles /
restoreOriginalDllFiles, extractWinComponentFiles, changeWineAudioDriver,
extractSteamFiles, OpenAL extraction, zink_dlls extraction, and the
real-Steam steam.exe probe / staleSteam dir delete.

Verified by snapshot diff: launching Dead Cells (proton-10) then
868-HACK (proton-9) no longer shrinks 868's d3dx9_*/d3dcompiler_* in
system32/syswow64 or its registry hives.

Author: TideGear

app/src/main/java/app/gamenative/gamefixes/RegistryKeyFix.kt

@@ -21,8 +21,10 @@ class RegistryKeyFix(
         installPathWindows: String,
         container: Container,
     ): Boolean {
-        val imageFs = ImageFs.find(context)
-        val systemRegFile = File(imageFs.wineprefix, "system.reg")
+        // Per-container path; imageFs.wineprefix resolves through the global
+        // xuser symlink which is unsafe for writes (see WineUtils.applySystemTweaks
+        // for the cascade-corruption rationale).
+        val systemRegFile = File(container.rootDir, ".wine/system.reg")
         if (!systemRegFile.exists()) {
             Timber.tag("GameFixes").w("system.reg not found at ${systemRegFile.absolutePath}")
             return false

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

@@ -2837,7 +2837,13 @@ private fun setupXEnvironment(
     envVars.put("LC_ALL", lc_all)
     envVars.put("MESA_DEBUG", "silent")
     envVars.put("MESA_NO_ERROR", "1")
-    envVars.put("WINEPREFIX", imageFs.wineprefix)
+    // Use the per-container wine prefix path directly. imageFs.wineprefix
+    // resolves through the global `xuser` symlink which points at whichever
+    // container was last activated, so writes from this Wine process can race
+    // a concurrent activate-container on another launch and corrupt the wrong
+    // container's prefix (registry hives shrink, native d3dx9/d3dcompiler
+    // revert to Wine builtins, etc.).
+    envVars.put("WINEPREFIX", File(container.rootDir, ".wine").absolutePath)
     if (container.isSdlControllerAPI){
         if (container.inputType == PreferredInputApi.XINPUT.ordinal || container.inputType == PreferredInputApi.AUTO.ordinal){
             envVars.put("SDL_XINPUT_ENABLED", "1")
@@ -4027,15 +4033,28 @@ private fun setupWineSystemFiles(
     val imageFs = ImageFs.find(context)
     val appVersion = AppUtils.getVersionCode(context).toString()
     val imgVersion = imageFs.getVersion().toString()
-    val wineVersion = imageFs.getArch()
-    val variant = imageFs.getVariant()
+    // imageFs.getArch() and imageFs.getVariant() read .winlator/.arch and
+    // .winlator/.variant which are GLOBAL files shared across containers
+    // (whichever container launched last writes them). When a container with a
+    // different Wine version launches, that flips the global file and the next
+    // launch of any other container sees a fake "wineVersion changed" mismatch
+    // and runs applyGeneralPatches, which deletes and re-extracts every common
+    // DLL (including d3dx9_*/d3dcompiler_*) from Wine's bundle — reverting
+    // installed-redist DLLs back to Wine builtins and breaking the prefix.
+    // Compare against per-container state instead so a foreign launch can't
+    // contaminate this container.
+    val lastAppliedWine = container.getExtra("lastAppliedWineVersion", "")
+    val lastAppliedVariant = container.getExtra("lastAppliedVariant", "")
     var containerDataChanged = false
 
     if (!container.getExtra("appVersion").equals(appVersion) || !container.getExtra("imgVersion").equals(imgVersion) ||
-        container.containerVariant != variant || (container.containerVariant == variant && container.wineVersion != wineVersion)) {
+        container.containerVariant != lastAppliedVariant ||
+        (container.containerVariant == lastAppliedVariant && container.wineVersion != lastAppliedWine)) {
         applyGeneralPatches(context, container, imageFs, xServerState.value.wineInfo, containerManager, onExtractFileListener)
         container.putExtra("appVersion", appVersion)
         container.putExtra("imgVersion", imgVersion)
+        container.putExtra("lastAppliedWineVersion", container.wineVersion)
+        container.putExtra("lastAppliedVariant", container.containerVariant)
         containerDataChanged = true
     }
 
@@ -4056,7 +4075,7 @@ private fun setupWineSystemFiles(
         )
     }
 
-    val needReextract = ALWAYS_REEXTRACT || xServerState.value.dxwrapper != container.getExtra("dxwrapper") || container.wineVersion != wineVersion
+    val needReextract = ALWAYS_REEXTRACT || xServerState.value.dxwrapper != container.getExtra("dxwrapper") || container.wineVersion != lastAppliedWine
 
     Timber.i("needReextract is " + needReextract)
     Timber.i("xServerState.value.dxwrapper is " + xServerState.value.dxwrapper)
@@ -4093,7 +4112,9 @@ private fun setupWineSystemFiles(
     val openalState = if (needsOpenalDlls) "yes" else "no"
     if (openalState != container.getExtra("openal_dlls") || firstTimeBoot) {
         if (needsOpenalDlls) {
-            val windowsDir = File(imageFs.rootDir, ImageFs.WINEPREFIX + "/drive_c/windows")
+            // Per-container path; xuser symlink is unsafe for writes (see
+            // applySystemTweaks rationale).
+            val windowsDir = File(container.rootDir, ".wine/drive_c/windows")
             TarCompressorUtils.extract(
                 TarCompressorUtils.Type.ZSTD, context.assets,
                 "wincomponents/openal.tzst", windowsDir, onExtractFileListener,
@@ -4108,12 +4129,12 @@ private fun setupWineSystemFiles(
         // on launch, so invalidate the extraction when Wine version or variant changes.
         val steamExtractedKey = "${container.wineVersion}|${container.containerVariant}"
         val steamExtractedPrev = container.getExtra("steamExtractedForWine")
-        val steamExeFile = File(ImageFs.find(context).rootDir.absolutePath, ImageFs.WINEPREFIX + "/drive_c/Program Files (x86)/Steam/steam.exe")
+        val steamExeFile = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam/steam.exe")
         if (steamExtractedPrev != steamExtractedKey && steamExeFile.exists()) {
             // Symlink-safe delete: steamapps/common/<installdir> symlinks point at
             // GameNative's own Steam dir, and a following recursive delete would wipe
             // every installed game's files.
-            val steamDir = File(ImageFs.find(context).rootDir.absolutePath, ImageFs.WINEPREFIX + "/drive_c/Program Files (x86)/Steam")
+            val steamDir = File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam")
             SteamUtils.deleteTreeNoFollowSymlinks(steamDir)
         }
         extractSteamFiles(context, container, onExtractFileListener)
@@ -4126,7 +4147,7 @@ private fun setupWineSystemFiles(
 
     val desktopTheme = container.desktopTheme
     if ((desktopTheme + "," + screenInfo) != container.getExtra("desktopTheme")) {
-        WineThemeManager.apply(context, WineThemeManager.ThemeInfo(desktopTheme), screenInfo)
+        WineThemeManager.apply(context, WineThemeManager.ThemeInfo(desktopTheme), screenInfo, container)
         container.putExtra("desktopTheme", desktopTheme + "," + screenInfo)
         containerDataChanged = true
     }
@@ -4181,7 +4202,7 @@ private fun applyGeneralPatches(
         Timber.i("Attempting to extract _container_pattern.tzst with wine version " + container.wineVersion)
     }
     containerManager.extractContainerPatternFile(container.getWineVersion(), contentsManager, container.rootDir, null)
-    WineUtils.applySystemTweaks(context, wineInfo)
+    WineUtils.applySystemTweaks(context, wineInfo, container)
     container.putExtra("graphicsDriver", null)
     container.putExtra("desktopTheme", null)
     WinlatorPrefManager.init(context)
@@ -4215,9 +4236,11 @@ private fun extractDXWrapperFiles(
         "ddraw.dll",
     )
     val splitDxWrapper = dxwrapper.split("-")[0]
-    if (firstTimeBoot && splitDxWrapper != "vkd3d") cloneOriginalDllFiles(imageFs, *dlls)
-    val rootDir = imageFs.getRootDir()
-    val windowsDir = File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows")
+    if (firstTimeBoot && splitDxWrapper != "vkd3d") cloneOriginalDllFiles(imageFs, container, *dlls)
+    // Per-container .wine paths; the xuser symlink is unsafe for writes
+    // (see applySystemTweaks for the cascade-corruption rationale).
+    val containerRoot = container.rootDir
+    val windowsDir = File(containerRoot, ".wine/drive_c/windows")
 
     when (splitDxWrapper) {
         "wined3d" -> {
@@ -4226,9 +4249,9 @@ private fun extractDXWrapperFiles(
         "cnc-ddraw" -> {
             restoreOriginalDllFiles(context, container, containerManager, imageFs, *dlls)
             val assetDir = "dxwrapper/cnc-ddraw-" + DefaultVersion.CNC_DDRAW
-            val configFile = File(rootDir, ImageFs.WINEPREFIX + "/drive_c/ProgramData/cnc-ddraw/ddraw.ini")
+            val configFile = File(containerRoot, ".wine/drive_c/ProgramData/cnc-ddraw/ddraw.ini")
             if (!configFile.isFile) FileUtils.copy(context, "$assetDir/ddraw.ini", configFile)
-            val shadersDir = File(rootDir, ImageFs.WINEPREFIX + "/drive_c/ProgramData/cnc-ddraw/Shaders")
+            val shadersDir = File(containerRoot, ".wine/drive_c/ProgramData/cnc-ddraw/Shaders")
             FileUtils.delete(shadersDir)
             FileUtils.copy(context, "$assetDir/Shaders", shadersDir)
             TarCompressorUtils.extract(
@@ -4287,11 +4310,11 @@ private fun extractDXWrapperFiles(
         }
     }
 }
-private fun cloneOriginalDllFiles(imageFs: ImageFs, vararg dlls: String) {
-    val rootDir = imageFs.rootDir
-    val cacheDir = File(rootDir, ImageFs.CACHE_PATH + "/original_dlls")
+private fun cloneOriginalDllFiles(imageFs: ImageFs, container: Container, vararg dlls: String) {
+    val containerRoot = container.rootDir
+    val cacheDir = File(containerRoot, ".cache/original_dlls")
     if (!cacheDir.isDirectory) cacheDir.mkdirs()
-    val windowsDir = File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows")
+    val windowsDir = File(containerRoot, ".wine/drive_c/windows")
     val dirnames = arrayOf("system32", "syswow64")
 
     for (dll in dlls) {
@@ -4308,12 +4331,12 @@ private fun restoreOriginalDllFiles(
     imageFs: ImageFs,
     vararg dlls: String,
 ) {
-    val rootDir = imageFs.rootDir
+    val containerRoot = container.rootDir
     if (container.containerVariant.equals(Container.GLIBC)) {
-        val cacheDir = File(rootDir, ImageFs.CACHE_PATH + "/original_dlls")
+        val cacheDir = File(containerRoot, ".cache/original_dlls")
         val contentsManager = ContentsManager(context)
         if (cacheDir.isDirectory) {
-            val windowsDir = File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows")
+            val windowsDir = File(containerRoot, ".wine/drive_c/windows")
             val dirnames = cacheDir.list()
             var filesCopied = 0
 
@@ -4345,9 +4368,9 @@ private fun restoreOriginalDllFiles(
             },
         )
 
-        cloneOriginalDllFiles(imageFs, *dlls)
+        cloneOriginalDllFiles(imageFs, container, *dlls)
     } else {
-        val windowsDir = File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows")
+        val windowsDir = File(containerRoot, ".wine/drive_c/windows")
         var system32dlls: File? = null
         var syswow64dlls: File? = null
 
@@ -4376,9 +4399,11 @@ private fun extractWinComponentFiles(
     // shortcut: Shortcut?,
     onExtractFileListener: OnExtractFileListener?,
 ) {
-    val rootDir = imageFs.rootDir
-    val windowsDir = File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows")
-    val systemRegFile = File(rootDir, ImageFs.WINEPREFIX + "/system.reg")
+    // Resolve through container.rootDir, not the global xuser symlink — see
+    // applySystemTweaks for the cascade-corruption rationale.
+    val containerRoot = container.rootDir
+    val windowsDir = File(containerRoot, ".wine/drive_c/windows")
+    val systemRegFile = File(containerRoot, ".wine/system.reg")
 
     try {
         val wincomponentsJSONObject = JSONObject(FileUtils.readString(context, "wincomponents/wincomponents.json"))
@@ -4395,7 +4420,7 @@ private fun extractWinComponentFiles(
                 }
             }
 
-            cloneOriginalDllFiles(imageFs, *dlls.toTypedArray())
+            cloneOriginalDllFiles(imageFs, container, *dlls.toTypedArray())
             dlls.clear()
         }
 
@@ -4669,11 +4694,13 @@ private fun extractGraphicsDriverFiles(
                 )
                 val renderer = GPUInformation.getRenderer(null, null)
                 if (container.wineVersion.contains("arm64ec") && renderer?.contains("Mali") != true) {
+                    // Per-container path; xuser symlink is unsafe for writes
+                    // (see applySystemTweaks rationale).
                     TarCompressorUtils.extract(
                         TarCompressorUtils.Type.ZSTD,
                         context.assets,
                         "graphics_driver/zink_dlls" + ".tzst",
-                        File(rootDir, ImageFs.WINEPREFIX + "/drive_c/windows"),
+                        File(container.rootDir, ".wine/drive_c/windows"),
                     )
                 }
             }
@@ -4771,7 +4798,9 @@ private fun extractSteamFiles(
     onExtractFileListener: OnExtractFileListener?,
 ) {
     val imageFs = ImageFs.find(context)
-    if (File(ImageFs.find(context).rootDir.absolutePath, ImageFs.WINEPREFIX + "/drive_c/Program Files (x86)/Steam/steam.exe").exists()) return
+    // Per-container path; xuser symlink is unsafe for writes (see
+    // applySystemTweaks rationale).
+    if (File(container.rootDir, ".wine/drive_c/Program Files (x86)/Steam/steam.exe").exists()) return
     val downloaded = File(imageFs.getFilesDir(), "steam.tzst")
     Timber.i("Extracting steam.tzst")
     TarCompressorUtils.extract(
@@ -4802,8 +4831,9 @@ private fun readLibraryNameFromExtractedDir(destinationDir: File): String? {
 }
 private fun changeWineAudioDriver(audioDriver: String, container: Container, imageFs: ImageFs) {
     if (audioDriver != container.getExtra("audioDriver")) {
-        val rootDir = imageFs.rootDir
-        val userRegFile = File(rootDir, ImageFs.WINEPREFIX + "/user.reg")
+        // Per-container path; xuser symlink is unsafe for writes (see
+        // applySystemTweaks rationale).
+        val userRegFile = File(container.rootDir, ".wine/user.reg")
         WineRegistryEditor(userRegFile).use { registryEditor ->
             if (audioDriver == "alsa") {
                 registryEditor.setStringValue("Software\\Wine\\Drivers", "Audio", "alsa")

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

@@ -159,8 +159,11 @@ object SteamUtils {
      */
     fun applySteamInstallScriptShim(context: Context, steamAppId: Int) {
         try {
-            val imageFs = ImageFs.find(context)
-            val systemRegFile = File(imageFs.wineprefix, "system.reg")
+            // Per-container path; imageFs.wineprefix resolves through the
+            // global xuser symlink which is unsafe for writes (see
+            // WineUtils.applySystemTweaks rationale).
+            val container = ContainerUtils.getContainer(context, "STEAM_$steamAppId")
+            val systemRegFile = File(container.rootDir, ".wine/system.reg")
             if (!systemRegFile.isFile) return
 
             val appKeys = listOf(
@@ -298,7 +301,11 @@ object SteamUtils {
         var replaced64Count = 0
         val backupPaths = mutableSetOf<String>()
         val imageFs = ImageFs.find(context)
-        autoLoginUserChanges(imageFs)
+        // Pass the container so writes go to the per-container .wine prefix
+        // rather than through the global xuser symlink (which can race with
+        // another concurrent launch and corrupt that game's prefix).
+        val container = ContainerUtils.getContainer(context, appId)
+        autoLoginUserChanges(imageFs, container)
         setupLightweightSteamConfig(imageFs, SteamService.userSteamId?.toString())
 
         val rootPath = Paths.get(appDirPath)
@@ -555,19 +562,25 @@ object SteamUtils {
         )
     }
 
-    fun autoLoginUserChanges(imageFs: ImageFs) {
+    fun autoLoginUserChanges(imageFs: ImageFs, container: Container? = null) {
         val vdfFileText = SteamService.getLoginUsersVdfOauth(
             steamId64 = SteamService.userSteamId?.convertToUInt64().toString(),
             account = PrefManager.username,
             refreshToken = PrefManager.refreshToken,
             accessToken = PrefManager.accessToken,      // may be blank
             personaName = SteamService.instance?.localPersona?.value?.name ?: PrefManager.username
         )
-        val steamConfigDir = File(imageFs.wineprefix, "drive_c/Program Files (x86)/Steam/config")
+        // When called from a launch flow, prefer the per-container path.
+        // imageFs.wineprefix resolves through the global xuser symlink which is
+        // unsafe for concurrent launches (writes leak into the wrong
+        // container's prefix). The symlink-based fallback is kept for the
+        // login flow, which has no specific container context.
+        val winePrefixBase: File = container?.let { File(it.rootDir, ".wine") }
+            ?: File(imageFs.wineprefix)
+        val steamConfigDir = File(winePrefixBase, "drive_c/Program Files (x86)/Steam/config")
         try {
             File(steamConfigDir, "loginusers.vdf").writeText(vdfFileText)
-            val rootDir = imageFs.rootDir
-            val userRegFile = File(rootDir, ImageFs.WINEPREFIX + "/user.reg")
+            val userRegFile = File(winePrefixBase, "user.reg")
             val steamRoot = "C:\\Program Files (x86)\\Steam"
             val steamExe = "$steamRoot\\steam.exe"
             val hkcu = "Software\\Valve\\Steam"
@@ -1372,7 +1385,7 @@ object SteamUtils {
         // Update or modify localconfig.vdf
         updateOrModifyLocalConfig(imageFs, container, steamAppId.toString(), SteamService.userSteamId!!.accountID.toString())
 
-        skipFirstTimeSteamSetup(imageFs.rootDir)
+        skipFirstTimeSteamSetup(imageFs.rootDir, container)
         val appDirPath = SteamService.getAppDirPath(steamAppId)
 
         val restoredMarkerPresent = MarkerUtils.hasMarker(appDirPath, Marker.STEAM_DLL_RESTORED)
@@ -1382,7 +1395,7 @@ object SteamUtils {
             MarkerUtils.removeMarker(appDirPath, Marker.STEAM_DLL_REPLACED)
             MarkerUtils.removeMarker(appDirPath, Marker.STEAM_COLDCLIENT_USED)
 
-            autoLoginUserChanges(imageFs)
+            autoLoginUserChanges(imageFs, container)
             setupLightweightSteamConfig(imageFs, SteamService.userSteamId!!.accountID.toString())
 
             putBackSteamDlls(appDirPath)
@@ -2015,8 +2028,11 @@ object SteamUtils {
         return androidId.hashCode()
     }
 
-    private fun skipFirstTimeSteamSetup(rootDir: File?) {
-        val systemRegFile = File(rootDir, ImageFs.WINEPREFIX + "/system.reg")
+    private fun skipFirstTimeSteamSetup(rootDir: File?, container: Container? = null) {
+        // Per-container path when available — see autoLoginUserChanges for the
+        // cascade-corruption rationale.
+        val systemRegFile = container?.let { File(it.rootDir, ".wine/system.reg") }
+            ?: File(rootDir, ImageFs.WINEPREFIX + "/system.reg")
         val redistributables = listOf(
             "DirectX\\Jun2010" to "DXSetup",              // DirectX Jun 2010
             ".NET\\3.5" to "3.5 SP1",              // .NET 3.5

app/src/main/java/com/winlator/core/WineThemeManager.java

@@ -41,9 +41,10 @@ public ThemeInfo(String value) {
         }
     }
 
-    public static void apply(Context context, ThemeInfo themeInfo, ScreenInfo screenInfo) {
-        File rootDir = ImageFs.find(context).getRootDir();
-        File userRegFile = new File(rootDir, ImageFs.WINEPREFIX+"/user.reg");
+    public static void apply(Context context, ThemeInfo themeInfo, ScreenInfo screenInfo, com.winlator.container.Container container) {
+        // Per-container path; xuser symlink is unsafe for writes (see
+        // WineUtils.applySystemTweaks rationale).
+        File userRegFile = new File(container.getRootDir(), ".wine/user.reg");
         String background = Color.red(themeInfo.backgroundColor)+" "+Color.green(themeInfo.backgroundColor)+" "+Color.blue(themeInfo.backgroundColor);
 
         if (themeInfo.backgroundType == BackgroundType.IMAGE) createWallpaperBMPFile(context, screenInfo);