diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 0ceb14b6..3964257c 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,13 @@ You can help us in the development of the project on the website: https://boosty ----------------------------------------- Changelog: +###Scripts version 2066### +* updated WINE PROTON_GE_7.0RC6-1 (with dxvk and vkd3d) +* the wine version from PROTON_GE is used by default (can be replaced with PROTON STEAM by adding to user.conf: export PW_WINE_USE=PROTON_STEAM) +* added check for number of db files for one .exe +* fixed disabling of the League of Legends boot logo +* updated db files + ###Scripts version 2065### * HOTFIX - correcting the termination of the yad and yad_new processes diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index b0cc2d17..35210a6f 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -6,10 +6,16 @@ * перенести все библиотеки и бинарники добавленые нашим проектом в Portable * добавить проверку на существоваие каталога wine, если таковой нет, предложить стандартную версию, или скачать другую * добавить inxi в runtime и его вывод с аргументом -G в log -* добавить проверку количества db файлов на один exe * добавить выбор языка в PortProton и about us * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2066### +* обновлен WINE PROTON_GE_7.0RC6-1 (совместно с dxvk и vkd3d) +* по умолчанию используется версия wine от PROTON_GE (можно заменить на PROTON STEAM добавив в user.conf: export PW_WINE_USE=PROTON_STEAM) +* добавлена проверка на количество db файлов для один .exe +* исправлено отключение загрузочного лого League of Legends +* обновлены db файлы + ###Scripts version 2065### * HOTFIX - корректировка завершения процессов yad и yad_new diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index e8f037fd..73fb8f10 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -613,14 +613,35 @@ pw_tray_icon () { pw_init_db () { if [ ! -z "${portwine_exe}" ]; then export PORTWINE_DB=`echo "${portwine_exe}" | awk -F '/' 'NF>1{print $NF}' | sed s/".exe"/""/gi` - PORTWINE_DB_FILE=`grep -ilw "#${PORTWINE_DB}" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi` + orig_IFS="$IFS" + IFS=$'\n' + PW_FIND_DB_FILE=`grep -ilw "#${PORTWINE_DB}" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi` + if [[ `echo "$PW_FIND_DB_FILE" | wc -l` -gt 1 ]] ; then + unset ADD_CB_DBFILE + for PW_CHECK_DB_FILE in $PW_FIND_DB_FILE ; do + if [[ -z "${ADD_CB_DBFILE}" ]] ; then + export ADD_CB_DBFILE="${PW_CHECK_DB_FILE}" + else + export ADD_CB_DBFILE="${PW_CHECK_DB_FILE}!${ADD_CB_DBFILE}" + fi + done + PORTWINE_DB_FILE=`"${pw_yad_new}" --text-align=center --text "${PW_SELECTION_DB_LOC}" --borders=15 --form --center \ + --title "Database file selection..." --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --form --separator="" \ + --field="DB FILE: :CB" "${ADD_CB_DBFILE}"` + if [[ "$?" == "1" || "$?" == "252" ]] ; then exit 0 ; fi + elif [[ `echo "$PW_FIND_DB_FILE" | wc -l` -eq 1 ]] ; then + PORTWINE_DB_FILE="${PW_FIND_DB_FILE}" + fi + IFS="$orig_IFS" if [ ! -z "${PORTWINE_DB_FILE}" ]; then . "${PORTWINE_DB_FILE}" init_wine_ver && print_info "Use ${PORTWINE_DB_FILE} db file." fi + if [ -z "$PATH_TO_GAME" ] ; then + export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" + fi fi -# export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" # export WIN_PATH_TO_GAME=`echo "C:${PATH_TO_GAME}" | sed "s%$WINEPREFIX%%g" | sed "s/drive_c//g" | sed 's#/#\\\#g'` } diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 89107606..08d486b5 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -7,6 +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 inst_set="Выбор" export inst_set_top="Установка PortWINE" @@ -107,6 +108,7 @@ then elif [ "${update_loc}" = "ENG" ] then export PW_CHANGELOG_FILE="changelog_eng" + export PW_SELECTION_DB_LOC="More than one DB file found for the application being launched.\nSelect the required one, or delete the extra DB file before the next run.\n" export inst_set="Sett..." export inst_set_top="PortWINE setting" diff --git a/data_from_portwine/scripts/portwine_db/Install League of Legends na b/data_from_portwine/scripts/portwine_db/ACValhalla old mode 100755 new mode 100644 similarity index 80% rename from data_from_portwine/scripts/portwine_db/Install League of Legends na rename to data_from_portwine/scripts/portwine_db/ACValhalla index 2ac2750f..a6671eb4 --- a/data_from_portwine/scripts/portwine_db/Install League of Legends na +++ b/data_from_portwine/scripts/portwine_db/ACValhalla @@ -1,17 +1,17 @@ #!/bin/bash -#Author: xuser -#Install League of Legends na.exe +#Author: anonymous +#ACValhalla.exe #Rating=1-5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" -##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_WINDOWS_VER=10 # Set windows version 10, 7 or XP +export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=LUTRIS-GE-6.16-2-LOL-X86_64 -export PW_VULKAN_USE=dxvk +export PW_WINE_USE=proton_ge +export PW_VULKAN_USE=1 ##export PW_DXR_ON=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 @@ -23,7 +23,6 @@ export PW_VULKAN_USE=dxvk ##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) ##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=0 # Do not use eventfd-based in-process synchronization primitives -##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer ##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games ##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 @@ -33,5 +32,4 @@ export PW_VULKAN_USE=dxvk ##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG ##export PW_USE_TERMINAL=1 # Force run in terminal ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##export PATH_TO_GAME= ##add_in_start_portwine () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/Konfigurator b/data_from_portwine/scripts/portwine_db/FarCry6 similarity index 81% rename from data_from_portwine/scripts/portwine_db/Konfigurator rename to data_from_portwine/scripts/portwine_db/FarCry6 index 04ca3982..21e94441 100644 --- a/data_from_portwine/scripts/portwine_db/Konfigurator +++ b/data_from_portwine/scripts/portwine_db/FarCry6 @@ -1,6 +1,6 @@ #!/bin/bash -#Author: xuser -#Konfigurator.exe +#Author: gamer +#FarCry6.exe #Rating=1-5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" @@ -9,7 +9,8 @@ ##export WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options export PW_WINE_USE=PROTON_GE -export PW_VULKAN_USE=dxvk +export VK_FORMAT_A8_UNORM=1 +export PW_VULKAN_USE=1 export PW_DXR_ON=0 ##export PW_DLSS_ON=1 export PW_VULKAN_NO_ASYNC=0 @@ -20,8 +21,8 @@ export PW_FORCE_USE_VSYNC=0 export PW_VIRTUAL_DESKTOP=0 ##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue export ENABLE_VKBASALT=1 -export PW_VKBASALT_EFFECTS=cas:FilmGrain2:Curves -export PW_VKBASALT_FFX_CAS=0.75 +##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) +##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) export PW_NO_FSYNC=0 export PW_NO_ESYNC=1 export PW_USE_GSTREAMER=1 @@ -39,4 +40,4 @@ export PW_GUI_DISABLED_CS=0 export PW_MANGOHUD=1 export PW_USE_RUNTIME=1 export PW_USE_GAMEMODE=1 -export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=0 +export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=60 diff --git a/data_from_portwine/scripts/portwine_db/GalaxyClient b/data_from_portwine/scripts/portwine_db/GalaxyClient old mode 100755 new mode 100644 index e0967dcd..a6dcb8a2 --- a/data_from_portwine/scripts/portwine_db/GalaxyClient +++ b/data_from_portwine/scripts/portwine_db/GalaxyClient @@ -4,12 +4,14 @@ #GOG_Galaxy_2.0.exe #Rating=1-5 ################################################ -export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2=" -export LAUNCH_PARAMETERS=("/runWithoutUpdating" "/deelevated") -export PW_DLL_INSTALL="vcrun2019 mfc140" +export PW_VULKAN_USE=1 +export PW_WINE_USE=PROTON_STEAM +#export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2=" +#export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated" +export PW_DLL_INSTALL="vcrun2019" add_in_start_portwine () { if [ -e "${WINEPREFIX}/drive_c/users/${USER}/Local Settings/Application Data/GOG.com/Galaxy/Configuration/config.json" ] ; then sed -i 's/"featureOverlay" : true,/"featureOverlay" : false,/' "${WINEPREFIX}/drive_c/${USER}/steamuser/Local Settings/Application Data/GOG.com/Galaxy/Configuration/config.json" fi -} \ No newline at end of file +} diff --git a/data_from_portwine/scripts/portwine_db/GoW b/data_from_portwine/scripts/portwine_db/GoW new file mode 100644 index 00000000..fc740363 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/GoW @@ -0,0 +1,46 @@ +#!/bin/bash +#Author: zero +#GoW.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##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 WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_WINE_USE=PROTON-7.0RC6-GE-1!!! +export PW_VULKAN_USE=1 +export PW_USE_DXR10=0 +##export PW_DLSS_ON=1 +export PW_VULKAN_NO_ASYNC=0 +export PW_USE_NVAPI_AND_DLSS=1 +export PW_OLD_GL_STRING=0 +export PW_HIDE_NVIDIA_GPU=0 +export PW_FORCE_USE_VSYNC=0 +export PW_VIRTUAL_DESKTOP=0 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +export ENABLE_VKBASALT=0 +##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) +##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) +export PW_NO_FSYNC=1 +export PW_NO_ESYNC=1 +export PW_USE_GSTREAMER=1 +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +export PW_NO_WRITE_WATCH=0 +export PW_HEAP_DELAY_FREE=0 +export PW_WINE_ALLOW_XIM=0 +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +export PW_WINEDBG_DISABLE=1 +export PW_USE_TERMINAL=0 +export PW_GUI_DISABLED_CS=0 +##export PATH_TO_GAME= +##add_in_start_portwine () { commands ; } +export PW_MANGOHUD=1 +export PW_MANGOHUD_USER_CONF=0 +export PW_USE_DXR11=0 +export PW_USE_RUNTIME=1 +export PW_USE_GAMEMODE=1 +export PW_DX12_DISABLE=1 +export PW_USE_WINE_DXGI=0 +export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=0 diff --git a/data_from_portwine/scripts/portwine_db/Inscryption b/data_from_portwine/scripts/portwine_db/Inscryption new file mode 100644 index 00000000..50bf9d5b --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Inscryption @@ -0,0 +1,7 @@ +#!/bin/bash +#Author: garrett +#Inscryption.exe +#Rating=5 +#####################examples########################### +export PW_WINE_USE=PROTON_GE +export PW_VULKAN_USE=1 diff --git a/data_from_portwine/scripts/portwine_db/scummvm b/data_from_portwine/scripts/portwine_db/JustCause4 similarity index 73% rename from data_from_portwine/scripts/portwine_db/scummvm rename to data_from_portwine/scripts/portwine_db/JustCause4 index 542d26cc..d3449543 100644 --- a/data_from_portwine/scripts/portwine_db/scummvm +++ b/data_from_portwine/scripts/portwine_db/JustCause4 @@ -1,30 +1,26 @@ #!/bin/bash -#Author: xuser -#scummvm.exe +#Author: vbb +#JustCause4.exe #Rating=1-5 +######################################################## +export PW_VULKAN_USE=dxvk +export PW_DLL_INSTALL="vcrun2019" #####################examples########################### ##export PW_COMMENT_DB="blablabla" ##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 WINEDLLOVERRIDES="blabla=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -export PW_WINE_USE=PROTON_STEAM_6.3-7 -export PW_VULKAN_USE=1 -##export PW_USE_DXR10=1 -##export PW_DLSS_ON=1 +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXR_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 +##export PW_USE_NVAPI=0 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT ##export PW_VIRTUAL_DESKTOP=1 ##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue ##export ENABLE_VKBASALT=1 -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) ##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=0 # Do not use eventfd-based in-process synchronization primitives -##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer ##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games ##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 @@ -34,5 +30,8 @@ export PW_VULKAN_USE=1 ##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG ##export PW_USE_TERMINAL=1 # Force run in terminal ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } +ADD_IN_START_PORTWINE () { + if [[ -f "${PATH_TO_GAME}/EOSSDK-Win64-Shipping.dll" ]] && [[ ! -f "${PATH_TO_GAME}/eossdk-win64-shipping.dll" ]] ; then + try_copy_file "${PATH_TO_GAME}/EOSSDK-Win64-Shipping.dll" "${PATH_TO_GAME}/eossdk-win64-shipping.dll" + fi +} diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index ee4a31ef..7b2aaf61 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -61,6 +61,7 @@ check_download_wine_ver_for_lol check_port_for_lol () { "${pw_yad}" --progress --progress-text="Loading and start League of Legends. Please wait. It can take a long time!" \ --pulsate --no-buttons --undecorated --center --skip-taskbar --image="${PW_GUI_ICON_PATH}/covers/lol_cover.jpg" --image-on-top > /dev/null 2>&1 & + PW_YAD_PID_LOL="$?" process=LeagueClientUx.exe while [[ -z `pidof ${process}` ]] ; do echo "PID ${process} not found" @@ -80,7 +81,7 @@ check_port_for_lol () { sleep 1 done" kill -CONT ${uxpid} - pw_stop_progress_bar + kill -s SIGUSR1 "${PW_YAD_PID_LOL}" } add_in_start_portwine () { diff --git a/data_from_portwine/scripts/portwine_db/MikuMikuDance b/data_from_portwine/scripts/portwine_db/MikuMikuDance old mode 100755 new mode 100644 index 6cef38b0..85e4b9af --- a/data_from_portwine/scripts/portwine_db/MikuMikuDance +++ b/data_from_portwine/scripts/portwine_db/MikuMikuDance @@ -1,32 +1,42 @@ #!/bin/bash -#Author: vellyn +#Author: norz3n #MikuMikuDance.exe -#Rating=1-5 +#Rating=3-5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" +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 WINEDLLOVERRIDES="blabla=n,b" +export WINEDLLOVERRIDES="MMEffect,MMHack,d3d9,dsound=n,b" ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options -##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_USE_DXR10=1 -##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN -##export PW_USE_NVAPI_AND_DLSS=0 -##export PW_OLD_GL_STRING=1 -##export PW_HIDE_NVIDIA_GPU=1 -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_VIRTUAL_DESKTOP=1 +export PW_VULKAN_USE=0 +export PW_USE_DXR10=0 +export PW_VULKAN_NO_ASYNC=0 +export PW_USE_NVAPI_AND_DLSS=0 +export PW_OLD_GL_STRING=0 +export PW_HIDE_NVIDIA_GPU=0 +export PW_FORCE_USE_VSYNC=0 +export PW_VIRTUAL_DESKTOP=0 ##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -##export ENABLE_VKBASALT=1 -##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 ENABLE_VKBASALT=0 +export PW_NO_FSYNC=0 +export PW_NO_ESYNC=1 ##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##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 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread +export PW_NO_WRITE_WATCH=0 +export PW_HEAP_DELAY_FREE=0 +export PW_WINE_ALLOW_XIM=0 ##export WINEARCH=win32 # defaut = win64 ##export WINEPREFIX= -##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG -##export PW_USE_TERMINAL=1 # Force run in terminal -##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +export PW_WINEDBG_DISABLE=1 +export PW_USE_TERMINAL=0 +export PW_GUI_DISABLED_CS=0 ##add_in_start_portwine () { commands ; } +##export PW_WINE_USE=WINE_7.0_STAGING_AMD64!!!! +export PW_MANGOHUD=0 +export PW_MANGOHUD_USER_CONF=0 +export PW_USE_DXR11=0 +export PW_USE_GSTREAMER=1 +export PW_USE_RUNTIME=1 +export PW_USE_GAMEMODE=1 +export PW_DX12_DISABLE=0 +export PW_USE_WINE_DXGI=1 +export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=0 diff --git a/data_from_portwine/scripts/portwine_db/Photoshop b/data_from_portwine/scripts/portwine_db/Photoshop new file mode 100644 index 00000000..fa5e6401 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Photoshop @@ -0,0 +1,36 @@ +#!/bin/bash +#Author: nixon +#Photoshop.exe +#Rating=1-5 +######################################################## +export PW_WINDOWS_VER=10 +export PW_VIRTUAL_DESKTOP=1 +export PW_DLL_INSTALL="atmlib corefonts gdiplus msxml3 msxml6 vcrun2010 vcrun2012 vcrun2013 vcrun2019" +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +#export LAUNCH_PARAMETERS="" +##export PW_DLL_INSTALL="gdiplus msxml3 msxml6 atmlib corefonts vcrun2010 vcrun2012 vcrun2013 vcrun2019" # Install DDL in port prefix (used winetricks) +##export WINEDLLOVERRIDES="blabla=n,b" +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXR_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_NVAPI_DISABLE=1 +##export PW_OLD_GL_STRING=1 +##export PW_HIDE_NVIDIA_GPU=1 +##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +##export ENABLE_VKBASALT=1 +##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_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 +##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=1 # Force run in terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +#ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/hulk b/data_from_portwine/scripts/portwine_db/hulk deleted file mode 100755 index 7a990763..00000000 --- a/data_from_portwine/scripts/portwine_db/hulk +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -#Author: Сергей 33(46) -#hulk.exe -#Rating=1-5 -################################################ -export PW_VULKAN_USE=0 -export PW_WINDOWS_VER="XP" -export LAUNCH_PARAMETERS="-d3d9" -export PW_WINE_USE=proton_steam diff --git a/data_from_portwine/scripts/portwine_db/vocaloid4_4.3.0_setup b/data_from_portwine/scripts/portwine_db/vocaloid4_4.3.0_setup new file mode 100644 index 00000000..bd3d81dd --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/vocaloid4_4.3.0_setup @@ -0,0 +1,45 @@ +#!/bin/bash +#Author: norz3n +#vocaloid4_4.3.0_setup.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##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 WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +export PW_VULKAN_USE=0 +export PW_USE_DXR10=0 +##export PW_DLSS_ON=1 +export PW_VULKAN_NO_ASYNC=0 +export PW_USE_NVAPI_AND_DLSS=0 +export PW_OLD_GL_STRING=0 +export PW_HIDE_NVIDIA_GPU=0 +export PW_FORCE_USE_VSYNC=0 +export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +export ENABLE_VKBASALT=0 +##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) +##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) +export PW_NO_FSYNC=0 +export PW_NO_ESYNC=1 +export PW_USE_GSTREAMER=1 +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +export PW_NO_WRITE_WATCH=0 +export PW_HEAP_DELAY_FREE=0 +export PW_WINE_ALLOW_XIM=0 +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +export PW_WINEDBG_DISABLE=1 +export PW_USE_TERMINAL=0 +export PW_GUI_DISABLED_CS=0 +##export PATH_TO_GAME= +##add_in_start_portwine () { commands ; } +export PW_MANGOHUD=0 +export PW_MANGOHUD_USER_CONF=0 +export PW_USE_DXR11=0 +export PW_USE_RUNTIME=1 +export PW_USE_GAMEMODE=1 +export PW_DX12_DISABLE=0 +export PW_USE_WINE_DXGI=0 +export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt,fps_limit=0 diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 4665b0df..a58c11a9 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -470,9 +470,6 @@ start_portwine () { pw_run () { if [ ! -z "$portwine_exe" ] ; then - if [ -z "$PATH_TO_GAME" ] ; then - export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" - fi cd "${PATH_TO_GAME}" else cd "${WINEPREFIX}/drive_c" @@ -514,7 +511,7 @@ else fi unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB -unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE +unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME export portname=PortProton cd "$(dirname "`readlink -f "$0"`")" && export PORT_SCRIPTS_PATH="$(pwd)" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index e1606db5..72de7e01 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -273,22 +273,30 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then if [[ -z "${PW_VULKAN_USE}" || -z "${PW_WINE_USE}" ]] ; then unset PW_GUI_DISABLED_CS [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=1 - [ -z "${PW_WINE_USE}" ] && export PW_WINE_USE=${PW_PROTON_STEAM_VER} + # [ -z "${PW_WINE_USE}" ] && export PW_WINE_USE=${PW_PROTON_STEAM_VER} fi case "${PW_VULKAN_USE}" in "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)' ;; *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL ' ;; esac case "${PW_WINE_USE}" in - "${PW_PROTON_GE_VER}") export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" ;; - "${PW_PROTON_STEAM_VER}") export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" ;; + "${PW_PROTON_GE_VER}") + export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" ;; + "${PW_PROTON_STEAM_VER}") + export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" ;; *) 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_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" ;; esac else export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL ' - export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" + 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}" + 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}" + else + export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" + fi unset PW_GUI_DISABLED_CS fi if [ ! -z "${portwine_exe}" ]; then @@ -406,7 +414,7 @@ else --field=":LBL" "" \ --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \ --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \ - --field=":CB" "${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" \ + --field=":CB" "${PW_DEFAULT_WINE_USE}" \ --field=":LBL" "" \ --field='WINEFILE'!!"${loc_winefile}":"BTN" '@bash -c "button_click WINEFILE"' \ --field='WINECMD'!!"${loc_winecmd}":"BTN" '@bash -c "button_click WINECMD"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 49ce0bd7..2a3144d4 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2065 +#SCRIPTS_NEXT_VERSION=2066 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1 @@ -38,7 +38,7 @@ export PW_PLUGINS_VER="_v1" export PW_STEAM_VER="6.3-8C_PW2" export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" ###WINE_PROTON_GE### -export PW_GE_VER="6.19-5" +export PW_GE_VER="7.0RC6-1" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export WINE_FULLSCREEN_FSR="1" export WINE_FULLSCREEN_FSR_STRENGTH="2"