Scripts version 2078-1

data_from_portwine/scripts/functions_helper

@@ -346,6 +346,23 @@ init_wine_ver () {
     return 0
 }
 
+regdlloverrides () {
+    PW_DLL_EXE=`echo $@ | awk -F: '{print $1}'`
+    PW_DLL_LIB=`echo $@ | awk -F: '{print $2}' | awk -F= '{print $1}'`
+    PW_DLL_SET=`echo $@ | awk -F= '{print $NF}'`
+    case "${PW_DLL_SET}" in
+        "n,b") PW_DLL_IN_REG="native,builtin" ;;
+        "b,n") PW_DLL_IN_REG="builtin,native" ;;
+            "n") PW_DLL_IN_REG="native" ;;
+            "b") PW_DLL_IN_REG="builtin" ;;
+            *) PW_DLL_IN_REG="" ;;
+    esac
+    grep 'HKCU,Software\\Wine\\AppDefaults\\'"${PW_DLL_EXE}"'\\DllOverrides,'\"${PW_DLL_LIB}\",0x2,\"${PW_DLL_IN_REG}\" "${WINEDIR}/share/wine/wine.inf"
+    if [[ "$?" != "0" ]] ; then
+        sed -i "/\[SteamClient.ntamd64\]/a HKCU,Software\\\Wine\\\AppDefaults\\\\${PW_DLL_EXE}\\\DllOverrides,\"${PW_DLL_LIB}\",0x2,\"${PW_DLL_IN_REG}\"" "${WINEDIR}/share/wine/wine.inf"
+    fi
+}
+
 wait_wineserver () {
     while [ ! -z "$(ls -l /proc/*/exe 2>/dev/null | grep -ie ${portname} | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')" ] ; do
         sleep 1

data_from_portwine/scripts/portwine_db/EpicGamesLauncher

@@ -8,4 +8,7 @@ export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=1
 export LAUNCH_PARAMETERS="-SkipBuildPatchPrereq"
 export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2019"
-export WINEDLLOVERRIDES="vulkan-1=n,b"
+
+add_in_start_portwine () {
+    regdlloverrides "RDR2.exe:vulkan-1=n"
+}

data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher

@@ -8,3 +8,6 @@
 export PW_VULKAN_USE=1
 export PW_DLL_INSTALL="vcrun2019"
 export PW_WINDOWS_VER=10
+add_in_start_portwine () {
+    regdlloverrides "RDR2.exe:vulkan-1=n"
+}

data_from_portwine/scripts/runlib

@@ -25,6 +25,8 @@ start_portwine () {
     export WINEARCH="win64"
     pw_check_and_download_wine "${PW_WINE_USE}" 
     init_wine_ver
+    sed -i '/Steam.exe/d' "${WINEDIR}/share/wine/wine.inf"
+    sed -i '/\\Valve\\Steam/d' "${WINEDIR}/share/wine/wine.inf"
     if [ -x "`which konsole 2>/dev/null`" ]; then export PW_TERM="konsole --nofork -e"
 #    elif [ -x "`which gnome-terminal 2>/dev/null`" ]; then export PW_TERM="gnome-terminal -- /usr/bin/env bash" ???
     elif [ -x "`which lxterminal 2>/dev/null`" ]; then export PW_TERM="lxterminal -e"
@@ -131,6 +133,8 @@ start_portwine () {
     else
         export WINEDEBUG="-all"
         export DXVK_LOG_LEVEL="none"
+        export VKD3D_SHADER_DEBUG="none"
+        export VKD3D_FEATURE_LEVEL="12_0"
         export VKD3D_DEBUG="none"
         export DXVK_LOG_PATH="none"
     fi
@@ -304,14 +308,14 @@ start_portwine () {
     ! -f "${WINEPREFIX}"/userdef.reg || ! -f "${WINEPREFIX}"/system.reg || ! -f "${WINEPREFIX}"/user.reg ]]
     then
         pw_clear_pfx
-        OLD_PW_WINE_USE="${PW_WINE_USE}"
-        export PW_WINE_USE=${PW_PROTON_STEAM_VER}
-        init_wine_ver
+        # OLD_PW_WINE_USE="${PW_WINE_USE}"
+        # export PW_WINE_USE=${PW_PROTON_STEAM_VER}
+        # init_wine_ver
         check_dirs_and_files_in_pfx
         ${pw_runtime} env LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
         wait_wineserver &&
-        export PW_WINE_USE="${OLD_PW_WINE_USE}"
-        init_wine_ver
+        # export PW_WINE_USE="${OLD_PW_WINE_USE}"
+        # init_wine_ver
         echo "${PW_WINE_USE}" > "${WINEPREFIX}/.wine_ver"
     elif [[ -z "`cat ${WINEPREFIX}/.wine_ver | grep ${PW_WINE_USE}`" ]] ; then 
         check_dirs_and_files_in_pfx

data_from_portwine/scripts/start.sh

@@ -142,7 +142,7 @@ portwine_start_debug () {
     env LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_WINELIB}/portable/lib/\$LIB" "${PW_WINELIB}/portable/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log"
     echo " " >> "${PORT_WINE_PATH}/${portname}.log"
     echo "inxi -G:" >> "${PORT_WINE_PATH}/${portname}.log"
-    "${PW_WINELIB}/portable/bin/inxi" -G | sed 's/[*]12/""/' >> "${PORT_WINE_PATH}/${portname}.log"
+    env LANG=C "${PW_WINELIB}/portable/bin/inxi" -G >> "${PORT_WINE_PATH}/${portname}.log"
     echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log"
     "${PW_WINELIB}/portable/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log"