CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

###Scripts version 1066###

Browse Source
This commit is contained in:
castro-fidel 2021-05-04 13:26:42 +03:00
parent 7168b32480
commit 447c314ded
11 changed files with 133 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data_from_portwine/changelog
View File

@ -1,6 +1,8 @@
История изменений и дальнейшие планы:
-----------------------------------------
В планах:
* проверить Overwatch
* проверить первый запуск после автоустановки на выбор режима запуска (Vulkan), проверить пересоздание ярлыков
* перенести reset в GUI PortProton
* добавить фикс установки dotnet
* добавить кнопку очистки префикса в PortProton
@ -13,10 +15,21 @@
* добавить контроль за окнами для правильного отключения прогресс бара
* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
-----------------------------------------
###Scripts version 1061###
###Scripts version 1066###
* виртуальный рабочий стол включенный из db файла, или глобально из скрипта "var" исправно работает с любой игрой/программой
* фикс работы переменной "PW_GUI_DISABLED_CS=1" прописанной в .desktop файле
* улучшеный режим запуска всех приложений с помощью аргументов start /b /unix
###Scripts version 1062, 1063, 1064 и 1065###
* HOTFIX - убрана переменная PW_VULKAN_USE из скрипта runlib
###PortProton-78### 03.05.2021 ###Scripts version 1061###
* обновлен Proton 6.3 (стабильная ветка + патченный netprofm.dll)
* полностью исправлена проблема с фокусом мыши
* отключена авто отчистка префикса во время обновления порта
* в GUI изменен цвет ссылок url на красный
* частичная чистка кода
* проверка и удаление scripts.tar.xz перед обновлением
* HOTFIX - исправлено ложное срабатывание проверки скачивания (проверка успешного скачивания/распаковки всех компонентов и удаление архивов если одно из условий не истина)
* при ошибке скачивания одного из компонентов PortProton добавлено оповещение с автоматическим перезапуском.
###Scripts version 1060###
@ -27,7 +40,7 @@
* вместо vcrun2015-2017 принудительно ставится vcrun2019 (так как имеет кумулятивные обновления)
###PortProton-77### 01.05.2021 ###Scripts version 1057###
* Обновлен Proton Experimental от 29.04.2021
* обновлен Proton Experimental от 29.04.2021
* используется default_pfx при создании нового префикса
* фикс выбора режима запуска при уже созданном ярлыке, но отсутствующем PW_VULKAN_USE

BIN
data_from_portwine/dist/lib/wine/netprofm.dll vendored
View File

Binary file not shown.

BIN
data_from_portwine/dist/lib64/wine/netprofm.dll vendored
View File

Binary file not shown.

3
data_from_portwine/scripts/portwine_db/Battle.net_Launcher
View File

@ -2,12 +2,13 @@
#Author: dez
#Battle.net Launcher.exe
#Battle.net-Setup.exe
#Battle.net.exe
#Rating=5
################################################
##export PW_VULKAN_USE=dxvk
export LAUNCH_PARAMETERS=""
export WINEDLLOVERRIDES="locationapi="
export PW_DLL_INSTALL="vcrun2017 d3dx11_42 d3dx11_43"
export PW_DLL_INSTALL="vcrun2019 d3dx11_42 d3dx11_43"
export PW_WINDOWS_VER=10
export PW_NVAPI_DISABLE=1

3
data_from_portwine/scripts/portwine_db/GalaxyClient
View File

@ -4,8 +4,7 @@
#GOG_Galaxy_2.0.exe
#Rating=1-5
################################################
export PW_VULKAN_USE=dxvk
export WINEDLLOVERRIDES="galaxycommunication.exe=n"
export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2="
export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated"
export PW_DLL_INSTALL="vcrun2017 vcrun6 mfc140"
ADD_IN_START_PORTWINE ()

3
data_from_portwine/scripts/portwine_db/WorldOfTanks
View File

@ -4,5 +4,6 @@
#Rating=5
################################################
export PW_VULKAN_USE=dxvk #dxvk, vkd3d or 0 for OpenGL
export PW_DLL_INSTALL="lucida" # Install DDL in port prefix (used winetricks)
export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used winetricks)
export WINEDLLOVERRIDES="xaudio2_7="
export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG

9
data_from_portwine/scripts/portwine_db/wgc
View File

@ -5,13 +5,14 @@
################################################
#export PW_VULKAN_USE=dxvk #dxvk, vkd3d or 0 for OpenGL
export LAUNCH_PARAMETERS="--disable-gpu" # Additional launch options
export PW_USE_TERMINAL=1
export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP
#export PW_USE_TERMINAL=1
#export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP
export PW_NVAPI_DISABLE=1
export WINEDLLOVERRIDES="ucrtbase=b,n"
#export WINEDLLOVERRIDES="xaudio2_7=n"
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
ADD_IN_START_PORTWINE () {
sed -i 's/true/false/g' "$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/preferences.xml"
}

16
data_from_portwine/scripts/runlib
View File

@ -161,7 +161,7 @@ PW_LOAD_LIBS () {
try_remove_dir "${HOME}/.PortWINE/libs${pw_libs_ver}"
try_remove_file "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
`zenity --error --title "Error..." \
--text "Failed to download runtime libraries.\nCheck internet connection and press OK" \
--text "Failed to install runtime libraries.\nCheck internet connection and press OK" \
--no-wrap ` > /dev/null 2>&1 && PW_LOAD_LIBS
fi
else
@ -671,7 +671,7 @@ PW_INIT_PFX () {
try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
[ "$?" == 0 ] && var_winedlloverride_update "${wine_dxvk_dll}=n"
done
#var_winedlloverride_update "d3d12="
var_winedlloverride_update "d3d12="
echo "Use DXVK version ${PW_DXVK_VER} (DX9-DX11 to Vulkan)"
else
for wine_vkd3d_dll in d3d12 ; do
@ -680,7 +680,6 @@ PW_INIT_PFX () {
[ "$?" == 0 ] && var_winedlloverride_update "${wine_vkd3d_dll}=n"
done
if [ ! -z "${PW_DXGI_FROM_DXVK}" ] && [ "${PW_DXGI_FROM_DXVK}" != 0 ] ; then
for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do
try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
@ -788,6 +787,7 @@ export WINEDIR="${PORT_WINE_PATH}"/data/dist
export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}"
export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}"
export WINE_WIN_START="${WINEPREFIX}/drive_c/windows/system32/start.exe"
export PW_RUNTIME="$WINELIB/run.sh"
export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
export PW_VULKAN_DLL="${HOME}/.PortWINE/vulkan"
@ -795,6 +795,16 @@ export PW_DXVK_VER="${PW_DEF_DXVK_VER}"
export PW_VKD3D_VER="${PW_DEF_VKD3D_VER}"
export install_ver=`cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1`
export scripts_install_ver=`cat "${PORT_WINE_TMP_PATH}/scripts_ver" | head -n 1`
export PW_FORCE_DISABLED_GAMEMOD=0
export PW_FORCE_LARGE_ADDRESS_AWARE=
export PW_CHECK_AUTOINSTAL=
export PW_WINEDBG_DISABLE=1
export PW_NO_WRITE_WATCH=
export WINEDLLOVERRIDES=
export PW_VULKAN_USE=
export PW_NO_FSYNC=
export PW_NO_ESYNC=
export MANGOHUD=
if [ -z "${INSTALLING_PORT}" ] ; then
PW_LOAD_LIBS

2
data_from_portwine/scripts/setup.sh
View File

@ -57,7 +57,7 @@ done
chmod u+x "${PORT_SCRIPTS_PATH}/"*
try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/"
pw_clear_pfx
#pw_clear_pfx
if [ "${s_install}" = "1" ]; then
echo "Installation completed successfully."
else

22
data_from_portwine/scripts/start.sh
View File

@ -13,17 +13,13 @@ PORTWINE_LAUNCH () {
PORTWINE_BAT=`basename "${portwine_exe}" | grep .bat`
if [ ! -z "${PW_VIRTUAL_DESKTOP}" ] && [ "${PW_VIRTUAL_DESKTOP}" == "1" ] ; then
pw_screen_resolution=`xrandr --current | grep "*" | awk '{print $1;}' | head -1`
PW_RUN explorer "/desktop=portwine,${pw_screen_resolution}" "$portwine_exe"
PW_RUN explorer "/desktop=portwine,${pw_screen_resolution}" "$WINE_WIN_START" /b /unix "$portwine_exe"
elif [ ! -z "${PORTWINE_MSI}" ]; then
echo "PORTWINE_MSI=${PORTWINE_MSI}"
PW_RUN msiexec /i "$portwine_exe"
elif [ ! -z "${PORTWINE_BAT}" ]; then
echo "PORTWINE_BAT=${PORTWINE_BAT}"
PW_RUN explorer "$portwine_exe"
elif [ ! -z "${portwine_exe}" ]; then
PW_RUN "$portwine_exe"
elif [ ! -z "${PORTWINE_BAT}" ] || [ ! -z "${portwine_exe}" ]; then
PW_RUN "$WINE_WIN_START" /b /unix "$portwine_exe"
else
PW_RUN explorer
PW_RUN "$WINE_WIN_START" /b explorer
fi
}
PORTWINE_CREATE_SHORTCUT () {
@ -172,20 +168,20 @@ PORTWINE_DEBUG () {
}
PW_WINECFG () {
START_PORTWINE
PW_RUN winecfg
PW_RUN "$WINE_WIN_START" /b winecfg
}
PW_WINEFILE () {
START_PORTWINE
PW_RUN "explorer"
PW_RUN "$WINE_WIN_START" /b explorer
}
PW_WINECMD () {
export PW_USE_TERMINAL=1
START_PORTWINE
PW_RUN "cmd"
PW_RUN cmd
}
PW_WINEREG () {
START_PORTWINE
PW_RUN "regedit"
PW_RUN "$WINE_WIN_START" /b regedit
}
PW_WINETRICKS () {
UPDATE_WINETRICKS
@ -200,8 +196,6 @@ PW_AUTO_INSTALL_FROM_DB () {
. "$PORT_SCRIPTS_PATH/autoinstall"
$PW_YAD_SET
}
if [ ! -z "${portwine_exe}" ]; then
if [ -z "${PW_GUI_DISABLED_CS}" ] || [ "${PW_GUI_DISABLED_CS}" = 0 ] || [ -z "${PW_VULKAN_USE}" ]; then
if [ ! -z "${PORTWINE_DB_FILE}" ] && [ ! -z "${PW_VULKAN_USE}" ]; then

3
data_from_portwine/scripts/var
View File

@ -4,6 +4,7 @@
#export PW_MANGOHUD=1
#export MANGOHUD_CONFIG=full,height=500,font_size=24,position=top-left,toggle_hud=F12
#export DXVK_HUD=fps,devinfo
#export PW_VIRTUAL_DESKTOP=1
export PW_FORCE_DISABLED_GAMEMOD=0
@ -18,7 +19,7 @@ export PW_USE_TERMINAL=0
export PW_WINDOWS_VER="7"
export WINEARCH="win64"
export mono_ver=6.1.2
export mono_ver=6.1.1
export gecko_ver=2.47.2
export pw_libs_ver="_v10"