Merge branch 'devel'

data_from_portwine/changelog_en

@@ -2,6 +2,18 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2424### / stable / Дата: 01.07.2025 / Download update size: 380 megabytes
+* cumulative update to the stable version of PortProton scripts
+
+###Scripts version 2423### / Date: 01.07.2025 / Download update size: 4 megabytes
+* added new version "WINE_HYP_10-10" to fix launch of game "Genshin Impact"
+(to apply fix just use autoinstall HoYoPlay again)
+
+###Scripts version 2422### / Date: 25.06.2025 / Download update size: 4 megabytes
+* fixed work of games in full screen when using native wayland
+* fixed work of third-party versions of WINE when using native wayland
+* quieter mode when using the variable START_FROM_STEAM="1"
+
 ###Scripts version 2421### / Date: 24.06.2025 / Download update size: 380 megabytes
 * with new versions of WINE and PROTON, launch under native Wayland has been fixed
 * WINE_LG has been updated to version "10-10-1" (added support for native Wayland)

data_from_portwine/changelog_ru

@@ -2,6 +2,18 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2424### / stable / Дата: 01.07.2025 / Размер скачиваемого обновления: 380 мегабайт
+* кумулятивное обновление стабильной версии скриптов PortProton
+
+###Scripts version 2423### / Дата: 01.07.2025 / Размер скачиваемого обновления: 4 мегабайта
+* добавлена новая версия "WINE_HYP_10-10" для исправления запуска игры "Genshin Impact"
+(для применения исправления просто воспользуйтесь повторно автоустановкой HoYoPlay)
+
+###Scripts version 2422### / Дата: 25.06.2025 / Размер скачиваемого обновления: 4 мегабайта
+* исправлена работа игр в полном экране при использовании нативного wayland
+* исправлена работа сторонних версий WINE при использовании нативного wayland
+* более "тихий" режим при использовании переменной START_FROM_STEAM="1"
+
 ###Scripts version 2421### / Дата: 24.06.2025 / Размер скачиваемого обновления: 380 мегабайт
 * с новыми версиями WINE и PROTON исправлен запуск под нативным Wayland
 * обновлен WINE_LG до версии "10-10-1" (добавлена поддержка нативного Wayland)

data_from_portwine/scripts/functions_helper

@@ -1696,7 +1696,7 @@ init_wine_ver () {
         WINE_LIBRARY_PATH="${WINEDIR}/lib"
         if [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]]
         then WINE_LIBRARY_PATH+=":${WINEDIR}/lib64"
-        elif [[ -d "${WINEDIR}/lib/x86_64-linux-gnu/gstreamer-1.0" ]]
+        elif [[ -d "${WINEDIR}/lib/x86_64-linux-gnu" ]]
         then WINE_LIBRARY_PATH+=":${WINEDIR}/lib/x86_64-linux-gnu:${WINEDIR}/lib/i386-linux-gnu"
         fi
 		export WINE_LIBRARY_PATH
@@ -4216,15 +4216,6 @@ start_portwine () {
         get_and_set_reg_file --add 'System\CurrentControlSet\Services\winebus' 'Enable SDL' 'REG_DWORD' "1" "system"
     fi
 
-    if [[ $PW_WINE_DPI_VALUE != "disabled" ]] ; then
-        if [[ $PW_WINE_DPI_VALUE == "recommended" ]] ; then
-            PW_RECOMMENDED_DPI=$(recommend_dpi "${PW_SCREEN_RESOLUTION:5:8}")
-            get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_RECOMMENDED_DPI" "user"
-        else
-            get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_WINE_DPI_VALUE" "user"
-        fi
-    fi
-
     if check_wayland_session \
     && [[ $PW_USE_NATIVE_WAYLAND == "1" || $PW_USE_DXVK_HDR == "1" ]]
     then
@@ -4232,11 +4223,31 @@ start_portwine () {
         export WINE_WAYLAND_HACKS="1"
         var_winedlloverride_update "winex11.drv=d;winewayland.drv=b"
         get_and_set_reg_file --add 'Software\Wine\Drivers' 'Graphics' 'REG_SZ' "x11,wayland" "user"
+
+        print_warning "Wayland in use. Force dpi=96"
+        export PW_WINE_DPI_VALUE="96"
+
+        if [[ -f "$WINEDIR/lib/libxkbregistry.so" ]] \
+        || [[ -f "$WINEDIR/lib/x86_64-linux-gnu/libxkbregistry.so" ]]
+        then print_info "runtime in use with native wayland."
+        else
+            print_warning "Wine is not support native wayland with runtime! Force disabled SLR."
+            export PW_USE_RUNTIME="0"
+        fi
     else
         unset WINE_WAYLAND_HACKS DXVK_HDR
         get_and_set_reg_file --delete 'Software\Wine\Drivers' 'Graphics'
     fi
 
+    if [[ $PW_WINE_DPI_VALUE != "disabled" ]] ; then
+        if [[ $PW_WINE_DPI_VALUE == "recommended" ]] ; then
+            PW_RECOMMENDED_DPI=$(recommend_dpi "${PW_SCREEN_RESOLUTION:5:8}")
+            get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_RECOMMENDED_DPI" "user"
+        else
+            get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_WINE_DPI_VALUE" "user"
+        fi
+    fi
+
     case "$PW_SOUND_DRIVER_USE" in
         pulse) get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "pulse" "user" ;;
          alsa) get_and_set_reg_file --add 'Software\Wine\Drivers' 'Audio' 'REG_SZ' "alsa" "user" ;;

data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb

@@ -8,5 +8,5 @@
 export PW_WINDOWS_VER="10"
 export PW_VULKAN_USE="2"
 export PW_PREFIX_NAME="HO_YO_PLAY"
-export PW_WINE_USE="WINE_LG"
+export PW_WINE_USE="WINE_HYP_10-10"
 export LAUNCH_PARAMETERS="-platform_type CLOUD_THIRD_PARTY_PC"

data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY

@@ -10,6 +10,7 @@ export PW_VULKAN_USE=2
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Hoyolauncher_installer.exe"
 export PW_PREFIX_NAME="HO_YO_PLAY"
 export PORTWINE_CREATE_SHORTCUT_NAME="HoYoPlay"
+export PW_WINE_USE="WINE_HYP_10-10"
 
 start_portwine
 

data_from_portwine/scripts/start.sh

@@ -315,7 +315,9 @@ fi
 if ! check_flatpak ; then
     if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then
         print_warning "Found lock file: ${PW_TMPFS_PATH}/portproton.lock"
-        yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0
+        if [[ $START_FROM_STEAM != "1" ]]
+        then yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0
+        fi
     fi
     touch "${PW_TMPFS_PATH}/portproton.lock"
     rm_lock_file () {
@@ -417,7 +419,9 @@ EOF
                 fi
             done < "$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/.create_shortcut"
         fi
-        yad_info "${translations[Unpack is DONE for prefix:]} <b>\"${PW_PREFIX_NAME}\"</b>."
+        if [[ $START_FROM_STEAM != "1" ]]
+        then yad_info "${translations[Unpack is DONE for prefix:]} <b>\"${PW_PREFIX_NAME}\"</b>."
+        fi
         exit 0
     fi
 fi

data_from_portwine/scripts/var

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2421
-#SCRIPTS_STABLE_VERSION=2419
+#SCRIPTS_NEXT_VERSION=2424
+#SCRIPTS_STABLE_VERSION=2424
 ########################################################################
 export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT"
 export PROTON_USE_XALIA="0"