updated test script ksamu

sha256sum.list

@@ -191,10 +191,15 @@ ef7e8f1ba785d48e4ea287feed5b79bd630d423e59efadb43da9653adefef218  ais-lpu-client
 # winetricks vcrun2005 vcrun2008 dotnet20sp2 dotnet40 mfc42 7zip
 
 f18864014fdb2fead0b45b5e70e95073072b89168df8cd6debba89081ac51a2a  ksamu_pfx_x64_v01.tar.xz
-# create with wine_x_tkg_10-0_i586 (universal user: xuser)
+# create with wine-10.12.1-alt1-wow64 (universal user: xuser)
 # winetricks msxml6 msxml4 msxml3 riched30 msls31 riched20 msftedit richtx32 fontsmooth=gray
 # + manuall installed riched32
 
+7377159d7f21537e517ecc7bdd4c09d6ccab39f1368688506e78e11cfde7dc2a  ksamu_pfx_x64_v02.tar.xz
+# create with wine-10.18.1-alt1-wow64 (universal user: xuser)
+# winetricks corefonts tahoma msxml6 msxml4 msxml3 riched30 msls31 riched20 msftedit richtx32 fontsmooth=gray
+# + manuall installed riched32
+
 ##### ADDONS #####
 # addons with ODBC, SSH, *.reg
 0f4ef434df07bc338ae308af44330590eaa1d9c94b64850514e55b960642d0eb  scadoffice_addons_v02.tar.xz

testinstall/ksamu

@@ -6,17 +6,16 @@ export WH_WINE_USE="wine-10.18.1-alt1-wow64"
 export WINEPREFIX="ksamu"
 export PROG_NAME="КСАМУ"
 export PROG_ICON="ksamu"
-export BASE_PFX="ksamu_pfx_x64_v01"
+export BASE_PFX="ksamu_pfx_x64_v02"
 export WINEARCH="win64"
-export INSTALL_DLL="richtx32 riched20 riched30 msls31 msftedit msxml6 msxml4 msxml3 fontsmooth=gray"
+export INSTALL_DLL="corefonts tahoma richtx32 riched20 riched30 msls31 msftedit msxml6 msxml4 msxml3 fontsmooth=gray"
 # riched32
-export WH_USE_EXTRA_FONTS="1"
 export WH_WINDOWS_VER="7"
 export WH_USE_CPCSP_PROXY="1"
 export WH_USE_CPCSP_CADES="0"
 export WINE_D3D_CONFIG="renderer=gdi"
-export WH_MAIN_DECORATED="1"
-export WH_MC_DECORATED="1"
+export WH_MAIN_DECORATED="0"
+export WH_VIRTUAL_DESKTOP="0"
 
 prepair_wine
 create_desktop "$PROG_NAME" "$DRIVE_C/KSAMU/KSAMU.exe" "$PROG_ICON"

winehelper

@@ -167,6 +167,7 @@ check_variables WH_USE_WINE_DXGI "0"
 check_variables WH_DLL_INSTALL ""
 check_variables WH_MAIN_DECORATED "default"
 check_variables WH_MC_DECORATED "default"
+check_variables WH_VIRTUAL_DESKTOP "default"
 
 check_variables WINE_WIN_START "start /wait /high /unix"
 
@@ -1204,7 +1205,6 @@ init_wineprefix () {
     then
         export MESA_GL_VERSION_OVERRIDE="3.3"
         export MESA_GLSL_VERSION_OVERRIDE="330"
-
     fi
 
     if check_wayland_session ; then
@@ -1229,6 +1229,20 @@ init_wineprefix () {
         get_and_set_reg_file --delete 'Software\Wine\X11 Driver' 'UseXVidMode'
     fi
 
+    # включаем виртуальный рабочий стол при необходимости
+    if [[ $WH_VIRTUAL_DESKTOP == "1" ]] ; then
+        get_and_set_reg_file --add 'Software\Wine\Explorer' 'Desktop' 'REG_SZ' "Default" "user"
+        WH_SCREEN_RESOLUTION="$(xrandr | sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')"
+        [[ $WH_SCREEN_RESOLUTION != *x* ]] && WH_SCREEN_RESOLUTION="1920x1080"
+        get_and_set_reg_file --add 'Software\Wine\Explorer\Desktops' 'Default' 'REG_SZ' "$WH_SCREEN_RESOLUTION" "user"
+    elif [[ $WH_VIRTUAL_DESKTOP == *x* ]] ; then
+        get_and_set_reg_file --add 'Software\Wine\Explorer' 'Desktop' 'REG_SZ' "Default" "user"
+        get_and_set_reg_file --add 'Software\Wine\Explorer\Desktops' 'Default' 'REG_SZ' "$WH_VIRTUAL_DESKTOP" "user"
+    elif [[ $WH_VIRTUAL_DESKTOP == "0" ]] ; then
+        get_and_set_reg_file --delete 'Software\Wine\Explorer\Desktops' 'Default'
+        get_and_set_reg_file --delete 'Software\Wine\Explorer' 'Desktop'
+    fi
+
     # управляем декоратором для ПО по умолчанию
     if [[ $WH_MAIN_DECORATED = "0" ]] ; then
         get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'Decorated' 'REG_SZ' "N" "user"