Merge branch 'minergenon-devel'

ksamu: updated wine and wine-cpcsp_proxy
updated sha256sum.list and added wow64 wine and wine-cpcsp_proxy
2025-11-13 22:51:08 +03:00 · 2025-11-13 22:48:19 +03:00 · 2025-11-13 22:46:46 +03:00 · 2025-11-13 22:44:28 +03:00 · 2025-11-11 14:34:44 +03:00 · 2025-11-07 10:50:01 +06:00
27 changed files with 329 additions and 19362 deletions
--- a/auto_completion/bash_completion/winehelper
+++ b/auto_completion/bash_completion/winehelper
@@ -4,7 +4,7 @@ _winehelper_completions() {
    COMPREPLY=()
    cur="${COMP_WORDS[COMP_CWORD]}"
    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts="--help --version --debug install installed install-dxvk install-vkd3d -r -i remove-all --clear-pfx killall remove-prefix backup-prefix restore-prefix create-prefix --changelog changelog change-wine"
+    opts="--help --version --debug install installed install-dxvk install-vkd3d -r -i remove-all --clear-pfx killall remove-prefix backup-prefix restore-prefix create-prefix --changelog changelog change-wine clear-winetricks-cache"
    wine_cmd="winecfg winereg winefile wineconsole winetricks desktop regedit explorer cmd run"

    case "${prev}" in
--- a/auto_completion/zsh_completion/_winehelper
+++ b/auto_completion/zsh_completion/_winehelper
@@ -21,6 +21,7 @@ _winehelper() {
    'backup-prefix[Создать резерную копию префикса]'
    'restore-prefix[восстановить префикс из резервной копии "путь/до/whpack"]'
    'change-wine[Изменить версию Wine/Proton для префикса]'
+    'clear-winetricks-cache[Очистить кэш Winetricks]'
  )

  wine_cmd=(
--- a/autoinstall/t-flex-cad-edu17
+++ b/autoinstall/t-flex-cad-edu17
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD Учебная Версия 17"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad17"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
@@ -36,5 +36,5 @@ if try_download "https://www.tflexcad.ru/download/t-flex-cad-free/files/TFCAD_ST
    try_remove_dir "${WH_TMP_DIR}/Стандартные элементы 17"

    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD Учебная Версия 17/Program/TFlexCad.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCadEDU"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCadEDU17"
 fi
--- a/autoinstall/t-flex-cad17
+++ b/autoinstall/t-flex-cad17
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD 17"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad17"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
@@ -29,5 +29,5 @@ if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%2017.zip" "${AUTOIN
    try_remove_file "${AUTOINSTALL_EXE}"

    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD 17/Program/TFlexCad.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad17"
 fi
--- a/autoinstall/t-flex-cad17-applications
+++ b/autoinstall/t-flex-cad17-applications
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="Приложения для T-FLEX CAD 17"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad17"
 export WH_WINDOWS_VER="10"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
--- a/autoinstall/t-flex-cad17-resources
+++ b/autoinstall/t-flex-cad17-resources
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="Ресурсы для T-FLEX CAD 17"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad17"
 export WH_WINDOWS_VER="10"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
--- a/autoinstall/t-flex-cad18
+++ b/autoinstall/t-flex-cad18
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD 18"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad18"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
@@ -30,5 +30,5 @@ if try_download "https://www.tflex.ru/downloads/V18/T-FLEX%20CAD%2018.zip" "${AU
    try_remove_dir "${AUTOINSTALL_UNPACK}"

    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD 18/Program/TFlexCad.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad18"
 fi
--- a/autoinstall/t-flex-cad18-applications
+++ b/autoinstall/t-flex-cad18-applications
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="Приложения для T-FLEX CAD 18"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad18"
 export WH_WINDOWS_VER="10"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
--- a/autoinstall/t-flex-cad18-resources
+++ b/autoinstall/t-flex-cad18-resources
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="Ресурсы для T-FLEX CAD 18"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad18"
 export WH_WINDOWS_VER="10"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
--- a/autoinstall/t-flex-cad2d+17
+++ b/autoinstall/t-flex-cad2d+17
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD 2D+ 17"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad17"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
@@ -29,5 +29,5 @@ if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%202D+%2017.zip" "${
    try_remove_file "${AUTOINSTALL_EXE}"

    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD 2D+ 17/Program/TFlexCad.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad2D"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad2D17"
 fi
--- a/autoinstall/t-flex-cad2d+18
+++ b/autoinstall/t-flex-cad2d+18
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD 2D+ 18"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad18"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
@@ -30,5 +30,5 @@ if try_download "https://www.tflex.ru/downloads/V18/T-FLEX%20CAD%202D+%2018.zip"
    try_remove_dir "${AUTOINSTALL_UNPACK}"

    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD 2D+ 18/Program/TFlexCad.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad2D"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad2D18"
 fi
--- a/autoinstall/t-flex-docs17
+++ b/autoinstall/t-flex-docs17
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX DOCs 17"
-export PROG_ICON="tflexdoc"
+export PROG_ICON="tflexdoc17"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
@@ -29,5 +29,5 @@ if try_download "https://www.tflex.ru/downloads/DOCs/T-FLEX%20DOCs%2017%20Client
    try_remove_file "${AUTOINSTALL_EXE}"

    WIN_FILE_EXEC="$DRIVE_C/Program Files (x86)/T-FLEX DOCs 17/Program/TFlex.DOCs.Client.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexDOCs17"
 fi
--- a/autoinstall/t-flex-viewer17
+++ b/autoinstall/t-flex-viewer17
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX Viewer 17"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad17"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
@@ -29,5 +29,5 @@ if try_download "https://www.tflex.ru/downloads/T-FLEX%20Viewer%2017.zip" "${AUT
    try_remove_file "${AUTOINSTALL_EXE}"

    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX Viewer 17/Program/TFlexViewer.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexViewer17"
 fi
--- a/autoinstall/t-flex-viewer18
+++ b/autoinstall/t-flex-viewer18
@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX Viewer 18"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexcad18"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
@@ -30,5 +30,5 @@ if try_download "https://www.tflex.ru/downloads/V18/T-FLEX%20Viewer%2018.zip" "$
    try_remove_dir "${AUTOINSTALL_UNPACK}"

    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX Viewer 18/Program/TFlexViewer.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexViewer18"
 fi
--- a/image/tflexcad17.png
+++ b/image/tflexcad17.png
--- a/image/tflexcad18.png
+++ b/image/tflexcad18.png
--- a/image/tflexdoc17.png
+++ b/image/tflexdoc17.png
--- a/sha256sum.list
+++ b/sha256sum.list
@@ -1,12 +1,17 @@
-##### WINE #####
+##### WINE WOW64 #####
+e9a8b79dfe12cad1304dca573d73aefe109e3d69b6fff739c8dbb8b2d3c271c6  wine-10.12.1-alt1-wow64.tar.xz
+
+##### WINE AMD64 #####
 009c95bfe2df3f9264c9c5092f3e30ea7a168dd7869046058a718a70739602d4  wine_wh_tflex_10-9_amd64.tar.xz
-3571c40a787f0386e0160b5d471b1bf11fa2a235b497156cd38198b90bcb4a9f  wine_x_tkg_10-0_i586.tar.xz
 71d6fdfd23d7988471d345c68e81699b8af931352b03dd216424b398f63c7b12  wine_x_tkg_10-0_amd64.tar.xz
-fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193  wine-9.0.14-alt1-i586-spravkibk.tar.xz
 e0a84bb4908c3927954d7eef6b8ac7212e442b8c107d000c6890fec340f96183  wine-9.0.14-alt1-amd64.tar.xz
-6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79  wine-9.0.9-alt1-i586.tar.xz
 f1bf1261550ca2928cefacdb724926d3d6d103433d0ff6882ee9783a50d8f4e4  wine-8.8-staging-amd64.tar.xz
 61bec1230b37b8fcc69fd45f848b44fd88cc41fcdd5dc3080336d7da63660f40  wine-7.16.1-alt1-amd64.tar.xz
+
+##### WINE I586 #####
+3571c40a787f0386e0160b5d471b1bf11fa2a235b497156cd38198b90bcb4a9f  wine_x_tkg_10-0_i586.tar.xz
+fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193  wine-9.0.14-alt1-i586-spravkibk.tar.xz
+6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79  wine-9.0.9-alt1-i586.tar.xz
 6fea17fd131f57c2ebf7ca4c60d3c5a9e819afe16e5d0b77ecb750da99ae0e38  wine-7.16.1-alt1-i586.tar.xz

 ##### WINE_LG #####
@@ -150,6 +155,7 @@ edf16d2b37bc77d121d5d81b06b60d3f694e0060c6606e729ceab30de3d27466  vkd3d-proton-s

 ##### CPCSP_PROXY #####
 3153088ff28d6af415c3504a421e5382554dbb305f38d5a87dd84df90d680421  wine-cpcsp_proxy-0.6.1-alt1.tar.xz
+fbe72bfe3c2c307363782ce2d37589e142b44111f269657b0e516a6b2d6ab8a9  wine-cpcsp_proxy-0.7.3-alt5-wow64.tar.xz

 ##### FONTS #####
 405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6  extra_fonts_v01.tar.xz
@@ -171,6 +177,10 @@ d62225f6a23e49355a59a2bd9a495390694bd70d4be6d6527cfb7fb2e2d65f0d  defpfx_x64_v01
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser and isolate_home by default)
 # winetricks msxml3 msxml4 msxml6 andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts wsh57 vcrun6 gdiplus lucida tahoma ucrtbase2019 vcrun2019 dotnet40 dotnet48 dotnet20sp2 d3dcompiler_47

+eb1fec64eea3d83f2bdce185c7bc0c1a93afb51139f16256c885098a6f7e2242  defpfx_dn48_x64_v03.tar.xz
+# based on dotpfx48v8 (renamed steamuser to xuser and isolate_home by default)
+# winetricks dotnet20sp2 dotnet40 dotnet45 dotnet46 dotnet461 dotnet462 dotnet472 dotnet48 andale arial comicsans courier georgia impact times rebuchet verdana webdings corefonts lucida mfc42 msxml3 msxml4 msxml6 vcrun2005 vcrun2010 vcrun2012 vcrun2013 vcrun2022 atmlib gdiplus 7zip
+
 68ad589a3e6d8a845c2e3bd4c2672cf97982b3fea0ca4b4f2fb6da126d8b3075  tflex_pfx_x64_v03.tar.xz
 # create with wine_wh_tflex_10-9_amd64
 # winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei internal dotnet48 dotnet20 eufonts takao d3dcompiler_47 fontsmooth=rgb vcrun2019 vlgothic andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts liberation sourcehansans baekmuk tahoma lucida t-flex-cad-prepair
--- a/testinstall/declaration
+++ b/testinstall/declaration
@@ -3,37 +3,33 @@
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="declaration"
+export WINEPREFIX="nalog"
 export PROG_NAME="Декларация"
 export PROG_ICON="declarac"
-export BASE_PFX="defpfx_x86_v01"
+export BASE_PFX="none"
 export WINEARCH="win32"
-export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
 export WH_WINDOWS_VER="10"
+export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48"

-DECL_FILE="${WH_TMP_DIR}/decl.html"
-curl -o "$DECL_FILE" -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "https://www.nalog.gov.ru/rn77/program/5961249/"
-
-if [[ ! -f "$DECL_FILE" ]] \
-|| grep -q "Forbidden" "$DECL_FILE"
-then
-    fatal "The site page is unavailable or the request limit has been exceeded."
-fi
-
-VER_YEAR=$(grep -oP 'href="\K[^"]*.msi[^"]*' "$DECL_FILE" | awk -F'/' '{print $(NF-2)}' | head -n 1)
+try_get_page "https://www.nalog.gov.ru/rn77/program/5961249/"
+VER_YEAR=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-2)}' | head -n 1)
 YEAR="${VER_YEAR//decl/}"
-VER_MSI_SLASH=$(grep -oP 'href="\K[^"]*.msi[^"]*' "$DECL_FILE" | awk -F'/' '{print $(NF-1)}' | head -n 1)
-VER_MSI=$(grep -oP 'href="\K[^"]*.msi[^"]*' "$DECL_FILE" | awk -F'/' '{print $(NF)}' | head -n 1)
-
+VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1)
+VER_MSI=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF)}' | head -n 1)
 AUTOINSTALL_MSI="${WH_TMP_DIR}/${VER_MSI}"

 prepair_wine
-if try_download "https://data.nalog.ru/files/${VER_YEAR}/${VER_MSI_SLASH}/$VER_MSI" "${AUTOINSTALL_MSI}" ; then
-    wine_run_install "${AUTOINSTALL_MSI}" "/q"
+if try_download "https://data.nalog.ru/files/${VER_YEAR}/${VER_MSI_SLASH}/${VER_MSI}" "${AUTOINSTALL_MSI}" ; then
+    wine_run_install "${AUTOINSTALL_MSI}" /q
    try_remove_file "${AUTOINSTALL_MSI}"

    WIN_FILE_EXEC="$DRIVE_C/АО ГНИВЦ/Декларация ${YEAR}/Decl${YEAR}.exe"
    create_desktop "$PROG_NAME $YEAR" "$WIN_FILE_EXEC" "$PROG_ICON"
-    remove_desktop "Декларация $((YEAR - 1))"
-fi

+    # Удаляем ярлык предыдущей версии
+    remove_desktop "Декларация $((YEAR - 1))"
+
+    print_info "Программа Декларация $YEAR успешно установлена"
+else
+    fatal "Не удалось скачать установочный файл"
+fi
--- a/testinstall/ksamu
+++ b/testinstall/ksamu
@@ -1,17 +1,18 @@
 #!/usr/bin/env bash
-# info_ru: Программа “КСАМУ”.
+# info_ru: “КСАМУ” - Комплексная система автоматизации медицинского учреждения.
 ########################################################################
 export PROG_URL="https://docs.medicine-it.ru/"
-export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine-10.12.1-alt1-wow64"
 export WINEPREFIX="ksamu"
 export PROG_NAME="КСАМУ"
 export PROG_ICON="ksamu"
 export BASE_PFX="ksamu_pfx_x64_v01"
 export WINEARCH="win64"
-export INSTALL_DLL="richtx32 riched20 riched30 msls31 msftedit msxml6 msxml3 msxml4 fontsmooth=gray" #riched32
+export INSTALL_DLL="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"

 prepair_wine
-
 create_desktop "$PROG_NAME" "$DRIVE_C/KSAMU/KSAMU.exe" "$PROG_ICON"
--- a/testinstall/npul
+++ b/testinstall/npul
@@ -6,32 +6,24 @@ export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="nalog"
 export PROG_NAME="Налогоплательщик ЮЛ"
 export PROG_ICON="npul"
-export BASE_PFX="defpfx_x86_v01"
+export BASE_PFX="none"
 export WINEARCH="win32"
-export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
 export WH_WINDOWS_VER="10"
+export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48"

-NPUL_FILE="${WH_TMP_DIR}/npul.html"
-curl -o "$NPUL_FILE" -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "https://www.nalog.gov.ru/rn77/program/5961229/"
-
-if [[ ! -f "$NPUL_FILE" ]] \
-|| grep -q "Forbidden" "$NPUL_FILE"
-then
-    fatal "Страница сайта не доступна, или превышено количество запросов к странице."
-fi
-
-VER_MSI=$(grep -oP 'NalogUL\K[0-9.]+(?=\.msi)' "$NPUL_FILE" | tail -n 1)
-VER_MSI_SLASH=$(grep -oP '[0-9]+\.[0-9]+/NalogUL[0-9]+\.msi' "$NPUL_FILE" | tail -n 1)
-VER_EXE=$(grep -oP 'NalogUL\K[0-9.]+(?=\.exe)' "$NPUL_FILE" | tail -n 1)
-VER_EXE_SLASH=$(grep -oP '[0-9]+\.[0-9]+\.[0-9]+/NalogUL[0-9]+\.exe' "$NPUL_FILE" | tail -n 1)
+try_get_page "https://data.nalog.ru/rn77/program/5961229/"
+VER_MSI=$(read_page | grep -oP 'NalogUL\d+\.msi' | tail -1 | grep -oP '\d+')
+VER_MSI_URL="${VER_MSI:0:1}.${VER_MSI:1}"  # 492 → 4.92
+VER_EXE=$(read_page | grep -oP 'NalogUL\d+\.exe' | tail -1 | grep -oP '\d+')
+VER_EXE_URL="${VER_EXE:0:1}.${VER_EXE:1:2}.${VER_EXE:3}"  # 4924 → 4.92.4

 AUTOINSTALL_MSI="${WH_TMP_DIR}/NalogUL${VER_MSI}.msi"
 AUTOINSTALL_EXE="${WH_TMP_DIR}/NalogUL${VER_EXE}.exe"

 prepair_wine
-if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_SLASH}" "${AUTOINSTALL_MSI}" ; then
+if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_URL}/NalogUL${VER_MSI}.msi" "${AUTOINSTALL_MSI}" ; then
    wine_run_install "${AUTOINSTALL_MSI}" /quiet INSTALLDIR="c:\npul"
-   try_remove_file "${AUTOINSTALL_MSI}"
+    try_remove_file "${AUTOINSTALL_MSI}"

    PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "*.msi")"
    wine_run_install "${PRINT_INSTALLER}" "/q"
@@ -42,7 +34,7 @@ if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_SLASH}" "${AUTOINST
 fi

 if [[ -n "$VER_EXE" ]] \
-&& try_download "https://data.nalog.ru/files/nalul/${VER_EXE_SLASH}" "${AUTOINSTALL_EXE}"
+&& try_download "https://data.nalog.ru/files/nalul/${VER_EXE_URL}/NalogUL${VER_EXE}.exe" "${AUTOINSTALL_EXE}"
 then
    wine_run_install "${AUTOINSTALL_EXE}" "/SILENT"
    try_remove_file "${AUTOINSTALL_EXE}"
@@ -53,4 +45,3 @@ fi
 touch "$DRIVE_C/npul/INPUTDOC/linux.txt"
 WIN_FILE_EXEC="$DRIVE_C/npul/INPUTDOC/inputdoc.exe"
 create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
-try_remove_file "$NPUL_FILE"
--- a/testinstall/ppdgr2
+++ b/testinstall/ppdgr2
@@ -2,24 +2,26 @@
 # info_ru: Подготовка документов для государственной регистрации (ППДГР)
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export AUTOINSTALL_EXE="${WH_TMP_DIR}/SetupPPDGR2.msi"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="ppdgr2"
+export WINEPREFIX="nalog"
 export PROG_NAME="ППДГР-2"
-# export PROG_VERSION=""
 export PROG_ICON="ppdgr"
-# export ADD_MIME_TYPE=""
-export BASE_PFX="defpfx_dn48_x86_v01"
+export BASE_PFX="none"
 export WINEARCH="win32"
-export INSTALL_DLL="dotnet48 msxml3 msxml4 msxml6 corefonts lucida wsh57 vcrun6 jet40 gdiplus"
 export WH_WINDOWS_VER="10"
 var_winedlloverride_update "msxml4=b,wininet=b"
+export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48"
+
+try_get_page "https://www.nalog.gov.ru/rn77/program/5961277/"
+VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1)
+AUTOINSTALL_EXE="${WH_TMP_DIR}/SetupPPDGR2.msi"

 prepair_wine
-if try_download "https://data.nalog.ru/files/ppdgr/2.7.0/SetupPPDGR2.msi" "${AUTOINSTALL_EXE}" ; then
+if try_download "https://data.nalog.ru/files/ppdgr/${VER_MSI_SLASH}/SetupPPDGR2.msi" "${AUTOINSTALL_EXE}" ; then
    wine_run_install "${AUTOINSTALL_EXE}" /q
    try_remove_file "${AUTOINSTALL_EXE}"

    WIN_FILE_EXEC="$DRIVE_C/АО ГНИВЦ/ППДГР-2/PPDGR2.exe"
    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
 fi
+https://data.nalog.ru/files/ppdgr/2.7.3/SetupPPDGR2.msi
--- a/testinstall/soun
+++ b/testinstall/soun
@@ -2,20 +2,21 @@
 # info_ru: Справочник кодов обозначения налоговых органов для целей учета налогоплательщиков
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export AUTOINSTALL_EXE="${WH_TMP_DIR}/soun_ins.exe"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="soun"
+export WINEPREFIX="nalog"
 export PROG_NAME="СОУН"
-# export PROG_VERSION=""
 export PROG_ICON="soun"
-# export ADD_MIME_TYPE=""
-export BASE_PFX="defpfx_x86_v01"
+export BASE_PFX="none"
 export WINEARCH="win32"
-export INSTALL_DLL="corefonts"
 export WH_WINDOWS_VER="10"
+export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48"
+
+try_get_page "https://www.nalog.gov.ru/rn77/program/5961268/"
+VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.exe[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1)
+AUTOINSTALL_EXE="${WH_TMP_DIR}/soun_ins.exe"

 prepair_wine
-if try_download "https://data.nalog.ru/files/Soun/2.6.2/soun_ins.exe" "${AUTOINSTALL_EXE}" ; then
+if try_download "https://data.nalog.ru/files/Soun/${VER_MSI_SLASH}/soun_ins.exe" "${AUTOINSTALL_EXE}" ; then
    # TODO: Тихий режим или предупреждение
    wine_run_install "${AUTOINSTALL_EXE}"
    try_remove_file "${AUTOINSTALL_EXE}"
--- a/testinstall/tester_n
+++ b/testinstall/tester_n
@@ -2,22 +2,23 @@
 # info_ru: Программа проверки файлов на соответствие форматам представления в электронном виде налоговых деклараций, бухгалтерской отчетности.
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export LAUNCH_PARAMETERS="/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-"
-export AUTOINSTALL_EXE="${WH_TMP_DIR}/tester2269.exe"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="nalog"
 export PROG_NAME="Тестер"
-# export PROG_VERSION=""
 export PROG_ICON="tester"
-# export ADD_MIME_TYPE=""
-export BASE_PFX="defpfx_x86_v01"
+export BASE_PFX="none"
 export WINEARCH="win32"
-export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
 export WH_WINDOWS_VER="10"
+export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48"
+
+try_get_page "https://www.nalog.gov.ru/rn77/program/5961279/"
+VER_EXE_SLASH=$(read_page | grep -oP 'href="\K[^"]*.exe[^"]*' | awk -F'/' '{print $(NF-1)}' | tail -n 1)
+VER_EXE=$(read_page | grep -oP 'href="\K[^"]*.exe[^"]*' | awk -F'/' '{print $(NF)}' | tail -n 1)
+AUTOINSTALL_EXE="${WH_TMP_DIR}/${VER_EXE}"

 prepair_wine
-if try_download "https://data.nalog.ru/files/tester/2.269/tester2269.exe" "${AUTOINSTALL_EXE}" ; then
-    wine_run_install "${AUTOINSTALL_EXE}"
+if try_download "https://data.nalog.ru/files/tester/${VER_EXE_SLASH}/${VER_EXE}" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
    try_remove_file "${AUTOINSTALL_EXE}"

    WIN_FILE_EXEC="$DRIVE_C/Tester/tester.exe"
--- a/203
+++ b/203
@@ -7,7 +7,8 @@ if [[ $(id -u) -eq 0 ]] ; then
 fi

 ##### DEFAULT PATH #####
-export SCRIPT_NAME USER_WORK_PATH RUN_SCRIPT DATA_PATH CHANGELOG_FILE WH_ICON_PATH LICENSE_FILE AGREEMENT THIRD_PARTY_FILE WH_ICON_TRAY GENERAL
+export SCRIPT_NAME USER_WORK_PATH RUN_SCRIPT DATA_PATH CHANGELOG_FILE WH_ICON_PATH \
+       LICENSE_FILE AGREEMENT THIRD_PARTY_FILE WH_ICON_TRAY GENERAL WH_WINETRICKS

 SCRIPT_NAME="$(basename "$0")"
 if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then
@@ -23,6 +24,7 @@ if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then
    AGREEMENT="/usr/share/doc/winehelper-$WH_VERSION/LICENSE_AGREEMENT"
    THIRD_PARTY_FILE="/usr/share/doc/winehelper-$WH_VERSION/THIRD-PARTY"
    GENERAL="/usr/share/doc/winehelper-$WH_VERSION/GENERAL"
+    WH_WINETRICKS="/usr/bin/winetricks"
 else
    # переменные для тестового запуска WineHelper из репозитория
    USER_WORK_PATH="$HOME/test-$SCRIPT_NAME"
@@ -35,8 +37,10 @@ else
    AGREEMENT="$DATA_PATH/LICENSE_AGREEMENT"
    THIRD_PARTY_FILE="$DATA_PATH/THIRD-PARTY"
    GENERAL="$DATA_PATH/GENERAL"
+    WH_WINETRICKS="/usr/bin/winetricks"
    WH_DEVEL="1"

+
    # минимальная проверка синтаксиса скриптов
    for self_check_script in "$RUN_SCRIPT" \
    "$DATA_PATH/dependencies.sh" "$DATA_PATH/autoinstall"/* \
@@ -88,7 +92,7 @@ check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}

 ##### CHECK DEBUG #####
 if [[ "$1" == "--debug" ]] ; then
-    check_variables WINEDEBUG "+loaddll,+seh"
+    check_variables WINEDEBUG "+loaddll"
    export DXVK_LOG_LEVEL="error"
    export VKD3D_DEBUG="error"
    export WINE_MONO_TRACE="E:System.NotImplementedException"
@@ -106,9 +110,6 @@ else
    check_variables DXVK_NVAPI_LOG_LEVEL "none"
 fi

-##### WINETRICKS VERSION #####
-WINETRICKS_VERSION="20250102"
-
 ##### DEFAULT VARIABLES #####
 WH_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
 WH_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
@@ -120,7 +121,6 @@ WH_DB_DIR="$DATA_PATH/database"
 WH_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"
 WH_MANUALINSTALL_DIR="$DATA_PATH/manualinstall"
 WH_TESTINSTALL_DIR="$DATA_PATH/testinstall"
-WH_WINETRICKS="$DATA_PATH/winetricks_$WINETRICKS_VERSION"

 WH_MENU_DIR="$HOME/.local/share/applications/WineHelper"

@@ -142,7 +142,8 @@ check_variables WINEARCH "win64" # or "win32"
 check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system

 check_variables WH_USE_CPCSP_PROXY "0"
-check_variables CPCSP_PROXY_VER "0.6.1-alt1"
+check_variables CPCSP_PROXY_X86_64_VER "0.6.1-alt1"
+check_variables CPCSP_PROXY_WOW64_VER "0.7.3-alt5-wow64"

 check_variables WH_USE_EXTRA_FONTS "0"
 check_variables EXTRA_FONTS_VER "01"
@@ -460,9 +461,12 @@ try_copy_wine_dll_to_pfx_64 () {
 }

 try_copy_wine_dll_to_pfx_32() {
-    if [[ -d "$WINEDIR/lib/wine/i386-windows" ]]
-    then WINE_BUILD_DLL_32="$WINEDIR/lib/wine/i386-windows"
-    else WINE_BUILD_DLL_32="$WINEDIR/lib/wine"
+    if [[ -d "$WINEDIR/lib/wine/i386-windows" ]] ; then
+        WINE_BUILD_DLL_32="$WINEDIR/lib/wine/i386-windows"
+    elif [[ -d "$WINEDIR/lib64/wine/i386-windows" ]] ; then
+        WINE_BUILD_DLL_32="$WINEDIR/lib64/wine/i386-windows"
+    else
+        WINE_BUILD_DLL_32="$WINEDIR/lib/wine"
    fi
    if [[ "$WINEARCH" == "win64" ]] ; then
        cmp -s "$WINE_BUILD_DLL_32/$1" "${WINEPREFIX}/drive_c/windows/syswow64/$1" && return 0
@@ -873,6 +877,10 @@ init_wine_ver () {
        fi

        [[ ! -f "$WINEDIR/version" ]] && echo "$WH_WINE_USE" > "$WINEDIR/version"
+        if [[ $WH_WINE_USE =~ wow64 ]]
+        then export WH_WINE_WOW64="1"
+        else export WH_WINE_WOW64="0"
+        fi

        export WINE="$WINEDIR/bin/wine"
        export WINELOADER="$WINEDIR/bin/wine"
@@ -907,21 +915,32 @@ init_wine_ver () {
            fi
        fi

-        if [[ $WH_USE_CPCSP_PROXY == "1" ]] \
-        && ! grep -q "$CPCSP_PROXY_VER" "$WINEDIR/cpcsp_proxy.ver"
-        then
-            CPCSP_PROXY_NAME="wine-cpcsp_proxy-$CPCSP_PROXY_VER"
-            CPCSP_PROXY_URL="$CLOUD_URL/$CPCSP_PROXY_NAME.tar.xz"
-
-            try_download cloud "$CPCSP_PROXY_URL" "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz" check256sum
-            unpack "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz" "$WH_TMP_DIR"
-
-            cp -fr "$WH_TMP_DIR/$CPCSP_PROXY_NAME/"i386-* "$WINEDIR/lib/wine/"
-            if [[ -d "$WINEDIR/lib64" ]] ; then
-                cp -fr "$WH_TMP_DIR/$CPCSP_PROXY_NAME/"x86_64-* "$WINEDIR/lib64/wine/"
+        if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then
+            local cpcsp_proxy_ver
+            if [[ $WH_WINE_WOW64 == "1" ]]
+            then cpcsp_proxy_ver="$CPCSP_PROXY_WOW64_VER"
+            else cpcsp_proxy_ver="$CPCSP_PROXY_X86_64_VER"
+            fi
+            if [[ ! -f "$WINEDIR/cpcsp_proxy.ver" ]] \
+            || ! grep -q "$cpcsp_proxy_ver" "$WINEDIR/cpcsp_proxy.ver"
+            then
+                CPCSP_PROXY_NAME="wine-cpcsp_proxy-$cpcsp_proxy_ver"
+                CPCSP_PROXY_URL="$CLOUD_URL/$CPCSP_PROXY_NAME.tar.xz"
+
+                try_download cloud "$CPCSP_PROXY_URL" "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz" check256sum
+                unpack "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz" "$WH_TMP_DIR"
+
+                if [[ $WH_WINE_WOW64 == "1" ]] ; then
+                    cp -fr "$WH_TMP_DIR/$CPCSP_PROXY_NAME/"* "$WINEDIR/lib64/wine/"
+                else
+                    cp -fr "$WH_TMP_DIR/$CPCSP_PROXY_NAME/"i386-* "$WINEDIR/lib/wine/"
+                    if [[ -d "$WINEDIR/lib64" ]] ; then
+                        cp -fr "$WH_TMP_DIR/$CPCSP_PROXY_NAME/"x86_64-* "$WINEDIR/lib64/wine/"
+                    fi
+                fi
+                try_remove_dir "$WH_TMP_DIR/$CPCSP_PROXY_NAME"
+                echo "$cpcsp_proxy_ver" > "$WINEDIR/cpcsp_proxy.ver"
            fi
-            try_remove_dir "$WH_TMP_DIR/$CPCSP_PROXY_NAME"
-            echo "$CPCSP_PROXY_VER" > "$WINEDIR/cpcsp_proxy.ver"
        fi
    else
        # use system WINE
@@ -1186,6 +1205,21 @@ init_wineprefix () {
        get_and_set_reg_file --delete 'Software\Wine\X11 Driver' 'UseXVidMode'
    fi

+    # отключаем декоратор для maincontroller.exe
+    # заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0009-wine.inf.in-disable-decorated-window-for-maincontrol.patch;h=887a5e90e130cddeefdead831ef7a78a32588f11;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4
+    get_and_set_reg_file --add 'Software\Wine\AppDefaults\maincontroller.exe\X11 Driver' 'Decorated' 'REG_SZ' "N" "user"
+
+    # заменям шрифт Microsoft Sans Serif на Tahoma
+    # заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0003-wine.inf-Add-the-font-replacement-for-Microsoft-Sans.patch;h=26b8ae2192d94a2b8ddd8565b90b62a2c2b0ed52;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4
+    get_and_set_reg_file --add 'Software\Wine\Fonts\Replacements' 'Microsoft Sans Serif' 'REG_SZ' "Tahoma" "user"
+
+    # добавляем сглаживание шрифтов
+    # заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0002-Add-font-smoothing.patch;h=d7c252899499e9ee0e1a93f7c02548cc79025358;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4
+    get_and_set_reg_file --add 'Control Panel\Desktop' 'FontSmoothing' 'REG_SZ' "2" "user"
+    get_and_set_reg_file --add 'Control Panel\Desktop' 'FontSmoothingGamma' 'REG_DWORD' "0x00000578" "user"
+    get_and_set_reg_file --add 'Control Panel\Desktop' 'FontSmoothingOrientation' 'REG_DWORD' "0x00000001" "user"
+    get_and_set_reg_file --add 'Control Panel\Desktop' 'FontSmoothingType' 'REG_DWORD' "0x00000002" "user"
+
    # добавление ассоциаций файлов для запуска нативного приложения из wine
    # пример переменной: WH_XDG_OPEN="txt doc pdf"
    check_variables WH_XDG_OPEN "0"
@@ -1232,38 +1266,70 @@ init_wineprefix () {

    # настраиваем префикс для работы с cpcsp_proxy
    if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then
-        for cpcsp_proxy_file in "cpcsp_proxy.dll" "cpcsp_proxy_setup.exe" ; do
-            try_copy_wine_dll_to_pfx_64 "$cpcsp_proxy_file"
-            try_copy_wine_dll_to_pfx_32 "$cpcsp_proxy_file"
-        done
+
+        local cades_ver="release_2_0_14892"
+        local url_cades_dll="https://cryptopro.ru/sites/default/files/products/cades/$cades_ver"
+
+        if [[ ! -d "$DRIVE_C/Program Files (x86)/Common Files/Crypto Pro/Shared/" ]]
+        then
+            local msi_cades32="cades-win32.msi"
+            try_download cloud "$url_cades_dll/$msi_cades32" "$WH_TMP_DIR/$msi_cades32"
+            print_info "Установка КриптоПро ЭЦП Runtime ($msi_cades32)"
+            WINEDLLOVERRIDES="msxml3=b" wine_run "$WH_TMP_DIR/$msi_cades32" /q
+        fi
+
+        if [[ "$WINEARCH" == "win64" ]] \
+        && [[ ! -d "$DRIVE_C/Program Files/Common Files/Crypto Pro/Shared" ]]
+        then
+            local msi_cades64="cades-x64.msi"
+            try_download cloud "$url_cades_dll/$msi_cades64" "$WH_TMP_DIR/$msi_cades64"
+            print_info "Установка КриптоПро ЭЦП Runtime ($msi_cades64)"
+            WINEDLLOVERRIDES="msxml3=b" wine_run "$WH_TMP_DIR/$msi_cades64" /q
+        fi

        if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" ; then
-            if [[ "$WINEARCH" == "win32" ]]
-            then cpcsp_proxy_cmd=("$WINELOADER" "cpcsp_proxy_setup.exe")
-            else cpcsp_proxy_cmd=("${WINELOADER}64" "cpcsp_proxy_setup.exe")
+            print_info "Запускаем настройку cpcsp_proxy..."
+            CPCSP_PROXY_OK="0"
+
+            try_copy_wine_dll_to_pfx_64 "cpcsp_proxy.dll"
+            try_copy_wine_dll_to_pfx_32 "cpcsp_proxy.dll"
+
+            if [[ $WH_WINE_WOW64 == "1" ]] ; then
+                env WINEDEBUG="fixme-all" "$WINE" "C:\\windows\\system32\\regsvr32.exe" \
+                /s /n /i cpcsp_proxy.dll 2>&1 | tee "$WINEPREFIX/cpcsp_setup.log"
+
+                env WINEDEBUG="fixme-all" "$WINE" "C:\\windows\\syswow64\\regsvr32.exe" \
+                /s /n /i cpcsp_proxy.dll 2>&1 | tee -a "$WINEPREFIX/cpcsp_setup.log"
+            else
+                try_copy_wine_dll_to_pfx_64 "cpcsp_proxy_setup.exe"
+                try_copy_wine_dll_to_pfx_32 "cpcsp_proxy_setup.exe"
+
+                if [[ "$WINEARCH" == "win32" ]]
+                then cpcsp_proxy_cmd=("$WINELOADER" "cpcsp_proxy_setup.exe")
+                else cpcsp_proxy_cmd=("${WINELOADER}64" "cpcsp_proxy_setup.exe")
+                fi
+
+                set -o pipefail
+                for ((i=2; i < 6; i++)) ; do
+                    "${cpcsp_proxy_cmd[@]}" | tee "$WINEPREFIX/cpcsp_setup.log"
+                    [[ "${PIPESTATUS[0]}" == "0" ]] && break
+                    print_warning "Попытка $i из 5..."
+                    wait_wineserver
+                done
            fi

-            print_info "Запускаем настройку cpcsp_proxy..."
-            unset CPCSP_PROXY_OK
-            set -o pipefail
-            for ((i=2; i < 6; i++)) ; do
-                "${cpcsp_proxy_cmd[@]}" | tee "$WINEPREFIX/cpcsp_setup.log"
-                local CPCSP_EXIT_STATUS="${PIPESTATUS[0]}"
-                if grep -q "failed to load /opt/cprocsp/" "$WINEPREFIX/cpcsp_setup.log" ; then
-                    fatal "Проверьте правильность установки КриптоПро в системе.\n Инструкция: https://www.altlinux.org/CryptoPro"
-                fi
-
-                if [[ $CPCSP_EXIT_STATUS == "0" ]] ; then
-                    print_info "Настройка cpcsp_proxy успешно завершена."
-                    CPCSP_PROXY_OK="1"
-                    break
-                fi
-                print_warning "Попытка $i из 5..."
-                wait_wineserver
-            done
-            wait_wineserver
+            if grep -q "failed to load /opt/cprocsp/" "$WINEPREFIX/cpcsp_setup.log" ; then
+                print_error "Проверьте правильность установки КриптоПро в системе.\n Инструкция: https://www.altlinux.org/CryptoPro"
+            else
+                CPCSP_PROXY_OK="1"
+            fi
            try_remove_file "$WINEPREFIX/cpcsp_setup.log"
-            [[ $CPCSP_PROXY_OK != "1" ]] && fatal "Ошибка во время настройки cpcsp_proxy."
+
+            wait_wineserver
+            if [[ $CPCSP_PROXY_OK == "1" ]]
+            then print_info "Настройка cpcsp_proxy успешно завершена."
+            else fatal "Ошибка во время настройки cpcsp_proxy."
+            fi
        fi
    fi

@@ -1880,13 +1946,16 @@ create_base_pfx () {
    users_dir="$drive_c_dir/users"
    archive_path="$WH_TMP_DIR/pfx/new_${PREFIX_NAME}.tar.xz"

+    # создаем резернвую копию каталога с префиксом
    try_copy_dir "$prefix_dir" "${prefix_dir}_bak"
    create_new_dir "$WH_TMP_DIR/pfx/"

+    # удаляем лишнюю информацию из winetricks.log
    for wtlog in workaround isolate internal winxp win2 win7 win10
    do sed -i "/$wtlog/d" "$prefix_dir/winetricks.log"
    done

+    # переносим пользовательский каталог в общий для всех "xuser"
    if [[ -d "$users_dir/$USER" ]] \
    && [[ ! -L "$users_dir/$USER" ]]
    then
@@ -1897,6 +1966,7 @@ create_base_pfx () {
        cp -fr "$users_dir/$USER"/* "$users_dir/xuser/"
    fi

+    # удаляем всё ненужное для переноса префикса
    try_remove_file "$prefix_dir/.update-timestamp"
    try_remove_file "$prefix_dir/.firstboot"
    try_remove_file "$prefix_dir/last.conf"
@@ -1907,9 +1977,14 @@ create_base_pfx () {
    try_remove_dir "$drive_c_dir/windows/temp/"
    try_remove_dir "$drive_c_dir/windows/Installer/"

+    # удаляем кэш установщика .net
    rm -fr "$drive_c_dir/windows/Microsoft.NET"/*/*/SetupCache/

+    # удаляем все симлинки внутри каталога windows
+    find "$drive_c_dir/windows/" -type l -delete
+
    cd "$prefix_dir"
+    # запускаем сжатие префикса
    if tar --no-xattrs -c -I 'xz --memlimit=8000MiB -9 -T0' -f "$archive_path" ./* ; then
        print_ok "Архив создан по пути: $archive_path"
        xdg-open "$(dirname "$archive_path")" &
@@ -2293,6 +2368,30 @@ run_change_wine_version() {
    print_ok "Версия Wine для префикса $PREFIX_NAME успешно изменена на $WH_WINE_USE."
 }

+clear_winetricks_cache() {
+    local winetricks_cache_dir="$HOME/.cache/winetricks"
+    local winehelper_wt_cache_dir="$HOME/.cache/winehelper/winetricks"
+
+    if [[ ! -d "$winetricks_cache_dir" ]] && [[ ! -d "$winehelper_wt_cache_dir" ]]; then
+        print_info "Кэш Winetricks не найден. Очистка не требуется."
+        return 0
+    fi
+
+    if [[ ! $1 =~ --force|-y ]] ; then
+        print_warning "Вы собираетесь очистить кэш Winetricks."
+        echo "Будут удалены все скачанные установщики Winetricks и списки компонентов."
+        if ! print_confirmation "Продолжить?"
+        then
+            print_info "Операция отменена."
+            exit 1
+        fi
+    fi
+    print_info "Очистка кэша Winetricks..."
+    try_remove_dir "$winetricks_cache_dir"
+    try_remove_dir "$winehelper_wt_cache_dir"
+    print_ok "Кэш Winetricks успешно очищен."
+}
+
 wh_info () {
    echo "Использование: $SCRIPT_NAME [команда]

@@ -2312,6 +2411,7 @@ wh_info () {
    remove-prefix [имя_префикса]    удалить префикс и все связанные данные
    backup-prefix [имя_префикса]    создать резервную копию префикса
    restore-prefix \"путь/до/whpack\" восстановить префикс из резервной копии
+    clear-winetricks-cache          очистить кэш Winetricks

 Параметры:
    --help                          показать эту справку и выйти
@@ -2370,6 +2470,7 @@ case "$arg1" in
    remove-prefix) remove_prefix "$@" ;;
    create-base-pfx) create_base_pfx "$@" ;;
    init-prefix) prepair_wine ; wait_wineserver ;;
+    clear-winetricks-cache) clear_winetricks_cache "$@" ;;
    *)
        if [[ -f "$arg1" ]] ; then
            WIN_FILE_EXEC="$(readlink -f "$arg1")"
--- a/winehelper_gui.py
+++ b/winehelper_gui.py
@@ -31,6 +31,7 @@ class Var:
    LICENSE_AGREEMENT_FILE = os.environ.get("AGREEMENT")
    THIRD_PARTY_FILE = os.environ.get("THIRD_PARTY_FILE")
    GENERAL = os.environ.get("GENERAL")
+    WH_WINETRICKS = os.environ.get("WH_WINETRICKS")

 class DependencyManager:
    """Класс для управления проверкой и установкой системных зависимостей."""
@@ -446,6 +447,7 @@ class WinetricksManagerDialog(QDialog):
        self.previous_tab_widget = None
        self.cache_dir = os.path.join(os.path.expanduser("~"), ".cache", "winehelper", "winetricks")
        os.makedirs(self.cache_dir, exist_ok=True)
+        self.is_reloading_after_cache_clear = False

        self.setWindowTitle(f"Менеджер компонентов для префикса: {os.path.basename(prefix_path)}")
        self.setMinimumSize(800, 500)
@@ -478,8 +480,14 @@ class WinetricksManagerDialog(QDialog):
        self.log_output.setText(self.INFO_TEXT)
        main_layout.addWidget(self.log_output)

-        # Кнопки управления, выровненные по правому краю
+        # Кнопки управления
        button_layout = QHBoxLayout()
+
+        self.clear_cache_button = QPushButton("Очистить кеш")
+        self.clear_cache_button.setStyleSheet("background-color: red; color: white;")
+        self.clear_cache_button.clicked.connect(self.clear_winetricks_cache)
+        button_layout.addWidget(self.clear_cache_button)
+
        button_layout.addStretch(1)

        self.apply_button = QPushButton("Применить")
@@ -736,9 +744,18 @@ class WinetricksManagerDialog(QDialog):
                self._log(output)
                self._log("--------------------------------------------------")

+        # Проверяем, были ли ошибки во время загрузки какой-либо из категорий
+        has_errors = any(status == 'error' for status in self.category_statuses.values())
+
        self.loading_count -= 1
        if self.loading_count == 0:
            self._update_ui_state()
+            if self.is_reloading_after_cache_clear:
+                if has_errors:
+                    self._log("\n=== Ошибка при обновлении списков. Проверьте лог выше. ===", "red")
+                else:
+                    self._log("\n=== Списки успешно обновлены ===")
+                self.is_reloading_after_cache_clear = False # Сбрасываем флаг

    def _on_item_changed(self, item):
        """Обрабатывает изменение состояния чекбокса, предотвращая снятие галочки с установленных."""
@@ -895,6 +912,64 @@ class WinetricksManagerDialog(QDialog):
        self.installation_complete.emit()
        self.installation_finished = True

+    def clear_winetricks_cache(self):
+        """Запускает очистку кэша Winetricks."""
+        reply = self._show_message_box(
+            "Очистка кэша Winetricks",
+            "Вы собираетесь удалить все скачанные установщики и списки компонентов Winetricks.\n\n"
+            "Это действие может потребоваться, если у вас возникают проблемы со скачиванием или установкой компонентов.\n\n"
+            "Продолжить?",
+            QMessageBox.Question,
+            {"buttons": {"Да": QMessageBox.YesRole, "Нет": QMessageBox.NoRole}, "default": "Нет"}
+        )
+
+        if reply != "Да":
+            return
+
+        # Блокируем UI на время выполнения
+        self.tabs.setEnabled(False)
+        self.clear_cache_button.setEnabled(False)
+        self.apply_button.setEnabled(False)
+        self.reinstall_button.setEnabled(False)
+        self.close_button.setEnabled(False)
+
+        self.log_output.clear()
+
+        self.cache_clear_process = QProcess(self)
+        self.cache_clear_process.setProcessChannelMode(QProcess.MergedChannels)
+
+        def handle_output():
+            output = self.cache_clear_process.readAll().data().decode('utf-8', 'ignore').strip()
+            if output:
+                self._log(output)
+
+        def handle_finish(exit_code, exit_status):
+            if exit_code == 0:
+                self.is_reloading_after_cache_clear = True # Устанавливаем флаг перед перезагрузкой
+                self.category_statuses.clear() # Очищаем статусы перед новой загрузкой
+                # Воссоздаем директорию кэша, так как скрипт ее полностью удалил
+                os.makedirs(self.cache_dir, exist_ok=True)
+                self._log("Обновление списков...")
+                self.initial_states.clear()
+                self.load_all_categories()
+            else:
+                self._log(f"\n=== Ошибка (код: {exit_code}) ===", "red")
+
+            # Восстанавливаем UI
+            self.tabs.setEnabled(True)
+            self.clear_cache_button.setEnabled(True)
+            self.close_button.setEnabled(True)
+            self._update_ui_state() # Обновляем состояние кнопок Применить/Переустановить
+
+        self.cache_clear_process.readyRead.connect(handle_output)
+        self.cache_clear_process.finished.connect(handle_finish)
+
+        winehelper_path = self.parent().winehelper_path if hasattr(self.parent(), 'winehelper_path') else Var.RUN_SCRIPT
+        args = ["clear-winetricks-cache", "--force"]
+
+        self._log(f"Выполнение: {shlex.quote(winehelper_path)} {' '.join(args)}\n")
+        self.cache_clear_process.start(winehelper_path, args)
+
    def closeEvent(self, event):
        """Обрабатывает закрытие окна, чтобы предотвратить выход во время установки."""
        # Проверяем, запущен ли процесс установки/переустановки
@@ -938,6 +1013,8 @@ class WinetricksManagerDialog(QDialog):
        """Добавляет сообщение в лог с возможностью указания цвета."""
        if color:
            self.log_output.append(f'<span style="color:{color};">{message}</span>')
+            # Сбрасываем формат, чтобы следующий текст не наследовал цвет
+            self.log_output.setCurrentCharFormat(QTextCharFormat())
        else:
            self.log_output.append(message)
        self.log_output.moveCursor(QTextCursor.End)
@@ -2291,6 +2368,11 @@ class WineHelperGUI(QMainWindow):

        # Если нужно скрыть тестовые версии и они были добавлены
        elif not is_checked and test_buttons:
+            # Если текущая активная кнопка находится среди удаляемых, сбрасываем ее
+            if self.current_active_button in test_buttons:
+                self._reset_info_panel_to_default("Автоматическая установка")
+                self.current_active_button = None
+
            # Останавливаем анимацию и удаляем виджеты тестовых кнопок
            for btn in test_buttons:
                if btn in self.icon_animators:
@@ -3850,22 +3932,7 @@ class WineHelperGUI(QMainWindow):
            QMessageBox.critical(self, "Ошибка", f"Каталог префикса не найден:\n{prefix_path}")
            return

-        winetricks_search_dir = Var.DATA_PATH
-        winetricks_path = None
-        try:
-            # Ищем файл, который начинается с 'winetricks_'
-            for filename in os.listdir(winetricks_search_dir):
-                if filename.startswith("winetricks_"):
-                    winetricks_path = os.path.join(winetricks_search_dir, filename)
-                    break  # Нашли, выходим из цикла
-        except OSError as e:
-            QMessageBox.critical(self, "Ошибка", f"Не удалось прочитать директорию {winetricks_search_dir}: {e}")
-            return
-
-        if not winetricks_path:
-            QMessageBox.critical(self, "Ошибка", f"Скрипт winetricks не найден в директории:\n{winetricks_search_dir}")
-            return
-
+        winetricks_path = Var.WH_WINETRICKS
        wine_executable = self._get_wine_executable_for_prefix(prefix_name)
        dialog = WinetricksManagerDialog(prefix_path, winetricks_path, self, wine_executable=wine_executable)
        dialog.installation_complete.connect(lambda: self.update_prefix_info_display(prefix_name))
--- a/19204
+++ b/19204
Author	SHA1	Message	Date
Mikhail Tergoev	70bee8c760	Merge branch 'minergenon-devel'	2025-11-13 22:51:08 +03:00
Mikhail Tergoev	dab4017c44	ksamu: updated wine and wine-cpcsp_proxy	2025-11-13 22:48:19 +03:00
Mikhail Tergoev	e21db7d2bd	updated sha256sum.list and added wow64 wine and wine-cpcsp_proxy	2025-11-13 22:46:46 +03:00
Mikhail Tergoev	e2d39484f4	added support wine-cpcsp_proxy wow64	2025-11-13 22:44:28 +03:00
Mikhail Tergoev	01d60271c2	create_base_pfx: added rm symlink from windows	2025-11-11 14:34:44 +03:00
Sergey Palcheh	0a6994abf3	fix: winetricks path handling	2025-11-07 10:50:01 +06:00
Mikhail Tergoev	0a4844a9f3	added url for last comments	2025-11-06 15:01:56 +03:00
Mikhail Tergoev	e905461567	added font smoothing	2025-11-06 14:54:33 +03:00
Mikhail Tergoev	b872b9d165	replaced font: Microsoft Sans Serif to Tahoma	2025-11-06 14:46:11 +03:00
Mikhail Tergoev	ea6799fbf2	disabled Decorated for maincontroller.exe	2025-11-06 14:38:02 +03:00
Mikhail Tergoev	7a990ca99c	used system winetricks	2025-11-05 14:05:09 +03:00
Mikhail Tergoev	96c6c8f059	rename TFlex.DOCs17 to TFlexDOCs17	2025-11-05 11:59:02 +03:00
Mikhail Tergoev	122a77a62c	Merge branch 'minergenon-devel'	2025-11-05 11:48:15 +03:00
Sergey Palcheh	3c89777792	tflex: correcting the display of the icon and name for a desktop file	2025-10-30 20:08:22 +06:00
Sergey Palcheh	4afdbaa220	added the winetricks cache deletion feature	2025-10-25 15:16:09 +06:00
Sergey Palcheh	81013bfe71	fix: reset active button if it's being removed	2025-10-25 12:31:16 +06:00
Sergey Palcheh	caccc333db	updating tax program scripts	2025-10-25 12:26:42 +06:00