###Scripts version 2071###

e9c3d0fd · Mikhail Tergoev · 168f8c4d · e9c3d0fd · e9c3d0fd · e9c3d0fd
Commit e9c3d0fd authored Jan 26, 2022 by Mikhail Tergoev
10 changed files
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,10 +2,17 @@ You can help us in the development of the project on the website: https://boosty
 -----------------------------------------
 Changelog:
+###Scripts version 2071###
+* added the ability to download other versions of WINE when opening an exe file (in the WINE selection drop-down list)
+* updated launch mode gamemode (bug fixed libgamemode.so)
+* added FSYNC optimization when getting kernel 5.16+ (increases FPS)
+* added new launch mode: "VULKAN (WINE DXGI)" required for some new games using DX12
 ###Scripts version 2070###
 * added PW_D3D_EXTRAS_DISABLE variable to EDIT_DB for DirectX external library
 * rollback MANGOHUD to stable version from libs_v19.2
 * fixed internet download interruption
+* updated WINE_LOL_GE 7.0
 ###Scripts version 2069###
 * added support for OpenSUSE (vkBasalt and MANGOHUD)

--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,10 +2,17 @@
 -----------------------------------------
 История изменений:
+###Scripts version 2071###
+* добавлена возможность скачивать другие версии WINE при запуске exe файла (в выпадающем списке выбора WINE)
+* обновлен режим запуска gamemode (исправлена ошибка libgamemode.so)
+* добавлена оптимизация FSYNC при условии использования ядра 5.16+ (повышает FPS)
+* добавлен новый режим запуска: "VULKAN (WINE DXGI)" необходимый для некоторых новых игр использующих DX12
 ###Scripts version 2070###
 * добавлена переменная PW_D3D_EXTRAS_DISABLE в EDIT_DB для возможности отключения сторонних библиотек DirectX
 * откат MANGOHUD до стабильной версии из libs_v19.2
 * исправлено прерывание загрузки из интернета
+* обновлен WINE_LOL_GE до версии 7.0
 ###Scripts version 2069###
 * добавлена поддержка OpenSUSE (vkBasalt и MANGOHUD)

--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -7,7 +7,7 @@ export update_loc=${update_loc}
 if [ "${update_loc}" = "RUS" ]
 then
 	export PW_CHANGELOG_FILE="changelog_rus"
-	export PW_SELECTION_DB_LOC="Найдено более одного DB файла для запускаемого приложения.\nВыберите необходимый, или перед следующим слезапуском удалите лишний DB файл.\n"
+	export PW_SELECTION_DB_LOC="Найдено более одного DB файла для запускаемого приложения.\nВыберите необходимый, или перед следующим запуском удалите лишний DB файл.\n"
 	export inst_set="Выбор"
 	export inst_set_top="Установка PortWINE"
@@ -82,6 +82,8 @@ then
 	export PW_DX12_DISABLE_INFO='Принудительное отключение DirectX 12'
 	export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)'
 	export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)'
+	export PW_D3D_EXTRAS_DISABLE_INFO='Отключить принудительное использование сторонних библиотек DirectX'
+	export PW_PRIME_RENDER_OFFLOAD_INFO='Включить дискретную видеокарту NVIDIA для ноутбуков с гибридной графикой (при поддержке установленого драйвера в ОС)'
 	export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)'
 	export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместо с CAS'

--- a/data_from_portwine/scripts/portwine_db/DXHRDC
+++ b/data_from_portwine/scripts/portwine_db/DXHRDC
@@ -10,7 +10,7 @@
 ##export PW_DLL_INSTALL="vcrun2017"               # Install DDL in port prefix (used winetricks) 
 export WINEDLLOVERRIDES="WINMM=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
-export PW_WINE_USE=PROTON_GE_6.19-5
+export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=1
 ##export PW_USE_DXR10=1
 ##export PW_DLSS_ON=1

--- a/data_from_portwine/scripts/portwine_db/League of Legends
+++ b/data_from_portwine/scripts/portwine_db/League of Legends
@@ -76,7 +76,7 @@ check_port_for_lol () {
    fi
    echo "Waiting for port ${port}"
    kill -STOP ${uxpid}
-    timeout 200m /bin/bash -c "
+    timeout 200m /bin/bash "
    until openssl s_client -connect :${port} <<< Q > /dev/null 2>&1 ; do
    sleep 1
    done"
@@ -89,7 +89,7 @@ add_in_start_portwine () {
        zenity --question --title="Fix for LoL anti-cheat" \
        --text='Root rights are required to execute the command:           \n"sysctl -w abi.vsyscall32=0" and "sysctl -p"' --no-wrap
        [ "$?" = 1 ] && exit 0
-        pkexec /bin/bash -c 'sysctl -w abi.vsyscall32=0 && sysctl -p'
+        pkexec /bin/bash 'sysctl -w abi.vsyscall32=0 && sysctl -p'
    fi
    check_port_for_lol &
 }
--- a/data_from_portwine/scripts/portwine_db/MikuMikuDance
+++ b/data_from_portwine/scripts/portwine_db/MikuMikuDance
@@ -5,7 +5,7 @@
 #####################examples###########################
 export PW_COMMENT_DB="MikuMikuDance"
 ##export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
-##export PW_DLL_INSTALL="vcrun2017"               # Install DDL in port prefix (used winetricks) 
+export PW_DLL_INSTALL="vcrun2017"               # Install DDL in port prefix (used winetricks) 
 export WINEDLLOVERRIDES="MMEffect,MMHack,d3d9,dsound=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 export PW_VULKAN_USE=0

--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -137,9 +137,10 @@ start_portwine () {
    #default wine-mono override for FNA games
    export WINE_MONO_OVERRIDES="Microsoft.Xna.Framework.*,Gac=n"
-    if [[ ! -z "${PW_NO_ESYNC}" && "${PW_NO_ESYNC}" != 0 ]]
+    if [[ ! -z "${PW_NO_ESYNC}" && "${PW_NO_ESYNC}" != 0 ]] ; then
-    then export WINEESYNC="0"
+        export WINEESYNC="0"
-    else export WINEESYNC="1"
+    else 
+        export WINEESYNC="1"
    fi
    if [[ ! -z "${PW_NO_FSYNC}" && "${PW_NO_FSYNC}" != 0 ]] ; then
        export WINEFSYNC="0"
@@ -147,6 +148,7 @@ start_portwine () {
    else
        export WINEFSYNC="1"
        export WINEFSYNC_FUTEX2="1"
+        export WINEFSYNC_SPINCOUNT=100
    fi
    if [[ ! -z "${PW_FORCE_LARGE_ADDRESS_AWARE}" && "${PW_FORCE_LARGE_ADDRESS_AWARE}" != 0 ]]
    then export WINE_LARGE_ADDRESS_AWARE="1"
@@ -256,8 +258,15 @@ start_portwine () {
            setxkbmap us,ru
        fi
    fi
-    if [[ -x "`which "gamemoderun" 2>/dev/null`" && "$PW_USE_GAMEMODE" = "1" && -z "`cat /etc/os-release | grep -i "red hat"`" ]] ; then
+    if [[ -x "`which "gamemoderun" 2>/dev/null`" && "$PW_USE_GAMEMODE" = "1" ]] && \
+       [[ -z "`cat /etc/os-release | grep -i "red hat"`" ]] && \
+       [[ -z "`cat /etc/os-release | grep -i "centos"`" ]] ; then
        export PW_GAMEMODERUN=1
+        if [[ ! -z "${LD_PRELOAD}" ]] ; then
+            export PW_LD_PRELOAD="$LD_PRELOAD:libgamemodeauto.so.0"
+        else
+            export PW_LD_PRELOAD="libgamemodeauto.so.0"
+        fi
        echo "Gamemod will be launched."
    else
        export PW_GAMEMODERUN=0
@@ -388,7 +397,7 @@ start_portwine () {
            try_force_link_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll"
            try_force_link_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll"
        done
-        if [[ ! -z "${PW_USE_WINE_DXGI}" && "${PW_USE_WINE_DXGI}" != 0 ]] ; then 
+        if [[ "${PW_USE_WINE_DXGI}" = 1 ]] || [[ "${PW_VULKAN_USE}" = "2" ]]; then 
            echo "Try link wine DXGI..."
            if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/dxgi.dll"
            then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/dxgi.dll"
@@ -463,7 +472,7 @@ start_portwine () {
            "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} 2>&1 | tr /n /r | grep -i "" &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
            # if [ "${PW_WINE_VER_FROM_DB}" != "${PW_PROTON_STEAM_VER}" ] ; then
            #     export PW_SILENT_RESTART=1
-            #     /bin/bash -c ${pw_full_command_line[*]} &
+            #     /bin/bash ${pw_full_command_line[*]} &
            #     exit 0
            # fi
        fi
@@ -490,12 +499,13 @@ pw_run () {
        cd "${WINEPREFIX}/drive_c"
    fi
    pw_mangohud_check
-    print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VKD3D_CONFIG" "LD_LIBRARY_PATH" "PATH"
+    print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VKD3D_CONFIG" \
+    "LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2"
    if [ "${PW_LOG}" == 1 ] ; then
        export PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log"
        if [[ ! -z "${PW_GAMEMODERUN}" && "${PW_GAMEMODERUN}" != 0 ]] ; then
-            ${optirun_on} gamemoderun ${pw_runtime} env VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \
+            ${optirun_on} ${pw_runtime} env LD_PRELOAD="${PW_LD_PRELOAD}" VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" \
-            ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}"
+            LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}"
        else
            ${optirun_on} ${pw_runtime} env VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \
            ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}"
@@ -503,8 +513,8 @@ pw_run () {
    else
        [ "${PW_USE_TERMINAL}" != "1" ] && export PW_TERM=""
        if [[ ! -z "${PW_GAMEMODERUN}" && "${PW_GAMEMODERUN}" != 0 ]] ; then
-            $PW_TERM ${optirun_on} gamemoderun ${pw_runtime} env VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \
+            $PW_TERM ${optirun_on} ${pw_runtime} env LD_PRELOAD="${PW_LD_PRELOAD}" VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" \
-            ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
+            LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
        else
            $PW_TERM ${optirun_on} ${pw_runtime} env VK_LAYER_PATH="${VK_LAYER_PATH}" PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \
            ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}

--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -142,7 +142,7 @@ portwine_start_debug () {
    env LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_WINELIB}/portable/lib/\$LIB" "${PW_WINELIB}/portable/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log"
    echo " " >> "${PORT_WINE_PATH}/${portname}.log"
    echo "inxi -G:" >> "${PORT_WINE_PATH}/${portname}.log"
-    "${PW_WINELIB}/portable/bin/inxi" -G >> "${PORT_WINE_PATH}/${portname}.log"
+    "${PW_WINELIB}/portable/bin/inxi" -G | sed 's/[*]12/""/' >> "${PORT_WINE_PATH}/${portname}.log"
    echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
    echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log"
    "${PW_WINELIB}/portable/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log"
@@ -239,10 +239,9 @@ pw_edit_db () {
    pw_gui_for_edit_db PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \
    PW_VULKAN_NO_ASYNC PW_USE_NVAPI_AND_DLSS PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP \
    PW_WINEDBG_DISABLE PW_USE_TERMINAL PW_WINE_ALLOW_XIM PW_HEAP_DELAY_FREE PW_NO_WRITE_WATCH PW_GUI_DISABLED_CS \
-    PW_USE_GSTREAMER PW_USE_RUNTIME PW_USE_GAMEMODE PW_DX12_DISABLE PW_USE_WINE_DXGI PW_PRIME_RENDER_OFFLOAD \
+    PW_USE_GSTREAMER PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_D3D_EXTRAS_DISABLE
-    PW_D3D_EXTRAS_DISABLE
    if [ "$?" == 0 ] ; then
-        /bin/bash -c ${pw_full_command_line[*]} &
+        /bin/bash ${pw_full_command_line[*]} &
        exit 0
    fi
 }
@@ -279,37 +278,38 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then
        [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=1
    fi
    case "${PW_VULKAN_USE}" in
-            "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)' ;;
+            "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)' ;;
-              *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL ' ;;
+            "1") export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL ' ;;
+            "2") export PW_DEFAULT_VULKAN_USE='VULKAN (WINE DXGI)!VULKAN (DXVK and VKD3D)!OPENGL ' ;;
    esac
    if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] ; then
-        export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}"
+        export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE"
    elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] ; then
-        export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}"
+        export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE"
    else
        if [[ "${PW_WINE_USE}" == "${PW_PROTON_STEAM_VER}" ]] ; then
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" 
+            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" 
        elif [[ "${PW_WINE_USE}" == "${PW_PROTON_GE_VER}" ]] ; then
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" 
+            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" 
        else
            export DIST_ADD_TO_GUI=`echo ${DIST_ADD_TO_GUI} | sed -e s/"\!${PW_WINE_USE}$//g"`
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}"
+            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE"
        fi
    fi
 else
-    export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL '
+    export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL '
    if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] ; then
-        export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}"
+        export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE"
    elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] ; then
-        export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}"
+        export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE"
    else
        if [[ "${PW_WINE_USE}" == "${PW_PROTON_STEAM_VER}" ]] ; then
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" 
+            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" 
        elif [[ "${PW_WINE_USE}" == "${PW_PROTON_GE_VER}" ]] ; then
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" 
+            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE" 
        else
            export DIST_ADD_TO_GUI=`echo ${DIST_ADD_TO_GUI} | sed -e s/"\!${PW_WINE_USE}$//g"`
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}"
+            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}!GET-OVER-WINE"
        fi     
    fi
    unset PW_GUI_DISABLED_CS
@@ -329,7 +329,7 @@ if [ ! -z "${portwine_exe}" ]; then
        --button='LAUNCH'!!"${loc_launch}":106 )
        export PW_YAD_SET="$?"
        if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi
-        export VULKAN_MOD=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}' | awk '{print $1}'`
+        export VULKAN_MOD=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}'`
        export PW_WINE_VER=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $2}' | awk '{print $1}'`
    elif [ ! -z "${PORTWINE_DB_FILE}" ]; then
        portwine_launch
@@ -346,7 +346,7 @@ else
    gui_clear_pfx () {
        if gui_question "${port_clear_pfx}" ; then
            pw_clear_pfx
-            /bin/bash -c ${pw_full_command_line[*]} &
+            /bin/bash ${pw_full_command_line[*]} &
            exit 0
        fi
    }
@@ -366,7 +366,7 @@ else
    gui_pw_update () {
        try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier"
-        /bin/bash -c ${pw_full_command_line[*]} &
+        /bin/bash ${pw_full_command_line[*]} &
        exit 0
    }
@@ -426,7 +426,7 @@ else
    "${pw_yad}" --plug=${KEY} --tabnum=1 --columns=3 --form --separator=";" \
    --image "$PW_GUI_ICON_PATH/port_proton.png" \
-    --field=":CB" "VULKAN (DXVK and VKD3D)!OPENGL" \
+    --field=":CB" "VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL" \
    --field=":LBL" "" \
    --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \
    --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \
@@ -452,14 +452,17 @@ else
    if [ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" ] ; then
        cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
        export VULKAN_MOD=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk '{print $1}' | awk -F";" '{print $1}'`
-        export PW_WINE_VER=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk -F";" '{print $5}' | awk '{print $1}'`
+        export PW_WINE_VER=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk -F";" '{print $5}'`
-        try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
+        #try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
    fi
 fi
 if [[ ! -z "${VULKAN_MOD}" && "${VULKAN_MOD}" = "OPENGL" ]] 
 then export PW_VULKAN_USE="0"
-else export PW_VULKAN_USE="1"
+elif [[ ! -z "${VULKAN_MOD}" && "${VULKAN_MOD}" = "VULKAN (DXVK and VKD3D)" ]] 
+then export PW_VULKAN_USE="1"
+elif [[ ! -z "${VULKAN_MOD}" && "${VULKAN_MOD}" = "VULKAN (WINE DXGI)" ]] 
+then export PW_VULKAN_USE="2"
 fi
 init_wine_ver

--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
 #!/bin/bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2070
+#SCRIPTS_NEXT_VERSION=2071
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=1