From 8d04691db561f83855bcdf926b8afecc5d9ab32a Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Fri, 29 Mar 2024 14:31:39 +0300
Subject: [PATCH] Scripts version 2269

---
 data_from_portwine/changelog_eng              |  4 ++++
 data_from_portwine/changelog_rus              |  4 ++++
 data_from_portwine/scripts/functions_helper   | 23 +++++++++++--------
 .../scripts/portwine_db/HorizonForbiddenWest  | 15 ++++++++++++
 data_from_portwine/scripts/runlib             | 11 +++++----
 data_from_portwine/scripts/start.sh           |  7 ++++--
 data_from_portwine/scripts/var                |  2 +-
 7 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 data_from_portwine/scripts/portwine_db/HorizonForbiddenWest

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index a5e243d..d295a12 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2269### Date: 29.03.2024 / Download update size: 15 megabytes
+* added improvements when using the system WINE
+* the preparation of PortProton scripts for working in flatpak has been completed
+
 ###Scripts version 2268### Date: 27.03.2024 / Download update size: 15 megabytes
 * fixed the launch of some 32-bit games on the DEFAULT prefix. Examples:
     LEGO Marvel Super Heroes
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 3a9a6d0..a12b485 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,10 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2269### Дата: 29.03.2024 / Размер скачиваемого обновления: 15 мегабайт
+* добавлены улучшения при использовании cистемного WINE
+* завершена подготовка скриптов PortProton для работы во flatpak
+
 ###Scripts version 2268### Дата: 27.03.2024 / Размер скачиваемого обновления: 15 мегабайт
 * исправлен запуск некоторых 32-х битных игр на префиксе DEFAULT. Примеры:
     LEGO Marvel Super Heroes
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 6c46c8e..1a6614a 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -425,23 +425,29 @@ check_user_conf () {
 }
 
 init_wine_ver () {
+    if [[ "${PW_WINE_VER}" == "USE_SYSTEM_WINE" ]]
+    then export PW_WINE_USE="USE_SYSTEM_WINE"
+    elif [[ ! -z "${PW_WINE_VER}" ]]
+    then export PW_WINE_USE="$PW_WINE_VER"
+    fi
+    unset PW_WINE_VER
+
     if [[ "${PW_WINE_USE}" == "USE_SYSTEM_WINE" ]] \
     && command -v wine &>/dev/null ; then
         if ! check_flatpak ; then
             export WINEDIR="$RT_PREFIX/usr"
-            export WINE="$RT_PREFIX/$(command -v wine)"
+            export WINE="$RT_PREFIX$(command -v wine)"
             export WINELOADER="$WINE"
-            export WINESERVER="$RT_PREFIX/$(command -v wineserver)"
-            export PW_USE_RUNTIME=0
+            export WINESERVER="$RT_PREFIX$(command -v wineserver)"
             export PW_NO_FSYNC=1
         else
             export WINEDIR="$RT_PREFIX/app"
             export WINE="$RT_PREFIX/app/bin/wine"
             export WINELOADER="$WINE"
             export WINESERVER="$RT_PREFIX/app/bin/wineserver"
-            export PW_USE_RUNTIME=0
             export PW_NO_FSYNC=1
         fi
+        unset WINEDLLPATH
     else
         if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then
         orig_IFS="$IFS"
@@ -465,9 +471,6 @@ init_wine_ver () {
         elif [[ "$PW_WINE_USE" == WINE_LG ]]
         then export PW_WINE_USE="${PW_WINE_LG_VER}"
         fi
-        [ ! -z "${PW_WINE_VER}" ] && export PW_WINE_USE=`echo "${PW_WINE_VER}" | tr [[:lower:]] [[:upper:]]`
-        [ ! -z "${PW_WINE_USE}" ] && export PW_WINE_USE=`echo "${PW_WINE_USE}" | tr [[:lower:]] [[:upper:]]`
-        unset PW_WINE_VER
 
         export WINEDIR="${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}"
         export WINE="${WINEDIR}/bin/wine"
@@ -556,7 +559,10 @@ init_wine_ver () {
 }
 
 pw_init_runtime () {
-    if [[ "$PW_USE_RUNTIME" != 1 ]] || check_flatpak ; then
+    if [[ "$PW_USE_RUNTIME" != 1 ]] \
+    || [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]] \
+    || check_flatpak
+    then
         export pw_runtime=""
         return 0
     fi
@@ -1140,7 +1146,6 @@ pw_init_db () {
         fi
         if [[ -f "${PORTWINE_DB_FILE}" ]] ; then
             . "${PORTWINE_DB_FILE}"
-
             init_wine_ver && 
             print_info "Use ${PORTWINE_DB_FILE} db file."
         fi
diff --git a/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest b/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest
new file mode 100644
index 0000000..e1279ad
--- /dev/null
+++ b/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#Author: fidel
+#HorizonForbiddenWest.exe
+#Rating=1-5
+#####################examples###########################
+export PW_WINDOWS_VER="10"
+export PW_DLL_INSTALL=""
+export WINEDLLOVERRIDES=""
+export PW_VULKAN_USE="2"
+export PW_USE_GSTREAMER="1"
+export PW_USE_D3D_EXTRAS="1"
+export PW_FIX_VIDEO_IN_GAME="1"
+export PW_USE_SHADER_CACHE="0"
+export PW_USE_EAC_AND_BE="0"
+export LAUNCH_PARAMETERS="-EpicPortal"
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 1a32c94..5cd09a0 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -675,7 +675,10 @@ pw_run () {
     print_var "VULKAN_API_DRIVER_VERSION" "VKD3D_CONFIG" "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2"
     print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH"
     kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" &>/dev/null
-    if [[ "$PW_USE_RUNTIME" == 1 ]] ; then
+    if [[ "$PW_USE_RUNTIME" == 1 ]] \
+    && [[ "$PW_WINE_USE" != "USE_SYSTEM_WINE" ]] \
+    && ! check_flatpak
+    then
         if [[ "${PW_LOG}" == 1 ]] ; then
             if check_start_from_steam ; then
                 for VAR_LOGGER in PW_WINE_USE WINEDIR WINEDLLPATH WINEPREFIX PATH_TO_GAME PW_VULKAN_USE PW_LD_LIBRARY_PATH LD_LIBRARY_PATH PATH \
@@ -743,7 +746,7 @@ pw_run () {
             echo "Log WINE:" >> "${PW_LOG_TO_FILE}"
             echo ""
             print_info "Log WINE:"
-            env \
+            env FAKE_VAR= \
             ${PW_GAMEMODERUN_SLR} \
             ${PW_MANGOHUD_SLR} \
             "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
@@ -754,7 +757,7 @@ pw_run () {
             echo ""
             echo "Log WINE:" > "${PW_LOG_TO_FILE}"
             print_info "Log WINE:"
-            env \
+            env FAKE_VAR= \
             ${PW_GAMEMODERUN_SLR} \
             ${PW_MANGOHUD_SLR} \
             "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]}
@@ -793,7 +796,7 @@ unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PO
 unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PORTWINE_CREATE_SHORTCUT_NAME FLATPAK_IN_USE
 unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
 unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
-unset MANGOHUD_CONFIG
+unset MANGOHUD_CONFIG PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME
 
 export portname=PortProton
 
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 2b70fa6..7966ace 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -569,7 +569,8 @@ IFS=$IFS_OLD
 export PW_ADD_PREFIXES_TO_GUI="${PW_PREFIX_NAME^^}${PW_ADD_PREFIXES_TO_GUI}"
 
 PW_ALL_DIST=$(ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"${PW_WINE_LG_VER}$//g" | sed -e s/"${PW_PROTON_LG_VER}$//g")
-if command -v wine &>/dev/null
+if command -v wine &>/dev/null \
+&& ! check_flatpak
 then DIST_ADD_TO_GUI="!USE_SYSTEM_WINE"
 else unset DIST_ADD_TO_GUI
 fi
@@ -917,7 +918,9 @@ esac
 init_wine_ver
 
 if [[ "${PW_DISABLED_CREATE_DB}" != 1 ]] ; then
-    if [[ ! -z "${PORTWINE_DB}" ]] && [[ -z "${PORTWINE_DB_FILE}" ]] ; then
+    if [[ ! -z "${PORTWINE_DB}" ]] \
+    && [[ -z "${PORTWINE_DB_FILE}" ]]
+    then
         PORTWINE_DB_FILE=$(grep -il "\#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/*)
         if [[ -z "${PORTWINE_DB_FILE}" ]] ; then
             echo "#!/usr/bin/env bash"  > "${portwine_exe}".ppdb
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 50c774a..89f2dbf 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2268
+#SCRIPTS_NEXT_VERSION=2269
 ########################################################################
 export PW_MANGOHUD="0"
 export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"