fixed ppdgr2 script

manualinstall/t-flex-cad-manual

@@ -2,7 +2,7 @@
 # info_ru: Ручная установка дополнений для T-FLEX CAD 17 или 18
 ########################################################################
 export PROG_NAME="T-FLEX CAD 17/18"
-export PROG_ICON="tflexcad"
+export ICONS_BUTTON_GUI="tflexcad17 tflexcad18"
 export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"

manualinstall/t-flex-docs-manual

@@ -2,7 +2,7 @@
 # info_ru: Ручная установка дополнений для T-FLEX DOCS 17 или 18
 ########################################################################
 export PROG_NAME="T-FLEX DOCS 17/18"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexdoc17"
 export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"

testinstall/declaration

@@ -3,13 +3,13 @@
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="nalog"
+export WINEPREFIX="declaration"
 export PROG_NAME="Декларация"
 export PROG_ICON="declarac"
-export BASE_PFX="none"
+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 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/5961249/"
 VER_YEAR=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-2)}' | head -n 1)

testinstall/npul

@@ -6,10 +6,10 @@ 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 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 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://data.nalog.ru/rn77/program/5961229/"
 VER_MSI=$(read_page | grep -oP 'NalogUL\d+\.msi' | tail -1 | grep -oP '\d+')

testinstall/ppdgr2

@@ -3,14 +3,14 @@
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="nalog"
+export WINEPREFIX="ppdgr2"
 export PROG_NAME="ППДГР-2"
 export PROG_ICON="ppdgr"
-export BASE_PFX="none"
+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"
 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)
@@ -24,4 +24,3 @@ if try_download "https://data.nalog.ru/files/ppdgr/${VER_MSI_SLASH}/SetupPPDGR2.
     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

testinstall/soun

@@ -3,13 +3,14 @@
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="nalog"
+export WINEPREFIX="soun"
 export PROG_NAME="СОУН"
 export PROG_ICON="soun"
-export BASE_PFX="none"
+export BASE_PFX="defpfx_x86_v01"
 export WINEARCH="win32"
+export INSTALL_DLL=""
 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"
+export WH_USE_EXTRA_FONTS="1"
 
 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)

testinstall/tester_n

@@ -6,10 +6,10 @@ 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 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 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)

winehelper_gui.py

@@ -642,9 +642,9 @@ class WinetricksManagerDialog(QDialog):
         settings_blacklist_pattern = None
 
         if category == 'dlls':
-            # Исключаем d3d*, directx9, dont_use, dxvk*, vkd3d*, galliumnine, faudio*, Foundation
+            # Исключаем dont_use, dxvk*, vkd3d*, galliumnine, faudio*, Foundation
             dlls_blacklist_pattern = re.compile(
-                r'^(d3d|directx9|dont_use|dxvk|vkd3d|galliumnine|faudio|foundation)', re.IGNORECASE
+                r'^(dont_use|dxvk|vkd3d|galliumnine|faudio|foundation)', re.IGNORECASE
             )
         elif category == 'fonts':
             fonts_blacklist_pattern = re.compile(
@@ -1034,14 +1034,21 @@ class ScriptParser:
             with open(script_path, 'r', encoding='utf-8') as f:
                 lines = f.readlines()
 
-            # 1. Приоритет у PROG_ICON
+            # 1. Приоритет у переменной ICONS_BUTTON_GUI для GUI
+            for line in lines:
+                if line.strip().startswith('export ICONS_BUTTON_GUI='):
+                    icon_names_str = line.split('=', 1)[1].strip().strip('"\'')
+                    if icon_names_str:
+                        return icon_names_str.split()
+
+            # 2. Если ICONS_BUTTON_GUI не найдена, ищем PROG_ICON (для обратной совместимости)
             for line in lines:
                 if line.strip().startswith('export PROG_ICON='):
-                    icon_name = line.split('=', 1)[1].strip().strip('"\'')
-                    if icon_name:
-                        return [icon_name]
+                    icon_names_str = line.split('=', 1)[1].strip().strip('"\'')
+                    if icon_names_str:
+                        return icon_names_str.split()
 
-            # 2. Если PROG_ICON не найден, ищем все вызовы create_desktop
+            # 3. Если ничего не найдено, ищем все вызовы create_desktop
             icon_names = []
             for line in lines:
                 line = line.strip()