updated ksamu (test without cades)

autoinstall/dialux

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# info_ru: Программное обеспечение для 3D-графики, предназначенное для проектирования освещения. (Версия 4.4.0.2)
-########################################################################
-export WH_WINE_USE="wine_x_tkg_10-0_i586"
-export WINEPREFIX="dialux"
-export PROG_NAME="DIALux"
-export PROG_ICON="dialux"
-export BASE_PFX="none"
-export WH_WINDOWS_VER="7"
-export WINEARCH="win32"
-export INSTALL_DLL="mdac28 jet40 dotnet20sp1 vcrun2010 gdiplus ie8"
-
-AUTOINSTALL_SETUP="$DRIVE_C/Dialux4_setup/Dialux/DIALux_4402_Admin_Setup.exe"
-
-prepair_wine
-
-wine_run_install "${AUTOINSTALL_SETUP}"
-
-WIN_FILE_EXEC="$DRIVE_C/Program Files/DIALux/DIALux.exe"
-create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
-

sha256sum.list

@@ -1,6 +1,7 @@
 ##### WINE WOW64 #####
 e9a8b79dfe12cad1304dca573d73aefe109e3d69b6fff739c8dbb8b2d3c271c6  wine-10.12.1-alt1-wow64.tar.xz
 a862761c432f8619caf8100589678a1cbb523787259120ccd4388089d81e3b17  wine-10.18.1-tflex-alt2-wow64.tar.xz
+349c707148a23e667970309248bbbf97b4e2a0db59c548e73d9fe9c3f585872c  wine-10.18.1-alt1-wow64.tar.xz
 
 ##### WINE AMD64 #####
 009c95bfe2df3f9264c9c5092f3e30ea7a168dd7869046058a718a70739602d4  wine_wh_tflex_10-9_amd64.tar.xz

testinstall/ksamu

@@ -2,7 +2,7 @@
 # info_ru: “КСАМУ” - Комплексная система автоматизации медицинского учреждения.
 ########################################################################
 export PROG_URL="https://docs.medicine-it.ru/"
-export WH_WINE_USE="wine-10.12.1-alt1-wow64"
+export WH_WINE_USE="wine-10.18.1-alt1-wow64"
 export WINEPREFIX="ksamu"
 export PROG_NAME="КСАМУ"
 export PROG_ICON="ksamu"
@@ -13,6 +13,10 @@ export INSTALL_DLL="richtx32 riched20 riched30 msls31 msftedit msxml6 msxml4 msx
 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"
 
 prepair_wine
 create_desktop "$PROG_NAME" "$DRIVE_C/KSAMU/KSAMU.exe" "$PROG_ICON"

testinstall/npul

@@ -2,20 +2,19 @@
 # info_ru: Программа автоматизации процесса подготовки юридическими и физическими лицами документов для представления в налоговые органы в электронной форме и на бумажном носителе.
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export WH_WINE_USE="system"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="nalog"
 export PROG_NAME="Налогоплательщик ЮЛ"
 export PROG_ICON="npul"
-export BASE_PFX="none"
-export WINEARCH="win64"
-export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 gdiplus"
+export BASE_PFX="defpfx_x86_v01"
+export WINEARCH="win32"
+export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
 export WH_WINDOWS_VER="10"
-export WH_XDG_OPEN="doc"
 
 try_get_page "https://data.nalog.ru/rn77/program/5961229/"
-VER_MSI=$(read_page | grep -oP 'NalogUL\d+\.msi' | tail -n 1 | grep -oP '\d+')
+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 -n 1 | grep -oP '\d+')
+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"
@@ -26,7 +25,7 @@ if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_URL}/NalogUL${VER_M
     wine_run_install "${AUTOINSTALL_MSI}" /quiet INSTALLDIR="c:\npul"
     try_remove_file "${AUTOINSTALL_MSI}"
 
-    PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "Печать НД с PDF417*.msi")"
+    PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "*.msi")"
     wine_run_install "${PRINT_INSTALLER}" "/q"
 
     # Процедуры конвертации, индексация данных. По завершении процедур программа сама закроется. Признаком успешного завершения будет отсутствие в папке с программой файла setupmarker.ini. Если не принять процедуру, .exe файл обновления не установиться.
@@ -39,9 +38,6 @@ if [[ -n "$VER_EXE" ]] \
 then
     wine_run_install "${AUTOINSTALL_EXE}" "/SILENT"
     try_remove_file "${AUTOINSTALL_EXE}"
-
-    PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "Печать НД с PDF417*.msi" | tail -n 1)"
-    wine_run_install "${PRINT_INSTALLER}" "/q"
 else
     print_info "Дополнительных обновлений не требуется."
 fi

testinstall/ppdgr2

@@ -2,17 +2,16 @@
 # info_ru: Подготовка документов для государственной регистрации (ППДГР)
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export WH_WINE_USE="system"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ppdgr2"
 export PROG_NAME="ППДГР-2"
 export PROG_ICON="ppdgr"
-export BASE_PFX="none"
-export WINEARCH="win64"
-export INSTALL_DLL="dotnet48 msxml4 msxml6 corefonts lucida wsh57 vb6run"
-# export INSTALL_DLL="dotnet48 msxml3 msxml4 msxml6 corefonts lucida wsh57 vcrun6 jet40 gdiplus vb6run"
+export BASE_PFX="defpfx_dn48_x86_v01"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet48 msxml3 msxml4 msxml6 corefonts lucida wsh57 vcrun6 jet40 gdiplus"
 export WH_WINDOWS_VER="10"
 export WH_USE_EXTRA_FONTS="1"
-# var_winedlloverride_update "gdiplus,msxml3,wininet=b;msxml4=n"
+var_winedlloverride_update "gdiplus,msxml3,wininet=b;msxml4=n"
 
 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)

testinstall/soun

@@ -2,12 +2,12 @@
 # info_ru: Справочник кодов обозначения налоговых органов для целей учета налогоплательщиков
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export WH_WINE_USE="system"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="soun"
 export PROG_NAME="СОУН"
 export PROG_ICON="soun"
-export BASE_PFX="none"
-export WINEARCH="win64"
+export BASE_PFX="defpfx_x86_v01"
+export WINEARCH="win32"
 export INSTALL_DLL=""
 export WH_WINDOWS_VER="10"
 export WH_USE_EXTRA_FONTS="1"

testinstall/tester_n

@@ -2,13 +2,13 @@
 # info_ru: Программа проверки файлов на соответствие форматам представления в электронном виде налоговых деклараций, бухгалтерской отчетности.
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export WH_WINE_USE="system"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="nalog"
 export PROG_NAME="Тестер"
 export PROG_ICON="tester"
-export BASE_PFX="none"
-export WINEARCH="win64"
-export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 gdiplus"
+export BASE_PFX="defpfx_x86_v01"
+export WINEARCH="win32"
+export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
 export WH_WINDOWS_VER="10"
 
 try_get_page "https://www.nalog.gov.ru/rn77/program/5961279/"

winehelper

@@ -144,9 +144,12 @@ check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system
 check_variables WH_USE_CPCSP_PROXY "0"
 check_variables CPCSP_PROXY_X86_64_VER "0.6.1-alt1"
 check_variables CPCSP_PROXY_WOW64_VER "0.7.7-alt1-wow64"
+check_variables WH_USE_CPCSP_CADES "0"
 
 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 STAGING_SHARED_MEMORY "1"
 check_variables WINE_LARGE_ADDRESS_AWARE "1"
@@ -162,6 +165,8 @@ check_variables WH_USE_SHADER_CACHE "1"
 check_variables WH_USE_MESA_GL_OVERRIDE "0"
 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 WINE_WIN_START "start /wait /high /unix"
 
@@ -1224,20 +1229,29 @@ init_wineprefix () {
         get_and_set_reg_file --delete 'Software\Wine\X11 Driver' 'UseXVidMode'
     fi
 
-    if [[ $WH_MC_NO_DECORATED = "1" ]] ; then
-        # отключаем декоратор для 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"
+    # управляем декоратором для ПО по умолчанию
+    if [[ $WH_MAIN_DECORATED = "0" ]] ; then
+        get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'Decorated' 'REG_SZ' "N" "user"
+    elif [[ $WH_MAIN_DECORATED = "1" ]] ; then
+        get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'Decorated' 'REG_SZ' "Y" "user"
     fi
 
+    # управляем декоратором для maincontroller.exe
+    if [[ $WH_MC_DECORATED = "0" ]] ; then
+        # заменяет патч: 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"
+    elif [[ $WH_MC_DECORATED = "1" ]] ; then
+        get_and_set_reg_file --add 'Software\Wine\AppDefaults\maincontroller.exe\X11 Driver' 'Decorated' 'REG_SZ' "Y" "user"
+    fi
+
+    # заменям шрифт Microsoft Sans Serif на Tahoma
     if [[ $WH_FONT_MSS_REPLACE = "1" ]] ; then
-        # заменям шрифт 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"
     fi
 
+    # добавляем сглаживание шрифтов
     if [[ $WH_FONT_SMOOTHING = "1" ]] ; then
-        # добавляем сглаживание шрифтов
         # заменяет патч: 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"
@@ -1292,24 +1306,26 @@ init_wineprefix () {
     # настраиваем префикс для работы с cpcsp_proxy
     if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then
 
-        local cades_ver="release_2_0_14892"
-        local url_cades_dll="https://cryptopro.ru/sites/default/files/products/cades/$cades_ver"
+        if [[ $WH_USE_CPCSP_CADES == "1" ]] ; then
+            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 [[ ! -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
+            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
         fi
 
         if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" ; then