diff --git a/data_from_portwine/locales/PortProton.pot b/data_from_portwine/locales/PortProton.pot index eaf194e..16c5064 100644 --- a/data_from_portwine/locales/PortProton.pot +++ b/data_from_portwine/locales/PortProton.pot @@ -476,10 +476,6 @@ msgstr "" msgid "Use Gstreamer to output clips in games (WMF support)" msgstr "" -msgid "Increases RAM usage limits for 32-bit applications from two to four " - "gigabytes" -msgstr "" - msgid "Use container launch mode (It is recommended not to change the value)" msgstr "" diff --git a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po index ff21c01..4e45843 100644 --- a/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/es/LC_MESSAGES/PortProton.po @@ -542,12 +542,6 @@ msgstr "" msgid "Use Gstreamer to output clips in games (WMF support)" msgstr "Utilizar Gstreamer para reproducir clips en juegos (soporte de WMF)" -msgid "" -"Increases RAM usage limits for 32-bit applications from two to four gigabytes" -msgstr "" -"Aumenta los límites de uso de RAM para aplicaciones de 32 bits de dos a " -"cuatro gigabytes" - msgid "Use container launch mode (It is recommended not to change the value)" msgstr "" "Utilizar el modo de lanzamiento de contenedor (Se recomienda no cambiar el " diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po index 25b57a7..fd69c6b 100644 --- a/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po +++ b/data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po @@ -557,11 +557,6 @@ msgstr "Отключить окно выбора режимов запуска msgid "Use Gstreamer to output clips in games (WMF support)" msgstr "Использовать Gstreamer для показа видеороликов в играх (поддержка WMF)" -msgid "" -"Increases RAM usage limits for 32-bit applications from two to four gigabytes" -msgstr "" -"Увеличение лимита использования оперативной памяти для 32-битных приложений" - msgid "Use container launch mode (It is recommended not to change the value)" msgstr "" "Использовать режим запуска контейнера (рекомендуется не менять значение)" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 585e482..879d175 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3297,11 +3297,6 @@ start_portwine () { export WINE_DISABLE_WRITE_WATCH="1" fi - if [[ "${PW_FORCE_LARGE_ADDRESS_AWARE}" == 1 ]] - then export WINE_LARGE_ADDRESS_AWARE="1" - else export WINE_LARGE_ADDRESS_AWARE="0" - fi - if [[ "${PW_OLD_GL_STRING}" == 1 ]] ; then export MESA_EXTENSION_MAX_YEAR="2003" #mesa override export __GL_ExtensionStringVersion="17700" #nvidia override @@ -4278,6 +4273,15 @@ pw_run () { else cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" || : fi + + if file "$portwine_exe" | grep -q "x86-64" ; then + print_info "file: $portwine_exe is x86-64, force set WINE_LARGE_ADDRESS_AWARE to 0" + export WINE_LARGE_ADDRESS_AWARE="0" + else + print_info "file: $portwine_exe not x86-64, force set WINE_LARGE_ADDRESS_AWARE to 1" + export WINE_LARGE_ADDRESS_AWARE="1" + fi + PW_LOG_TO_FILE="${PORT_WINE_PATH}/PortProton.log" PW_LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}:${WINE_LIBRARY_PATH}" print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME" @@ -5024,9 +5028,9 @@ export -f gui_proton_downloader gui_edit_db () { KEY_EDIT_DB_GUI=$RANDOM PW_EDIT_DB_LIST=(PW_MANGOHUD PW_MANGOHUD_USER_CONF PW_VKBASALT PW_VKBASALT_USER_CONF PW_DGVOODOO2 PW_GAMESCOPE - PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_USE_FAKE_DLSS_3 PW_WINE_FULLSCREEN_FSR - PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL PW_GUI_DISABLED_CS PW_USE_GAMEMODE 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_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_USE_FAKE_DLSS_3 + PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL PW_GUI_DISABLED_CS PW_USE_GAMEMODE + PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_DISABLE_COMPOSITING PW_USE_RUNTIME PW_DINPUT_PROTOCOL PW_USE_NATIVE_WAYLAND ) @@ -5060,7 +5064,6 @@ gui_edit_db () { PW_NO_WRITE_WATCH_INFO=${translations[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.)]} PW_GUI_DISABLED_CS_INFO=${translations[Disable the window for selecting startup modes and WINE versions]} PW_USE_GSTREAMER_INFO=${translations[Use Gstreamer to output clips in games (WMF support)]} - PW_FORCE_LARGE_ADDRESS_AWARE_INFO=${translations[Increases RAM usage limits for 32-bit applications from two to four gigabytes]} PW_USE_RUNTIME_INFO=${translations[Use container launch mode (It is recommended not to change the value)]} PW_MANGOHUD_INFO=${translations[Using FPS and system load monitoring (Turns on and off by the key combination - right Shift + F12)]} PW_USE_GAMEMODE_INFO=${translations[Using automatic system optimization to improve performance in games (provided the gamemode package is installed on the system, doesn\'t work with ananicy)]} @@ -6872,7 +6875,6 @@ EOF pw_autoinstall_from_db () { export PW_USER_TEMP="${PORT_WINE_TMP_PATH}" - export PW_FORCE_LARGE_ADDRESS_AWARE=1 export PW_USE_GAMEMODE=0 export PW_CHECK_AUTOINSTALL=1 export PW_GUI_DISABLED_CS=1 diff --git a/data_from_portwine/scripts/portwine_db/ACIII.ppdb b/data_from_portwine/scripts/portwine_db/ACIII.ppdb index 34ee59c..69769a5 100644 --- a/data_from_portwine/scripts/portwine_db/ACIII.ppdb +++ b/data_from_portwine/scripts/portwine_db/ACIII.ppdb @@ -18,7 +18,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_US_LAYOUT="0" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="0" export PW_DINPUT_PROTOCOL="0" diff --git a/data_from_portwine/scripts/portwine_db/APlagueTaleInnocence_x64.ppdb b/data_from_portwine/scripts/portwine_db/APlagueTaleInnocence_x64.ppdb index 12ac8f3..88d6a2f 100644 --- a/data_from_portwine/scripts/portwine_db/APlagueTaleInnocence_x64.ppdb +++ b/data_from_portwine/scripts/portwine_db/APlagueTaleInnocence_x64.ppdb @@ -17,7 +17,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_US_LAYOUT="0" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="0" export PW_DINPUT_PROTOCOL="0" diff --git a/data_from_portwine/scripts/portwine_db/AliceMadnessReturns.ppdb b/data_from_portwine/scripts/portwine_db/AliceMadnessReturns.ppdb index 75811e8..4e28349 100644 --- a/data_from_portwine/scripts/portwine_db/AliceMadnessReturns.ppdb +++ b/data_from_portwine/scripts/portwine_db/AliceMadnessReturns.ppdb @@ -8,4 +8,3 @@ export PW_NO_FSYNC="1" export PW_NO_ESYNC="1" export PW_USE_GSTREAMER="1" export PW_WINE_USE="PROTON_LG" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" diff --git a/data_from_portwine/scripts/portwine_db/AloneInTheDark-Win64-Shipping.ppdb b/data_from_portwine/scripts/portwine_db/AloneInTheDark-Win64-Shipping.ppdb index 0b40dd2..bb1eb39 100644 --- a/data_from_portwine/scripts/portwine_db/AloneInTheDark-Win64-Shipping.ppdb +++ b/data_from_portwine/scripts/portwine_db/AloneInTheDark-Win64-Shipping.ppdb @@ -20,7 +20,6 @@ export PW_PREFIX_NAME="ALONE_IN_THE_DARK" export PW_WINE_FULLSCREEN_FSR="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_GALLIUM_ZINK="0" diff --git a/data_from_portwine/scripts/portwine_db/Bioshock2HD.ppdb b/data_from_portwine/scripts/portwine_db/Bioshock2HD.ppdb index 7282249..03dfd07 100644 --- a/data_from_portwine/scripts/portwine_db/Bioshock2HD.ppdb +++ b/data_from_portwine/scripts/portwine_db/Bioshock2HD.ppdb @@ -17,7 +17,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_US_LAYOUT="0" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="0" export PW_DINPUT_PROTOCOL="0" diff --git a/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb b/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb index 12d8c98..f2b53ce 100644 --- a/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb +++ b/data_from_portwine/scripts/portwine_db/Genshin Impact.ppdb @@ -7,4 +7,3 @@ export PW_WINDOWS_VER="10" export PW_VULKAN_USE="2" export PW_PREFIX_NAME="HO_YO_PLAY" -export PW_FORCE_LARGE_ADDRESS_AWARE="0" diff --git a/data_from_portwine/scripts/portwine_db/Matrix3.ppdb b/data_from_portwine/scripts/portwine_db/Matrix3.ppdb index 625b620..ab38721 100644 --- a/data_from_portwine/scripts/portwine_db/Matrix3.ppdb +++ b/data_from_portwine/scripts/portwine_db/Matrix3.ppdb @@ -17,7 +17,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_US_LAYOUT="0" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="0" export PW_DINPUT_PROTOCOL="0" diff --git a/data_from_portwine/scripts/portwine_db/P4G.ppdb b/data_from_portwine/scripts/portwine_db/P4G.ppdb index 05554fd..ca6f7a7 100644 --- a/data_from_portwine/scripts/portwine_db/P4G.ppdb +++ b/data_from_portwine/scripts/portwine_db/P4G.ppdb @@ -17,7 +17,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_US_LAYOUT="0" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="0" export PW_DINPUT_PROTOCOL="0" diff --git a/data_from_portwine/scripts/portwine_db/TMNT.ppdb b/data_from_portwine/scripts/portwine_db/TMNT.ppdb index 5c087c2..c22bc5c 100644 --- a/data_from_portwine/scripts/portwine_db/TMNT.ppdb +++ b/data_from_portwine/scripts/portwine_db/TMNT.ppdb @@ -17,7 +17,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_US_LAYOUT="0" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="0" export PW_DINPUT_PROTOCOL="0" diff --git a/data_from_portwine/scripts/portwine_db/TMNT2.ppdb b/data_from_portwine/scripts/portwine_db/TMNT2.ppdb index 0c45607..1454e39 100644 --- a/data_from_portwine/scripts/portwine_db/TMNT2.ppdb +++ b/data_from_portwine/scripts/portwine_db/TMNT2.ppdb @@ -17,7 +17,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_US_LAYOUT="0" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="0" export PW_DINPUT_PROTOCOL="0" diff --git a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb index 3177f3b..01b1bef 100644 --- a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb +++ b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb @@ -10,6 +10,5 @@ export WINEDLLOVERRIDES="vulkan-1=n,b" export PW_NO_ESYNC="1" export PW_USE_D3D_EXTRAS="1" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export LAUNCH_PARAMETERS="" diff --git a/data_from_portwine/scripts/portwine_db/eve.ppdb b/data_from_portwine/scripts/portwine_db/eve.ppdb index e87c35f..ba4eb50 100644 --- a/data_from_portwine/scripts/portwine_db/eve.ppdb +++ b/data_from_portwine/scripts/portwine_db/eve.ppdb @@ -21,7 +21,6 @@ export PW_USE_GSTREAMER="0" export PW_PREFIX_NAME="EVE_ONLINE" export PW_WINE_FULLSCREEN_FSR="0" export PW_USE_D3D_EXTRAS="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="0" export PW_USE_SHADER_CACHE="0" export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 tahoma arial" # msdelta export WINEDLLOVERRIDES="msvcp140,msvcp140_1=n" diff --git a/data_from_portwine/scripts/portwine_db/setup.ppdb b/data_from_portwine/scripts/portwine_db/setup.ppdb index bf634bf..3a507ab 100644 --- a/data_from_portwine/scripts/portwine_db/setup.ppdb +++ b/data_from_portwine/scripts/portwine_db/setup.ppdb @@ -10,7 +10,6 @@ export PW_MANGOHUD="0" export PW_NO_FSYNC="1" export PW_NO_ESYNC="1" export PW_USE_GAMEMODE="0" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_DLL_INSTALL="" # export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_WINE_USE="WINE_LG" diff --git a/data_from_portwine/scripts/portwine_db/warframe.ppdb b/data_from_portwine/scripts/portwine_db/warframe.ppdb index 7841511..00c3d75 100644 --- a/data_from_portwine/scripts/portwine_db/warframe.ppdb +++ b/data_from_portwine/scripts/portwine_db/warframe.ppdb @@ -7,4 +7,3 @@ export PW_WINDOWS_VER="10" export PW_VULKAN_USE="2" export PW_PREFIX_NAME="DEFAULT" export PW_USE_D3D_EXTRAS="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="0" diff --git a/data_from_portwine/scripts/portwine_db/win_install_student.ppdb b/data_from_portwine/scripts/portwine_db/win_install_student.ppdb index cead02c..c4afae6 100644 --- a/data_from_portwine/scripts/portwine_db/win_install_student.ppdb +++ b/data_from_portwine/scripts/portwine_db/win_install_student.ppdb @@ -9,7 +9,6 @@ export PW_DISABLED_CREATE_DB="1" export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" export PW_NO_FSYNC="1" export PW_NO_ESYNC="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="mscoree,mshtml=" export DISABLE_CP_DEFPFX="1" diff --git a/data_from_portwine/scripts/portwine_db/win_install_teacher.ppdb b/data_from_portwine/scripts/portwine_db/win_install_teacher.ppdb index 71725b6..b609d95 100644 --- a/data_from_portwine/scripts/portwine_db/win_install_teacher.ppdb +++ b/data_from_portwine/scripts/portwine_db/win_install_teacher.ppdb @@ -9,7 +9,6 @@ export PW_DISABLED_CREATE_DB="1" export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" export PW_NO_FSYNC="1" export PW_NO_ESYNC="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="mscoree,mshtml=" export DISABLE_CP_DEFPFX="1" diff --git a/data_from_portwine/scripts/portwine_db/witcher3.ppdb b/data_from_portwine/scripts/portwine_db/witcher3.ppdb index f0ee740..3648eef 100644 --- a/data_from_portwine/scripts/portwine_db/witcher3.ppdb +++ b/data_from_portwine/scripts/portwine_db/witcher3.ppdb @@ -19,7 +19,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_REDUCE_PULSE_LATENCY="0" export PW_USE_US_LAYOUT="0" export PW_USE_GSTREAMER="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_DINPUT_PROTOCOL="0" export PW_USE_NATIVE_WAYLAND="0" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE index 082d199..d44aa19 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -15,7 +15,6 @@ export PW_PREFIX_NAME="EVE_ONLINE" export PW_WINE_FULLSCREEN_FSR="0" export PW_USE_GAMEMODE="0" export PW_USE_D3D_EXTRAS="1" -export PW_FORCE_LARGE_ADDRESS_AWARE="0" export PW_USE_SHADER_CACHE="0" export PW_USE_EAC_AND_BE="1" export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 arial tahoma" # msdelta diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index acc9a0b..44d2317 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -31,7 +31,6 @@ export PW_WINE_CPU_TOPOLOGY="disabled" export PW_MESA_GL_VERSION_OVERRIDE="disabled" export PW_MESA_VK_WSI_PRESENT_MODE="disabled" export PW_VKD3D_FEATURE_LEVEL="disabled" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_EAC_AND_BE="1" export PW_USE_US_LAYOUT="0" export PW_GPU_USE="disabled"