###Scripts version 1093###

2021-05-30 21:33:43 +03:00 · 2021-05-30 21:33:43 +03:00 · ef0b8f7689
commit ef0b8f7689
parent c818fdb2ad
42 changed files with 100 additions and 80 deletions
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@ -15,6 +15,19 @@
 * добавлено отображение скорости интернета и примерный остаток времени при скачивании библиотек libs, gecko, mono
 * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
+###Scripts version 1093###
+* исправлено определение использования RUNTIME в логах
+
+###Scripts version 1093###
+* возвращена переменная в скрипте var: WINE_WIN_START="start.exe /i /unix" что возвращает запуск .bat файлов и решает проблему с запуском игры WoT из WGC
+
+###Scripts version 1092###
+* исправлена автоустановка WGC под запуском в контейнерном режиме
+* добавлен фикс работы старых версий порта с новыми скриптами
+* частичный откат кода со скриптов от PortProton-78
+* Установка xact_x64 совместно c xact по умолчанию с любым db файлом
+* контейнерный режим включен по умолчанию и отключается в скрипте "каталог_порта/data/scripts/var" переменной PW_USE_RUNTIME=(1 - включен; 0 - выключен)
+
 ###Scripts version 1091###
 * Установка xact по умолчанию с любым db файлом

@ -30,7 +43,7 @@

 ###PortProton-84### 23.05.2021 ###Scripts version 1089### - BETA
 * обновлен WINE до версии Proton 6.9 GE 1
-* контейнерный режим включен по умолчанию и отключается с помощью раскомментирования переменной в скрипте var #export PW_FORCE_DISABLED_RUNTIME=1
+* контейнерный режим включен по умолчанию и отключается с помощью раскомментирования переменной в скрипте var #export PW_USE_RUNTIME=1
 * более чем в 2 раза увеличена производительность игр под VKD3D (Cyberpunk2077 и т.п.) за счет исползования dxgi из dxvk под vkd3d
 * для префикса по умолчанию включена версия windows 10
 * реализовано создание символьных ссылок с библиотек gstreamer в контейнер runtime для исправления ошибок WMF (gst)
@ -46,7 +59,7 @@
 * HOTFIX - изменена переменная export WINE_WIN_START="start.exe /b"

 ###Scripts version 1085###
-* в скрипт var добавлена и временно включена переменная export PW_FORCE_DISABLED_RUNTIME=1 (требуется рашение проблемы с загрузкой faudio)
+* в скрипт var добавлена и временно включена переменная export PW_USE_RUNTIME=1 (требуется рашение проблемы с загрузкой faudio)
 * добавлено автоматическое создание каталога "${WINEPREFIX}/drive_c/users/Public/Documents/Steam"
 * HOTFIX - обновление скриптов после установки происходило только при повторном запуске порта

--- a/data_from_portwine/scripts/autoinstall
+++ b/data_from_portwine/scripts/autoinstall
@ -3,7 +3,7 @@
 ########################################################################
 export PW_USER_TEMP="$WINEPREFIX/drive_c/users/${USER}/Temp"
 export PW_FORCE_LARGE_ADDRESS_AWARE=0
-export PW_FORCE_DISABLED_GAMEMOD=1
+export PW_USE_GAMEMODE=0
 export PW_CHECK_AUTOINSTAL=1
 export PW_WINEDBG_DISABLE=1
 export PW_NO_WRITE_WATCH=0
@ -19,6 +19,23 @@ PW_WGC () {
    START_PORTWINE
    if try_download "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}"
    then
+        while true ; do
+            if [ "${PW_USE_RUNTIME}" = 0 ]
+            then echo "PW_USE_RUNTIME: `echo $PW_USE_RUNTIME`" & break
+            fi
+            if  [ -z `pgrep wgc.exe` ] ; then
+                echo -e "PID WGC not found"
+                sleep 2
+            else
+                echo -e "PID WGC: `pgrep wgc.exe` \nPID Cont: `pidof -s bwrap`"
+                    while   [ ! -z `pgrep wgc.exe` ]; do
+                        echo -e "PID WGC found: `pgrep wgc.exe` \nPID_Status: `echo $?`"
+                        sleep 2
+                        KILL_PORTWINE
+                    done
+                break
+            fi
+        done &
        PW_START_PROGRESS_BAR_CS "Starting WGC installation..."
        PW_RUN "${PW_AUTOINSTALL_EXE}"
        portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/wgc_api/wgc_api.exe"
--- a/data_from_portwine/scripts/portwine_db/ACIII
+++ b/data_from_portwine/scripts/portwine_db/ACIII
@ -23,7 +23,7 @@ export WINEDLLOVERRIDES="xinput1_3,d3dcompiler_43=n,b"
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/Arthur
+++ b/data_from_portwine/scripts/portwine_db/Arthur
@ -27,7 +27,7 @@ export PW_VULKAN_USE=dxvk
 ##export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
 ##export PW_NO_ESYNC=1                            # Do not use eventfd-based in-process synchronization primitives
 export PULSE_LATENCY_MSEC=90                    # Fix crackling audio in games
-##export PW_FORCE_DISABLED_GAMEMOD=1              # Force disabele gamemod
+##export PW_USE_GAMEMODE=1              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PW_NO_WRITE_WATCH=1                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
 ##export PW_HEAP_DELAY_FREE=1
--- a/data_from_portwine/scripts/portwine_db/Cyberpunk2077
+++ b/data_from_portwine/scripts/portwine_db/Cyberpunk2077
@ -19,7 +19,7 @@ export WINEDLLOVERRIDES="Crash*,REDEngineErrorReporter.exe="
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=0                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=1              # Force disabele gamemod
+##export PW_USE_GAMEMODE=1              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 export PULSE_LATENCY_MSEC=40                    # Fix crackling audio in games
 export LAUNCH_PARAMETERS=("--launcher-skip")                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/DOOM
+++ b/data_from_portwine/scripts/portwine_db/DOOM
@ -17,7 +17,7 @@ export PW_NO_ESYNC=1        # Do not use eventfd-based in-process synchronizatio
 #export PW_HIDE_NVIDIA_GPU=0
 #export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 #export PW_WINEDBG_DISABLE=0
-#export PW_FORCE_DISABLED_GAMEMOD=1              # Force disabele gamemod
+#export PW_USE_GAMEMODE=1              # Force disabele gamemod
 #export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 export PULSE_LATENCY_MSEC=60
 #export PW_DLL_INSTALL="foo bar"
--- a/data_from_portwine/scripts/portwine_db/Diablo_II
+++ b/data_from_portwine/scripts/portwine_db/Diablo_II
@ -20,7 +20,7 @@ export PW_VULKAN_USE=0
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/Far
+++ b/data_from_portwine/scripts/portwine_db/Far
@ -16,7 +16,7 @@ export PW_OLD_GL_STRING=1
 #export PW_HIDE_NVIDIA_GPU=0
 #export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 #export PW_WINEDBG_DISABLE=1
-#export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+#export PW_USE_GAMEMODE=0              # Force disabele gamemod
 #export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 #export PULSE_LATENCY_MSEC=60
 #export PW_DLL_INSTALL=""
--- a/data_from_portwine/scripts/portwine_db/FarLoneSails
+++ b/data_from_portwine/scripts/portwine_db/FarLoneSails
@ -20,7 +20,7 @@
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/Hades
+++ b/data_from_portwine/scripts/portwine_db/Hades
@ -18,7 +18,7 @@ export PW_VULKAN_USE=dxvk #dxvk or vkd3d
 #export PW_HIDE_NVIDIA_GPU=0
 #export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 #export PW_WINEDBG_DISABLE=1
-#export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+#export PW_USE_GAMEMODE=0              # Force disabele gamemod
 #export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 #export PULSE_LATENCY_MSEC=60
 #export PW_DLL_INSTALL="foo bar"
--- a/data_from_portwine/scripts/portwine_db/Hulk
+++ b/data_from_portwine/scripts/portwine_db/Hulk
@ -5,5 +5,5 @@
 ################################################
 export PW_VULKAN_USE=0
 export PW_WINDOWS_VER="XP"
-export PW_FORCE_DISABLED_GAMEMOD=1
+export PW_USE_GAMEMODE=1
 export LAUNCH_PARAMETERS="-d3d9"
--- a/data_from_portwine/scripts/portwine_db/LOF2
+++ b/data_from_portwine/scripts/portwine_db/LOF2
@ -20,7 +20,7 @@ export PW_VULKAN_USE=dxvk
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 export PULSE_LATENCY_MSEC=120                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/LostEmber
+++ b/data_from_portwine/scripts/portwine_db/LostEmber
@ -21,7 +21,7 @@ export PW_NVAPI_DISABLE=1
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/MassEffect
+++ b/data_from_portwine/scripts/portwine_db/MassEffect
@ -18,7 +18,7 @@ export PW_DLL_INSTALL="physx d3dx9"                  # Install DDL in port prefi
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/MassEffect2
+++ b/data_from_portwine/scripts/portwine_db/MassEffect2
@ -18,7 +18,7 @@ export PW_DLL_INSTALL="physx d3dx9"                  # Install DDL in port prefi
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/MikuMikuDance
+++ b/data_from_portwine/scripts/portwine_db/MikuMikuDance
@ -24,7 +24,7 @@ export PW_VULKAN_USE=dxvk
 ##export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
 ##export PW_NO_ESYNC=1                            # Do not use eventfd-based in-process synchronization primitives
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
-##export PW_FORCE_DISABLED_GAMEMOD=1              # Force disabele gamemod
+##export PW_USE_GAMEMODE=1              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PW_NO_WRITE_WATCH=1                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
 ##export PW_HEAP_DELAY_FREE=1
--- a/data_from_portwine/scripts/portwine_db/Need_For_Speed_The_Run
+++ b/data_from_portwine/scripts/portwine_db/Need_For_Speed_The_Run
@ -21,7 +21,7 @@
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/NovaRO
+++ b/data_from_portwine/scripts/portwine_db/NovaRO
@ -29,7 +29,7 @@ export PW_DLL_INSTALL="d3dcompiler_42 d3dcompiler_43 d3dx9"
 ##export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
 ##export PW_NO_ESYNC=1                            # Do not use eventfd-based in-process synchronization primitives
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
-##export PW_FORCE_DISABLED_GAMEMOD=1              # Force disabele gamemod
+##export PW_USE_GAMEMODE=1              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PW_NO_WRITE_WATCH=1                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
 ##export PW_HEAP_DELAY_FREE=1
--- a/data_from_portwine/scripts/portwine_db/Origin
+++ b/data_from_portwine/scripts/portwine_db/Origin
@ -29,7 +29,7 @@ export PW_NVAPI_DISABLE=1

 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games

-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PW_NO_WRITE_WATCH=0                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
 ##export PW_HEAP_DELAY_FREE=0
--- a/data_from_portwine/scripts/portwine_db/SR2_pc
+++ b/data_from_portwine/scripts/portwine_db/SR2_pc
@ -21,7 +21,7 @@
 ##export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
 ##export PW_NO_ESYNC=1                            # Do not use eventfd-based in-process synchronization primitives
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
-##export PW_FORCE_DISABLED_GAMEMOD=1              # Force disabele gamemod
+##export PW_USE_GAMEMODE=1              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PW_NO_WRITE_WATCH=1                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
 ##export PW_HEAP_DELAY_FREE=1
--- a/data_from_portwine/scripts/portwine_db/Sam3
+++ b/data_from_portwine/scripts/portwine_db/Sam3
@ -28,7 +28,7 @@ export PULSE_LATENCY_MSEC=150
 ##export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
 ##export PW_NO_ESYNC=1                            # Do not use eventfd-based in-process synchronization primitives
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
-##export PW_FORCE_DISABLED_GAMEMOD=1              # Force disabele gamemod
+##export PW_USE_GAMEMODE=1              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PW_NO_WRITE_WATCH=1                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
 ##export PW_HEAP_DELAY_FREE=1
--- a/data_from_portwine/scripts/portwine_db/Sirus
+++ b/data_from_portwine/scripts/portwine_db/Sirus
@ -21,7 +21,7 @@ export PW_WINDOWS_VER=7                      # Set windows version 10, 7 or XP
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/SpideyPC
+++ b/data_from_portwine/scripts/portwine_db/SpideyPC
@ -5,5 +5,5 @@
 ################################################
 export PW_VULKAN_USE=0
 export PW_WINDOWS_VER="XP"
-export PW_FORCE_DISABLED_GAMEMOD=1
+export PW_USE_GAMEMODE=1
 export LAUNCH_PARAMETERS="-d3d9"
--- a/data_from_portwine/scripts/portwine_db/StarCraft
+++ b/data_from_portwine/scripts/portwine_db/StarCraft
@ -21,7 +21,7 @@
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/Suite
+++ b/data_from_portwine/scripts/portwine_db/Suite
@ -18,7 +18,7 @@ export PW_DLL_INSTALL="corefonts"        # Install DDL in port prefix (used wine
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/UbisoftConnect
+++ b/data_from_portwine/scripts/portwine_db/UbisoftConnect
@ -22,7 +22,7 @@
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/WarGame3
+++ b/data_from_portwine/scripts/portwine_db/WarGame3
@ -21,7 +21,7 @@
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/alanwake
+++ b/data_from_portwine/scripts/portwine_db/alanwake
@ -19,7 +19,7 @@ export PW_DLL_INSTALL="d3dx9 d3dcompiler_43"        # Install DDL in port prefix
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=1              # Force disabele gamemod
+##export PW_USE_GAMEMODE=1              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/arizona-starter
+++ b/data_from_portwine/scripts/portwine_db/arizona-starter
@ -20,7 +20,7 @@
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/default
+++ b/data_from_portwine/scripts/portwine_db/default
@ -39,4 +39,4 @@

 ##ADD_IN_START_PORTWINE () { commands ; }

-export PW_DLL_INSTALL="vcrun2019 vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9 xact"
+export PW_DLL_INSTALL="vcrun2019 vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9"
--- a/data_from_portwine/scripts/portwine_db/dontstarve
+++ b/data_from_portwine/scripts/portwine_db/dontstarve
@ -21,7 +21,7 @@ export PW_DLL_INSTALL="d3dx9 d3dcompiler_43"        # Install DDL in port prefix
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/eve
+++ b/data_from_portwine/scripts/portwine_db/eve
@ -30,7 +30,7 @@ export WINEDLLOVERRIDES="concrt140,msvcp140,msvcp140_1,msvcp140_2,d3dcompiler_47

 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games

-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PW_NO_WRITE_WATCH=0                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
 ##export PW_HEAP_DELAY_FREE=0
--- a/data_from_portwine/scripts/portwine_db/iw3sp
+++ b/data_from_portwine/scripts/portwine_db/iw3sp
@ -26,7 +26,7 @@
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/iw4sp
+++ b/data_from_portwine/scripts/portwine_db/iw4sp
@ -31,7 +31,7 @@
 ##export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
 ##export PW_NO_ESYNC=1                            # Do not use eventfd-based in-process synchronization primitives
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PW_NO_WRITE_WATCH=0                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
 ##export PW_HEAP_DELAY_FREE=0
--- a/data_from_portwine/scripts/portwine_db/risen-1
+++ b/data_from_portwine/scripts/portwine_db/risen-1
@ -18,7 +18,7 @@ export PW_DLL_INSTALL="physx d3dx9"        # Install DDL in port prefix (used wi
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/s1_sp64_ship
+++ b/data_from_portwine/scripts/portwine_db/s1_sp64_ship
@ -26,7 +26,7 @@
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/portwine_db/setup
+++ b/data_from_portwine/scripts/portwine_db/setup
@ -21,7 +21,7 @@ export PW_NO_WRITE_WATCH=0          # Disable support for memory write watches i
 #export PW_HIDE_NVIDIA_GPU=0
 #export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 export PW_WINEDBG_DISABLE=1
-export PW_FORCE_DISABLED_GAMEMOD=1             # Force disabele gamemod
+export PW_USE_GAMEMODE=1             # Force disabele gamemod
 export PW_FORCE_LARGE_ADDRESS_AWARE=0          # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 #export PULSE_LATENCY_MSEC=60
 export PW_DLL_INSTALL="vcrun6 mfc42 vcrun6sp6 mfc120 vcrun2013"
--- a/data_from_portwine/scripts/portwine_db/wgc
+++ b/data_from_portwine/scripts/portwine_db/wgc
@ -11,6 +11,6 @@ export LAUNCH_PARAMETERS="--disable-gpu"            # Additional launch options
 export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
 #export PW_NVAPI_DISABLE=1
 #export WINEDLLOVERRIDES="ucrtbase,xaudio2_7,xaudio2_8=n"
-export PW_DLL_INSTALL="lucida vcrun2019"     # Install DDL in port prefix (used winetricks) 
+export PW_DLL_INSTALL="lucida"     # Install DDL in port prefix (used winetricks) 
 ##export PW_GUI_DISABLED_CS=1
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
--- a/data_from_portwine/scripts/portwine_db/wotblitz
+++ b/data_from_portwine/scripts/portwine_db/wotblitz
@ -21,7 +21,7 @@ export PW_DLL_INSTALL="vcrun2013 vcrun2017 dotnet472"
 ##export PW_HIDE_NVIDIA_GPU=0
 ##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_FORCE_DISABLED_GAMEMOD=0              # Force disabele gamemod
+##export PW_USE_GAMEMODE=0              # Force disabele gamemod
 ##export PW_FORCE_LARGE_ADDRESS_AWARE=1           # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
 ##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@ -136,7 +136,9 @@ pw_clear_pfx () {
    try_remove_file "${WINEPREFIX}/winetricks.log"
    try_remove_file "${WINEPREFIX}/.update-timestamp"
    rm -f "${PORT_WINE_TMP_PATH}"/*.bin
+    rm -f "${PORT_WINE_TMP_PATH}"/*.foz
    try_remove_dir "${WINEPREFIX}/drive_c/windows/"
+    try_remove_dir  "${PORT_WINE_TMP_PATH}/mesa_shader_cache"
 }
 sszen() {
    zenity --progress --title="Settings..." --text="Updating parameters" --pulsate --auto-close --width=500 --height=90 --no-cancel
@ -258,30 +260,16 @@ START_PORTWINE ()
    try_remove_dir"${WINEDIR}"/share/wine/mono
    try_force_link_dir "${HOME}/.PortWINE/gecko" "${WINEDIR}"/share/wine/
    try_force_link_dir "${HOME}/.PortWINE/mono" "${WINEDIR}"/share/wine/
-    for pw_winedllpath in "${WINEDIR}/lib/wine/i386-windows" "${WINEDIR}/lib64/wine" "${WINEDIR}/lib64/wine/x86_64-windows" "${WINEDIR}/lib/wine/x86_64-windows"; do
-        if [ -d "${pw_winedllpath}" ]
-        then export WINEDLLPATH="${pw_winedllpath}:${WINEDLLPATH}"
-        fi
-    done
-    if [ ! -z "${PW_SYS_PATH}" ]
-    then export PATH="${PW_SYS_PATH}"
-    else export PW_SYS_PATH="${PATH}"
-    fi
-    if [ ! -z "${PW_LDL_PATH}" ]
-    then export LD_LIBRARY_PATH="${PW_SYS_PATH}"
-    else export PW_LDL_PATH="${LD_LIBRARY_PATH}"
+    if [ -d ${PATH_TO_GAME} ]
+    then export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${PATH_TO_GAME}"
+    else export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
    fi
    if [ ! -z "${PATH}" ]
    then export PATH="${WINEDIR}/bin:${PATH}"
    else export PATH="${WINEDIR}/bin"
    fi
-    export LD_LIBRARY_PATH="${WINEDIR}/lib"
-    for pw_ld_library_path in "${WINEDIR}/lib/wine/i386-unix" "${WINEDIR}/lib64" "${WINEDIR}/lib64/wine/x86_64-unix" ; do
-    if [ -d "${pw_ld_library_path}" ]
-    then export LD_LIBRARY_PATH="${pw_ld_library_path}:${LD_LIBRARY_PATH}"
-    fi
-    done
-    if [ ! -z "${PW_FORCE_DISABLED_RUNTIME}" ] && [ "${PW_FORCE_DISABLED_RUNTIME}" != 0 ] ; then
+    #export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib"
+    if [ "${PW_USE_RUNTIME}" = 0 ] ; then
        export PW_RUNTIME=""
        echo "RUNTIME is disabled"
    else
@ -364,7 +352,7 @@ START_PORTWINE ()
    create_new_dir "${PORT_WINE_TMP_PATH}/dxvk_cache"
    export DXVK_STATE_CACHE_PATH="${PORT_WINE_TMP_PATH}"/dxvk_cache
    export DXVK_STATE_CACHE=1
-    export optirun_on=""
+       export optirun_on=""
    export check_optimus_manager=
    export PW_NVIDIA="$(lspci | grep NVIDIA)"
    if [ -x "`which optimus-manager 2>/dev/null`" ]; then
@ -373,9 +361,18 @@ START_PORTWINE ()
    if [ ! -z "${PW_NVIDIA}" ] && [ "${check_optimus_manager}" != "intel" ]; then
        if [ "${check_optimus_manager}" = "nvidia" ]; then
            export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
-        else
-            export __NV_PRIME_RENDER_OFFLOAD=1
+        elif [ -x "`which primusrun 2>/dev/null`" ]; then
+            export optirun_on="primusrun"
+            export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
+        elif [ -x "`which optirun 2>/dev/null`" ]; then
+            export optirun_on="optirun -b primus"
+            export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
+        elif [ -x "`which prime-run 2>/dev/null`" ]; then
+            export optirun_on="prime-run"
+            export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
        fi
+        export __NV_PRIME_RENDER_OFFLOAD=1
+        export __GLX_VENDOR_LIBRARY_NAME=nvidia
        if [ ! -d "${PORT_WINE_TMP_PATH}"/gl_shader_cache ] ; then
            mkdir -p "${PORT_WINE_TMP_PATH}"/gl_shader_cache
        fi
@ -404,12 +401,12 @@ START_PORTWINE ()
    if [ ! -z ${PW_XKBD} ]; then
        setxkbmap us,ru
    fi
-    if [ -x "`which "gamemoderun" 2>/dev/null`" ] && [ "$PW_FORCE_DISABLED_GAMEMOD" != "1" ]; then
+    if [ -x "`which "gamemoderun" 2>/dev/null`" ] && [ "$PW_USE_GAMEMODE" = "1" ]; then
        export PW_GAMEMODERUN=1
        echo "Gamemod will be launched."
    else
        export PW_GAMEMODERUN=0
-        echo "Gamemod is not installed or disabled in vars script: PW_FORCE_DISABLED_GAMEMOD=$PW_FORCE_DISABLED_GAMEMOD"
+        echo "Gamemod is not installed or disabled in vars script: PW_USE_GAMEMODE=$PW_USE_GAMEMODE"
    fi
    PW_INIT_PFX
    RUN_WINETRICKS_FROM_DB
@ -449,14 +446,6 @@ STOP_PORTWINE () {
    PW_STOP_PROGRESS_BAR
    try_remove_file "${PORT_SCRIPTS_PATH}/0"
    try_remove_file "${PORT_SCRIPTS_PATH}/1"
-    if [ ! -z "${PW_SYS_PATH}" ] ; then
-        export PATH="${PW_SYS_PATH}"
-        unset PW_SYS_PATH
-    fi
-    if [ ! -z "${PW_LDL_PATH}" ] ; then
-        export LD_LIBRARY_PATH="${PW_SYS_PATH}"
-        unset PW_LDL_PATH
-    fi
 }

 UPDATE_WINETRICKS () {
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@ -17,7 +17,7 @@ PORTWINE_LAUNCH () {
    elif [ ! -z "${PORTWINE_MSI}" ]; then
        PW_RUN msiexec /i "$portwine_exe"
    elif [ ! -z "${PORTWINE_BAT}" ] || [ ! -z "${portwine_exe}" ]; then
-        PW_RUN "$portwine_exe"
+        PW_RUN ${WINE_WIN_START} "$portwine_exe"
    else
        PW_RUN explorer
    fi
@ -94,7 +94,7 @@ PORTWINE_DEBUG () {
    echo "Scripts version:" >> "${PORT_WINE_PATH}/${portname}.log"
    cat "${PORT_WINE_TMP_PATH}/scripts_ver" >> "${PORT_WINE_PATH}/${portname}.log"
    echo "-----------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    if [ ! -z "${PW_FORCE_DISABLED_RUNTIME}" ] && [ "${PW_FORCE_DISABLED_RUNTIME}" != 0 ] ; then
+    if [ "${PW_USE_RUNTIME}" = 0 ] ; then
        echo "RUNTIME is disabled" >> "${PORT_WINE_PATH}/${portname}.log"
    else
        echo "RUNTIME is enabled" >> "${PORT_WINE_PATH}/${portname}.log"
@ -223,7 +223,7 @@ if [ ! -z "${portwine_exe}" ]; then
            --button='EDIT  DB'!!"${loc_edit_db} ${PORTWINE_DB}":118 \
            --button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
            --button='DEBUG'!!"${loc_debug}":102 \
-            --button='LAUNCH'!!"${loc_launch}":106 )  
+            --button='LAUNCH'!!"${loc_launch}":106 )
            PW_YAD_SET="$?"
        elif [ ! -z "${PORTWINE_DB_FILE}" ] && [ -z "${PW_VULKAN_USE}" ]; then
            if [ -z "${PW_COMMENT_DB}" ] ; then
@ -236,7 +236,7 @@ if [ ! -z "${portwine_exe}" ]; then
            --button='EDIT  DB'!!"${loc_edit_db} ${PORTWINE_DB}":118 \
            --button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
            --button='DEBUG'!!"${loc_debug}":102 \
-            --button='LAUNCH'!!"${loc_launch}":106 )  
+            --button='LAUNCH'!!"${loc_launch}":106 )
            PW_YAD_SET="$?"
            export VULKAN_MOD=`echo "$OUTPUT_START" | awk '{print $1}'`
        else
@ -246,7 +246,7 @@ if [ ! -z "${portwine_exe}" ]; then
            --field="Run with :CB" "DXVK (DX 9-11 to Vulkan)"\!"VKD3D (DX 12 to Vulkan)"\!"OPENGL " \
            --button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
            --button='DEBUG'!!"${loc_debug}":102 \
-            --button='LAUNCH'!!"${loc_launch}":106 )  
+            --button='LAUNCH'!!"${loc_launch}":106 )
            PW_YAD_SET="$?"
            export VULKAN_MOD=`echo "$OUTPUT_START" | awk '{print $1}'`
        fi
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@ -6,9 +6,9 @@
 #export DXVK_HUD=fps,devinfo
 #export PW_VIRTUAL_DESKTOP=1

-#export PW_FORCE_DISABLED_RUNTIME=1
-#export PW_FORCE_DISABLED_GAMEMOD=1
+export PW_USE_RUNTIME=1     # 0 - disabled; 1 - enabled

+export PW_USE_GAMEMODE=1
 export PW_FORCE_USE_VSYNC=2
 export PW_LOG=0
 export PW_TERM=""
@ -25,10 +25,11 @@ export pw_libs_ver="_v14"

 export WINEDIR="${PORT_WINE_PATH}/data/dist"
 export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
+export WINE_WIN_START="start.exe /i /unix"

 export porturl="http://portwine-linux.ru/"

-export PW_MUST_HAVE_DLL="xact"
+export PW_MUST_HAVE_DLL="xact xact_x64"
 ########################################################################
 ADD_IN_START_PORTWINE ()
 {