Update scripts 1037

data_from_portwine/changelog

@@ -1,13 +1,11 @@
 История изменений и дальнейшие планы:
 -----------------------------------------
 В планах:
-* добавить выбор версий dxvk и vkd3d в db файле.
+* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
 * добавить условие: если установлен vcrun2019, то не устанавливать vcrun2015-2017
-* проверить Cyberpunk и Tomd Raider 4 
 * EDIT DB открывается не у всех
 * добавить всю инфу из db файла и winetricks.log в debug
 * проверка установки mangohud
-* вывод changlog после обновления
 * исправить работу windows steam
 * создать defaut префикс и сделать авто симлинки в другие префиксы (games, programm files, users)
 * добавить кнопку отчистки префикса без затрагивания игр и программ
@@ -17,22 +15,28 @@
 * убрать все *_vars
 * выкачка либов из серверов кроссовера?
 * иконка в трей для PortProton
-* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
+* проверка версий dxvk на github: curl -s https://github.com/doitsujin/dxvk/releases | grep Version | awk {'print $3'} | sed 's%</a>%%g'
+* проверка версий vkd3d на github: curl -s https://github.com/HansKristian-Work/vkd3d-proton/releases | grep Version | awk {'print $3'} | sed 's%</a>%%g'
 -----------------------------------------
-
+###PortProton-74### 20.04.2021 ###Scripts version 1037###
-* в setup db изменен список библиотек (export PW_DLL_INSTALL="vcrun6 mfc42 vcrun6sp6 mfc120 vcrun2013")
+* обновлен wine до версии Proton 6.3-2 next
+* в setup db изменен список библиотек (фикс  для "xatab") "vcrun6 mfc42 vcrun6sp6 mfc120 vcrun2013" 
+* добавить выбор версий dxvk и vkd3d в db файле, с последующей закачкой с github при отсутствии в ~/.PortWINE/vulkan
+* обновлены libs до v9 (добавлен пакет zstd для реализация функции смены vkd3d)
+* произведена частичная чистка и оптимизация кода
+* добавлен вывод changlog после обновления
 
 ###PortProton-73### 18.04.2021 ###Scripts version 1036###
 * фикс для StarCraft (db)
-* Фикс работы порта в solus (отключение xterm)
+* фикс работы порта в solus (отключение xterm)
-* Фикс создания циклической ссылки drive_c внутри drive_c
+* фикс создания циклической ссылки drive_c внутри drive_c
-* Удален &>>/dev/null из PW_RUN (ломает запуск неторорых игр и приложений)
+* удален &>>/dev/null из PW_RUN (ломает запуск неторорых игр и приложений)
-* Очистищен код функции PW_RUN (убрано условие optirun_on за ненадобностью)
+* очистищен код функции PW_RUN (убрано условие optirun_on за ненадобностью)
-* Проверить минимальный набор библиотек в default db (vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9)
+* исправлен минимальный набор библиотек в default db (vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9)
 
 
 ###PortProton-72###   17.04.2021   ###Scripts version 1035###
-* Обновлен wine до версии Proton experimental-6.3-20210407b (совместно с dxvk и vkd3d)
+* обновлен wine до версии Proton experimental-6.3-20210407b (совместно с dxvk и vkd3d)
 * добавлен фикс работы 32-битных игр в режиме DXVK (export PW_FORCE_LARGE_ADDRESS_AWARE=1)
 * изменен список библиотек для запуска неизвестных игр (для которых еще нет db файлов)
 * добавлен dxvk.conf в каталог data

data_from_portwine/scripts/portwine_db/ACIII

@@ -0,0 +1,39 @@
+#!/bin/bash
+    #Author: xuser
+    #ACIII.exe 
+    #ACLiberation.exe     
+    #Rating=1-5
+    ################################################
+#    export PW_VULKAN_USE=dxvk
+#####################examples###########################
+##export PW_COMMENT_DB="blablabla"
+##export PW_DXVK_VER=1.8.1 
+##export PW_VKD3D_VER=2.2
+export WINEDLLOVERRIDES="xinput1_3,d3dcompiler_43=n,b"
+##export PW_DLL_INSTALL="d3dcompiler_43"        # Install DDL in port prefix (used winetricks) 
+##export PW_LOG=0                                 # Enable debug mode fo terminal 
+##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 PW_DXVK_NO_ASYNC=1                       # Disabled ASYNC for VULKAN
+##export PW_USE_TERMINAL=0                        # Force run in terminal
+##export PW_OLD_GL_STRING=0
+##export PW_NVAPI_DISABLE=1
+##export PW_VKD3D_FEATURE_LEVEL=0
+##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_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_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
+##export PW_GUI_DISABLED_CS=1                     # 1 = disabled GUI 
+##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue,dxr
+##export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
+##export PW_VIRTUAL_DESKTOP=1
+##export DXVK_HUD=fps,devinfo
+##export PW_HEAP_DELAY_FREE=0
+##export PW_DXGI_FROM_DXVK=0
+##export WINEARCH=win32                           # defaut = win64
+##export WINEPREFIX=
+##ADD_IN_START_PORTWINE () { commands ; }

data_from_portwine/scripts/portwine_db/Cyberpunk2077

@@ -4,9 +4,10 @@
     #Rating=1-5
     ################################################
     export PW_VULKAN_USE=vkd3d
+    export PW_VKD3D_VER=2.1
 #####################examples###########################
 ##export PW_COMMENT_DB="blablabla"
-##export WINEDLLOVERRIDES="xaudio2_7=n,b"
+export WINEDLLOVERRIDES="Crash*,REDEngineErrorReporter.exe="
 ##export PW_DLL_INSTALL="d3dcompiler_47"        # Install DDL in port prefix (used winetricks) 
 ##export PW_LOG=0                                 # Enable debug mode fo terminal 
 ##export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
@@ -14,23 +15,23 @@
 ##export PW_DXVK_NO_ASYNC=1                       # Disabled ASYNC for VULKAN
 ##export PW_USE_TERMINAL=0                        # Force run in terminal
 ##export PW_OLD_GL_STRING=0
-export PW_NVAPI_DISABLE=1
+##export PW_NVAPI_DISABLE=1
-##export PW_VKD3D_FEATURE_LEVEL=0
+##export PW_VKD3D_FEATURE_LEVEL=1
 ##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_HIDE_NVIDIA_GPU=0
-##export PW_FORCE_USE_VSYNC=2                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
+##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=0              # Force disabele gamemod
+##export PW_FORCE_DISABLED_GAMEMOD=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="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
+export LAUNCH_PARAMETERS=("--launcher-skip")                # Additional launch options
 ##export PW_GUI_DISABLED_CS=1                     # 1 = disabled GUI 
-##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue
+##export VKD3D_CONFIG=force_bindless_texel_buffer
 export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
 ##export PW_VIRTUAL_DESKTOP=1
 ##export DXVK_HUD=fps,devinfo
-export PW_HEAP_DELAY_FREE=1
+export PW_HEAP_DELAY_FREE=0
 ##export PW_DXGI_FROM_DXVK=0
 ##export WINEARCH=win32                           # defaut = win64
 ##export WINEPREFIX=
-##ADD_IN_START_PORTWINE () { commands ; }
+#ADD_IN_START_PORTWINE () { "${PW_RUNTIME}" "$WINESERVER" -w }

data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher

@@ -0,0 +1,23 @@
+#!/bin/bash
+    #Author: cefeiko
+    #WorldOfTanksEnCoreLauncher.exe 
+    #Rating=1-5
+    ################################################
+    export PW_VULKAN_USE=dxvk
+    export PW_USE_TERMINAL=0
+    export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_dotnet/"
+    export PW_DLL_INSTALL="vcrun2017 vcrun6 mfc42 vb6run physx dotnet40 "        # Install DDL in port prefix (used winetricks) 
+    export PW_COMMENT_DB="World Of Tanks EnCore"
+    ## export DXVK_HUD=fps,devinfo
+    ## export PW_MANGOHUD=1
+#####################examples###########################
+while [ `pidof -s dotNetFx40_Full_x86_x64.exe` ] ; do
+    if  [ $? -eq 0 ] ; then
+        sleep 1
+    elif
+        export dotnet_pids=`ps -ax | grep mscorsvw.exe | awk '{print $1}' | uniq`
+        [ ! -z $dotnet_pids ]
+        kill -n 9 $dotnet_pids
+        sleep 1
+    fi
+done

data_from_portwine/scripts/portwine_db/default

@@ -6,6 +6,8 @@ export PW_DLL_INSTALL="vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dc
 #####################examples###########################
 ##export PW_COMMENT_DB="blablabla"
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
+##export PW_DXVK_VER=1.8.1 
+##export PW_VKD3D_VER=2.2
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export PW_DLL_INSTALL="vcrun2019 vcrun6"        # Install DDL in port prefix (used winetricks) 
 ##export PW_LOG=0                                 # Enable debug mode fo terminal 

data_from_portwine/scripts/portwine_db/setup

@@ -17,12 +17,12 @@ export PW_NO_ESYNC=1        # Do not use eventfd-based in-process synchronizatio
 #export PW_OLD_GL_STRING=0
 #export PW_NVAPI_DISABLE=1
 #export PW_VKD3D_FEATURE_LEVEL=0
-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_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_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_WINEDBG_DISABLE=1
 export PW_FORCE_DISABLED_GAMEMOD=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 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" 
 #export LAUNCH_PARAMETERS="-d3d9"

data_from_portwine/scripts/runlib

@@ -16,7 +16,7 @@ if [ "${s_install}" != "1" ] && [ ! -x "`which "zenity" 2>/dev/null`" ];then
     xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0
 fi
 pw_default_vars () {
-    export pw_libs_ver="_v8"
+    export pw_libs_ver="_v9"
     export mono_ver=6.1.1
     export gecko_ver=2.47.2
     export PW_DXVK_VER=1.8.1 
@@ -27,7 +27,6 @@ pw_default_vars () {
     export WINEARCH="win64"
     export PW_WINDOWS_VER="7"
     export PW_FORCE_LARGE_ADDRESS_AWARE=1
-    export PW_VULKAN_DLL="${PORT_WINE_PATH}"/data/vulkan
 }
 print_error () {
     echo "ERROR: $@"
@@ -147,35 +146,21 @@ if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_ver" ]; then
 fi
 
 pw_default_vars
+var_winedlloverride_update "winemenubuilder.exe="
 export url_mono="https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${mono_ver}/wine-mono-${mono_ver}-x86.tar.xz"
 export url_gecko_x86="https://dl.winehq.org/wine/wine-gecko/${gecko_ver}/wine-gecko-${gecko_ver}-x86.tar.xz"
 export url_gecko_x86_64="https://dl.winehq.org/wine/wine-gecko/${gecko_ver}/wine-gecko-${gecko_ver}-x86_64.tar.xz"
-export url_dxvk="https://github.com/doitsujin/dxvk/releases/download/v${PW_DXVK_VER}/dxvk-${PW_DXVK_VER}.tar.gz"
-export url_vkd3d="https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${PW_VKD3D_VER}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
-export WINEDIR="${PORT_WINE_PATH}"/data/dist
-export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}"
-export WINEPREFIX="${PORT_WINE_PATH}/data/pfx/"
-export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}/"
-export PW_RUNTIME="$WINELIB/run.sh"
-export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
 export urlg="https://portwine-linux.ru/portwine-faq/"
 export PW_FTP_URL="https://portwine-linux.ru/ftp"
-export PW_WINE_VER_DXVK=""
+export WINEDIR="${PORT_WINE_PATH}"/data/dist
+export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}"
+export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
+export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}"
+export PW_RUNTIME="$WINELIB/run.sh"
+export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
+export PW_VULKAN_DLL="${HOME}/.PortWINE/vulkan"
 
-var_winedlloverride_update "winemenubuilder.exe="
 
-zen_width=500
-if [ -f "${WINEDIR}"_dxvk/version ]; then
-    read PW_WINE_VER_DXVK < "${WINEDIR}"_dxvk/version
-    PW_WINE_VER_DXVK="( wine: $PW_WINE_VER_DXVK )"
-    zen_width=1000
-fi
-export PW_WINE_VER_VKD3D=""
-if [ -f "${WINEDIR}"_vkd3d/version ]; then
-    read PW_WINE_VER_VKD3D < "${WINEDIR}"_vkd3d/version
-    PW_WINE_VER_VKD3D="( wine: $PW_WINE_VER_VKD3D )"
-    zen_width=1000
-fi
 if [ -z "${INSTALLING_PORT}" ] ; then
     if [ ! -e "${WINELIB}/run.sh" ] || [ ! -e "${WINELIB}/usr/bin/yad" ] || [ ! -e "${WINELIB}/amd64/usr/bin/vkcube" ] || [ ! -e "${WINELIB}/amd64/usr/bin/xterm" ] || [ -e "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ] ; then 
         echo "Download and install libraries..."
@@ -190,6 +175,7 @@ if [ -z "${INSTALLING_PORT}" ] ; then
         try_remove_dir "${WINELIB}/pinned_libs_32"
         try_remove_dir "${WINELIB}/pinned_libs_64"
         export pw_yad="${WINELIB}/usr/bin/yad"
+        export pw_zstd="${WINELIB}/usr/bin/zstd"
         if [ -x "`which xterm 2>/dev/null`" ]; then
             export SYS_XTERM=`which xterm`
             export PW_XTERM="${SYS_XTERM} -geometry 159x37 -e" 
@@ -228,13 +214,6 @@ if [ -z "${INSTALLING_PORT}" ] ; then
     try_force_link_dir "${HOME}/.PortWINE/gecko" "${WINEDIR}"/share/wine/      
     try_force_link_dir "${HOME}/.PortWINE/mono" "${WINEDIR}"/share/wine/ 
 
-    for pw_dist in "dxvk" "vkd3d"
-    do
-        if [ -d "${WINEDIR}"_"${pw_dist}"/share/wine/ ]; then
-            try_force_link_dir "${WINEDIR}"/share/wine/gecko "${WINEDIR}"_"${pw_dist}"/share/wine/ 
-            try_force_link_dir "${WINEDIR}"/share/wine/mono "${WINEDIR}"_"${pw_dist}"/share/wine/     
-        fi
-    done 
     if [ ! -z "${gamestart}" ]; then
         export PORTWINE_DB=`echo "${gamestart}" | awk -F '/' 'NF>1{print $NF}' | sed s/".exe"/""/gi`
     elif [ ! -z "${portwine_exe}" ]; then
@@ -275,11 +254,35 @@ START_PORTWINE ()
     else
         read "var_pw_vulkan" < "${PORT_WINE_TMP_PATH}/pw_vulkan" && export var_pw_vulkan 
     fi
-    PW_START_PROGRESS_BAR
+
-    if [ "${var_pw_vulkan}" = "0" ]; then
+    try_remove_dir "${PORT_WINE_PATH}/data/vulkan"
-        if [ -d "${WINEDIR}_dxvk" ]; then
+    create_new_dir "${PW_VULKAN_DLL}"
-            export WINEDIR="${WINEDIR}_dxvk"
+
+    export url_dxvk="https://github.com/doitsujin/dxvk/releases/download/v${PW_DXVK_VER}/dxvk-${PW_DXVK_VER}.tar.gz"
+    if [ ! -d "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}" ] ; then
+        try_download "${url_dxvk}" "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz"
+        [ "${DOWNLOAD_ERROR}" != 1 ] && tar -zxvf "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz" -C "${PW_VULKAN_DLL}/"
+        try_remove_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz"
+        if [ "${DOWNLOAD_ERROR}" != 0 ] ; then
+            `zenity --error --title "Error..." --text "You will need to change DXVK version in db file!" --no-wrap ` > /dev/null 2>&1
+            PW_EDIT_DB & exit 1
         fi
+    fi
+
+    export url_vkd3d="https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${PW_VKD3D_VER}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
+    if [ ! -d "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}" ] ; then
+        try_download "${url_vkd3d}" "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
+        [ "${DOWNLOAD_ERROR}" != 1 ] && tar -C "${PW_VULKAN_DLL}/" -I "${pw_zstd}" -xvf "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst" 
+        try_remove_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
+        if [ "${DOWNLOAD_ERROR}" != 0 ] ; then
+            `zenity --error --title "Error..." --text "You will need to change VKD3D version in db file!" --no-wrap ` > /dev/null 2>&1
+            PW_EDIT_DB & exit 1
+        fi
+    fi
+
+    PW_START_PROGRESS_BAR
+
+    if [ "${var_pw_vulkan}" = "0" ]; then
         export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}"
         export GL_NO_DSO_FINALIZER=1 
         export GL_YIELD="NOTHING" 
@@ -292,35 +295,30 @@ START_PORTWINE ()
         done
         try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/"
         try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/"
-        var_winedlloverride_update "dxgi=b"
+        var_winedlloverride_update "dxgi=b;d3d12="
         [ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD_DLSYM=1
         echo "Use OpenGL"
     elif [ "${var_pw_vulkan}" = "dxvk" ]; then
-        if [ -d "${WINEDIR}_dxvk" ]; then
-            export WINEDIR="${WINEDIR}_dxvk"
-        fi
         for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do
-            try_copy_file "${PW_VULKAN_DLL}/dxvk/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+            try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
-            try_copy_file "${PW_VULKAN_DLL}/dxvk/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+            try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
             [ "$?" == 0 ] && var_winedlloverride_update "${wine_dxvk_dll}=n"
         done
-        var_winedlloverride_update "d3d12="
+        #var_winedlloverride_update "d3d12="
         [ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD=1
-        echo "Use DXVK (DX9-DX11 to Vulkan)"
+        echo "Use DXVK version ${PW_DXVK_VER} (DX9-DX11 to Vulkan)"
     else 
-        if [ -d "${WINEDIR}_vkd3d" ]; then
-            export WINEDIR="${WINEDIR}_vkd3d"
-        fi
         for wine_vkd3d_dll in d3d12 ; do
-            try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+            try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
-            try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+            try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
             [ "$?" == 0 ] && var_winedlloverride_update "${wine_vkd3d_dll}=n"
         done
         if [ ! -z "${PW_DXGI_FROM_DXVK}" ] && [ "${PW_DXGI_FROM_DXVK}" != 0 ] ; then
-            var_winedlloverride_update "dxgi=n"
+             
             for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do
-                try_copy_file "${PW_VULKAN_DLL}/dxvk/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+                try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
-                try_copy_file "${PW_VULKAN_DLL}/dxvk/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+                try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+                var_winedlloverride_update "${wine_dxvk_dll}=n"
             done
         else
             try_copy_file "${WINEDIR}/lib/wine/fakedlls/dxgi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
@@ -333,39 +331,17 @@ START_PORTWINE ()
         fi
         [ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD=1
         export PW_WINDOWS_VER="10"
-        echo "Use VKD3D (DX12 to vulkan)"
+        echo "Use VKD3D-PROTON version ${PW_VKD3D_VER} (DX12 to vulkan)"
     fi
-    try_copy_file "${PW_VULKAN_DLL}/dxvk/x32/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
-    try_copy_file "${PW_VULKAN_DLL}/dxvk/x64/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/system32/"
-    [ "$?" == 0 ] && var_winedlloverride_update "dxvk_config.dll=n"
 
     export WINELOADER="${WINEDIR}/bin/wine"
-    export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
+    export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${PATH_TO_GAME}"
     export WINESERVER="${WINEDIR}/bin/wineserver"
     if [ ! -z "${PATH}" ] 
     then export PATH="${WINEDIR}/bin:${PATH}"
     else export PATH="${WINEDIR}/bin"
     fi
     export WINE="${WINELOADER}"
-
-    rm -f  "${WINEDIR}"*/lib*/*steam* 
-    rm -f  "${WINEDIR}"*/lib*/wine/*steam* 
-    rm -f  "${WINEDIR}"*/lib*/wine/fakedlls/*steam* 
-    rm -f "${WINEPREFIX}/drive_c/windows/system32"/steam* 
-    rm -f "${WINEPREFIX}/drive_c/windows/syswow64"/steam* 
-
-    try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf
-    try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf
-    try_copy_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf
-    try_copy_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf
-    try_copy_file "${WINEDIR}/share/fonts/"SourceHanSansSCRegular.otf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf
-
-    for wine_build_dll in ntdll mf mf3216 mferror mfmediaengine mfplat mfplay mfreadwrite vulkan-1 ; do #sqmapi msmpeg2vdec msmpeg2adec colorcnv
-        try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
-        try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
-        [ "$?" == 0 ] && var_winedlloverride_update "${wine_build_dll}=b"
-    done
-    var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n"
 #    export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/gstreamer-1.0"
     export WINE_GST_REGISTRY_DIR="${PORT_WINE_TMP_PATH}"
     export MEDIACONV_AUDIO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/audio.foz
@@ -428,7 +404,6 @@ START_PORTWINE ()
     if [ ! -z "${PW_HEAP_DELAY_FREE}" ] && [ "${PW_HEAP_DELAY_FREE}" != 0 ] ; then
         export WINE_HEAP_DELAY_FREE="1"
     fi
-
     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
@@ -489,7 +464,7 @@ START_PORTWINE ()
         export PW_GAMEMODERUN=0
         echo "Gamemod is not installed or disabled in vars script: PW_FORCE_DISABLED_GAMEMOD=$PW_FORCE_DISABLED_GAMEMOD"
     fi
-    PW_CREATE_PFX
+    PW_INIT_PFX
     RUN_WINETRICKS_FROM_DB 
     ADD_IN_START_PORTWINE
 } 
@@ -537,7 +512,7 @@ UPDATE_WINETRICKS () {
             [ "$DOWNLOAD_ERROR" != "1" ] && W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})" 
             chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
         fi
-    fi #modded by Cefeiko
+    fi
 }
 
 RUN_WINETRICKS_FROM_DB () {
@@ -622,17 +597,8 @@ PW_UPDATE () {
         else
             case $xsd2 in
                 "${port_time4}")
-                        if [ ! -z "$(command -v sensible-browser)" ]; then
-                            sensible-browser "$urlg" &
-                        elif [ ! -z "$(command -v xdg-open)" ]; then
                     xdg-open "$urlg" &
-                        elif [ ! -z "$(command -v gnome-open)" ]; then
-                            gnome-open "$urlg" &
-                        elif [ ! -z "$(command -v python)" ]; then
-                            python -m webbrowser "$urlg" 
-                        fi &
                     echo "300" > "${HOME}/.config/.PortTime" 
-                        sleep 5
                     exit 0 ;;
                 "${port_time5}")
                     echo "75" > "${HOME}/.config/.PortTime" ;;
@@ -643,7 +609,10 @@ PW_UPDATE () {
     fi 
 }
 
-PW_CREATE_PFX () {
+PW_INIT_PFX () {
+    rm -f  "${WINEDIR}"*/lib*/*steam* 
+    rm -f  "${WINEDIR}"*/lib*/wine/*steam* 
+    rm -f  "${WINEDIR}"*/lib*/wine/fakedlls/*steam* 
     #sed -i '/HKCU,Software\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf 
     #sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf 
     #sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf 
@@ -655,6 +624,19 @@ PW_CREATE_PFX () {
         `zenity --info --title "Info..." --text "   Updating prefix completed successfully.\n\n   Restart ${portname}." --no-wrap ` > /dev/null 2>&1  
         exit 0
     fi
+    rm -f "${WINEPREFIX}/drive_c/windows/system32"/steam* 
+    rm -f "${WINEPREFIX}/drive_c/windows/syswow64"/steam* 
+    try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf
+    try_copy_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf
+    try_copy_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf
+    try_copy_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf
+    try_copy_file "${WINEDIR}/share/fonts/"SourceHanSansSCRegular.otf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf
+    for wine_build_dll in ntdll mf mf3216 mferror mfmediaengine mfplat mfplay mfreadwrite vulkan-1 ; do #sqmapi msmpeg2vdec msmpeg2adec colorcnv
+        try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+        try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+        [ "$?" == 0 ] && var_winedlloverride_update "${wine_build_dll}=b"
+    done
+    var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n"
     #sed -i '/steamclient/d' "${WINEPREFIX}"/*.reg 
     #sed -i '/SteamPath/d' "${WINEPREFIX}"/*.reg 
     }
@@ -677,6 +659,7 @@ PW_SCRIPTS_UPDATE () {
                 try_remove_file "${PORT_WINE_TMP_PATH}/scripts.tar.xz"
                 echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver"
                 `zenity --info --title "Info..." --text "${loc_scripts_update}" --no-wrap ` > /dev/null 2>&1
+                xdg-open "${PORT_WINE_PATH}/data/changelog"
                 exit 0
             fi
         fi

data_from_portwine/scripts/start.sh

@@ -195,7 +195,7 @@ if [ ! -z "${portwine_exe}" ]; then
             fi
             OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=15 --form --center  \
             --title "$portname"  --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
-            --field="WINE:CB" "DXVK ${PW_WINE_VER_DXVK}"!"VKD3D ${PW_WINE_VER_VKD3D}"!"OPENGL ${PW_WINE_VER_DXVK}" \
+            --field="WINE:CB" "DXVK"!"VKD3D"!"OPENGL" \
             --button='EDIT  DB'!!"${loc_edit_db} ${PORTWINE_DB}":118 \
             --button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
             --button='DEBUG'!!"${loc_debug}":102 \
@@ -204,7 +204,7 @@ if [ ! -z "${portwine_exe}" ]; then
         else
             OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center  \
             --title "$portname"  --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
-            --field="WINE:CB" "DXVK ${PW_WINE_VER_DXVK}"!"VKD3D ${PW_WINE_VER_VKD3D}"!"OPENGL ${PW_WINE_VER_DXVK}" \
+            --field="WINE:CB" "DXVK"!"VKD3D"!"OPENGL" \
             --button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
             --button='DEBUG'!!"${loc_debug}":102 \
             --button='LAUNCH'!!"${loc_launch}":106 )
@@ -215,7 +215,7 @@ if [ ! -z "${portwine_exe}" ]; then
     else
         OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center  \
         --title "$portname"  --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
-        --field="WINE:CB" "DXVK ${PW_WINE_VER_DXVK}"!"VKD3D ${PW_WINE_VER_VKD3D}"!"OPENGL ${PW_WINE_VER_DXVK}" \
+        --field="WINE:CB" "DXVK"!"VKD3D"!"OPENGL" \
         --button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
         --button='DEBUG'!!"${loc_debug}":102 \
         --button='LAUNCH'!!"${loc_launch}":106 )
@@ -224,7 +224,7 @@ if [ ! -z "${portwine_exe}" ]; then
 else
     OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center  \
     --title "$portname"  --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
-    --field="WINE:CB" "DXVK ${PW_WINE_VER_DXVK}"!"VKD3D ${PW_WINE_VER_VKD3D}"!"OPENGL ${PW_WINE_VER_DXVK}" \
+    --field="WINE:CB" "DXVK"!"VKD3D"!"OPENGL" \
     --button='DEBUG'!!"${loc_debug}":102 \
     --button='WINECFG'!!"${loc_winecfg}":108 \
     --button='WINEFILE'!!"${loc_winefile}":110 \
@@ -234,9 +234,9 @@ else
     PW_YAD_SET="$?"
 fi
 export VULKAN_MOD=$(echo $OUTPUT_START | awk 'BEGIN {FS=";" } { print $1 }')
-if [ "${VULKAN_MOD}" = "DXVK ${PW_WINE_VER_DXVK}" ]; then
+if [ "${VULKAN_MOD}" = "DXVK" ]; then
     echo "dxvk" > "${PORT_WINE_TMP_PATH}/pw_vulkan"
-elif [ "${VULKAN_MOD}" = "VKD3D ${PW_WINE_VER_VKD3D}" ]; then
+elif [ "${VULKAN_MOD}" = "VKD3D" ]; then
     echo "vkd3d" > "${PORT_WINE_TMP_PATH}/pw_vulkan"
 else   
     echo "0" > "${PORT_WINE_TMP_PATH}/pw_vulkan"