Fix custom mapping drive container

app/src/main/feature/settings/containers/ContainerSettingsComposeDialog.kt

@@ -463,7 +463,10 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         } else items
 
         drivesWorking.clear()
-        val drivesStr = c?.getDrives() ?: Container.DEFAULT_DRIVES
+        val drivesStr = c?.let {
+            com.winlator.cmod.runtime.wine.WineUtils.readDrivesFromPrefix(it)
+                .ifEmpty { it.getDrives() }
+        } ?: Container.DEFAULT_DRIVES
         for (drive in Container.drivesIterator(drivesStr)) {
             drivesWorking.add(
                 DriveDraft(
@@ -848,6 +851,10 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             c.setEmulator64(emulator64)
             c.setWinComponents(wincomponents)
             c.setDrives(drivesString)
+            // an existing prefix owns the drive list, so write it there too
+            if (java.io.File(c.rootDir, ".wine/dosdevices").isDirectory) {
+                com.winlator.cmod.runtime.wine.WineUtils.applyDrivesToPrefix(c, drivesString)
+            }
             c.setFullscreenStretched(state.fullscreenStretched.value)
             c.setUseUnixLibs(state.useUnixLibs.value)
             c.setInputType(finalInputType)

app/src/main/res/values-b+es+419/strings.xml

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">Seleccionar EXE</string>
     <string name="common_ui_select_folder">Seleccionar carpeta</string>
     <string name="common_ui_current_folder">Carpeta actual</string>
+    <string name="common_ui_enter_path">Ingresar ruta</string>
+    <string name="common_ui_path_not_found">Ruta no encontrada</string>
     <string name="common_ui_select_valid_exe_file">Selecciona un archivo .exe válido</string>
     <string name="common_ui_select_valid_icon_file">Selecciona un archivo .ico o .png válido.</string>
     <string name="common_ui_exit">Salir</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Vælg</string>
     <string name="common_ui_select_folder">Vælg mappe</string>
     <string name="common_ui_current_folder">Nuværende mappe</string>
+    <string name="common_ui_enter_path">Indtast sti</string>
+    <string name="common_ui_path_not_found">Stien blev ikke fundet</string>
     <string name="common_ui_storage_roots">Lagringsrødder</string>
     <string name="common_ui_browse_local_folders_directly">Gennemse lokale mapper direkte</string>
     <string name="common_ui_no_folders_available_here">Ingen mapper tilgængelige her</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Auswählen</string>
     <string name="common_ui_select_folder">Ordner auswählen</string>
     <string name="common_ui_current_folder">Aktueller Ordner</string>
+    <string name="common_ui_enter_path">Pfad eingeben</string>
+    <string name="common_ui_path_not_found">Pfad nicht gefunden</string>
     <string name="common_ui_storage_roots">Speicherorte</string>
     <string name="common_ui_browse_local_folders_directly">Lokale Ordner direkt durchsuchen</string>
     <string name="common_ui_no_folders_available_here">Hier sind keine Ordner verfügbar</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Seleccionar</string>
     <string name="common_ui_select_folder">Seleccionar carpeta</string>
     <string name="common_ui_current_folder">Carpeta actual</string>
+    <string name="common_ui_enter_path">Introducir ruta</string>
+    <string name="common_ui_path_not_found">Ruta no encontrada</string>
     <string name="common_ui_storage_roots">Ubicaciones de almacenamiento</string>
     <string name="common_ui_browse_local_folders_directly">Explorar carpetas locales directamente</string>
     <string name="common_ui_no_folders_available_here">No hay carpetas disponibles aquí</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">Valitse EXE</string>
     <string name="common_ui_select_folder">Valitse kansio</string>
     <string name="common_ui_current_folder">Nykyinen kansio</string>
+    <string name="common_ui_enter_path">Anna polku</string>
+    <string name="common_ui_path_not_found">Polkua ei löytynyt</string>
     <string name="common_ui_select_valid_exe_file">Valitse kelvollinen .exe-tiedosto</string>
     <string name="common_ui_select_valid_icon_file">Valitse kelvollinen .ico- tai .png-tiedosto.</string>
     <string name="common_ui_exit">Poistu</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Sélectionner</string>
     <string name="common_ui_select_folder">Sélectionner un dossier</string>
     <string name="common_ui_current_folder">Dossier actuel</string>
+    <string name="common_ui_enter_path">Saisir le chemin</string>
+    <string name="common_ui_path_not_found">Chemin introuvable</string>
     <string name="common_ui_storage_roots">Emplacements de stockage</string>
     <string name="common_ui_browse_local_folders_directly">Parcourir directement les dossiers locaux</string>
     <string name="common_ui_no_folders_available_here">Aucun dossier disponible ici</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">EXE चुनें</string>
     <string name="common_ui_select_folder">फ़ोल्डर चुनें</string>
     <string name="common_ui_current_folder">वर्तमान फ़ोल्डर</string>
+    <string name="common_ui_enter_path">पथ दर्ज करें</string>
+    <string name="common_ui_path_not_found">पथ नहीं मिला</string>
     <string name="common_ui_select_valid_exe_file">कृपया मान्य .exe फ़ाइल चुनें</string>
     <string name="common_ui_select_valid_icon_file">कृपया मान्य .ico या .png फ़ाइल चुनें।</string>
     <string name="common_ui_exit">बाहर निकलें</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Seleziona</string>
     <string name="common_ui_select_folder">Seleziona cartella</string>
     <string name="common_ui_current_folder">Cartella corrente</string>
+    <string name="common_ui_enter_path">Inserisci percorso</string>
+    <string name="common_ui_path_not_found">Percorso non trovato</string>
     <string name="common_ui_storage_roots">Percorsi di archiviazione</string>
     <string name="common_ui_browse_local_folders_directly">Sfoglia direttamente le cartelle locali</string>
     <string name="common_ui_no_folders_available_here">Nessuna cartella disponibile qui</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">EXEを選択</string>
     <string name="common_ui_select_folder">フォルダを選択</string>
     <string name="common_ui_current_folder">現在のフォルダ</string>
+    <string name="common_ui_enter_path">パスを入力</string>
+    <string name="common_ui_path_not_found">パスが見つかりません</string>
     <string name="common_ui_select_valid_exe_file">有効な.exeファイルを選択してください</string>
     <string name="common_ui_select_valid_icon_file">有効な.icoまたは.pngファイルを選択してください。</string>
     <string name="common_ui_exit">終了</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">선택</string>
     <string name="common_ui_select_folder">폴더 선택</string>
     <string name="common_ui_current_folder">현재 폴더</string>
+    <string name="common_ui_enter_path">경로 입력</string>
+    <string name="common_ui_path_not_found">경로를 찾을 수 없음</string>
     <string name="common_ui_storage_roots">저장소 루트</string>
     <string name="common_ui_browse_local_folders_directly">로컬 폴더를 바로 탐색</string>
     <string name="common_ui_no_folders_available_here">여기에서 사용할 수 있는 폴더가 없습니다</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">Velg EXE</string>
     <string name="common_ui_select_folder">Velg mappe</string>
     <string name="common_ui_current_folder">Gjeldende mappe</string>
+    <string name="common_ui_enter_path">Angi sti</string>
+    <string name="common_ui_path_not_found">Fant ikke stien</string>
     <string name="common_ui_select_valid_exe_file">Velg en gyldig .exe-fil</string>
     <string name="common_ui_select_valid_icon_file">Velg en gyldig .ico- eller .png-fil.</string>
     <string name="common_ui_exit">Avslutt</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Wybierz</string>
     <string name="common_ui_select_folder">Wybierz folder</string>
     <string name="common_ui_current_folder">Bieżący folder</string>
+    <string name="common_ui_enter_path">Wprowadź ścieżkę</string>
+    <string name="common_ui_path_not_found">Nie znaleziono ścieżki</string>
     <string name="common_ui_storage_roots">Lokalizacje pamięci</string>
     <string name="common_ui_browse_local_folders_directly">Przeglądaj lokalne foldery bezpośrednio</string>
     <string name="common_ui_no_folders_available_here">Brak dostępnych folderów w tej lokalizacji</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Selecionar</string>
     <string name="common_ui_select_folder">Selecionar pasta</string>
     <string name="common_ui_current_folder">Pasta atual</string>
+    <string name="common_ui_enter_path">Inserir caminho</string>
+    <string name="common_ui_path_not_found">Caminho não encontrado</string>
     <string name="common_ui_storage_roots">Locais de armazenamento</string>
     <string name="common_ui_browse_local_folders_directly">Navegar pelas pastas locais diretamente</string>
     <string name="common_ui_no_folders_available_here">Nenhuma pasta disponível aqui</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">Selecionar EXE</string>
     <string name="common_ui_select_folder">Selecionar Pasta</string>
     <string name="common_ui_current_folder">Pasta Atual</string>
+    <string name="common_ui_enter_path">Introduzir caminho</string>
+    <string name="common_ui_path_not_found">Caminho não encontrado</string>
     <string name="common_ui_select_valid_exe_file">Selecione um ficheiro .exe válido</string>
     <string name="common_ui_select_valid_icon_file">Selecione um ficheiro .ico ou .png válido.</string>
     <string name="common_ui_exit">Sair</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Selectează</string>
     <string name="common_ui_select_folder">Selectează folder</string>
     <string name="common_ui_current_folder">Folder curent</string>
+    <string name="common_ui_enter_path">Introduceți calea</string>
+    <string name="common_ui_path_not_found">Calea nu a fost găsită</string>
     <string name="common_ui_storage_roots">Locații de stocare</string>
     <string name="common_ui_browse_local_folders_directly">Răsfoiește direct folderele locale</string>
     <string name="common_ui_no_folders_available_here">Niciun folder disponibil aici</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">Выбрать EXE</string>
     <string name="common_ui_select_folder">Выбрать папку</string>
     <string name="common_ui_current_folder">Текущая папка</string>
+    <string name="common_ui_enter_path">Введите путь</string>
+    <string name="common_ui_path_not_found">Путь не найден</string>
     <string name="common_ui_select_valid_exe_file">Выберите корректный файл .exe</string>
     <string name="common_ui_select_valid_icon_file">Выберите корректный файл .ico или .png.</string>
     <string name="common_ui_exit">Выход</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">Välj EXE</string>
     <string name="common_ui_select_folder">Välj mapp</string>
     <string name="common_ui_current_folder">Aktuell mapp</string>
+    <string name="common_ui_enter_path">Ange sökväg</string>
+    <string name="common_ui_path_not_found">Sökvägen hittades inte</string>
     <string name="common_ui_select_valid_exe_file">Välj en giltig .exe-fil</string>
     <string name="common_ui_select_valid_icon_file">Välj en giltig .ico- eller .png-fil.</string>
     <string name="common_ui_exit">Avsluta</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">เลือก EXE</string>
     <string name="common_ui_select_folder">เลือกโฟลเดอร์</string>
     <string name="common_ui_current_folder">โฟลเดอร์ปัจจุบัน</string>
+    <string name="common_ui_enter_path">ป้อนพาธ</string>
+    <string name="common_ui_path_not_found">ไม่พบพาธ</string>
     <string name="common_ui_select_valid_exe_file">โปรดเลือกไฟล์ .exe ที่ถูกต้อง</string>
     <string name="common_ui_select_valid_icon_file">โปรดเลือกไฟล์ .ico หรือ .png ที่ถูกต้อง</string>
     <string name="common_ui_exit">ออก</string>

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

@@ -15,6 +15,8 @@
     <string name="common_ui_select_exe">EXE Seç</string>
     <string name="common_ui_select_folder">Klasör Seç</string>
     <string name="common_ui_current_folder">Geçerli Klasör</string>
+    <string name="common_ui_enter_path">Yol girin</string>
+    <string name="common_ui_path_not_found">Yol bulunamadı</string>
     <string name="common_ui_select_valid_exe_file">Lütfen geçerli bir .exe dosyası seçin</string>
     <string name="common_ui_select_valid_icon_file">Lütfen geçerli bir .ico veya .png dosyası seçin.</string>
     <string name="common_ui_exit">Çıkış</string>

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

@@ -128,6 +128,8 @@
     <string name="common_ui_select">Вибрати</string>
     <string name="common_ui_select_folder">Вибрати теку</string>
     <string name="common_ui_current_folder">Поточна тека</string>
+    <string name="common_ui_enter_path">Введіть шлях</string>
+    <string name="common_ui_path_not_found">Шлях не знайдено</string>
     <string name="common_ui_storage_roots">Сховища</string>
     <string name="common_ui_browse_local_folders_directly">Переглядати локальні теки безпосередньо</string>
     <string name="common_ui_no_folders_available_here">Тут немає доступних тек</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -128,6 +128,8 @@
     <string name="common_ui_select">选择</string>
     <string name="common_ui_select_folder">选择文件夹</string>
     <string name="common_ui_current_folder">当前文件夹</string>
+    <string name="common_ui_enter_path">输入路径</string>
+    <string name="common_ui_path_not_found">找不到路径</string>
     <string name="common_ui_storage_roots">存储根目录</string>
     <string name="common_ui_browse_local_folders_directly">直接浏览本地文件夹</string>
     <string name="common_ui_no_folders_available_here">此处没有可用的文件夹</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -128,6 +128,8 @@
     <string name="common_ui_select">選擇</string>
     <string name="common_ui_select_folder">選擇資料夾</string>
     <string name="common_ui_current_folder">目前資料夾</string>
+    <string name="common_ui_enter_path">輸入路徑</string>
+    <string name="common_ui_path_not_found">找不到路徑</string>
     <string name="common_ui_storage_roots">儲存根目錄</string>
     <string name="common_ui_browse_local_folders_directly">直接瀏覽本機資料夾</string>
     <string name="common_ui_no_folders_available_here">這裡沒有可用的資料夾</string>

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

@@ -16,6 +16,8 @@
     <string name="common_ui_select_exe">Select EXE</string>
     <string name="common_ui_select_folder">Select Folder</string>
     <string name="common_ui_current_folder">Current Folder</string>
+    <string name="common_ui_enter_path">Enter Path</string>
+    <string name="common_ui_path_not_found">Path not found</string>
     <string name="common_ui_select_valid_exe_file">Please select a valid .exe file</string>
     <string name="common_ui_select_valid_icon_file">Please select a valid .ico or .png file.</string>
     <string name="common_ui_exit">Exit</string>

app/src/main/runtime/display/XServerDisplayActivity.java

@@ -6803,7 +6803,8 @@ private void setupXEnvironment() throws PackageManager.NameNotFoundException {
             normalizeSyncEnvVars(envVars);
 
             ArrayList<String> bindingPaths = new ArrayList<>();
-            String drives = shortcut != null ? getShortcutSetting("drives", container.getDrives()) : container.getDrives();
+            String drives = WineUtils.readDrivesFromPrefix(container);
+            if (drives.isEmpty()) drives = container.getDrives();
             for (String[] drive : Container.drivesIterator(drives)) {
                 bindingPaths.add(drive[1]);
             }