ksamu: fixed open in background choose cert file

autoinstall/ved-control

@@ -16,11 +16,11 @@ prepair_wine
 # фикс постоянного запроса обновления Windows
 get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
 
-AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cl.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_ct.exe"
-AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cl"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_ct"
-AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cl/setup.exe"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_ct/setup.exe"
 
-if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_cl.exe" "${AUTOINSTALL_EXE}" ; then
+if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_ct.exe" "${AUTOINSTALL_EXE}" ; then
     unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 

sha256sum.list

@@ -191,10 +191,19 @@ 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
+
+53dd6b92f0a1144e90cbd3c3b581a9af377a9644e76a2b1d3fe76fff0247187b  dialux_pfx_x86_v02.tar.xz
+# create with wine_x_tkg_10-0_i586 (universal user: xuser)
+# winetricks mdac27 wsh57 jet40 msxml6 mdac28 gdiplus msxml4 msxml3 vcrun2010 msls31 ie8 dotnet20sp1
+
 ##### ADDONS #####
 # addons with ODBC, SSH, *.reg
 0f4ef434df07bc338ae308af44330590eaa1d9c94b64850514e55b960642d0eb  scadoffice_addons_v02.tar.xz

testinstall/ksamu

@@ -6,17 +6,37 @@ 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_VIRTUAL_DESKTOP="0"
 
 prepair_wine
 create_desktop "$PROG_NAME" "$DRIVE_C/KSAMU/KSAMU.exe" "$PROG_ICON"
+
+echo '
+# хак для исправления открытия выбора файла сертификата в фоне
+if ! command -v wmctrl &>/dev/null ; then
+    wmctrl_not_found="Для продолжения работы установите wmctrl:\n\nsu -\napt-get update\napt-get install wmctrl\nexit"
+    zenity --error --title="Ошибка" --text="$wmctrl_not_found" --ok-label="Выход"
+    fatal "$wmctrl_not_found"
+fi
+
+background_task() {
+    while true; do
+        sleep 1
+        OPEN_WIN_ID=$(wmctrl -xl | grep -i "ksamu" | grep -i "открыть" | cut -d" " -f1)
+        if [[ -n $OPEN_WIN_ID ]] ; then
+            wmctrl -i -r $OPEN_WIN_ID -b add,above
+        fi
+    done
+}
+
+background_task &
+BG_PID=$!
+export BG_PID
+' >> "$DRIVE_C/KSAMU/KSAMU.exe.whdb"

winehelper

@@ -40,7 +40,6 @@ else
     WH_WINETRICKS="/usr/bin/winetricks"
     WH_DEVEL="1"
 
-
     # минимальная проверка синтаксиса скриптов
     for self_check_script in "$RUN_SCRIPT" \
     "$DATA_PATH/dependencies.sh" "$DATA_PATH/autoinstall"/* \
@@ -101,7 +100,7 @@ if [[ "$1" == "--debug" ]] ; then
     export DXVK_NVAPI_LOG_LEVEL="error"
     shift
 else
-    check_variables WINEDEBUG "-all,err+all"
+    check_variables WINEDEBUG "-all"
     check_variables DXVK_LOG_LEVEL "none"
     check_variables VKD3D_SHADER_DEBUG "none"
     check_variables VKD3D_DEBUG "none"
@@ -150,6 +149,7 @@ check_variables WH_USE_EXTRA_FONTS "0"
 check_variables EXTRA_FONTS_VER "01"
 check_variables WH_FONT_MSS_REPLACE "0"
 check_variables WH_FONT_SMOOTHING "0"
+check_variables FREETYPE_PROPERTIES "truetype:interpreter-version=35"
 
 check_variables STAGING_SHARED_MEMORY "1"
 check_variables WINE_LARGE_ADDRESS_AWARE "1"
@@ -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"
 
@@ -720,8 +721,10 @@ EOF
         } > "$exe_file".whdb
 
         grep -e "info_" -e "#####" -e "PROG_URL=" -e "WINEPREFIX=" -e "INSTALL_DLL=" \
-             -e "PROG_NAME=" -e "PROG_ICON=" -e "var_" "$INSTALL_SCRIPT" \
+             -e "PROG_NAME=" -e "PROG_ICON=" -e "var_" -e "WH_MAIN_DECORATED" \
-        | awk '{$1=$1;print}' >> "$exe_file".whdb
+             -e "WH_VIRTUAL_DESKTOP" -e "WINE_TOP_WINDOW" -e "WH_FONT_SMOOTHING "\
+             -e "WH_FONT_MSS_REPLACE" \
+             "$INSTALL_SCRIPT" | awk '{$1=$1;print}' >> "$exe_file".whdb
 
         print_info "Создан файл настроек для $exe_file"
     fi
@@ -1204,7 +1207,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 +1231,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"
@@ -1397,7 +1413,7 @@ init_wineprefix () {
     for var in WH_WINE_USE BASE_PFX WINEARCH WH_WINDOWS_VER WINEESYNC WINEFSYNC \
     STAGING_SHARED_MEMORY WINE_LARGE_ADDRESS_AWARE WH_USE_SHADER_CACHE WH_USE_WINE_DXGI \
     WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_MESA_GL_OVERRIDE \
-    WH_USE_CPCSP_PROXY
+    WH_USE_CPCSP_PROXY WH_USE_EXTRA_FONTS
     do
         echo "export $var=\"${!var}\"" >> "$WINEPREFIX/last.conf"
     done
@@ -2625,3 +2641,8 @@ case "$arg1" in
         fi
     ;;
 esac
+
+if [[ -n "$WH_BG_PID" ]] ; then
+    print_info "Завершение фонового процесса: $WH_BG_PID"
+    kill "$WH_BG_PID" 2>/dev/null
+fi