Scripts version 2119

Scripts version 2118
Scripts version 2117
2022-06-21 21:12:10 +03:00 · 2022-06-15 23:02:23 +03:00 · 2022-06-06 21:35:16 +03:00 · 2022-06-06 12:54:12 +03:00 · 2022-06-06 11:54:17 +03:00 · 2022-06-04 12:17:25 +03:00
24 changed files with 706 additions and 131 deletions
--- a/README.md
+++ b/README.md
@ -1,11 +1,103 @@
 # PortWINE  
-  
-data_from_portwine - contains scripts and additional files for configuring and running applications.  
-  
-portwine_install_script - contains a self-extracting port setup script  
-  
-PLEASE DO NOT REPORT BUGS ENCOUNTERED WITH THIS AT WINEHQ OR VALVE SOFTWARE!  

-Generated Wine sources for use in PortWINE:  
+PortWINE is a project designed to make it easy and convenient to run Windows games on Linux for both beginners and advanced users.
+The project strives to make launching games (and other software) as simple as possible, but at the same time provides flexible settings for advanced users.
+
+Based on the version of WINE from Valve (Proton) and its modifications (Proton GE). Includes a set of scripts combined with wine-proton itself, a Steam Runtime Sniper container with the addition of ported versions of MANGOHUD (output useful information over the game window: FPS, FrameTime, CPU, GPU, etc) and vkBasalt (improvement of graphics in games, very good in in conjunction with FSR, DLSS) + many already configured optimizations for maximum performance.
+
+Implemented one-click auto-installation (in the AUTOINSTALL tab ) of popular launchers such as: WGC, Epic Games, Battle.net, Origin, EVE Online, RockStar, Ubisoft connect , League of Legends and many others.
+For fans of console games, there are many console emulators to choose from (in the EMULATORS tab ): PPSSPP, Citra, Cemu, ePSXe, MAME and many others.
+
+PLEASE DO NOT REPORT BUGS ENCOUNTERED WITH THIS AT WINEHQ OR VALVE SOFTWARE!
+
+Wine sources used in PortWINE:  
 WINE-PROTON: https://github.com/ValveSoftware/Proton  
-WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/  
+WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/
+
+## Installation using packages
+
+* **Ubuntu 20.04** (Kubuntu, Xubuntu, Lubuntu, etc.), **Linux Mint 20.x** : [portproton_1.0-2_amd64.deb](https://github.com/Castro-Fidel/PortProton_dpkg/releases/download/portproton_1.0-2_amd64/portproton_1.0-2_amd64.deb)
+* **Arch Linux** and derivatives (Manjaro, Garuda, etc.) : [portproton-1.0-8-x86_64.pkg.tar.zst](https://github.com/Castro-Fidel/PortProton_PKGBUILD/releases/download/portproton-1.0-8-x86_64/portproton-1.0-8-x86_64.pkg.tar.zst)
+* **ROSA Linux** (package in the official repository) is installed with the command:  `sudo urpmi portproton`
+
+## Universal (manual) installation
+
+**ATTENTION** : with the universal method of installing PortProton, dependencies must be installed manually!
+
+Normal installation:
+
+`wget -c "https://github.com/Castro-Fidel/PortWINE/raw/master/portwine_install_script/PortProton_1.0" && sh PortProton_1.0`
+
+Silent installation (ENG):
+
+`wget -c "https://github.com/Castro-Fidel/PortWINE/raw/master/portwine_install_script/PortProton_1.0" && sh PortProton_1.0 -eng`
+
+Silent installation (RUS):
+
+`wget -c "https://github.com/Castro-Fidel/PortWINE/raw/master/portwine_install_script/PortProton_1.0" && sh PortProton_1.0 -rus`
+
+## Dependencies
+
+* **NVIDIA graphics card users**
+
+If you have a video card from NVIDIA and a proprietary driver is installed, then you need to check if lib32-nvidia-utils is installed (no 32-bit game will work without it)
+
+* **Ubuntu / Linux Mint / Pop!_OS**
+
+`sudo dpkg --add-architecture i386`
+
+`sudo add-apt-repository multiverse`
+
+`sudo apt update && sudo apt upgrade`
+
+`sudo apt install curl file libc6 libnss3 policykit-1 xz-utils zenity bubblewrap curl icoutils tar libvulkan1 libvulkan1:i386 wget zenity zstd cabextract xdg-utils openssl bc libgl1-mesa-glx libgl1-mesa-glx:i386`
+
+* **Arch Linux / Manjaro**
+
+`sudo pacman -Syu bash icoutils wget bubblewrap zstd cabextract bc tar openssl gamemode desktop-file-utils curl dbus freetype2 gdk-pixbuf2 ttf-font zenity lsb-release nss xorg-xrandr vulkan-driver vulkan-icd-loader lsof lib32-freetype2 lib32-libgl lib32-gcc-libs lib32-libx11 lib32-libxss lib32-alsa-plugins lib32-libgpg-error lib32-nss lib32-vulkan-driver lib32-vulkan-icd-loader lib32-gamemode lib32-openssl`
+
+If you have a video card from **NVIDIA** , be sure to check if the **lib32-nvidia-utils** package is installed
+
+`sudo pacman -Syu lib32-nvidia-utils`
+
+* **Debian/Deepin**
+
+`sudo apt install software-properties-common -y && sudo apt-add-repository non-free && sudo dpkg --add-architecture i386 && sudo apt update && sudo apt upgrade`
+
+`sudo apt install bubblewrap curl gamemode icoutils tar wget zenity zstd libvulkan1 libvulkan1:i386 steam cabextract`
+
+* **openSUSE**
+
+`sudo zypper ref && sudo zypper up && sudo zypper in curl icoutils wget zenity bubblewrap zstd cabextract tar steam zenity zenity-lang`
+
+Installing Gamemode is done with a separate command:
+
+`opi gamemode`
+
+* **Fedora**
+
+Enable Non-free repository:
+
+`sudo dnf install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm`
+
+Install the required dependencies:
+
+`sudo dnf update && sudo dnf upgrade --refresh && sudo dnf install curl gamemode icoutils libcurl  wget zenity bubblewrap zstd cabextract tar goverlay openssl steam`
+
+* **Alt Linux**
+
+`sudo apt-get update && sudo apt-get dist-upgrade -y`
+
+`sudo apt-get install bubblewrap cabextract curl gamemode icoutils i586-libvulkan1 libvulkan1 steam vulkan-tools wget zenity zstd`
+
+* **ROSA DESKTOP FRESH R12**
+
+`sudo dnf update && sudo dnf upgrade --refresh && sudo dnf install sysvinit-tools curl libcurl4 icoutils wget zenity bubblewrap zstd cabextract tar libvulkan1 lib64vulkan1 vulkan.x86_64 vulkan.i686 vkd3d.x86_64 vkd3d.i686 coreutils file libc6 libnss3 xz bubblewrap xdg-utils openssl bc libgl1 lib64freetype2 libfreetype2 lib64txc-dxtn libtxc-dxtn coreutils lib64opencl1 libopencl1 libdrm2 libdrm2.i686 mesa.i686`
+
+* **Solus 4.x**
+
+`sudo eopkg it curl file zenity bubblewrap curl icoutils tar wget zenity zstd cabextract xdg-utils openssl bc vulkan vulkan-32bit mesalib-32bit samba`
+
+## Contacts
+
+You can join our [Discord](https://discord.gg/FTaheP99wE) server.
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@ -2,6 +2,39 @@ You can help us in the development of the project on the website: boosty.to/port
 -----------------------------------------
 Changelog:

+###Scripts version 2119###
+* HOTFIX - for PW_USE_D3D_EXTRAS
+* updated information about the project, developers and paid subscribers on boosty
+* added optimization of games and applications when using a Wayland session (using direct launch, not using XWayland)
+
+###Scripts version 2118###
+* PW_USE_D3D_EXTRAS is back on by default (except WGC)
+* updated "PROTON_STEAM" to version 7.0-3
+* added information about the project and developers (test mode)
+
+###Scripts version 2117###
+* HOTFIX - World of Sea Battles
+* HOTFIX - AUTOINSTALL
+
+###Scripts version 2116###
+* HOTFIX - Epic Games Store
+* HOTFIX - League of Legends
+
+###Scripts version 2115###
+* optimized launch PortProton in Rosa Linux
+
+###Scripts version 2111 - 2114###
+* debug
+
+###Scripts version 2110###
+* updated "PROTON_GE" to version 7-20
+* fixed the work of the game World of Warplanes
+* variable PW_D3D_EXTRAS_DISABLE renamed to PW_USE_D3D_EXTRAS and disabled by default
+
+###Scripts version 2109###
+* update "libs_v31"
+* updated "PROTON_GE" to version 7-19
+
 ###Scripts version 2108###
 * HOTFIX for Rosa Linux

--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@ -2,13 +2,48 @@
 -----------------------------------------
 История изменений:

+###Scripts version 2119###
+* исправлено и ускорено создание DOTNET префикса
+* HOTFIX - для PW_USE_D3D_EXTRAS 
+* обновлена информация о проекте, разработчиках и платных подписчиков на boosty
+* добавлена оптимизация игр и приложений при использовании сесcии Wayland (используется прямой запуск, не используя XWayland)
+
+###Scripts version 2118###
+* переменная PW_USE_D3D_EXTRAS снова включена по умолчанию (кроме WGC)
+* обновлен "PROTON_STEAM" до версии 7.0-3
+* добавлена информация о проекте, разработчиках и платных подписчиков на boosty (тестовый режим) 
+
+###Scripts version 2117###
+* исправлена установка и запуск World of Sea Battle
+* для AUTOINSTALL по умолчанию включена переменная PW_USE_D3D_EXTRAS (необходима для стабильной установки лончеров в тихом режиме)
+
+###Scripts version 2116###
+* HOTFIX - Epic Games Store
+* HOTFIX - League of Legends
+
+###Scripts version 2115###
+* ускорен запуск PortProton в Rosa Linux
+
+###Scripts version 2111 - 2114###
+* исправление ошибок
+
+###Scripts version 2110###
+* обновлен "PROTON_GE" до версии 7-20
+* исправлена работа игры World of Warplanes
+* переменная PW_D3D_EXTRAS_DISABLE переименована в PW_USE_D3D_EXTRAS и выключена по умолчанию (в связи с развитием WINE сторонние библиотеки DirectX нужны в меньшем количестве игр)
+
+###Scripts version 2109###
+* обновлен "libs_v31" (HOTFIX для Rosa Linux)
+* обновлен "PROTON_GE" до версии 7-19
+* исправлена работа Overwatch
+
 ###Scripts version 2108###
-* HOTFIX - для правильной работы в Rosa Linux
+* HOTFIX  - для правильной работы в Rosa Linux

 ###Scripts version 2107###
 * ускорен запуск контейнера
 * оптимизация скрипта start.sh
-* обнолвен "libs_v30" (восстановлена работа vkBasalt на предыдущих версиях OS Linux)
+* обновлен "libs_v30" (восстановлена работа vkBasalt на предыдущих версиях OS Linux)
 * обновлен "PROTON_GE" до версии 7-18

 ###Scripts version 2106###
@ -865,7 +900,7 @@ PS: не забывает для активации добавить перем

 ###PortProton-75### 24.04.2021 ###Scripts version 1040###
 * обновлен wine Proton experimental 6.3 от 23.04.2021
-* добавлена функция pw_clear_pfx для отчистки префикса порта во время обновления без затрагивания игр и программ
+* добавлена функция pw_clear_pfx для очистки префикса порта во время обновления без затрагивания игр и программ
 * проверка и настройка переменных для MANGOHUD добавлены функцию pw_mangohud_check
 * версия VKD3D по умолчанию = 2.3
 * добавлена поддержка DXR (RTX) в режиме VKD3D, при условии использования переменной PW_USE_DXR10=1
@ -881,7 +916,7 @@ PS: не забывает для активации добавить перем
 * ускорена работа reset скрипта останавливающая все процессы порта
 * исправлены ошибки связанные с остановкой отсутствующих pid-оф yad и процессов wine.
 * удалено использование wineserver -k в функции kill_portwine (влияло на инициализацию префикса)
-* добавлена отчистка ~/.PortWINE, при условии установки новой версии порта
+* добавлена очистка ~/.PortWINE, при условии установки новой версии порта
 * добавлена вся информация из db файла и winetricks.log в debug
 * удален каталог vars (из за db файлоа больше в нем нет необходимости)
 * скрипт PortProton_vars перенесен в каталог scripts и переименован в var
--- a/data_from_portwine/scripts/credits
+++ b/data_from_portwine/scripts/credits
@ -0,0 +1,284 @@
+#!/usr/bin/env bash
+
+KEY_CREDITS=$RANDOM
+
+"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \
+--text-align=center --scroll --text="PortProton v.${install_ver}
+scripts v. ${scripts_install_ver}
+
+https://portwine-linux.ru
+
+Copyright © 2022 Castro-Fidel (PortWINE-Linux.ru)
+
+This program comes with absolutely no warranty.
+See the License for details." &
+
+
+"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=2 \
+--text-align=center --scroll --text="Author:   Casro-Fidel (Mikhail Tergoev)
+
+Developer assistants and testers:
+Cefeiko
+Dezert1r
+Taz_mania
+Anton_Famillianov
+RidBowt
+chal55rus
+UserDiscord
+survolog
+gavr
+RusNor
+aldiserg
+an9949an
+andrey4korop
+" &
+
+"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License
+
+Copyright (©) 2022 Castro-Fidel (PortWINE-Linux.ru)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED (AS IS), WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE." &
+
+"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=4 \
+--text-info --show-uri  --scroll <<< 'https://boosty.to/portwine-linux.ru:
+
+1 1
+A B
+AdamArclight666
+Akai
+Aleks
+Alex Sh
+Alexsei Cherniavskiy
+Allegra_g
+AlxChkln
+Andrei K
+Another games
+Apofis Smab
+Aule Mahal
+Azartiny Mor
+BELIJJAaL
+CanBoo
+Coin Hunt
+Cruze
+DIO
+Dadenard
+Dallasss
+Daniil Go
+Dencher12
+Denis
+Dezert1r
+Dima Manshin
+Dmitriy Tokarev
+Drakorgaur
+El Mago
+Eliot
+Ethan Winters
+Evgen Buiko
+EvilDevolver
+GaiverX
+Gekko
+Geomant17
+Happy Husky
+Homyakin
+Ivan Vlasov
+LeGi0neR
+Lexa XLS
+Linux Vumtut
+Lonely Lonely
+MICROFARAT
+MLogaut
+Maksami Cordyceps
+Maktub
+Melord
+Monti Roquefort
+MrBatonio
+Nesterik
+Nikola P.
+Nuclearsun
+Nurik
+Oleg55Rus
+Optimus
+Ottakvot
+PLAFON
+Pependos
+PlagueEvgeny
+Rojok56
+Ruslan Vlasov
+Rustam
+Saireg
+Seeropoonya
+Soma
+StGdG
+Subscript
+Sudo Connect
+Taras Zagibalov
+The End
+Tykva
+V1ktr
+VAtiB
+VUMtut
+VanBugel
+Vikthor Prieto
+Vosarat
+Windchester
+Xpamych
+Yurec
+Yuri Emelyanov
+Zillah Giovanni
+Zloy Ivan
+Zorit
+amikha1lov
+anisan_sg
+apolon
+benya
+chal55rus(Sergey P.)
+d.kostroma
+dunkanMcLoud
+dupster mailbox
+fight fox
+funti2f
+fusiok
+gg_harper
+haravara
+ivboss
+ksandr4370
+onix
+paulscathedral
+penguin4ek
+sanelasan
+sashman
+sendependa_dio
+shecspir
+sship
+sugoyako
+tima
+ua3dko
+vlad petrov
+wrager
+xpamych
+Александр
+Александр Абдулов
+Александр Кладов
+Александр Лобанов
+Алексей Ultralin
+Алексей Войтенко
+Алексей Галаш
+Алексей Зубрийчук
+Алексей Ивушкин
+Алексей Кравчук
+Алексей Чугунов
+Андрей Гусаков
+Андрей Карпенцов
+Антон Рудковский
+Антон Фамилианов
+Антоний Дамикан
+Артём К.
+Валерий Толмачёв
+Виктор Шварц
+Виктор Щетинин
+Виндэта(рог)
+Виталий Нуров
+Влад Блинов
+Влад Кладиев
+Владимир Бильдюкевич
+Владимир Дарвин
+Вячеслав Шитюков
+Вячеслав Шустров
+Георгий Гурский
+Данил Павлов
+Дед Мазай
+Денис Мальцев
+Денис Матій
+Денис Олефиренко
+Дмитрий Круглов
+Дмитрий Мазанка
+Дмитрий Сидоров
+Евгений Бебин
+Евгений Долгополов
+Евгений Хирвонен
+Евгений Храмов
+Егор Кречун
+Женя Рябушкин
+Иван Белекеев
+Коляныч Королёв
+Константин __
+Константин Абадонна
+Леонид
+Максим Хмара-Миронов
+Маленькая сосна
+Марат
+Марат Рахимов
+Неизвестый Дмитрий
+Никита Булавин
+Павел Иванов
+Павел Пашенцев
+Равич Ревес
+Рамиль
+Рома Б.
+Роман Игнатьев
+Роман Паженский
+Саша 
+Семён Клишин
+Семён Ярополов
+Сергей Казёнкин
+Сергей Круглов
+Серёга Сапрыкин
+Стас Толкачёв
+Тима Суеубаев
+Тимофей Ковалев
+Тимур Сафонов
+Удалить Аккаунт
+Хоттабыч
+Николай Гинтов
+
+
+Список будет дополняться...' &
+
+"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \
+--title=JOIN --window-icon=group  --image=system-config-users --uri-color=red --show-uri \
+--text-info --scroll <<< \
+"Website:  http://portwine-linux.ru
+Discord:  http://discord.gg/yJSEFjF
+VK:       https://vk.com/portwinelinux
+-------------------------------------------
+Стать платным подписчиком:
+boosty: https://boosty.to/portwine-linux.ru
+patreon: https://www.patreon.com/portproton
+Кошельки WebMoney:   WMZ-Z135951244401   WME-E325631629973
+Yandex кошельк:   410012267513818
+-------------------------------------------
+Задонатить на стрим:
+https://www.donationalerts.com/r/portwine_linux" &
+
+"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
+--text-info <<< "Сторонние библиотеки, которые используются в PortProton
+
+PortProton собран на основе следующих бесплатных библиотек программного обеспечения:
+
+WINE-PROTON: https://github.com/ValveSoftware/Proton
+WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/
+YAD: https://github.com/v1cont/"${pw_yad_new}"
+ZENITY: https://github.com/GNOME/zenity" &
+    
+"${pw_yad_new}" --title "ABOUT US" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
+--center --notebook --no-buttons  --tab-pos=bottom \
+--tab="ABOUT PORTPROTON" --tab="AUTORS" --tab="LICENSE" --tab="SPONSORS" --tab="JOIN" \
+--tab="THIRD PARTY LIBRARIES"
+
+/usr/bin/env bash -c ${pw_full_command_line[*]} 
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@ -63,7 +63,7 @@ try_remove_dir () {
 export -f try_remove_dir

 try_force_link_file () {
-    if [ ! -f "$1" ] ; then	print_info "file $1 not found for link"
+    if [ ! -f "$1" ] ; then :
    elif [ -z "$2" ] ; then	print_error "no way to link file $1"
    else
        ln -sf "$1" "$2"
@ -332,6 +332,10 @@ init_wine_ver () {

 pw_init_runtime () {

+    if [[ -n "$(grep "ROSA Fresh" "/etc/os-release")" ]] ; then
+        export LOCPATH="/run/host/usr/share/locale/"
+    fi
+
    PW_PV_OVERRIDES="/usr/lib/pressure-vessel/overrides/lib" 
    export PW_LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${PW_WINELIB}/portable/lib/lib64:${PW_WINELIB}/portable/lib/lib32:${PW_PV_OVERRIDES}/x86_64-linux-gnu/aliases:${PW_PV_OVERRIDES}/i386-linux-gnu/aliases"

--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@ -12,7 +12,7 @@ then
    export loc_gui_changelog="История изменений"
    export loc_gui_edit_usc="Редактировать USER.CONF"
    export loc_gui_scripts_fb="Откатить версию скриптов"
-    export loc_gui_about_us="О нас"
+    export loc_gui_credits="Авторы и спасибы =)"

 	export loc_tray_winefile="Файловый менеджер WINE"
 	export loc_tray_tascmng="Диспетчер задач WINE"
@ -103,7 +103,7 @@ then
 	export PW_DX12_DISABLE_INFO='Принудительное отключение DirectX 12'
 	export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)'
 	export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)'
-	export PW_D3D_EXTRAS_DISABLE_INFO='Отключить принудительное использование сторонних библиотек DirectX'
+	export PW_USE_D3D_EXTRAS_INFO='Включить принудительное использование сторонних библиотек DirectX'
 	export PW_PRIME_RENDER_OFFLOAD_INFO='Включить дискретную видеокарту NVIDIA для ноутбуков с гибридной графикой (при поддержке установленого драйвера в ОС)'
 	export PW_USE_WINDOWS_7_INFO='Изменить версию WINDOWS 10 на WINDOWS 7 в префиксе'
 	export PW_USE_AMDVLK_DRIVER_INFO='Использовать драйвер AMDVLK вместо RADV на видеокартах от AMD'
@ -142,7 +142,7 @@ then
    export loc_gui_changelog="CHANGELOG"
    export loc_gui_edit_usc="EDIT USER.CONF"
    export loc_gui_scripts_fb="SCRIPTS FROM BACKUP"
-    export loc_gui_about_us="ABOUT PORTPROTON"
+    export loc_gui_credits="CREDITS"

 	export loc_tray_winefile="WINEFILE"
 	export loc_tray_tascmng="TASKMNR"
--- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher
+++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher
@ -8,6 +8,7 @@ export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=1
 export LAUNCH_PARAMETERS="-SkipBuildPatchPrereq"
 export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2019"
+export PW_USE_D3D_EXTRAS=1

 add_in_start_portwine () {
    regdlloverrides "RDR2.exe:vulkan-1=n"
--- a/data_from_portwine/scripts/portwine_db/Forsaken_World
+++ b/data_from_portwine/scripts/portwine_db/Forsaken_World
@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+#Author: berg
+#pemv.exe
+#Rating=5
+#####################examples###########################
+##export PW_COMMENT_DB="blablabla"
+export PW_WINDOWS_VER="10"
+export PW_DLL_INSTALL=""
+export WINEDLLOVERRIDES=""
+export LAUNCH_PARAMETERS=""
+export PW_WINE_USE="PROTON_GE"
+export PW_VULKAN_USE="1"
+export PW_USE_DXR10="0"
+##export PW_DLSS_ON=1
+##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
+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="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=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="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_PREFIX_NAME="DEFAULT"
+export PW_USE_DXR11="0"
+export PW_WINE_FULLSCREEN_FSR="0"
+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_USE_AMDVLK_DRIVER="0"
+export PW_FORCE_LARGE_ADDRESS_AWARE="1"
+export PW_USE_SHADER_CACHE="1"
--- a/data_from_portwine/scripts/portwine_db/League
+++ b/data_from_portwine/scripts/portwine_db/League
@ -20,6 +20,7 @@ export PW_PREFIX_NAME="LEAGUE_OF_LEGENDS"
 export PW_NO_FSYNC=1
 export PW_NO_ESYNC=1
 export PW_DISABLED_CREATE_DB=1
+export PW_USE_D3D_EXTRAS=1
 ##export PW_GUI_DISABLED_CS=1                     # 1 = disabled GUI

 check_download_wine_ver_for_lol () {
--- a/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb
+++ b/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb
@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+#Author: dez
+#MWO Portal.exe
+#Rating=1-5
+#####################examples###########################
+##export PW_COMMENT_DB="blablabla"
+export PW_WINDOWS_VER="10"
+export PW_DLL_INSTALL=""
+export WINEDLLOVERRIDES=""
+export LAUNCH_PARAMETERS="-noprompt -anygpu"
+export PW_WINE_USE="PROTON_GE"
+export PW_VULKAN_USE="1"
+export PW_USE_DXR10="0"
+##export PW_DLSS_ON=1
+##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
+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_VKBASALT_EFFECTS="FakeHDR:cas"
+export PW_VKBASALT_FFX_CAS="0.75"
+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=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="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_PREFIX_NAME="DOTNET"
+export PW_MANGOHUD="1"
+export PW_MANGOHUD_USER_CONF="1"
+export PW_USE_DXR11="0"
+export PW_WINE_FULLSCREEN_FSR="0"
+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_USE_AMDVLK_DRIVER="0"
+export PW_FORCE_LARGE_ADDRESS_AWARE="1"
+export PW_USE_SHADER_CACHE="1"
--- a/data_from_portwine/scripts/portwine_db/WolfNewOrder
+++ b/data_from_portwine/scripts/portwine_db/WolfNewOrder
@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+#Author: spider
+#WolfNewOrder_x64.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_WINE_USE="PROTON_GE"
+export PW_VULKAN_USE="1"
+export PW_USE_DXR10="0"
+##export PW_DLSS_ON=1
+##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
+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="0"
+export PW_VKBASALT_EFFECTS="Curves:SMAA:cas"
+export PW_VKBASALT_FFX_CAS="0.75"
+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=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="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_PREFIX_NAME="DEFAULT"
+export PW_MANGOHUD="1"
+export PW_MANGOHUD_USER_CONF="0"
+export PW_USE_DXR11="0"
+export PW_WINE_FULLSCREEN_FSR="0"
+export PW_USE_GAMEMODE="1"
+export PW_DX12_DISABLE="0"
+export PW_PRIME_RENDER_OFFLOAD="0"
+export PW_USE_D3D_EXTRAS="0"
+export PW_FIX_VIDEO_IN_GAME="0"
+export PW_USE_AMDVLK_DRIVER="0"
+export PW_FORCE_LARGE_ADDRESS_AWARE="1"
+export PW_USE_SHADER_CACHE="1"
--- a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient
+++ b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient
@ -7,10 +7,10 @@
 export PW_COMMENT_DB="World of Sea Battle"
 export PW_PREFIX_NAME="DOTNET"
 export PW_WINDOWS_VER="10"
-export PW_DLL_INSTALL="dotnet20sp2 dotnet48 faudio"
+export PW_DLL_INSTALL="faudio dotnet48 dotnet20sp2"
 export WINEDLLOVERRIDES="quartz=b"
 export LAUNCH_PARAMETERS=""
-export PW_WINE_USE="PROTON_GE_7-14"
+export PW_WINE_USE="PROTON_GE"
 export PW_VULKAN_USE="1"
 export PW_VULKAN_NO_ASYNC="0"
 export PW_USE_NVAPI_AND_DLSS="0"
@ -35,7 +35,7 @@ export PW_USE_DXR11="0"
 export PW_USE_GAMEMODE="1"
 export PW_DX12_DISABLE="0"
 export PW_PRIME_RENDER_OFFLOAD="0"
-export PW_D3D_EXTRAS_DISABLE="0"
+export PW_USE_D3D_EXTRAS=1
 export PW_FIX_VIDEO_IN_GAME="0"
 export PW_USE_AMDVLK_DRIVER="1"
 export PW_FORCE_LARGE_ADDRESS_AWARE="1"
--- a/data_from_portwine/scripts/portwine_db/WorldOfTanks
+++ b/data_from_portwine/scripts/portwine_db/WorldOfTanks
@ -7,3 +7,4 @@ export PW_VULKAN_USE=1                       #dxvk, vkd3d or 0 for OpenGL
 export PW_DLL_INSTALL="lucida vcrun2019"     # Install DDL in port prefix (used winetricks) 
 export WINEDLLOVERRIDES="xaudio2_7="
 export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
+export PW_USE_D3D_EXTRAS=0
--- a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
+++ b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
@ -8,6 +8,7 @@
    export PW_PREFIX_NAME="DOTNET"
    export PW_DLL_INSTALL="mfc42 vb6run physx dotnet40"        # Install DDL in port prefix (used winetricks) 
    export PW_COMMENT_DB="World Of Tanks EnCore"
+    export PW_USE_D3D_EXTRAS=0
    ## export DXVK_HUD=fps,devinfo
    ## export PW_MANGOHUD=1
 #####################examples###########################
--- a/data_from_portwine/scripts/portwine_db/wgc
+++ b/data_from_portwine/scripts/portwine_db/wgc
@ -15,7 +15,10 @@ export WINEDLLOVERRIDES="ucrtbase,xaudio2_7,xaudio2_8=n,b"
 export PW_DLL_INSTALL="lucida vcrun2019"     # Install DDL in port prefix (used winetricks)
 ##export PW_GUI_DISABLED_CS=1
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
+export PW_USE_D3D_EXTRAS=0

 add_in_start_portwine () {
-    sed -i 's%<igbHardwareAccelerationEnabled> true </igbHardwareAccelerationEnabled>%<igbHardwareAccelerationEnabled> false </igbHardwareAccelerationEnabled>%' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml"
+    if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" ]] ; then
+        sed -i 's%<igbHardwareAccelerationEnabled> true </igbHardwareAccelerationEnabled>%<igbHardwareAccelerationEnabled> false </igbHardwareAccelerationEnabled>%' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml"
+    fi
 }
--- a/data_from_portwine/scripts/portwine_db/wot_encore_install_ru
+++ b/data_from_portwine/scripts/portwine_db/wot_encore_install_ru
@ -1,40 +1,13 @@
 #!/usr/bin/env bash
-    #Author: user
-    #wot_encore_install_ru.exe 
-    #Rating=1-5
-    ################################################
-    export PW_VULKAN_USE=dxvk
-    export PW_USE_TERMINAL=1
-    export PW_PREFIX_NAME="DOTNET"
-    export PW_DLL_INSTALL="dotnet40 vcrun2017  mfc42 vb6run physx"
-    export PW_COMMENT_DB="World Of Tanks EnCore Installer"
-    ## export DXVK_HUD=fps,devinfo
-    ## export PW_MANGOHUD=1
-#####################examples###########################
-PW_INSTALL_DOTNET40 () {
-    export DN=dotNetFx40_Full_x86_x64.exe
-    export mscor=mscorsvw.exe
-    export KILL_MSCOR=0
-    export DN_INST_SUCC=0
-
-    while [ ! -z "`ps -ax | grep PortProton | grep -m1 'start.sh' | awk '{print $1}'`" ] ; do
-        echo "PID parrent start.sh was found"
-        sleep 5
-        while [ ! -z `pidof -s $DN` ] ; do
-            echo "$DN is runing.. Wait..."
-            sleep 5
-            export DN_INST_SUCC=1
-        done
-        while [ ! -z `pgrep "${mscor}" | head -n 1` ] && [ -z `pidof -s $DN` ] ; do
-            echo "$mscor was found. Kill it..."
-            kill -n 9 `pgrep "${mscor}" | head -n 1`
-            sleep 1
-            export KILL_MSCOR=1
-        done
-        if [ "$KILL_MSCOR" != 0 ] && [ "$DN_INST_SUCC" != 0 ] && [ -z `pidof -s $DN` ] && [ -z `pgrep "${mscor}" | head -n 1` ]; then
-            echo "All $mscor killed" 
-            break
-        fi
-    done
-}
-PW_INSTALL_DOTNET40 &
+#Author: user
+#wot_encore_install_ru.exe 
+#Rating=1-5
+################################################
+export PW_VULKAN_USE=dxvk
+export PW_USE_TERMINAL=1
+export PW_PREFIX_NAME="DOTNET"
+export PW_DLL_INSTALL="dotnet40 vcrun2017  mfc42 vb6run physx"
+export PW_COMMENT_DB="World Of Tanks EnCore Installer"
+export PW_USE_D3D_EXTRAS=0
+## export DXVK_HUD=fps,devinfo
+## export PW_MANGOHUD=1
--- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC
@ -3,6 +3,8 @@
 ########################################################################
 export LAUNCH_PARAMETERS=("/q" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EpicGamesLauncherInstaller.msi"
+export PW_USE_D3D_EXTRAS=1
+
 start_portwine
 if try_download "launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}"
 then
--- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG
@ -2,7 +2,7 @@
 # Author: Castro-Fidel (PortWINE-Linux.ru)
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
-export GOG_VER=2.0.46.133
+export GOG_VER=2.0.48.63
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe"
 start_portwine
 if try_download "content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}"
--- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL
@ -8,6 +8,7 @@ export PW_MUST_HAVE_DLL=""
 export PW_VULKAN_USE=1
 export PW_WINE_USE=WINE_LOL_GE_7.0-2
 export WINEDLLOVERRIDES="mscoree,mshtml="
+export PW_USE_D3D_EXTRAS=1

 if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then
    if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \
--- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB
@ -4,7 +4,7 @@
 export PW_PREFIX_NAME="DOTNET"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/wos_client.exe"
 export LAUNCH_PARAMETERS=("/VERYSILENT")
-export PW_DLL_INSTALL="dotnet20sp2 dotnet48 faudio"
+export PW_DLL_INSTALL="faudio dotnet48"
 export PW_VULKAN_USE=1

 if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@ -22,7 +22,6 @@ fi
 . "$(dirname $(readlink -f "$0"))/functions_helper"

 start_portwine () {
-    pw_update_pfx_cover_gui
    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/"
@ -242,8 +241,25 @@ start_portwine () {
        
        try_force_link_file "${WINEDIR}/share/wine/fonts/"tahoma.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"tahoma.ttf
    }
+
+    export DOTPFX_VER="48v1"
+    DOTPFX_URL="github.com/Castro-Fidel/PortWINE/releases/download/dotpfx${DOTPFX_VER}/dotpfx${DOTPFX_VER}.tar.xz"
+
+    if [[ "${update_loc}" == "RUS" && "${PW_PREFIX_NAME}" == "DOTNET" && ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/.dotnet48 ]] ; then
+        print_info "Download and install DOTNET..."
+        if try_download "${DOTPFX_URL}" "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" ; then
+            unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/"
+            try_remove_file "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz"
+        else
+            try_remove_file "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz"
+            zenity_error_download && exit 1
+        fi
+    fi
    
-    if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/windows || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices" || \
+    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 ]]
    then
        pw_clear_pfx
@ -254,9 +270,9 @@ 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}`" ]] ; then 
+    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 
        check_dirs_and_files_in_pfx
-        ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
+        ${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
@ -274,18 +290,26 @@ start_portwine () {
    #enabled BattleEye_Runtime and EasyAntiCheat_Runtime
    export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/d3d_extras/BattlEye_Runtime"
    export PROTON_EAC_RUNTIME="${PW_PLUGINS_PATH}/d3d_extras/EasyAntiCheat_Runtime"
-    var_winedlloverride_update "beclient,beclient_x64=b,n"
+    export PROTON_EASYANTICHEAT_RUNTIME="${PROTON_EAC_RUNTIME}"
+    var_winedlloverride_update "beclient,beclient_x64=b"
    #try link d3d extras libs
    for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \
    d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \
    d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \
    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 "${PW_PLUGINS_PATH}/d3d_extras/x64/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
-        try_force_link_file "${PW_PLUGINS_PATH}/d3d_extras/x32/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/"
-        if [[ "${PW_D3D_EXTRAS_DISABLE}" != 1 ]] ; then
+    do
+        if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then
+            try_force_link_file "${PW_PLUGINS_PATH}/d3d_extras/x64/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
+            try_force_link_file "${PW_PLUGINS_PATH}/d3d_extras/x32/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/"
            var_winedlloverride_update "${d3d_extras_from_plugins}=n,b"
+        else
+            if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/"
+            then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/"
+            fi
+            if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
+            then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
+            fi
        fi
        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"
@ -505,6 +529,7 @@ start_portwine () {
 }

 pw_run () {
+    unset GDK_BACKEND
    if [[ ! -z "$portwine_exe" ]] ; then
        cd "${PATH_TO_GAME}"
    else
@ -580,35 +605,8 @@ if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then
 fi

 create_new_dir "${PORT_WINE_PATH}/data/prefixes"
-try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}"
-if [[ -d "${PORT_WINE_PATH}/data/pfx" ]] ; then 
-    mv -f "${PORT_WINE_PATH}/data/pfx" "${PORT_WINE_PATH}/data/prefixes/DEFAULT"
-    orig_IFS="$IFS"
-    IFS=$'\n'
-    for change_path in `grep -il "/data/pfx/" "${HOME}/.local/share/applications"/*.desktop` ; do
-        sed -i 's%/data/pfx/%/data/prefixes/DEFAULT/%g' "${change_path}"
-    done
-    for change_path in `grep -il "/data/pfx/" "${PORT_WINE_PATH}"/*.desktop` ; do
-        sed -i 's%/data/pfx/%/data/prefixes/DEFAULT/%g' "${change_path}"
-    done
-    IFS="$orig_IFS"
-    rm -f "${PORT_WINE_PATH}/drive_c"
-fi
-
-if [[ -d "${PORT_WINE_PATH}/data/pfx_dotnet" ]] ; then 
-    mv -f "${PORT_WINE_PATH}/data/pfx_dotnet" "${PORT_WINE_PATH}/data/prefixes/DOTNET"
-    orig_IFS="$IFS"
-    IFS=$'\n'
-    for change_path in `grep -il "/data/pfx_dotnet/" "${HOME}/.local/share/applications"/*.desktop` ; do
-        sed -i 's%/data/pfx_dotnet/%/data/prefixes/DOTNET/%g' "${change_path}"
-    done
-    for change_path in `grep -il "/data/pfx_dotnet/" "${PORT_WINE_PATH}"/*.desktop` ; do
-        sed -i 's%/data/pfx_dotnet/%/data/prefixes/DOTNET/%g' "${change_path}"
-    done
-    IFS="$orig_IFS"
-fi
 create_new_dir "${PORT_WINE_PATH}/data/prefixes/DOTNET"
-
+try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}"

 orig_IFS="$IFS"
 IFS=$'\n'
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@ -151,7 +151,7 @@ portwine_start_debug () {
        echo "!!!gamemod not found!!!"  >> "${PORT_WINE_PATH}/${portname}.log"
    fi
    echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    if [[ "${PW_D3D_EXTRAS_DISABLE}" == 1 ]]
+    if [[ "${PW_USE_D3D_EXTRAS}" != 1 ]]
    then echo "D3D_EXTRAS - disabled" >> "${PORT_WINE_PATH}/${portname}.log"
    else echo "D3D_EXTRAS - enabled" >> "${PORT_WINE_PATH}/${portname}.log"
    fi
@ -398,7 +398,7 @@ pw_edit_db () {
    PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \
    PW_USE_NVAPI_AND_DLSS PW_WINE_FULLSCREEN_FSR PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP \
    PW_WINEDBG_DISABLE PW_USE_TERMINAL PW_WINE_ALLOW_XIM PW_HEAP_DELAY_FREE PW_GUI_DISABLED_CS PW_USE_GSTREAMER \
-    PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_D3D_EXTRAS_DISABLE PW_FIX_VIDEO_IN_GAME PW_USE_AMDVLK_DRIVER \
+    PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_USE_AMDVLK_DRIVER \
    PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE
    if [ "$?" == 0 ] ; then
        /usr/bin/env bash -c ${pw_full_command_line[*]} &
@ -421,22 +421,14 @@ pw_autoinstall_from_db () {
    export PW_DISABLED_CREATE_DB=1
    export PW_MANGOHUD=0
    export ENABLE_VKBASALT=0
+    export PW_USE_D3D_EXTRAS=1
    . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}"
 }

-gui_about_portproton () {
-    "${pw_yad_new}" --about --pname=PortProton  \
-    --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
-    --pversion="${install_ver}\n(scripts v. ${scripts_install_ver})" \
-    --image=help-about \
-    --copyright="Copyright © 2022 Castro-Fidel (PortWINE-Linux.ru)" \
-    --comments="Порт для запуска Windows игр и приложений в GNU/Linux" \
-    --license=MIT \
-    --authors="Castro-Fidel",,"Выражаем особую благодарность в помоще проекту:",Cefeiko,Dezert1r,Taz_mania,Anton_Famillianov,gavr,RidBowt,chal55rus,UserDiscord \
-    --website=portwine-linux.ru/ \
-    --website-label=portwine-linux.ru
+gui_credits () {
+    . "${PORT_SCRIPTS_PATH}/credits"
 }
-export -f gui_about_portproton
+export -f gui_credits

 ###MAIN###
 PW_PREFIX_NAME="$(echo "${PW_PREFIX_NAME}" | sed -e s/[[:blank:]]/_/g)"
@ -607,8 +599,8 @@ else
    --field="   $loc_gui_upd_pp"!""!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
    --field="   $loc_gui_changelog"!""!"":"FBTN" '@bash -c "button_click open_changelog"' \
    --field="   $loc_gui_edit_usc"!""!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \
-    --field="   $loc_gui_scripts_fb"!""!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' &
-    # --field="   $loc_gui_about_us"!""!"":"FBTN" '@bash -c "button_click gui_about_portproton"' &
+    --field="   $loc_gui_scripts_fb"!""!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \
+    --field="   $loc_gui_credits"!""!"":"FBTN" '@bash -c "button_click gui_credits"' &

    "${pw_yad_new}" --plug=${KEY} --tabnum=3 --columns=3 --align-buttons --form --separator=";" \
    --field="  3D API  : :CB" "VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL!GALLIUM_NINE (native DX9 on MESA)" \
@ -731,7 +723,7 @@ case "$PW_YAD_SET" in
    open_changelog) open_changelog ;;
    120) gui_vkBasalt ;;
    pw_create_prefix_backup) pw_create_prefix_backup ;;
-    gui_about_portproton) gui_about_portproton ;;
+    gui_credits) gui_credits ;;
    PW_*) pw_autoinstall_from_db ;;
 esac

--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2108
+#SCRIPTS_NEXT_VERSION=2119
 ########################################################################
 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
@ -12,34 +12,35 @@ export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,
 export PW_RT_MOUNT_RO=("")
 export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}")
 #export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}"
-export PW_NO_ESYNC=1
-export PW_USE_GAMEMODE=1
-export PW_FORCE_USE_VSYNC=2
-export PW_LOG=0
+export PW_NO_ESYNC="1"
+export PW_USE_GAMEMODE="1"
+export PW_FORCE_USE_VSYNC="2"
+export PW_LOG="0"
 export PW_TERM=""
-export PW_USE_TERMINAL=0
-export PW_WINEDBG_DISABLE=1
+export PW_USE_TERMINAL="0"
+export PW_WINEDBG_DISABLE="1"
 export PW_WINDOWS_VER="10"
 export WINEARCH="win64"
-export PW_LIBS_VER="_v30"
+export PW_LIBS_VER="_v31"
 export PORTWINE_URL="https://portwine-linux.ru/"
 export GDK_BACKEND="x11"
 export PW_USE_GSTREAMER="1"
+export PW_USE_D3D_EXTRAS="1"
 export PW_PREFIX_NAME="DEFAULT"
 export WINE_WIN_START="start.exe /i /unix"
-export PW_USE_SHADER_CACHE=1
-export STAGING_SHARED_MEMORY=1
-export PW_FORCE_LARGE_ADDRESS_AWARE=1
+export PW_USE_SHADER_CACHE="1"
+export STAGING_SHARED_MEMORY="1"
+export PW_FORCE_LARGE_ADDRESS_AWARE="1"
 ###DEFAULT_WINE###
-export PW_WINE_USE=PROTON_GE
+export PW_WINE_USE="PROTON_GE"
 export PW_PLUGINS_VER="_v5"
 ###WINE_PROTON_STEAM###
-export PW_STEAM_VER="7.0-2"
+export PW_STEAM_VER="7.0-3"
 export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}"
 ###WINE_PROTON_GE###
-export PW_GE_VER="7-18"
+export PW_GE_VER="7-20"
 export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
-export PW_WINE_FULLSCREEN_FSR=0
+export PW_WINE_FULLSCREEN_FSR="0"
 ###WINE_PROTON_PW_FOR_GALLIUM_NINE###
 export PW_PW_VER="7.5"
 export PW_PROTON_PW_VER="PROTON_PW_${PW_PW_VER}"
@ -48,10 +49,11 @@ pw_install_dll_in_prefix ()
 {
    case $PW_PREFIX_NAME in
        DEFAULT) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019" ;;
-         DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 dotnet20sp2 dotnet48 faudio" ;;
+         DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;;
              *) export PW_MUST_HAVE_DLL="" ;;
    esac
 }
+########################################################################
 add_in_start_portwine ()
 {
    echo " "
--- a/data_from_portwine/scripts/zen_yad_gui
+++ b/data_from_portwine/scripts/zen_yad_gui
@ -143,6 +143,7 @@ pw_tray_icon () {
  ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/port_winefile.png"|| \
  ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"|| \
  ${loc_tray_force_exit}    !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"||" & 
+
    return 0
 }
Author	SHA1	Message	Date
Castro_Fidel	bab528078e	Scripts version 2119	2022-06-21 21:12:10 +03:00
Castro_Fidel	d2410479d8	Scripts version 2118	2022-06-15 23:02:23 +03:00
castro-fidel	366cd15995	Scripts version 2117	2022-06-06 21:35:16 +03:00
Castro-Fidel	3f0f52669f	Merge pull request #16 from an9949an/master Add info to README.md	2022-06-06 12:54:12 +03:00
Andrew Kravtsov	f74a051301	Add info to README.md	2022-06-06 11:54:17 +03:00
castro-fidel	29fea96413	Scripts version 2116	2022-06-04 12:17:25 +03:00
castro-fidel	6103a61657	Scripts version 2115	2022-05-31 20:37:54 +03:00
castro-fidel	caa498a99d	Scripts version 2114	2022-05-31 15:55:02 +03:00
castro-fidel	da38a958ac	Scripts version 2113	2022-05-31 15:25:48 +03:00
castro-fidel	bcc3387749	Scripts version 2112.1	2022-05-31 15:16:28 +03:00
castro-fidel	564ed9aaf6	Scripts version 2112	2022-05-31 15:11:57 +03:00
castro-fidel	3ba7742e7f	Scripts version 2111	2022-05-31 15:07:17 +03:00
castro-fidel	efaeef7749	Scripts version 2110	2022-05-30 22:40:28 +03:00
castro-fidel	5fa3dd120c	Scripts version 2109	2022-05-28 14:39:08 +03:00