Update scripts 1037

9af583e1 · Mikhail Tergoev · 137abea9 · 9af583e1 · 9af583e1 · 9af583e1
Commit 9af583e1 authored Apr 20, 2021 by Mikhail Tergoev
8 changed files
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
 История изменений и дальнейшие планы:
 -----------------------------------------
 В планах:
-* добавить выбор версий 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'
 -----------------------------------------
-
-* в setup db изменен список библиотек (export PW_DLL_INSTALL="vcrun6 mfc42 vcrun6sp6 mfc120 vcrun2013")
+###PortProton-74### 20.04.2021 ###Scripts version 1037###
+* обновлен 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)
-* Фикс создания циклической ссылки drive_c внутри drive_c
-* Удален &>>/dev/null из PW_RUN (ломает запуск неторорых игр и приложений)
-* Очистищен код функции PW_RUN (убрано условие optirun_on за ненадобностью)
-* Проверить минимальный набор библиотек в default db (vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9)
+* фикс работы порта в solus (отключение xterm)
+* фикс создания циклической ссылки drive_c внутри drive_c
+* удален &>>/dev/null из PW_RUN (ломает запуск неторорых игр и приложений)
+* очистищен код функции PW_RUN (убрано условие optirun_on за ненадобностью)
+* исправлен минимальный набор библиотек в 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

--- a/data_from_portwine/scripts/portwine_db/ACIII
+++ b/data_from_portwine/scripts/portwine_db/ACIII
+#!/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 ; }
--- a/data_from_portwine/scripts/portwine_db/Cyberpunk2077
+++ b/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_VKD3D_FEATURE_LEVEL=0
+##export PW_NVAPI_DISABLE=1
+##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 }
--- a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
+++ b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
+#!/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
--- a/data_from_portwine/scripts/portwine_db/default
+++ b/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 

--- a/data_from_portwine/scripts/portwine_db/setup
+++ b/data_from_portwine/scripts/portwine_db/setup
@@ -17,14 +17,14 @@ 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 PW_DLL_INSTALL="vcrun6 mfc42 vcrun6sp6 mfc120 vcrun2013" 
 #export LAUNCH_PARAMETERS="-d3d9"
 export PW_GUI_DISABLED_CS=1
 #export PW_WINDOWS_VER=XP                      # Set windows version 10, 7 or XP
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
--- a/data_from_portwine/scripts/start.sh
+++ b/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"