Skip to content

Commit

Permalink
v0.77.9.7
Browse files Browse the repository at this point in the history
  • Loading branch information
VHSgunzo committed Sep 26, 2023
1 parent 9deeecb commit 7e0e2e5
Show file tree
Hide file tree
Showing 11 changed files with 77 additions and 82 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# v0.77.9.7

* Update [lwrun](https://github.com/VHSgunzo/lwrun/releases/tag/v0.39.1) packages
* Add DB script for `Wolfenstein 2009`
* Add DB script for `World in Conflict`
* Add DB script for `Command and Conquer - Red Alert 3`
* Update DB script for `WeMod` (now installation from `WeMod` setup EXE is also possible)
* Remove old DB scripts
* Fix fake Windows version in wine registry
* Update [wine-prefix](https://github.com/VHSgunzo/wine-prefix/releases/tag/v0.0.7) `v0.0.7`
* Update README.md

# v0.77.9.6

* Update [lwrun](https://github.com/VHSgunzo/lwrun) packages
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ lwrun --uninstall
- [x] SHELL mode or open file in SHELL (with access to all lux-wine functions)
- [x] CMD mode or open file in CMD
- [x] Built-in [Wine-staging](https://github.com/wine-staging/wine-staging)
- [x] Built-in [Proton GEn](https://github.com/VHSgunzo/ge-proton-lw)
- [x] Wine Manager ([Lutris](https://github.com/lutris/wine/releases), [Proton GE](https://github.com/GloriousEggroll/proton-ge-custom/releases), [Wine GE](https://github.com/GloriousEggroll/wine-ge-custom/releases), [Kron4ek](https://github.com/Kron4ek/Wine-Builds/releases))
- [x] Manage and install multiple wine/proton/dxvk/dxvk-nvapi/vkd3d/d3d_extras/dgvoodoo2 versions and on-the-fly change
- [x] DXR/RTX (Ray Tracing) (if the video adapter support and depends on [VKD3D](https://github.com/HansKristian-Work/vkd3d-proton))
Expand Down
16 changes: 0 additions & 16 deletions db/#PrinceOfPersia.lwdb

This file was deleted.

44 changes: 0 additions & 44 deletions db/#tlou-i-l.lwdb

This file was deleted.

1 change: 1 addition & 0 deletions db/RA3.lwdb
36 changes: 36 additions & 0 deletions db/WeMod.lwdb
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
pre_launch() {
if [[ "${EXE_NAME,,}" == 'wemod-'[0-9]* ]]
then
cleanwemodtmp() { [ -d "$wemodtmp" ] && rm -rf "$wemodtmp" ; }
wemodtmp="$LW_DEF_TMP/wemod-$RANDOM"
wemoddir="$WINEPREFIX/dosdevices/c:/Program Files/WeMod"
wemodexe="$wemoddir/WeMod.exe"
cleanwemodtmp
mkdir -p "$wemodtmp"
if (unzip -o "$LU_EXE" *.nupkg -d "$wemodtmp" ; \
unzip -o "$wemodtmp"/*.nupkg lib/net*/* -d "$wemodtmp")
then
[ -d "$wemoddir" ] && rm -f "$wemoddir"
mkdir -p "$(dirname "$wemoddir")"
if mv -f "$wemodtmp/lib/net"* "$wemoddir" && \
[ -f "$wemodexe" ]
then
cleanwemodtmp
export LU_EXE="$wemodexe"
lu_shortcut "$LU_EXE" 'WeMod'
cleanrun "$LW_SOURCE" "$LU_EXE"
exit $?
else
print_error yad "Failed to install: $EXE_NAME"
cleanwemodtmp
exit 1
fi
cleanwemodtmp
else
print_error yad "Failed to extract: $EXE_NAME"
cleanwemodtmp
exit 1
fi
fi
}

WIN_VER=10
WINEARCH=win64
MUST_HAVE_DLL=Disabled
Expand Down
3 changes: 3 additions & 0 deletions db/Wolf2.lwdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pre_launch() { check_exe_args '+set com_skipIntro 1' ; }

WIN_VER=10
7 changes: 7 additions & 0 deletions db/wic.lwdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre_launch() {
wicconfig="$WINEPREFIX/drive_c/users/steamuser/Documents/World in Conflict/Game Options.txt"
[ -f "$wicconfig" ] && \
sed -i 's|myDX10Flag 1|myDX10Flag 0|g' "$wicconfig"
}

WIN_VER=10
2 changes: 1 addition & 1 deletion lutris-wine
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LW_VERSION="0.77.9.6"
LW_VERSION="0.77.9.7"
35 changes: 15 additions & 20 deletions lux-wine
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

export LW_VERSION="0.77.9.6"
export LW_VERSION="0.77.9.7"
export LW_DEVELOPERS="VHSgunzo"

export RED='\033[1;91m'
Expand Down Expand Up @@ -211,7 +211,7 @@ check_def_config() {
[ ! -n "$LW_STEAMAPPS_DIR" ] && export LW_STEAMAPPS_DIR="$HOME/.local/share/Steam/steamapps/common"
[ ! -n "$CHKSTEAMAPPS" ] && export CHKSTEAMAPPS=1
[ ! -n "$RESIZABLE_BAR" ] && export RESIZABLE_BAR=1
[ ! -n "$DEFPFX_VERSION" ] && export DEFPFX_VERSION='v0.0.6'
[ ! -n "$DEFPFX_VERSION" ] && export DEFPFX_VERSION='v0.0.7'
export DEFPFX_URL="https://github.com/VHSgunzo/wine-prefix/releases/download/$DEFPFX_VERSION/defprefix.xz.lwpfx"
export DEFPFXDOTNET_URL="https://github.com/VHSgunzo/wine-prefix/releases/download/$DEFPFX_VERSION/defprefix_dotnet.xz.lwpfx"
export DEFPFX_HF_URL="https://huggingface.co/lux-wine/wine-prefix/resolve/main/releases/$DEFPFX_VERSION/defprefix.xz.lwpfx"
Expand Down Expand Up @@ -2413,6 +2413,7 @@ check_db_script() {
case "${EXE_NAME,,}" in
*'league of legends'*) export EXE_LWDBFL="$LW_DB_DIR/LeagueClient.lwdb" ;;
gog_galaxy*) export EXE_LWDBFL="$LW_DB_DIR/setup.lwdb" ;;
wemod-*) export EXE_LWDBFL="$LW_DB_DIR/WeMod.lwdb" ;;
esac
fi
fi
Expand Down Expand Up @@ -5359,37 +5360,31 @@ check_reset_pulse() {

check_win_version() {
[ -n "$1" ] && export WIN_VER="$1"
if [ ! -n "$(cat "$WINEPREFIX/system.reg" 2>/dev/null|grep -i "Microsoft Windows $WIN_VER" 2>/dev/null)" ]
if [[ ! -n "$(grep -i "ProductName.*Microsoft Windows $WIN_VER" "$WINEPREFIX/system.reg" 2>/dev/null)" || \
"$(cat "$WINEPREFIX/.winver" 2>/dev/null)" != "$WIN_VER" ]]
then
unset WINVEROK
[[ "$WIN_VER" == "xp" && "$WINEARCH" == "win64" ]] && \
export WIN_VER="xp64"
check_wine_pids
[[ ! -n "$WINE_PIDS" && -n "$OLD_WINE" ]] && unset OLD_WINE
check_ld_library
if [[ -n "$OLD_WINE" && -f "$OLD_WINE" ]]
then
DISABLE_MANGOHUD=1 DISABLE_VKBASALT=1 "$OLD_WINE" winecfg -v win$WIN_VER &>/dev/null
[ "$?" == 0 ] && export WINVEROK=1
export LD_LIBRARY_PATH="$SYS_LDLIBPTH"
elif [ -f "$WINE" ]
then
DISABLE_MANGOHUD=1 DISABLE_VKBASALT=1 "$WINE" winecfg -v win$WIN_VER &>/dev/null
[ "$?" == 0 ] && export WINVEROK=1
export LD_LIBRARY_PATH="$SYS_LDLIBPTH"
fi
if [ -n "$WINVEROK" ]
[[ -n "$OLD_WINE" && -f "$OLD_WINE" ]] && \
local WINE="$OLD_WINE"
DISABLE_MANGOHUD=1 DISABLE_VKBASALT=1 "$WINE" \
winecfg -v win$WIN_VER &>/dev/null && \
local WINVEROK=1
export LD_LIBRARY_PATH="$SYS_LDLIBPTH"
if [ "$WINVEROK" == 1 ]
then
unset WINVEROK
echo "$WIN_VER" > "$WINEPREFIX/.winver"
print_info notify "Windows version changed to Windows $WIN_VER"
try_shutdown_wine
else
export LD_LIBRARY_PATH="$SYS_LDLIBPTH"
unset WINVEROK
print_error yad "Windows version not changed to Windows $WIN_VER"
return 1
fi
else
return 1
else return 1
fi
}

Expand Down
2 changes: 1 addition & 1 deletion lwrap/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pkgname='lwrap'
pkgver='0.77.9'
pkgrel='6'
pkgrel='7'
pkgdesc='Lux Wine wrapper for RunImage container'
arch=('x86_64')
url='https://github.com/VHSgunzo/lux-wine'
Expand Down

0 comments on commit 7e0e2e5

Please sign in to comment.