minor fix

data_from_portwine/scripts/runlib

@@ -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

 #!/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,11 +2473,38 @@ 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"
 
+    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
@@ -2664,6 +2691,8 @@ _EOF_
 
         # 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)" \