diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 46f05efaf78dd3fe731426b22cfaceb5a8889b6b..2a9a831201fd7dc977ab164be9e6924f29e47bea 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 2226### Date: 09.10.2023 / Download update size: 8 megabytes +* updated autoinstall scripts (thanks Boria138) +* minor improvements + ###Scripts version 2225### Date: 08.10.2023 / Download update size: 8 megabytes * improved log creation mode * the inclusion of "USE_SYSTEM_VK_LAYERS" has been added to the "SETTINGS" tab, which makes it possible to use the system mangohud, vkBasalt, obs-vkcapture and others diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 6aca11eba03d0ff0d40ed28f44953cd949084312..dd796478a3bce8c07659f78253a98ad156b9f1d4 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,10 +2,14 @@ ----------------------------------------- Рстория изменений: +###Scripts version 2226### Дата: 09.10.2023 / Размер скачиваемого обновления: 8 мегабайт +* обновлены автоустановки лончеров (спасибо Boria138) +* небольшие исправления скриптов + ###Scripts version 2225### Дата: 08.10.2023 / Размер скачиваемого обновления: 8 мегабайт * улучшен режим создания лога * РІРѕ вкладку "РќРђРЎРўР РћРРўР¬" добавлено включение "USE_SYSTEM_VK_LAYERS" что дает возможность использовать системные mangohud, vkBasalt, obs-vkcapture Рё прочие -* РІРѕ вкладку "РќРђРЎРўР РћРРўР¬" добавлена включение "USE_OBS_VKCAPTURE" что дает возможность записи РІ OBS Studio СЃ помощью obs-vkcapture (Р’РќРРњРђРќРР•: будет включено принудительное использование системных mangohud, vkBasalt, obs-vkcapture Рё прочих приложений использующих vulkan layers) +* РІРѕ вкладку "РќРђРЎРўР РћРРўР¬" добавлено включение "USE_OBS_VKCAPTURE" что дает возможность записи РІ OBS Studio СЃ помощью obs-vkcapture (Р’РќРРњРђРќРР•: будет включено принудительное использование системных mangohud, vkBasalt, obs-vkcapture Рё прочих приложений использующих vulkan layers) * обновлена установка League of Legends ###Scripts version 2224### Дата: 28.09.2023 / Размер скачиваемого обновления: 210 мегабайт diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 873805fb0ef1ef43d57df3cd91e9d0780bccabe5..fc2214bf2ca7060069c55b93f65a2bf020ce6534 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -113,7 +113,6 @@ if [[ "${update_loc}" == "RUS" ]] ; then export PW_VIRTUAL_DESKTOP_INFO='Включить запуск приложение РІ виртуальном рабочем столе WINE' export PW_WINEDBG_DISABLE_INFO='Отключить РІСЃРµ функции отладки WINE (Рекомендуется РЅРµ изменять значение)' export PW_USE_TERMINAL_INFO='Запускать приложение РІ терминале' - export PW_WINE_ALLOW_XIM_INFO='Рспользовать альтернативный режим для контроллера (Рспользовать только РІ случае проблем СЃ контроллером)' export PW_HEAP_DELAY_FREE_INFO='Включить задержку освобождения некоторой памяти, чтобы обойти ошибки, связанные СЃ использованием приложения после освобождения памяти.' export PW_NO_WRITE_WATCH_INFO='Очень опасный СЃРїРѕСЃРѕР± взлома таймера записи РІ памяти РІ ntdll. Рто улучшает производительность некоторых очень специфических РёРіСЂ. (Рекомендуется РЅРµ изменять значение)' export PW_GUI_DISABLED_CS_INFO='Отключить РѕРєРЅРѕ выбора режимов запуска Рё версии WINE' @@ -369,7 +368,6 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export PW_VIRTUAL_DESKTOP_INFO='Enable the application to run in the WINE virtual desktop' export PW_WINEDBG_DISABLE_INFO='Disable all WINE debugging functions (It is recommended not to change the value)' export PW_USE_TERMINAL_INFO='Run the application in the terminal' - export PW_WINE_ALLOW_XIM_INFO='Use alternate mode for controller (Use only if there is a problem with the controller)' export PW_HEAP_DELAY_FREE_INFO='Include a delay in releasing some memory to bypass errors associated with using the application after the memory is released' export PW_NO_WRITE_WATCH_INFO='A very dangerous way to hack the memory write timer in ntdll. This improves the performance of some very specific games. (It is recommended not to change the value.)' export PW_GUI_DISABLED_CS_INFO='Disable the window for selecting startup modes and WINE versions' diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default index fccd01b6b17a66285aa43179134a2d96810e9459..f6c9e453d7ae7718a07daef4cb7ceee67d585026 100755 --- a/data_from_portwine/scripts/portwine_db/default +++ b/data_from_portwine/scripts/portwine_db/default @@ -36,7 +36,6 @@ ##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HEAP_DELAY_FREE=1 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread ##export WINEARCH=win32 # defaut = win64 ##export WINEPREFIX= diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 4f35ba60808c14c02126fe673a94a4075d7a6a29..81c1614f289f0e2946a2a6bb031f3ae2ad9648e9 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -67,23 +67,18 @@ start_portwine () { fi pw_init_runtime - + + check_variables VKD3D_DEBUG none + check_variables DXVK_LOG_LEVEL none + check_variables VK_LOADER_DEBUG none + check_variables VKBASALT_LOG_LEVEL none + check_variables DXVK_NVAPI_LOG_LEVEL none if [[ "${PW_LOG}" == 1 ]] ; then export WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg" - export DXVK_LOG_LEVEL="err" - export VKD3D_DEBUG="err" export WINE_MONO_TRACE="E:System.NotImplementedException" - export VK_LOADER_DEBUG="none" - export VKBASALT_LOG_LEVEL="none" - export DXVK_NVAPI_LOG_LEVEL="err" else export WINEDEBUG="-all" - export DXVK_LOG_LEVEL="none" - export VKD3D_SHADER_DEBUG="none" - export VKD3D_DEBUG="none" - export DXVK_LOG_PATH="none" - export VKBASALT_LOG_LEVEL="none" - export DXVK_NVAPI_LOG_LEVEL="none" + unset WINE_MONO_TRACE fi if [[ "${PW_NO_ESYNC}" == 1 ]] @@ -380,7 +375,7 @@ start_portwine () { create_new_dir "${PW_VULKAN_DIR}/opengl" PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/opengl" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/opengl" - + if [[ "${PW_VULKAN_USE}" == "0" ]] ; then print_info "Use OpenGL" export GL_YIELD="NOTHING" @@ -473,8 +468,8 @@ start_portwine () { fi if [[ "${PW_DX12_DISABLE}" == 1 ]] - then var_winedlloverride_update "d3d12,d3d12core,libvkd3d-1=" - else var_winedlloverride_update "d3d12,d3d12core,libvkd3d-1=n" + then var_winedlloverride_update "d3d12,d3d12core=" + else var_winedlloverride_update "d3d12,d3d12core=n" fi if [[ ! -d "${WINEPREFIX}/drive_c/vrclient/bin" ]] ; then @@ -622,7 +617,8 @@ pw_run () { echo "Log WINE:" >> "${PW_LOG_TO_FILE}" echo "" print_debug "Log from RUNTIME and WINE:" - env ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ + env ${optirun_on} ${PW_GAMEMODERUN_SLR} \ + NO_AT_BRIDGE=0 ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ @@ -637,7 +633,8 @@ pw_run () { fi echo "" print_debug "Log from RUNTIME and WINE:" - env ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ + env ${optirun_on} ${PW_GAMEMODERUN_SLR} \ + NO_AT_BRIDGE=0 ${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 50ce408018685efcdfc94306d9f8381cdb935dce..21a6883193db31b366fb5a810babb5fda88d0d00 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -120,8 +120,7 @@ portwine_start_debug () { fi echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Version WINE in the Port:" >> "${PORT_WINE_PATH}/${portname}.log" - print_var PW_WINE_USE >> "${PORT_WINE_PATH}/${portname}.log" - [ -f "${WINEDIR}/version" ] && cat "${WINEDIR}/version" >> "${PORT_WINE_PATH}/${portname}.log" + echo "$PW_WINE_USE" >> "${PORT_WINE_PATH}/${portname}.log" echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Date and time of start debug for ${portname}:" >> "${PORT_WINE_PATH}/${portname}.log" date >> "${PORT_WINE_PATH}/${portname}.log" @@ -216,10 +215,7 @@ portwine_start_debug () { done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v12_3}" --text-info --tail --button="STOP":0 --title="DEBUG" \ --skip-taskbar --width=800 --height=400 --text "${port_debug}" 2>/dev/null && kill_portwine -# sleep 1 && zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap &> /dev/null && kill_portwine sed -i '/.fx$/d' "${PORT_WINE_PATH}/${portname}.log" - sed -i '/kerberos/d' "${PORT_WINE_PATH}/${portname}.log" - sed -i '/ntlm/d' "${PORT_WINE_PATH}/${portname}.log" sed -i '/HACK_does_openvr_work/d' "${PORT_WINE_PATH}/${portname}.log" sed -i '/Uploading is disabled/d' "${PORT_WINE_PATH}/${portname}.log" deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++') @@ -436,13 +432,13 @@ pw_edit_db () { PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \ - PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE + PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE if [ "$?" == 0 ] ; then print_info "Restarting PP after update ppdb file..." /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 fi - # PW_WINE_ALLOW_XIM PW_FORCE_USE_VSYNC PW_WINEDBG_DISABLE PW_USE_AMDVLK_DRIVER + # PW_FORCE_USE_VSYNC PW_WINEDBG_DISABLE PW_USE_AMDVLK_DRIVER HEAP_DELAY_FREE } pw_autoinstall_from_db () { diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ddfeedf6030562d059110c3f8f43d8719c62596d..1c5bd5d707ea3fd2d0e23d43d0c6651312b47170 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=2225 +#SCRIPTS_NEXT_VERSION=2226 ######################################################################## 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