From 93c055630b1eb3253603014164b4c860f0d8cafa Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 1 Jun 2023 22:53:38 +0300 Subject: [PATCH] Scripts version 2196 --- data_from_portwine/changelog_eng | 17 +- data_from_portwine/changelog_rus | 15 +- data_from_portwine/scripts/functions_helper | 12 +- .../scripts/portwine_db/EpicGamesLauncher | 7 +- .../portwine_db/Rockstar_Games_Launcher | 7 +- .../scripts/portwine_db/SystemShockRemake | 39 +++ data_from_portwine/scripts/portwine_db/steam | 2 +- .../scripts/pw_autoinstall/PW_EPIC | 16 +- data_from_portwine/scripts/runlib | 225 ++++++++++-------- data_from_portwine/scripts/start.sh | 14 +- data_from_portwine/scripts/var | 9 +- data_from_portwine/scripts/zen_yad_gui | 8 +- 12 files changed, 227 insertions(+), 144 deletions(-) create mode 100644 data_from_portwine/scripts/portwine_db/SystemShockRemake diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 9090eef5..206ec7e3 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,20 +2,29 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: -###Scripts version 2195### Date: 30.05.2023 / The size of the downloaded update: 16 megabytes. +###Scripts version 2196### Date: 05/31/2023 / Update download size: 9 megabytes. +* fixed language switching in PortProton +* successfully tested native versions of DLSS and DXR in Alt Linux on video cards from NVIDIA RTX series +* added settings file for new game: SystemShockRemake +* updated STEAM settings file with online fix (thanks to Boria | Arch | GNOME) To apply the changes, you need to run the STEAM auto-installation again +* minor interface improvements +* added variable for laptops with hybrid graphics to PortProton/data/user.conf: "export optirun_on= #nvidia-prime-run or prime-run" +* added condition: if "optirun_on" variable is not empty, then PRIME_RENDER_OFFLOAD and nvidia_vk_icd_file check are automatically enabled + +###Scripts version 2195### * FIX - install Rockstar Games Launcher * DELETE - ROBLOX (need use: https://github.com/roblox-linux-wrapper/roblox-linux-wrapper) * updated DXR и DLSS functions -###Scripts version 2194### Date: 30.05.2023 / The size of the downloaded update: 9 megabytes. +###Scripts version 2194### * HOTFIX - removed nvml verification in the plugins directory -###Scripts version 2193### Date: 30.05.2023 / The size of the downloaded update: 15 megabytes. +###Scripts version 2193### * a small change in the settings of 3D api, DXR, DXS. * updated dxvk-nvapi to version 0.6.3 * updated FAKE_DLS 230506 (FidelityFx Super Resolution 2.2-3001-0-9-1683395145) -###Scripts version 2192### Date: 30.05.2023 / The size of the downloaded update: 9 megabytes. +###Scripts version 2192### * fixed interface window when changing its size * HOTFIX - transition on the way to .exe file diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 56fd36a1..c59a9741 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,10 +2,19 @@ ----------------------------------------- История изменений: +###Scripts version 2196### Дата: 01.06.2023 / Размер скачиваемого обновления: 9 мегабайт. +* исправлено переключение языка в PortProton +* успешно проверена работа нативных версий DLSS и DXR в Alt Linux на видеокартах от NVIDIA серии RTX +* добавлен файл настроек для новой игры: SystemShockRemake +* обновлен файл настроек STEAM с онлайн фиксом (спасибо Boria | Arch | GNOME) Для применения изменений требуется снова запустить автоустановку STEAM +* небольшие улучшения интерфейса +* в PortProton/data/user.conf добавлена переменная для ноутбуков с гибридной графикой: "export optirun_on= #nvidia-prime-run or prime-run" +* добавлено условие: если переменная "optirun_on" не пустая, то автоматически включается PRIME_RENDER_OFFLOAD и проверка nvidia_vk_icd_file + ###Scripts version 2195### Дата: 30.05.2023 / Размер скачиваемого обновления: 16 мегабайт. -* исправлена установка Rockstar Games Launcher -* временно убран установщик ROBLOX (не работает без https://github.com/roblox-linux-wrapper/roblox-linux-wrapper) -* улучшена работа DXR и DLSS (рекомендуется выбирать новейшие версии DXVK и VKD3D) +* исправлена установка Rockstar Games Launcher (ALT bug 46277) +* временно убран установщик ROBLOX (ALT bug 46283) +* добавлена поддержка DXR и DLSS в Alt Linux (необходимо выбирать новейшие версии DXVK и VKD3D) ###Scripts version 2194### Дата: 30.05.2023 / Размер скачиваемого обновления: 9 мегабайт. * HOTFIX - убрана проверка nvml в каталоге plugins diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 11f712fd..dda8e1db 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -27,7 +27,7 @@ try_copy_file () { else cp -f "$1" "$2" if [ "$?" != 0 ] - then print_error "failed to copy file $1 to $2" || return 1 + then print_error "failed to copy file $1 to $2" && return 1 else return 0 fi fi @@ -46,7 +46,7 @@ try_copy_dir () { export -f try_copy_dir try_remove_file () { - if [ -f "$1" ] ; then + if [ -f "$1" ] || [ ! -e "$1" ] ; then rm -f "$1" [ "$?" == 0 ] && return 0 || return 1 fi @@ -286,7 +286,13 @@ check_user_conf () { if [ ! -f "${USER_CONF}" ]; then echo "#!/usr/bin/env bash" > "${USER_CONF}" echo "# User overides db and var settings..." >> "${USER_CONF}" + echo "# export DXVK_HUD=full" >> "${USER_CONF}" + echo "# export GALLIUM_HUD=fps" >> "${USER_CONF}" + echo "export optirun_on= #nvidia-prime-run or prime-run" >> "${USER_CONF}" chmod u+x "${USER_CONF}" + else + grep "optirun_on" "${USER_CONF}" >/dev/null + [[ "$?" != 0 ]] && echo "export optirun_on=" >> "${USER_CONF}" fi return 0 } @@ -844,7 +850,7 @@ pw_port_update () { curl -s --list-only "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" | sszen CHANGLOG_NEWS=`cat "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed "/Scripts version ${scripts_install_ver}/,$ d" | sed '1,/---/ d' ` xcsd=`"${pw_yad_v12_3}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ - --borders=5 --form --separator='%%%' --width=1200 --height=600 \ + --borders=3 --form --separator='%%%' --width=1200 --height=600 \ --field=":TXT" "${CHANGLOG_NEWS}" \ --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" ` YAD_STATUS="$?" diff --git a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher index 49c7328b..7fb0035d 100755 --- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher +++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher @@ -11,7 +11,6 @@ export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2019" export PW_USE_D3D_EXTRAS=1 export PW_WINE_USE="PROTON_LG" export WINEDLLOVERRIDES="vulkan-1=n,b" - -add_in_start_portwine () { - regdlloverrides "RDR2.exe:vulkan-1=n,b" -} +# add_in_start_portwine () { +# regdlloverrides "RDR2.exe:vulkan-1=n,b" +# } diff --git a/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher b/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher index c50ee810..22ecc205 100755 --- a/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher +++ b/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher @@ -9,7 +9,6 @@ export PW_VULKAN_USE=1 export PW_DLL_INSTALL="vcrun2019" export PW_WINDOWS_VER=10 export WINEDLLOVERRIDES="vulkan-1=n,b" - -add_in_start_portwine () { - regdlloverrides "RDR2.exe:vulkan-1=n,b" -} +# add_in_start_portwine () { +# regdlloverrides "RDR2.exe:vulkan-1=n,b" +# } diff --git a/data_from_portwine/scripts/portwine_db/SystemShockRemake b/data_from_portwine/scripts/portwine_db/SystemShockRemake new file mode 100644 index 00000000..70aa57a1 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/SystemShockRemake @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +#Author: licrit +#SystemShock.exe +#SystemReShock-Win64-Shipping.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +export PW_WINDOWS_VER="10" +export PW_DLL_INSTALL="" +export WINEDLLOVERRIDES="" +export LAUNCH_PARAMETERS="" +export PW_VULKAN_USE="2" +export PW_USE_NVAPI_AND_DLSS="0" +export PW_HIDE_NVIDIA_GPU="0" +export PW_VIRTUAL_DESKTOP="0" +export ENABLE_VKBASALT="1" +export PW_NO_FSYNC="0" +export PW_NO_ESYNC="1" +export PW_USE_GSTREAMER="1" +export PW_USE_TERMINAL="0" +export PW_GUI_DISABLED_CS="0" +export PW_PREFIX_NAME="DEFAULT" +export PW_MANGOHUD="1" +export PW_MANGOHUD_x32="0" +export PW_MANGOHUD_USER_CONF="0" +export PW_USE_RAY_TRACING="0" +export PW_USE_FAKE_DLSS="0" +export PW_WINE_FULLSCREEN_FSR="1" +export PW_USE_GAMEMODE="1" +export PW_DX12_DISABLE="0" +export PW_PRIME_RENDER_OFFLOAD="0" +export PW_USE_D3D_EXTRAS="1" +export PW_FIX_VIDEO_IN_GAME="0" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="1" +export PW_USE_WINE_DXGI="0" +export PW_USE_EAC_AND_BE="0" +export PW_WINE_USE="WINE_8.5_LG" +gui_proton_downloader silent "WINE_8.5_LG" diff --git a/data_from_portwine/scripts/portwine_db/steam b/data_from_portwine/scripts/portwine_db/steam index a98a92f7..e9b5813f 100755 --- a/data_from_portwine/scripts/portwine_db/steam +++ b/data_from_portwine/scripts/portwine_db/steam @@ -6,7 +6,7 @@ export PW_COMMENT_DB="Steam" export PW_WINDOWS_VER="10" export PW_DLL_INSTALL="vcrun2019 d3dcompiler_46" -export WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;winemenubuilder=d" +export WINEDLLOVERRIDES="OnlineFix64,SteamOverlay64,steam_api,steam_api64,steamclient,steamclient64=n;winmm=n,b" export LAUNCH_PARAMETERS="-gamepadui -fullscreen -no-dwrite" export PW_VULKAN_USE="1" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index b90504a9..2c1236b8 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC @@ -4,22 +4,18 @@ export LAUNCH_PARAMETERS=("/q" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EpicGamesLauncherInstaller.msi" export PW_USE_D3D_EXTRAS=1 +# sed -i '/Epic Games/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/*.reg >/dev/null +try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" start_portwine if try_download "launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing Epic Games Launcher. ${loc_gui_please_wait} " -# pw_kill_autostart EpicGamesLauncher.exe & + # try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Epic Games/Epic Online Services/" + # try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Epic Games/Launcher/" + # try_remove_dir "${WINEPREFIX}/drive_c/ProgramData/Epic" pw_run msiexec /i "${PW_AUTOINSTALL_EXE}" -# sleep 10 -# if [ ! -z `pgrep msiexec* | head -n 1` ] ; then -# while [ ! -z `pgrep msiexec* | head -n 1` ] || [ ! -z `pgrep rundll32* | head -n 1` ] || [ ! -z `pgrep -a wrap | grep ${portname} | head -n 1` ] -# do -# [ ! -z `pgrep rundll32* | head -n 1` ] && kill -n 9 `pgrep rundll32* | head -n 1` && echo "Kill rundll32.exe" -# sleep 5 -# done -# fi - portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Epic Games/Launcher/Portal/Binaries/Win32/EpicGamesLauncher.exe" + portwine_exe="${WINEPREFIX}/drive_c/Program Files (x86)/Epic Games/Launcher/Portal/Binaries/Win32/EpicGamesLauncher.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 3c7d334a..be62967f 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -28,8 +28,9 @@ fi start_portwine () { var_winedlloverride_update "${PW_MUST_WINEDLLOVERRIDES}" export WINEPREFIX="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" - create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" - try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" + create_new_dir "${WINEPREFIX}/drive_c/windows/system32/" + create_new_dir "${WINEPREFIX}/drive_c/windows/syswow64/" + try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${WINEPREFIX}/drive_c/" export WINEARCH="win64" if [[ "${PW_VULKAN_USE}" == 3 ]] ; then export PW_WINE_USE="${PW_PROTON_LG_VER}" @@ -61,7 +62,7 @@ start_portwine () { pw_init_runtime - if [[ ! -z "${PW_LOG}" && "${PW_LOG}" != 0 ]] ; then + if [[ "${PW_LOG}" == 1 ]] ; then export WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg" export DXVK_LOG_LEVEL="warn" export VKD3D_DEBUG="warn" @@ -82,12 +83,12 @@ 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 ]] ; then - export WINEESYNC="0" - else - export WINEESYNC="1" + if [[ "${PW_NO_ESYNC}" == 1 ]] + then export WINEESYNC="0" + else export WINEESYNC="1" fi - if [[ ! -z "${PW_NO_FSYNC}" && "${PW_NO_FSYNC}" != 0 ]] ; then + + if [[ "${PW_NO_FSYNC}" == 1 ]] ; then export WINEFSYNC="0" export WINEFSYNC_FUTEX2="0" else @@ -95,18 +96,22 @@ start_portwine () { export WINEFSYNC_FUTEX2="1" export WINEFSYNC_SPINCOUNT=100 fi - if [[ ! -z "${PW_FORCE_LARGE_ADDRESS_AWARE}" && "${PW_FORCE_LARGE_ADDRESS_AWARE}" != 0 ]] + + if [[ "${PW_FORCE_LARGE_ADDRESS_AWARE}" == 1 ]] then export WINE_LARGE_ADDRESS_AWARE="1" else export WINE_LARGE_ADDRESS_AWARE="0" fi - if [[ ! -z "${PW_OLD_GL_STRING}" && "${PW_OLD_GL_STRING}" != 0 ]] ; then + + if [[ "${PW_OLD_GL_STRING}" == 1 ]] ; then export MESA_EXTENSION_MAX_YEAR="2003" #mesa override export __GL_ExtensionStringVersion="17700" #nvidia override fi - if [[ ! -z "${PW_NO_WRITE_WATCH}" && "${PW_NO_WRITE_WATCH}" != 0 ]] ; then + + if [[ "${PW_NO_WRITE_WATCH}" == 1 ]] ; then export WINE_DISABLE_WRITE_WATCH="1" fi - if [[ ! -z "${PW_VULKAN_NO_ASYNC}" && "${PW_VULKAN_NO_ASYNC}" != 0 ]] ; then + + if [[ "${PW_VULKAN_NO_ASYNC}" == 1 ]] ; then export RADV_DEBUG="llvm" var_vkd3d_config_update single_queue fi @@ -122,21 +127,21 @@ start_portwine () { fi } - if ! try_force_link_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" ; then - try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x32/nvapi.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" + if ! try_force_link_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" ; then + try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" fi - if ! try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" ; then - try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x64/nvapi64.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" + if ! try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" ; then + try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" fi - try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/nvml.dll" - try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvml.dll" - try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvngx.ini" - try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvngx.dll" - try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/_nvngx.dll" + try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/nvml.dll" + try_remove_file "${WINEPREFIX}/drive_c/windows/system32/nvml.dll" + try_remove_file "${WINEPREFIX}/drive_c/windows/system32/nvngx.ini" + try_remove_file "${WINEPREFIX}/drive_c/windows/system32/nvngx.dll" + try_remove_file "${WINEPREFIX}/drive_c/windows/system32/_nvngx.dll" if [[ "${PW_USE_FAKE_DLSS}" == 1 ]] && [[ -d "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/" ]] ; then - try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.ini" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" + try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" + try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.ini" "${WINEPREFIX}/drive_c/windows/system32/" enabled_fake_nvidia_videocard 1 var_winedlloverride_update "nvngx=n;_nvngx=" export DXVK_ENABLE_NVAPI=0 @@ -144,18 +149,22 @@ start_portwine () { export VKD3D_FEATURE_LEVEL="12_1" # export DXVK_NVAPI_DRIVER_VERSION= elif [[ "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] ; then - if ! try_copy_file `find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - then try_copy_file "${PW_PLUGINS_PATH}/nvngx/nvngx.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" + FIND_NVNGX_DLL=`find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` + [[ -f "${FIND_NVNGX_DLL}" ]] && FIND__NVNGX_DLL=`find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` + if [[ ! -z "${FIND_NVNGX_DLL}" ]] && [[ -f "${FIND_NVNGX_DLL}" ]] + then try_copy_file "${FIND_NVNGX_DLL}" "${WINEPREFIX}/drive_c/windows/system32/" + else try_copy_file "${PW_PLUGINS_PATH}/nvngx/nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" + fi + if [[ ! -z "${FIND__NVNGX_DLL}" ]] && [[ -f "${FIND__NVNGX_DLL}" ]] + then try_copy_file "${FIND__NVNGX_DLL}" "${PORT__WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" + else try_copy_file "${PW_PLUGINS_PATH}/nvngx/_nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" fi - if ! try_copy_file `find /usr/* -type f -name "_nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - then try_copy_file "${PW_PLUGINS_PATH}/nvngx/_nvngx.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - fi enabled_fake_nvidia_videocard 0 export DXVK_ENABLE_NVAPI=1 export WINE_HIDE_NVIDIA_GPU=0 export VKD3D_FEATURE_LEVEL="12_1" # export DXVK_NVAPI_DRIVER_VERSION= - var_winedlloverride_update "nvngx,_nvngx,nvapi,nvapi64=n" + var_winedlloverride_update "nvngx,_nvngx=n" else enabled_fake_nvidia_videocard 0 export DXVK_ENABLE_NVAPI=0 @@ -168,24 +177,32 @@ start_portwine () { sed -i /'renderer='/d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" fi - if [[ ! -z "${PW_PRIME_RENDER_OFFLOAD}" && "${PW_PRIME_RENDER_OFFLOAD}" != 0 ]] ; then + if [[ ! -z "${optirun_on}" && "${optirun_on}" != "" ]] ; then + export PW_PRIME_RENDER_OFFLOAD=1 + print_info "force PW_PRIME_RENDER_OFFLOAD=1" + fi + + if [[ "${PW_PRIME_RENDER_OFFLOAD}" == 1 ]] ; then export __NV_PRIME_RENDER_OFFLOAD=1 check_nvidia_vk_icd_file fi - if [[ ! -z "${PW_HEAP_DELAY_FREE}" && "${PW_HEAP_DELAY_FREE}" != 0 ]] + + if [[ "${PW_HEAP_DELAY_FREE}" == 1 ]] then export WINE_HEAP_DELAY_FREE="1" else export WINE_HEAP_DELAY_FREE="0" fi - if [[ ! -z "${PW_WINE_ALLOW_XIM}" && "${PW_WINE_ALLOW_XIM}" != 0 ]] + + if [[ "${PW_WINE_ALLOW_XIM}" == 1 ]] then export WINE_ALLOW_XIM="1" else export WINE_ALLOW_XIM="0" fi - if [[ ! -z "${PW_FIX_VIDEO_IN_GAME}" && "${PW_FIX_VIDEO_IN_GAME}" != 0 ]] + + if [[ "${PW_FIX_VIDEO_IN_GAME}" == 1 ]] then export WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER="1" else export WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER="0" fi - [[ ! -z "${PW_MANGOHUD_USER_CONF}" && "${PW_MANGOHUD_USER_CONF}" != 0 ]] && unset MANGOHUD_CONFIG + [[ "${PW_MANGOHUD_USER_CONF}" == 1 ]] && unset MANGOHUD_CONFIG if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then var_vkd3d_config_update dxr @@ -208,7 +225,7 @@ start_portwine () { killall xneur export int_xneur=1 fi - if [[ ! -z "${PW_XKBD_RU_HACK}" && "${PW_XKBD_RU_HACK}" == 1 ]] ; then + if [[ "${PW_XKBD_RU_HACK}" == 1 ]] ; then export PW_XKBD="$(setxkbmap -query | grep -w ru | awk '{print($2)}')" if [ ! -z ${PW_XKBD} ]; then setxkbmap us,ru @@ -233,25 +250,25 @@ start_portwine () { create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices" - create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" - create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - [ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/c:" ] && try_force_link_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/c:" + create_new_dir "${WINEPREFIX}/drive_c/windows/syswow64/" + create_new_dir "${WINEPREFIX}/drive_c/windows/system32/" + [ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/c:" [ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/z:" ] && try_force_link_dir "/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/z:" - create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/" - try_force_link_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"arial.ttf - try_force_link_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"arialbd.ttf - try_force_link_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"times.ttf - try_force_link_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"cour.ttf - try_force_link_file "${WINEDIR}/share/fonts/"LiberationMono-Bold.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"courbd.ttf - try_force_link_file "${WINEDIR}/share/fonts/"msyh.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"msyh.ttf - try_force_link_file "${WINEDIR}/share/fonts/"malgun.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"malgun.ttf - try_force_link_file "${WINEDIR}/share/fonts/"micross.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"micross.ttf - try_force_link_file "${WINEDIR}/share/fonts/"nirmala.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"nirmala.ttf + create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/" + try_force_link_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf + try_force_link_file "${WINEDIR}/share/fonts/"LiberationMono-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"courbd.ttf + try_force_link_file "${WINEDIR}/share/fonts/"msyh.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf + try_force_link_file "${WINEDIR}/share/fonts/"malgun.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"malgun.ttf + try_force_link_file "${WINEDIR}/share/fonts/"micross.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"micross.ttf + try_force_link_file "${WINEDIR}/share/fonts/"nirmala.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"nirmala.ttf - try_force_link_file "${WINEDIR}/share/fonts/"simsun.ttc "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"simsun.ttc - try_force_link_file "${WINEDIR}/share/fonts/"msgothic.ttc "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"msgothic.ttc + try_force_link_file "${WINEDIR}/share/fonts/"simsun.ttc "${WINEPREFIX}/drive_c/windows/Fonts/"simsun.ttc + try_force_link_file "${WINEDIR}/share/fonts/"msgothic.ttc "${WINEPREFIX}/drive_c/windows/Fonts/"msgothic.ttc - try_force_link_file "${WINEDIR}/share/wine/fonts/"tahoma.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"tahoma.ttf + try_force_link_file "${WINEDIR}/share/wine/fonts/"tahoma.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"tahoma.ttf } PROGPFX_URL="github.com/Castro-Fidel/PortWINE/releases/download/progpfx${PROGPFX_VER}/progpfx${PROGPFX_VER}.tar.xz" @@ -280,9 +297,11 @@ start_portwine () { pw_update_pfx_cover_gui - if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/windows || \ - ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/userdef.reg || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/system.reg || \ - ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/user.reg ]] + if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" \ + || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/windows \ + || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/userdef.reg \ + || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/system.reg \ + || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/user.reg ]] then pw_clear_pfx check_dirs_and_files_in_pfx @@ -292,22 +311,24 @@ start_portwine () { ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" wait_wineserver && echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" - elif [[ -z "`cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" | grep ${PW_WINE_USE}`" || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices" ]] ; then + elif [[ ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" ]] \ + || [[ -z "`cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" | grep ${PW_WINE_USE}`" ]] \ + || [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices" ]] ; then check_dirs_and_files_in_pfx ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" wait_wineserver && echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" fi - [ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/c:" ] && try_force_link_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/c:" + [ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/c:" [ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/z:" ] && try_force_link_dir "/" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices/z:" - create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser" - if [ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}" ]; then - try_force_link_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}" + create_new_dir "${WINEPREFIX}/drive_c/users/steamuser" + if [ ! -d "${WINEPREFIX}/drive_c/users/${USER}" ]; then + try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser" "${WINEPREFIX}/drive_c/users/${USER}" fi - create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/Public/Documents/Steam" - create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/Documents/Steam" - if [ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/My Documents" ] - then try_force_link_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/Documents" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/My Documents" + create_new_dir "${WINEPREFIX}/drive_c/users/Public/Documents/Steam" + create_new_dir "${WINEPREFIX}/drive_c/users/steamuser/Documents/Steam" + if [ ! -d "${WINEPREFIX}/drive_c/users/steamuser/My Documents" ] + then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/Documents" "${WINEPREFIX}/drive_c/users/steamuser/My Documents" fi #enabled BattleEye_Runtime and EasyAntiCheat_Runtime if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then @@ -334,8 +355,8 @@ start_portwine () { d3dx10_42 d3dx10_43 d3dx10 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \ d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 d3dx9_43 do - try_force_link_file "${PATH_TO_D3DEXTRAS}/x64/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" - try_force_link_file "${PATH_TO_D3DEXTRAS}/x32/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" + try_force_link_file "${PATH_TO_D3DEXTRAS}/x64/${d3d_extras_from_plugins}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + try_force_link_file "${PATH_TO_D3DEXTRAS}/x32/${d3d_extras_from_plugins}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" var_winedlloverride_update "${d3d_extras_from_plugins}=n" if [[ -z "`grep "${d3d_extras_from_plugins}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then echo "${d3d_extras_from_plugins}" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" @@ -343,19 +364,19 @@ start_portwine () { done fi echo "Try link wine DXGI by default..." - if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" - then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll" + 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" fi - if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/dxgi.dll" - then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/dxgi.dll" + if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" + then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" fi echo "Try link wine d3d filese by default..." for wine_build_dll in d3d12core d3d12 d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do - if ! try_force_link_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_build_dll}.dll" - then try_force_link_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_build_dll}.dll" + if ! try_force_link_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" + then try_force_link_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" fi - if ! try_force_link_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${wine_build_dll}.dll" - then try_force_link_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${wine_build_dll}.dll" + if ! try_force_link_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_build_dll}.dll" + then try_force_link_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_build_dll}.dll" fi done @@ -372,8 +393,8 @@ start_portwine () { echo "Use GALLIUM-NINE (Native DX9 on MESA drivers)" export PW_GALLIUM_NINE_VER="0.8" export PW_GALLIUM_NINE_PATH="${PW_PLUGINS_PATH}/gallium_nine_v.${PW_GALLIUM_NINE_VER}" - try_force_link_file "${PW_GALLIUM_NINE_PATH}/lib32/d3d9-nine.dll.so" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/d3d9.dll" - try_force_link_file "${PW_GALLIUM_NINE_PATH}/lib64/d3d9-nine.dll.so" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/d3d9.dll" + try_force_link_file "${PW_GALLIUM_NINE_PATH}/lib32/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/syswow64/d3d9.dll" + try_force_link_file "${PW_GALLIUM_NINE_PATH}/lib64/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/system32/d3d9.dll" var_winedlloverride_update "d3d9=n;wined3d=b;dxvk_config,vulkan-1,winevulkan=" unset FIND_D3D_MODULE D3D_MODULE_PATH FIND_D3D_MODULE=`dirname $(find /usr/ -maxdepth 4 -type f -name "d3dadapter9.so.*") 2>/dev/null` @@ -422,31 +443,30 @@ start_portwine () { echo "Try link native DXVK files..." for wine_dxvk_dll in ${CP_DXVK_FILES} ; do - try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" - try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${wine_dxvk_dll}.dll" + try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" + try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" [[ "$?" == 0 ]] && var_winedlloverride_update "${wine_dxvk_dll}=n" done echo "Try link native VKD3D files..." - for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-shader-1 libvkd3d-1 - do - try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" - try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-shader-1 libvkd3d-1 ; do + try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" + try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" done fi if [[ "${PW_DX12_DISABLE}" == 1 ]] - then var_winedlloverride_update "d3d12,d3d12core,libvkd3d-shader-1,libvkd3d-1=" - else var_winedlloverride_update "d3d12,d3d12core,libvkd3d-shader-1,libvkd3d-1=n" + then var_winedlloverride_update "d3d12,d3d12core=" + else var_winedlloverride_update "d3d12,d3d12core=n" fi - if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin" ]] ; then - create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin" - if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/vrclient.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin/vrclient.dll" - then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/vrclient.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin/vrclient.dll" + if [[ ! -d "${WINEPREFIX}/drive_c/vrclient/bin" ]] ; then + create_new_dir "${WINEPREFIX}/drive_c/vrclient/bin" + if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/vrclient.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient.dll" + then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/vrclient.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient.dll" fi - if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/vrclient_x64.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin/vrclient_x64.dll" - then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/vrclient_x64.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin/vrclient_x64.dll" + if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/vrclient_x64.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient_x64.dll" + then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/vrclient_x64.dll "${WINEPREFIX}/drive_c/vrclient/bin/vrclient_x64.dll" fi fi @@ -478,11 +498,15 @@ start_portwine () { fi for try_cp_dll_from_wine in "ntdll.dll" "vulkan-1.dll" "winevulkan.dll" ; do - if ! try_copy_file "${WINEDIR}"/lib/wine/i386-windows/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" - then try_copy_file "${WINEDIR}"/lib/wine/fakedlls/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" + if try_copy_file "${WINEDIR}/lib/wine/i386-windows/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" + then print_info "Try copy $try_cp_dll_from_wine to syswow64... OK." + elif ! try_copy_file "${WINEDIR}/lib/wine/fakedlls/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" + then try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" fi - if ! try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${try_cp_dll_from_wine}" - then try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/${try_cp_dll_from_wine} "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${try_cp_dll_from_wine}" + if try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/system32/${try_cp_dll_from_wine}" + then print_info "Try copy $try_cp_dll_from_wine to system32... OK." + elif ! try_copy_file "${WINEDIR}/lib64/wine/fakedlls/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/system32/${try_cp_dll_from_wine}" + then try_remove_file "${WINEPREFIX}/drive_c/windows/system32/${try_cp_dll_from_wine}" fi done @@ -490,6 +514,7 @@ start_portwine () { if [[ ! -z "${PW_MUST_HAVE_DLL}" ]] then export PW_DLL_INSTALL="`echo "${PW_MUST_HAVE_DLL} ${PW_DLL_INSTALL}" | awk '{ for(i=1;i<=NF;i++){a[$i]++} }END{ for(i in a){printf("%s ",i)} }' `" fi + if [[ ! -z "${PW_DLL_INSTALL}" ]] ; then export PW_DLL_NEED_INSTALL="" export USE_WT_FROM_DB=0 @@ -525,6 +550,7 @@ start_portwine () { kill_portwine fi fi + if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg" ]] && [[ -z `grep "Windows $PW_WINDOWS_VER" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"` ]] ; then if [[ ! -z "${PW_WINDOWS_VER}" && `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ]] ; then export PW_WINDOWS_VER="xp64" @@ -535,20 +561,22 @@ start_portwine () { kill_portwine echo "Set to win${PW_WINDOWS_VER}" fi + if [[ "${portwine_exe}" == *-Shipping.exe ]] ; then echo "Disable EAC" [[ -z "${LAUNCH_PARAMETERS}" ]] && export LAUNCH_PARAMETERS+=" -eac-nop-loaded " fi + sleep 1 pw_stop_progress_bar && pw_tray_icon && + if [[ "${PW_CHECK_AUTOINSTAL}" != "1" ]] ; then pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif" fi - if [[ "${PW_PREFIX_NAME}" == "DOTNET" ]] && [[ "${PW_VULKAN_USE}" == "1" || "${PW_VULKAN_USE}" == "2" ]] ; then - var_winedlloverride_update "libglesv2=" - fi + add_in_start_portwine + if [[ -f "${PATH_TO_GAME}/dxvk.conf" ]] ; then export DXVK_CONFIG_FILE="${PATH_TO_GAME}/dxvk.conf" fi @@ -557,7 +585,6 @@ start_portwine () { pw_run () { unset GDK_BACKEND if [[ -n "${PATH_TO_GAME}" ]] ; then - echo "cd to ${PATH_TO_GAME}" cd "${PATH_TO_GAME}" else cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" @@ -571,7 +598,7 @@ pw_run () { echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}" echo "------------------------------------" >> "${PW_LOG_TO_FILE}" echo "Log WINE:" >> "${PW_LOG_TO_FILE}" - ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ + env ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ @@ -584,7 +611,7 @@ pw_run () { export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" pw_init_runtime fi - ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ + env ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 00704f82..2e32e865 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -210,7 +210,7 @@ portwine_start_debug () { sed -i '/Uploading is disabled/d' "${PORT_WINE_PATH}/${portname}.log" deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++') echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log" - "$pw_yad" --title="${portname}.log" --borders=5 --no-buttons --text-align=center \ + "$pw_yad" --title="${portname}.log" --borders=3 --no-buttons --text-align=center \ --text-info --show-uri --wrap --width=1200 --height=550 --uri-color=red \ --filename="${PORT_WINE_PATH}/${portname}.log" stop_portwine @@ -302,7 +302,7 @@ pw_prefix_manager () { --text="Change config for prefix: \"${PW_PREFIX_NAME}\"" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" & - "${pw_yad_v12_3}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=1 --width=900 --height=800 \ + "${pw_yad_v12_3}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=3 --width=900 --height=800 \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "PREFIX MANAGER..." --tab-pos=bottom --tab="DLL" --tab="FONTS" --tab="SETTINGS" YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then @@ -380,7 +380,7 @@ pw_start_cont_xterm () { pw_create_prefix_backup () { cd "$HOME" - PW_PREFIX_TO_BACKUP=$("${pw_yad_v12_3}" --file --directory --borders=1 --width=650 --height=500 --auto-close \ + PW_PREFIX_TO_BACKUP=$("${pw_yad_v12_3}" --file --directory --borders=3 --width=650 --height=500 --auto-close \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "BACKUP PREFIX TO...") YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi @@ -569,7 +569,7 @@ if [ -n "${portwine_exe}" ]; then else PW_SHORTCUT="${loc_gui_delete_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_delete_shortcut}:98" fi - OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=1 --form \ + OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --borders=3 --form \ --title "${portname}-${install_ver} (${scripts_install_ver})" --image "${PW_ICON_FOR_YAD}" --separator=";" --keep-icon-size \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --field="3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \ @@ -666,7 +666,7 @@ else gui_open_scripts_from_backup () { cd "${PORT_WINE_TMP_PATH}/scripts_backup/" - PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v12_3}" --file --borders=5 --width=650 --height=500 --auto-close \ + PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v12_3}" --file --borders=3 --width=650 --height=500 --auto-close \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz") YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi @@ -793,7 +793,7 @@ else fi & if [[ -z "${PW_ALL_DF}" ]] ; then - "${pw_yad_v12_3}" --key=$KEY --notebook --borders=1 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ + "${pw_yad_v12_3}" --key=$KEY --notebook --borders=3 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom --keep-icon-size \ --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ @@ -803,7 +803,7 @@ else --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" YAD_STATUS="$?" else - "${pw_yad_v12_3}" --key=$KEY --notebook --borders=1 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ + "${pw_yad_v12_3}" --key=$KEY --notebook --borders=3 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom --keep-icon-size \ --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index bfaf0b67..5ae3de40 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,13 +1,9 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2195 +#SCRIPTS_NEXT_VERSION=2196 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt -#export DXVK_HUD=compiler -#export GALLIUM_HUD=fps -#export ENABLE_VKBASALT=1 -#export PW_VIRTUAL_DESKTOP=1 #export PW_XKBD_RU_HACK=1 export PW_RT_MOUNT_RO=("") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") @@ -31,6 +27,9 @@ export STAGING_SHARED_MEMORY="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_MANGOHUD_x32="0" export PW_USE_EAC_AND_BE="1" +###GTK_CONFIG### +# export GTK_DATA_PREFIX= +# export GTK_THEME="Adwaita:dark" ###DEFAULT_WINE### export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v12" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 003496c6..fd2c1642 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -102,7 +102,7 @@ pw_stop_progress_bar_cover () { export -f pw_stop_progress_bar_cover open_changelog () { - "${pw_yad}" --title="$loc_gui_changelog" --borders=10 --no-buttons --text-align=center \ + "${pw_yad}" --title="$loc_gui_changelog" --borders=3 --no-buttons --text-align=center \ --text-info --show-uri --wrap --width=1200 --height=700 --uri-color=red \ --filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" } @@ -190,7 +190,7 @@ pw_gui_for_edit_db () { --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :SCL" ${FPS_LIMIT_VAR} 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" & "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="650" \ - --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=1 --center \ + --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=3 \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \ --button="${loc_gui_open_db}"!!"${loc_gui_open_db_help}":150 \ @@ -414,7 +414,7 @@ gui_vkBasalt () { --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" & - "${pw_yad_v12_3}" --paned --key="$KEY_FX_GUI" --height="650" --title="vkBasalt" --center --borders=1 \ + "${pw_yad_v12_3}" --paned --key="$KEY_FX_GUI" --height="650" --title="vkBasalt" --center --borders=3 \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ --button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \ @@ -472,7 +472,7 @@ portwine_create_shortcut () { echo "Path="${PORT_SCRIPTS_PATH}/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Icon="${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" - "${pw_yad}" --title="${inst_set}." --form --center --borders=1 \ + "${pw_yad}" --title="${inst_set}." --form --borders=3 \ --window-icon "$PW_GUI_ICON_PATH/port_proton.png" \ --image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \ --field="\n ${name_desktop}.desktop:LBL" "" \