Made faster external loading optional and disabled by default as it w…

app/src/main/java/app/gamenative/ui/component/dialog/GeneralTab.kt

@@ -396,7 +396,28 @@ fun GeneralTabContent(
                     }
                 },
             )
+            SettingsSwitch(
+                colors = settingsTileColorsAlt(),
+                title = { Text(text = stringResource(R.string.disable_libredirect_title)) },
+                subtitle = { Text(text = stringResource(R.string.disable_libredirect_subtitle)) },
+                state = config.disableLibredirect,
+                onCheckedChange = {
+                    state.config.value = if (it) {
+                        config.copy(disableLibredirect = true, fasterExternalLoading = false)
+                    } else {
+                        config.copy(disableLibredirect = false)
+                    }
+                },
+            )
         }
+        SettingsSwitch(
+            colors = settingsTileColorsAlt(),
+            enabled = !config.disableLibredirect,
+            title = { Text(text = stringResource(R.string.faster_external_loading_title)) },
+            subtitle = { Text(text = stringResource(R.string.faster_external_loading_subtitle)) },
+            state = config.fasterExternalLoading,
+            onCheckedChange = { state.config.value = config.copy(fasterExternalLoading = it) },
+        )
         val steamTypeItems = listOf("Normal", "Light", "Ultra Light")
         val currentSteamTypeIndex = when (config.steamType.lowercase()) {
             Container.STEAM_TYPE_LIGHT -> 1

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

@@ -3921,15 +3921,6 @@ private fun setupXEnvironment(
         envVars.remove("VKD3D_FRAME_RATE")
         if (!envVars.has("WINEESYNC")) envVars.put("WINEESYNC", "1")
 
-        val ffpGameDir = runCatching {
-            Container.drivesIterator(container.drives).asSequence()
-                .firstOrNull { it[0] == "A" }?.let { File(it[1]).canonicalFile.path }
-        }.getOrNull() ?: ""
-        if (ffpGameDir.startsWith("/storage/") && !ffpGameDir.startsWith("/storage/emulated/")) {
-            envVars.put("FFP_ENABLE", "1")
-            envVars.put("FFP_MARKERS", "/steamapps/common/;/dosdevices/a:")
-        }
-
         val graphicsDriverConfig = KeyValueSet(container.getGraphicsDriverConfig())
         if (graphicsDriverConfig.get("version").lowercase(Locale.getDefault()).contains("gen8")) {
             var tuDebug = envVars.get("TU_DEBUG")

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

@@ -335,6 +335,8 @@ object ContainerUtils {
             fexcorePreset = container.getFEXCorePreset(),
             language = container.language,
             sdlControllerAPI = container.isSdlControllerAPI,
+            fasterExternalLoading = container.isFasterExternalLoading,
+            disableLibredirect = container.isDisableLibredirect,
             useSteamInput = useSteamInput,
             forceDlc = container.isForceDlc,
             localSavesOnly = container.isLocalSavesOnly,
@@ -520,6 +522,8 @@ object ContainerUtils {
         container.box86Preset = containerData.box86Preset
         container.box64Preset = containerData.box64Preset
         container.isSdlControllerAPI = containerData.sdlControllerAPI
+        container.isFasterExternalLoading = containerData.fasterExternalLoading
+        container.isDisableLibredirect = containerData.disableLibredirect
         container.putExtra("useSteamInput", containerData.useSteamInput)
         container.desktopTheme = containerData.desktopTheme
         container.graphicsDriverVersion = containerData.graphicsDriverVersion

app/src/main/java/com/winlator/container/Container.java

@@ -126,6 +126,8 @@ public enum XrControllerMapping {
     private String execArgs = ""; // Default exec arguments
     private String executablePath = ""; // Executable path for container
     private boolean sdlControllerAPI;
+    private boolean fasterExternalLoading;
+    private boolean disableLibredirect;
 
     // Preferred game language for Goldberg force_language.txt
     private String language = "english";
@@ -396,6 +398,22 @@ public void setSdlControllerAPI(boolean sdlControllerAPI) {
         this.sdlControllerAPI = sdlControllerAPI;
     }
 
+    public boolean isFasterExternalLoading() {
+        return fasterExternalLoading;
+    }
+
+    public void setFasterExternalLoading(boolean fasterExternalLoading) {
+        this.fasterExternalLoading = fasterExternalLoading;
+    }
+
+    public boolean isDisableLibredirect() {
+        return disableLibredirect;
+    }
+
+    public void setDisableLibredirect(boolean disableLibredirect) {
+        this.disableLibredirect = disableLibredirect;
+    }
+
     public String getLanguage() {
         return language != null ? language : "english";
     }
@@ -736,6 +754,8 @@ public void saveData() {
             data.put("executablePath", executablePath);
             data.put("needsUnpacking", needsUnpacking);
             data.put("sdlControllerAPI", sdlControllerAPI);
+            data.put("fasterExternalLoading", fasterExternalLoading);
+            data.put("disableLibredirect", disableLibredirect);
             // Disable mouse input flag
             data.put("disableMouseInput", disableMouseInput);
             // Touchscreen mode flag
@@ -953,6 +973,12 @@ public void loadData(JSONObject data) throws JSONException {
                 case "sdlControllerAPI" :
                     setSdlControllerAPI(data.getBoolean(key));
                     break;
+                case "fasterExternalLoading" :
+                    setFasterExternalLoading(data.getBoolean(key));
+                    break;
+                case "disableLibredirect" :
+                    setDisableLibredirect(data.getBoolean(key));
+                    break;
                 case "disableMouseInput" :
                     setDisableMouseInput(data.getBoolean(key));
                     break;

app/src/main/java/com/winlator/container/ContainerData.kt

@@ -70,6 +70,8 @@ data class ContainerData(
     val shaderBackend: String = "glsl",
     val useGLSL: String = "enabled",
     val sdlControllerAPI: Boolean = true,
+    val fasterExternalLoading: Boolean = false,
+    val disableLibredirect: Boolean = false,
     /** Enable Steam Input **/
     val useSteamInput: Boolean = false,
     /** Enable XInput API **/
@@ -155,6 +157,8 @@ data class ContainerData(
                     "fexcoreMultiBlock" to state.fexcoreMultiBlock,
                     "fexcorePreset" to state.fexcorePreset,
                     "sdlControllerAPI" to state.sdlControllerAPI,
+                    "fasterExternalLoading" to state.fasterExternalLoading,
+                    "disableLibredirect" to state.disableLibredirect,
                     "useSteamInput" to state.useSteamInput,
                     "enableXInput" to state.enableXInput,
                     "enableDInput" to state.enableDInput,
@@ -226,6 +230,8 @@ data class ContainerData(
                     fexcoreMultiBlock = (savedMap["fexcoreMultiBlock"] as? String) ?: "Disabled",
                     fexcorePreset = (savedMap["fexcorePreset"] as? String) ?: FEXCorePreset.INTERMEDIATE,
                     sdlControllerAPI = savedMap["sdlControllerAPI"] as Boolean,
+                    fasterExternalLoading = (savedMap["fasterExternalLoading"] as? Boolean) ?: false,
+                    disableLibredirect = (savedMap["disableLibredirect"] as? Boolean) ?: false,
                     useSteamInput = (savedMap["useSteamInput"] as? Boolean) ?: false,
                     enableXInput = savedMap["enableXInput"] as Boolean,
                     enableDInput = savedMap["enableDInput"] as Boolean,

app/src/main/java/com/winlator/xenvironment/ImageFsInstaller.java

@@ -97,6 +97,11 @@ private static void ensureBionicLib(Context context, File imagefs) {
                 FileUtils.copy(context, "libredirect-bionic-wx.so", wxDest);
                 chmod(wxDest);
             }
+            File wxMinimalDest = new File(imagefs, "usr/lib/libredirect-bionic-wx-minimal.so");
+            if (!wxMinimalDest.exists()) {
+                FileUtils.copy(context, "libredirect-bionic-wx-minimal.so", wxMinimalDest);
+                chmod(wxMinimalDest);
+            }
         }
     }
 

app/src/main/java/com/winlator/xenvironment/components/BionicProgramLauncherComponent.java

@@ -82,6 +82,20 @@ public WineInfo getWineInfo() {
     public Container getContainer() { return this.container; }
     public void setContainer(Container container) { this.container = container; }
 
+    // Resolve which libredirect shim to preload. Normally the flavor default
+    // (PRELOAD_BIONIC_SO). When the container disables libredirect, modern falls
+    // back to the W^X-only minimal shim (still required to run Wine on a strict
+    // W^X kernel) and legacy preloads nothing. Returns null to preload nothing.
+    private String resolveLibredirectPreload(ImageFs imageFs) {
+        if (container != null && container.isDisableLibredirect()) {
+            if (BuildConfig.MODERN_ANDROID) {
+                return imageFs.getLibDir() + "/libredirect-bionic-wx-minimal.so";
+            }
+            return null;
+        }
+        return imageFs.getLibDir() + "/" + BuildConfig.PRELOAD_BIONIC_SO;
+    }
+
     /** Numeric Steam appid for the game in this container (e.g. "221380").
      *  Set from XServerScreen before start(); only consumed in real-Steam mode
      *  to publish SteamGameId / SteamAppId for the steam_helper handshake. */
@@ -301,18 +315,37 @@ private int execGuestProgram() {
         String ld_preload = "";
         String sysvPath = imageFs.getLibDir() + "/libandroid-sysvshm.so";
         String evshimPath = context.getApplicationInfo().nativeLibraryDir + "/libevshim.so";
-        String replacePath = imageFs.getLibDir() + "/" + BuildConfig.PRELOAD_BIONIC_SO;
+        String replacePath = resolveLibredirectPreload(imageFs);
 
         if (new File(sysvPath).exists()) ld_preload += sysvPath;
 
 
         ld_preload += ":" + evshimPath;
-        ld_preload += ":" + replacePath;
+        if (replacePath != null) ld_preload += ":" + replacePath;
 
         envVars.put("LD_PRELOAD", ld_preload);
         envVars.put("EVSHIM_WINE", 1);
         envVars.put("EVSHIM_SHM_NAME", "controller-shm0");
 
+        if (container != null && container.isFasterExternalLoading()) {
+            String ffpGameDir = null;
+            for (String[] drive : Container.drivesIterator(container.getDrives())) {
+                if (drive[0].equals("A")) {
+                    try {
+                        ffpGameDir = new File(drive[1]).getCanonicalPath();
+                    } catch (IOException e) {
+                        ffpGameDir = drive[1];
+                    }
+                    break;
+                }
+            }
+            if (ffpGameDir != null && ffpGameDir.startsWith("/storage/")
+                    && !ffpGameDir.startsWith("/storage/emulated/")) {
+                envVars.put("FFP_ENABLE", "1");
+                envVars.put("FFP_MARKERS", "/steamapps/common/;/dosdevices/a:");
+            }
+        }
+
         // Check for specific shared memory libraries
 //        if ((new File(imageFs.getLibDir(), "libandroid-sysvshm.so")).exists()){
 //            ld_preload = imageFs.getLibDir() + "/libandroid-sysvshm.so";
@@ -672,11 +705,11 @@ public String execShellCommand(String command, boolean includeStderr) {
 
         String ld_preload = "";
         String sysvPath = imageFs.getLibDir() + "/libandroid-sysvshm.so";
-        String replacePath = imageFs.getLibDir() + "/" + BuildConfig.PRELOAD_BIONIC_SO;
+        String replacePath = resolveLibredirectPreload(imageFs);
 
         if (new File(sysvPath).exists()) ld_preload += sysvPath;
 
-        ld_preload += ":" + replacePath;
+        if (replacePath != null) ld_preload += ":" + replacePath;
 
         envVars.put("LD_PRELOAD", ld_preload);
 

app/src/main/res/values-da/strings.xml

@@ -2232,4 +2232,8 @@
     <string name="favorite_added">Føjet til favoritter</string>
     <string name="favorite_added_named">Føjede %1$s til favoritter</string>
     <string name="xr_refresh_rate">VR-opdateringsfrekvens</string>
+    <string name="faster_external_loading_title">Hurtigere indlæsning fra eksternt lager</string>
+    <string name="faster_external_loading_subtitle">Kan gøre spilstart fra eksternt lager markant hurtigere, men kan give problemer i nogle spil</string>
+    <string name="disable_libredirect_title">Deaktiver libredirect</string>
+    <string name="disable_libredirect_subtitle">Kan forbedre ydeevnen, men kan også give uventede problemer</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -2302,4 +2302,8 @@
     <string name="favorite_added">Zu Favoriten hinzugefügt</string>
     <string name="favorite_added_named">%1$s zu Favoriten hinzugefügt</string>
     <string name="xr_refresh_rate">VR-Bildwiederholrate</string>
+    <string name="faster_external_loading_title">Schnelleres Laden von externem Speicher</string>
+    <string name="faster_external_loading_subtitle">Kann den Spielstart von externem Speicher deutlich beschleunigen, kann aber bei manchen Spielen Probleme verursachen</string>
+    <string name="disable_libredirect_title">libredirect deaktivieren</string>
+    <string name="disable_libredirect_subtitle">Kann die Leistung verbessern, aber auch unerwartete Probleme verursachen</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -2360,4 +2360,8 @@
     <string name="favorite_added">Añadido a favoritos</string>
     <string name="favorite_added_named">%1$s añadido a favoritos</string>
     <string name="xr_refresh_rate">Frecuencia de actualización de RV</string>
+    <string name="faster_external_loading_title">Carga más rápida desde almacenamiento externo</string>
+    <string name="faster_external_loading_subtitle">Puede acelerar considerablemente el inicio de juegos desde almacenamiento externo, pero puede causar problemas en algunos juegos</string>
+    <string name="disable_libredirect_title">Desactivar libredirect</string>
+    <string name="disable_libredirect_subtitle">Puede mejorar el rendimiento, pero también puede causar problemas inesperados</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -2362,4 +2362,8 @@
     <string name="favorite_added">Ajouté aux favoris</string>
     <string name="favorite_added_named">%1$s ajouté aux favoris</string>
     <string name="xr_refresh_rate">Taux de rafraîchissement VR</string>
+    <string name="faster_external_loading_title">Chargement plus rapide depuis le stockage externe</string>
+    <string name="faster_external_loading_subtitle">Peut accélérer considérablement le démarrage des jeux depuis le stockage externe, mais peut causer des problèmes dans certains jeux</string>
+    <string name="disable_libredirect_title">Désactiver libredirect</string>
+    <string name="disable_libredirect_subtitle">Peut améliorer les performances, mais peut aussi causer des problèmes inattendus</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -2353,4 +2353,8 @@
     <string name="favorite_added">Aggiunto ai preferiti</string>
     <string name="favorite_added_named">%1$s aggiunto ai preferiti</string>
     <string name="xr_refresh_rate">Frequenza di aggiornamento VR</string>
+    <string name="faster_external_loading_title">Caricamento più veloce dalla memoria esterna</string>
+    <string name="faster_external_loading_subtitle">Può velocizzare notevolmente l\'avvio dei giochi dalla memoria esterna, ma può causare problemi in alcuni giochi</string>
+    <string name="disable_libredirect_title">Disattiva libredirect</string>
+    <string name="disable_libredirect_subtitle">Può migliorare le prestazioni, ma può anche causare problemi imprevisti</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -2316,4 +2316,8 @@
     <string name="favorite_added">お気に入りに追加しました</string>
     <string name="favorite_added_named">%1$s をお気に入りに追加しました</string>
     <string name="xr_refresh_rate">VRリフレッシュレート</string>
+    <string name="faster_external_loading_title">外部ストレージからの高速読み込み</string>
+    <string name="faster_external_loading_subtitle">外部ストレージからのゲーム起動を大幅に高速化できますが、一部のゲームで問題が発生する可能性があります</string>
+    <string name="disable_libredirect_title">libredirect を無効にする</string>
+    <string name="disable_libredirect_subtitle">パフォーマンスが向上する場合がありますが、予期しない問題が発生する可能性もあります</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -2357,4 +2357,8 @@
     <string name="favorite_added">즐겨찾기에 추가됨</string>
     <string name="favorite_added_named">%1$s을(를) 즐겨찾기에 추가함</string>
     <string name="xr_refresh_rate">VR 재생 빈도</string>
+    <string name="faster_external_loading_title">외부 저장소에서 더 빠른 로딩</string>
+    <string name="faster_external_loading_subtitle">외부 저장소에서의 게임 부팅 속도를 크게 높일 수 있지만 일부 게임에서 문제가 발생할 수 있습니다</string>
+    <string name="disable_libredirect_title">libredirect 비활성화</string>
+    <string name="disable_libredirect_subtitle">성능이 향상될 수 있지만 예기치 않은 문제가 발생할 수도 있습니다</string>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -2366,4 +2366,8 @@
     <string name="favorite_added">Dodano do ulubionych</string>
     <string name="favorite_added_named">Dodano %1$s do ulubionych</string>
     <string name="xr_refresh_rate">Częstotliwość odświeżania VR</string>
+    <string name="faster_external_loading_title">Szybsze wczytywanie z pamięci zewnętrznej</string>
+    <string name="faster_external_loading_subtitle">Może znacznie przyspieszyć uruchamianie gier z pamięci zewnętrznej, ale może powodować problemy w niektórych grach</string>
+    <string name="disable_libredirect_title">Wyłącz libredirect</string>
+    <string name="disable_libredirect_subtitle">Może poprawić wydajność, ale może też powodować nieoczekiwane problemy</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -2232,4 +2232,8 @@
     <string name="favorite_added">Adicionado aos favoritos</string>
     <string name="favorite_added_named">%1$s adicionado aos favoritos</string>
     <string name="xr_refresh_rate">Taxa de atualização de VR</string>
+    <string name="faster_external_loading_title">Carregamento mais rápido do armazenamento externo</string>
+    <string name="faster_external_loading_subtitle">Pode acelerar bastante a inicialização de jogos no armazenamento externo, mas pode causar problemas em alguns jogos</string>
+    <string name="disable_libredirect_title">Desativar libredirect</string>
+    <string name="disable_libredirect_subtitle">Pode melhorar o desempenho, mas também pode causar problemas inesperados</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -2366,4 +2366,8 @@
     <string name="favorite_added">Adăugat la favorite</string>
     <string name="favorite_added_named">%1$s adăugat la favorite</string>
     <string name="xr_refresh_rate">Rată de reîmprospătare VR</string>
+    <string name="faster_external_loading_title">Încărcare mai rapidă de pe stocarea externă</string>
+    <string name="faster_external_loading_subtitle">Poate accelera semnificativ pornirea jocurilor de pe stocarea externă, dar poate cauza probleme în unele jocuri</string>
+    <string name="disable_libredirect_title">Dezactivează libredirect</string>
+    <string name="disable_libredirect_subtitle">Poate îmbunătăți performanța, dar poate cauza și probleme neașteptate</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -2294,4 +2294,8 @@ https://gamenative.app
     <string name="favorite_added">Добавлено в избранное</string>
     <string name="favorite_added_named">%1$s добавлено в избранное</string>
     <string name="xr_refresh_rate">Частота обновления VR</string>
+    <string name="faster_external_loading_title">Быстрая загрузка с внешнего накопителя</string>
+    <string name="faster_external_loading_subtitle">Может значительно ускорить запуск игр с внешнего накопителя, но может вызывать проблемы в некоторых играх</string>
+    <string name="disable_libredirect_title">Отключить libredirect</string>
+    <string name="disable_libredirect_subtitle">Может повысить производительность, но также может вызвать непредвиденные проблемы</string>
 </resources>