Skip to content

P
PortWINE
Commit a05d9992 authored by Mikhail Tergoev's avatar Mikhail Tergoev
Browse files
Options

minor fix

parent 2f7835f5
Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 133 deletions
data_from_portwine/scripts/runlib
View file @ a05d9992
......@@ -126,9 +126,9 @@ then
export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk_nvidia.conf"
if [ ! -z "${WINEDLLOVERRIDES}" ]
then
export WINEDLLOVERRIDES="nvapi=;nvapi64=;${WINEDLLOVERRIDES}"
export WINEDLLOVERRIDES="nvapi,nvapi64=;${WINEDLLOVERRIDES}"
else
export WINEDLLOVERRIDES="nvapi=;nvapi64="
export WINEDLLOVERRIDES="nvapi,nvapi64="
fi
echo "runtime libs is disabled"
else
......
data_from_portwine/scripts/winetricks
View file @ a05d9992
#!/bin/sh
# shellcheck disable=SC2030,SC2031
. $(dirname $(readlink -f "$0"))/runlib
START_PORTWINE
export WINELOADER="${PORT_WINE_PATH}/data/wine/bin/wine"
# SC2030: Modification of WINE is local (to subshell caused by (..) group).
# SC2031: WINE was modified in a subshell. That change might be lost
# This has to be right after the shebang, see: https://github.com/koalaman/shellcheck/issues/779
......@@ -19,6 +16,9 @@ WINETRICKS_VERSION=20200412-next
#--------------------------------------------------------------------
#
# Winetricks is a package manager for Win32 dlls and applications on POSIX.
. $(dirname $(readlink -f "$0"))/runlib
START_PORTWINE
export WINELOADER="${WINEDIR}/bin/wine"
# Features:
# - Consists of a single shell script - no installation required
# - Downloads packages automatically from original trusted sources
......@@ -2473,43 +2473,70 @@ Usage: 'w_override_app_dlls app mode dll ...'." ;;
w_set_winver()
{
w_skip_windows w_set_winver && return
# FIXME: This should really be done with winecfg, but it has no CLI options.
# Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45616
_W_winver="$1"
# First, delete any lingering version info, otherwise it may conflict:
(
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion" /v SubVersionNumber /f || true
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion" /v VersionNumber /f || true
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion" /v CSDVersion /f || true
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion" /v CurrentBuildNumber /f || true
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion" /v CurrentVersion /f || true
"$WINE" reg delete "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /f || true
"$WINE" reg delete "HKLM\\System\\CurrentControlSet\\Control\\ServiceCurrent" /v OS /f || true
"$WINE" reg delete "HKLM\\System\\CurrentControlSet\\Control\\Windows" /v CSDVersion /f || true
"$WINE" reg delete "HKCU\\Software\\Wine" /v Version /f || true
"$WINE" reg delete "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /f || true
) > /dev/null 2>&1
case "$_W_winver" in
win31)
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
if w_wine_version_in ,5.7 ; then
# Make sure we pass the right version name:
case "$_W_winver" in
# These are the mismatched ones:
# winecfg doesn't accept 'default' as an option (as of wine-5.9):
# https://bugs.winehq.org/show_bug.cgi?id=49241
# For now, assuming win7:
default) _W_winver="win7";;
win2k3) _W_winver="win2003";;
win2k8) _W_winver="win2008";;
win2k8r2) _W_winver="win2008r2";;
# xp has two entries (winxp/winxp64):
winxp)
if [ "$W_ARCH" = "win64" ]; then
_W_winver="winxp64"
else
_W_winver="winxp"
fi
;;
# These are the same:
nt351|nt40|vista|win10|win20|win2k|win30|win31|win7|win8|win81|win95|win98|winme) : ;;
*) w_die "Unsupported Windows version $_W_winver";;
esac
w_try "$WINE" winecfg -v "$_W_winver"
else
# FIXME: remove this after wine-7.0 (i.e., after it's been in stable wine for a while):
# First, delete any lingering version info, otherwise it may conflict:
(
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion" /v SubVersionNumber /f || true
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion" /v VersionNumber /f || true
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion" /v CSDVersion /f || true
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion" /v CurrentBuildNumber /f || true
"$WINE" reg delete "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion" /v CurrentVersion /f || true
"$WINE" reg delete "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /f || true
"$WINE" reg delete "HKLM\\System\\CurrentControlSet\\Control\\ServiceCurrent" /v OS /f || true
"$WINE" reg delete "HKLM\\System\\CurrentControlSet\\Control\\Windows" /v CSDVersion /f || true
"$WINE" reg delete "HKCU\\Software\\Wine" /v Version /f || true
"$WINE" reg delete "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /f || true
) > /dev/null 2>&1
case "$_W_winver" in
win31)
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
REGEDIT4
[HKEY_USERS\\S-1-5-4\\Software\\Wine]
"Version"="win31"
_EOF_
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
return
;;
win95)
# This key is only used for Windows 95/98:
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
return
;;
win95)
# This key is only used for Windows 95/98:
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
REGEDIT4
[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion]
......@@ -2518,14 +2545,14 @@ REGEDIT4
"VersionNumber"="4.0.950"
_EOF_
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
return
;;
win98)
# This key is only used for Windows 95/98:
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
return
;;
win98)
# This key is only used for Windows 95/98:
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
REGEDIT4
[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion]
......@@ -2534,14 +2561,14 @@ REGEDIT4
"VersionNumber"="4.10.2222"
_EOF_
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
return
;;
nt40)
# Similar to modern version, but sets two extra keys:
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
return
;;
nt40)
# Similar to modern version, but sets two extra keys:
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
REGEDIT4
[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion]
......@@ -2559,96 +2586,96 @@ REGEDIT4
"CSDVersion"=dword:00000600
_EOF_
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
return
;;
win2k)
csdversion="Service Pack 4"
currentbuildnumber="2195"
currentversion="5.0"
csdversion_hex=dword:00000400
;;
winxp)
# Special case, afaik it's the only Windows version that has different version numbers for 32/64-bit
# So ensure we set the arch appropriate version:
if [ "$W_ARCH" = "win32" ]; then
csdversion="Service Pack 3"
currentbuildnumber="2600"
currentversion="5.1"
csdversion_hex=dword:00000300
elif [ "$W_ARCH" = "win64" ]; then
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
return
;;
win2k)
csdversion="Service Pack 4"
currentbuildnumber="2195"
currentversion="5.0"
csdversion_hex=dword:00000400
;;
winxp)
# Special case, afaik it's the only Windows version that has different version numbers for 32/64-bit
# So ensure we set the arch appropriate version:
if [ "$W_ARCH" = "win32" ]; then
csdversion="Service Pack 3"
currentbuildnumber="2600"
currentversion="5.1"
csdversion_hex=dword:00000300
elif [ "$W_ARCH" = "win64" ]; then
csdversion="Service Pack 2"
currentbuildnumber="3790"
currentversion="5.2"
csdversion_hex=dword:00000200
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
else
w_die "Invalid W_ARCH $W_ARCH"
fi
;;
win2k3)
csdversion="Service Pack 2"
currentbuildnumber="3790"
currentversion="5.2"
csdversion_hex=dword:00000200
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "ServerNT" /f
;;
vista)
csdversion="Service Pack 2"
currentbuildnumber="6002"
currentversion="6.0"
csdversion_hex=dword:00000200
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
else
w_die "Invalid W_ARCH $W_ARCH"
fi
;;
win2k3)
csdversion="Service Pack 2"
currentbuildnumber="3790"
currentversion="5.2"
csdversion_hex=dword:00000200
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "ServerNT" /f
;;
vista)
csdversion="Service Pack 2"
currentbuildnumber="6002"
currentversion="6.0"
csdversion_hex=dword:00000200
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
win7|default)
csdversion="Service Pack 1"
currentbuildnumber="7601"
currentversion="6.1"
csdversion_hex=dword:00000100
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
win2k8)
csdversion="Service Pack 2"
currentbuildnumber="6002"
currentversion="6.0"
csdversion_hex=dword:00000200
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "ServerNT" /f
;;
win2k8r2)
csdversion="Service Pack 1"
currentbuildnumber="7601"
currentversion="6.1"
csdversion_hex=dword:00000100
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "ServerNT" /f
;;
win8)
csdversion=""
currentbuildnumber="9200"
currentversion="6.2"
csdversion_hex=dword:00000000
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
win81)
csdversion=""
currentbuildnumber="9600"
currentversion="6.3"
csdversion_hex=dword:00000000
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
win10)
csdversion=""
currentbuildnumber="10240"
currentversion="10.0"
csdversion_hex=dword:00000000
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
*)
w_die "Invalid Windows version given."
;;
esac
;;
win7|default)
csdversion="Service Pack 1"
currentbuildnumber="7601"
currentversion="6.1"
csdversion_hex=dword:00000100
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
win2k8)
csdversion="Service Pack 2"
currentbuildnumber="6002"
currentversion="6.0"
csdversion_hex=dword:00000200
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "ServerNT" /f
;;
win2k8r2)
csdversion="Service Pack 1"
currentbuildnumber="7601"
currentversion="6.1"
csdversion_hex=dword:00000100
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "ServerNT" /f
;;
win8)
csdversion=""
currentbuildnumber="9200"
currentversion="6.2"
csdversion_hex=dword:00000000
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
win81)
csdversion=""
currentbuildnumber="9600"
currentversion="6.3"
csdversion_hex=dword:00000000
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
win10)
csdversion=""
currentbuildnumber="10240"
currentversion="10.0"
csdversion_hex=dword:00000000
"$WINE" reg add "HKLM\\System\\CurrentControlSet\\Control\\ProductOptions" /v ProductType /d "WinNT" /f
;;
*)
w_die "Invalid Windows version given."
;;
esac
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
echo "Setting Windows version to $_W_winver"
cat > "$W_TMP"/set-winver.reg <<_EOF_
REGEDIT4
[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion]
......@@ -2660,10 +2687,12 @@ REGEDIT4
"CSDVersion"=$csdversion_hex
_EOF_
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
w_try_regedit "$W_TMP_WIN"\\set-winver.reg
# Prevent a race when calling from another verb
w_wineserver -w
# Prevent a race when calling from another verb
w_wineserver -w
fi
}
w_unset_winver()
......@@ -22299,12 +22328,26 @@ _EOF_
# settings->winversions
#----------------------------------------------------------------
w_metadata nt351 settings \
title_uk="Встановити версію Windows NT 3.51" \
title="Set Windows version to Windows NT 3.51"
load_nt351()
{
w_package_unsupported_win64
w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=41559" "" "5.7"
w_set_winver nt351
}
#----------------------------------------------------------------
w_metadata nt40 settings \
title_uk="Встановити версію Windows NT 4.0" \
title="Set Windows version to Windows NT 4.0"
load_nt40()
{
w_package_unsupported_win64
w_set_winver nt40
}
......@@ -22321,12 +22364,26 @@ load_vista()
#----------------------------------------------------------------
w_metadata win20 settings \
title_uk="Встановити версію Windows 2.0" \
title="Set Windows version to Windows 2.0"
load_win20()
{
w_package_unsupported_win64
w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=41559" "" "5.7"
w_set_winver win20
}
#----------------------------------------------------------------
w_metadata win2k settings \
title_uk="Встановити версію Windows 2000" \
title="Set Windows version to Windows 2000"
load_win2k()
{
w_package_unsupported_win64
w_set_winver win2k
}
......@@ -22365,12 +22422,26 @@ load_win2k8r2()
#----------------------------------------------------------------
w_metadata win30 settings \
title_uk="Встановити версію Windows 3.0" \
title="Set Windows version to Windows 3.0"
load_win30()
{
w_package_unsupported_win64
w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=41559" "" "5.7"
w_set_winver win30
}
#----------------------------------------------------------------
w_metadata win31 settings \
title_uk="Встановити версію Windows 3.1" \
title="Set Windows version to Windows 3.1"
load_win31()
{
w_package_unsupported_win64
w_set_winver win31
}
......@@ -22426,6 +22497,7 @@ w_metadata win95 settings \
load_win95()
{
w_package_unsupported_win64
w_set_winver win95
}
......@@ -22437,11 +22509,25 @@ w_metadata win98 settings \
load_win98()
{
w_package_unsupported_win64
w_set_winver win98
}
#----------------------------------------------------------------
w_metadata winme settings \
title_uk="Встановити версію Windows ME" \
title="Set Windows version to Windows ME"
load_winme()
{
w_package_unsupported_win64
w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=41559" "" "5.7"
w_set_winver winme
}
#----------------------------------------------------------------
# Really, we should support other values, since winetricks did
w_metadata winver= settings \
title_uk="Встановити версію Windows за замовчуванням (Windows 7)" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment