used wine-tflex-wow64 for all t-flex

autoinstall/t-flex-cad-edu17

@@ -4,7 +4,7 @@
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD Учебная Версия 17"
 export PROG_ICON="tflexcad17"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

autoinstall/t-flex-cad17

@@ -4,7 +4,7 @@
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD 17"
 export PROG_ICON="tflexcad17"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

autoinstall/t-flex-cad17-applications

@@ -5,7 +5,7 @@ export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="Приложения для T-FLEX CAD 17"
 export PROG_ICON="tflexcad17"
 export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WINEPREFIX="tflex"

autoinstall/t-flex-cad17-resources

@@ -5,7 +5,7 @@ export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="Ресурсы для T-FLEX CAD 17"
 export PROG_ICON="tflexcad17"
 export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WINEPREFIX="tflex"

autoinstall/t-flex-cad18

@@ -4,7 +4,7 @@
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD 18"
 export PROG_ICON="tflexcad18"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

autoinstall/t-flex-cad18-applications

@@ -5,7 +5,7 @@ export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="Приложения для T-FLEX CAD 18"
 export PROG_ICON="tflexcad18"
 export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WINEPREFIX="tflex"

autoinstall/t-flex-cad18-resources

@@ -5,7 +5,7 @@ export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="Ресурсы для T-FLEX CAD 18"
 export PROG_ICON="tflexcad18"
 export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WINEPREFIX="tflex"

autoinstall/t-flex-cad2d+17

@@ -4,7 +4,7 @@
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD 2D+ 17"
 export PROG_ICON="tflexcad17"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

autoinstall/t-flex-cad2d+18

@@ -4,7 +4,7 @@
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX CAD 2D+ 18"
 export PROG_ICON="tflexcad18"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

autoinstall/t-flex-docs17

@@ -4,7 +4,7 @@
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX DOCs 17"
 export PROG_ICON="tflexdoc17"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

autoinstall/t-flex-viewer17

@@ -4,7 +4,7 @@
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX Viewer 17"
 export PROG_ICON="tflexcad17"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

autoinstall/t-flex-viewer18

@@ -4,7 +4,7 @@
 export PROG_URL="https://www.tflexcad.ru"
 export PROG_NAME="T-FLEX Viewer 18"
 export PROG_ICON="tflexcad18"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

database/t-flex-cad.whdb

@@ -2,7 +2,7 @@
 # info_ru: Компоненты сервисов поддержки T-FLEX 17 и 18
 ########################################################################
 export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WINEPREFIX="tflex"

manualinstall/t-flex-cad-manual

@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_NAME="T-FLEX CAD 17/18"
 export PROG_ICON="tflexcad"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

manualinstall/t-flex-docs-manual

@@ -3,7 +3,7 @@
 ########################################################################
 export PROG_NAME="T-FLEX DOCS 17/18"
 export PROG_ICON="tflexcad"
-export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"

sha256sum.list

@@ -1,5 +1,6 @@
 ##### WINE WOW64 #####
 e9a8b79dfe12cad1304dca573d73aefe109e3d69b6fff739c8dbb8b2d3c271c6  wine-10.12.1-alt1-wow64.tar.xz
+a862761c432f8619caf8100589678a1cbb523787259120ccd4388089d81e3b17  wine-10.18.1-tflex-alt2-wow64.tar.xz
 
 ##### WINE AMD64 #####
 009c95bfe2df3f9264c9c5092f3e30ea7a168dd7869046058a718a70739602d4  wine_wh_tflex_10-9_amd64.tar.xz
@@ -14,49 +15,6 @@ fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193  wine-9.0.14-al
 6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79  wine-9.0.9-alt1-i586.tar.xz
 6fea17fd131f57c2ebf7ca4c60d3c5a9e819afe16e5d0b77ecb750da99ae0e38  wine-7.16.1-alt1-i586.tar.xz
 
-##### WINE_LG #####
-765e52484f06169909b179f4884d04ae4b440ff868e4b5722e64fc7d7a036ad9  WINE_LG_10-10-1.tar.xz
-7a5128fcebbeed652ba36c5135821fd2c82493e87d715e8bc63e3210ba7ee849  WINE_LG_10-11.tar.xz
-373beeb85c1c8163e752a32a453dcf575dd7ecf971726cecb3195e330d094925  WINE_LG_10-12.tar.xz
-92f3c5a47a27644fde3ec1da810afcd5e6c9c5c2bc9c1f5f76a82b55894e745b  WINE_LG_10-1.tar.xz
-ef8a71c269f5a2a7012aec9c16f307ab49ed09fa85a91b42d6c6b954d40401a6  WINE_LG_10-5.tar.xz
-7aca95bd921a102e0a4464f4a8945095e05587bffbb924fe1603d2deb8283ba5  WINE_LG_10-7.tar.xz
-503a86e8b9446a4805da524ba5ec2bde591787b354df098135d65f2ed9d66dca  WINE_LG_8-18-1.tar.xz
-2714260a7f1f7d6427736aad2093dc17c1c10df9641b552e5ac4ac3fc73308ee  WINE_LG_9-10.tar.xz
-3c2dbb33da9eaa7f3afcbe366293f6abf601257fb782a06040710ec6f1def1ec  WINE_LG_9-11.tar.xz
-da79f89b1fc3175f113bf5ec35fc2755550159034736cff086f2165480dd6e0f  WINE_LG_9-12-2.tar.xz
-34a31802e50d6d70e1f4d23520c2d0047ae70d0cb4beb3e04046ee781e136a68  WINE_LG_9-12.tar.xz
-6d6fd31ff71fd43f17182b466b6d499b61652775b7dbf25a18c3eaab7eacea2d  WINE_LG_9-2.tar.xz
-3f0cda10a1019c6a18d832dc547709e612d88297ce332f0835c2bffeae9215c3  WINE_LG_9-5.tar.xz
-51ff56e435a90eeff13ffbbac543a820d1df14d65f2e3b760ad100bc946e4bfc  WINE_LG_9-7.tar.xz
-09901b17a7aaa13e5c1a1f99ab82c9f0d223aa2f5c9ac94938e5a9a0088bb244  WINE_LG_9-9.tar.xz
-
-##### PROTON_LG #####
-d0f5b42096bc5ed379a26e415d99963f849129d5cec1ba9134b1ee50100b049b  PROTON_LG_10-10.tar.xz
-d87eb914ce7e5cab47e6b480aa400f8c7840f39a22d585bf35092a033ac09201  PROTON_LG_10-13.tar.xz
-05ca56607af7cee30b4797ad6c6a111d38a52c9d5c2184d30eec2650f1585b58  PROTON_LG_10-15.tar.xz
-f8bfac3029bd79e211a6dc592c0959db239fb7807c410ed2a537c34467875c74  PROTON_LG_10-4.tar.xz
-83d3cf60bbae6ca9d0508c2fdeaf3887bb72830eb52afc858d4afa009d0faa78  PROTON_LG_10-8.tar.xz
-f70039931d644898bb0a44daa7e3d44fcafa9dca0881e2277b1062ecd2a5357a  PROTON_LG_8-25-2.tar.xz
-3e9202caf11d517406f82209e9e5385a4b0b1e4e16afa8b6f4fd517401537224  PROTON_LG_9-11.tar.xz
-0481da38de07c71074c245624404994af164c9a6a584942c6d1f12966db2311a  PROTON_LG_9-12.tar.xz
-786d6415bb884d0ec80617e02004558634ac6bd99474cd63c25e2e5fd339b112  PROTON_LG_9-15.tar.xz
-8f05ee518e1861a79b1830301c57a8d4422b6a9c24dfeec07fde474d283d4152  PROTON_LG_9-16.tar.xz
-8bd409e4c56472429042555c1b2102bcd8313a4d40a80fe17a2caac8f4c8d4ed  PROTON_LG_9-18.tar.xz
-e88e7b076ad1d85d625407468515d6f41dcb20b721a6bd699bcd8818647d136c  PROTON_LG_9-19.tar.xz
-bd5dfe3a5187eb3583e5bc2fbc7debe40760802539c1317211415edeeeae851e  PROTON_LG_9-27.tar.xz
-63fde3b768a60cf736dcf3f9922cc2ab606cb7007e4cbe59f10cd038d3bdbee8  PROTON_LG_9-2.tar.xz
-e09c5da9ddffc5d390de7689df1778f279cc84a946665cc76ce77861010b2604  PROTON_LG_9-4.tar.xz
-03ccc15aa4adcaa49f3eeb52bf2a9127bacd8d578478f716b390e812dab74e21  PROTON_LG_9-5-1.tar.xz
-56eae794a48aa7322ce5a636c490974d7f2516528d3153991fb033b0fa5fe3cf  PROTON_LG_9-5.tar.xz
-82263e1d0ab16130f15d419f2661fc5a7baf29193b9eeeb7eec3f01a3e54a1b3  PROTON_LG_9-7.tar.xz
-
-##### PROTON_STEAM #####
-09e6e386a87710996d634e08650bbc733365df65d3491a4372f06cf4e815a8b2  PROTON_STEAM_6.3-8.tar.xz
-2f8bdfeb75e5427886aac7d2a599a1ee8900e50d5873a0e620d5703707bf4271  PROTON_STEAM_7.0-5.tar.xz
-b33aca95664067c9eff06a2b4380992d43a5d31880ff970fb340e851671be625  PROTON_STEAM_8.0-4.tar.xz
-9a20af28f4213e4f1c532b79a20e6a95ef872130784fc306510637342c6f58a1  PROTON_STEAM_8.0-5.tar.xz
-
 ##### DXVK #####
 d1a86ca53ab7e156e1252d3cf7eed3c66fe0651699cfc9c4ba152024261d8258  dxvk-1.10.1-967.tar.xz
 98411effbc1b3611b11c4ca3af2ad29400b08e1c8c380791d6351600a06fb3c7  dxvk-1.10.3-28.tar.xz

winehelper

@@ -526,6 +526,10 @@ var_ld_library_path_update () {
     return 0
 }
 
+check_wayland_session () {
+    [[ $XDG_SESSION_TYPE =~ "wayland" ]] && return 0 || return 1
+}
+
 find_prefix () {
     # Автоматическое определение префикса, если он не задан
     if [[ -z "$WINEPREFIX" ]] && [[ "$1" == "$WH_PREFIXES_DIR"* ]]; then
@@ -1190,9 +1194,30 @@ init_wineprefix () {
     fi
 
     if [[ $WH_USE_MESA_GL_OVERRIDE == "1" ]] \
-    && ! lspci | grep -i nvidia > /dev/null ; then
+    && ! lspci | grep -i nvidia > /dev/null
+    then
         export MESA_GL_VERSION_OVERRIDE="3.3"
         export MESA_GLSL_VERSION_OVERRIDE="330"
+
+    fi
+
+    if check_wayland_session ; then
+        # добаляем возможность запуска в нативном wayland если WH_USE_WAYLAND=1
+        if [[ $WH_USE_WAYLAND == "1" ]] ; then
+            export WINE_WAYLAND_HACKS="1"
+            var_winedlloverride_update "winex11.drv=d;winewayland.drv=b"
+            get_and_set_reg_file --add 'Software\Wine\Drivers' 'Graphics' 'REG_SZ' "x11,wayland" "user"
+        else
+            unset WINE_WAYLAND_HACKS
+            get_and_set_reg_file --delete 'Software\Wine\Drivers' 'Graphics'
+        fi
+
+        # исправляем некорректное отображение выпадающих окон под wayland
+        if [[ $DXVK_VER == "none" ]] \
+        || [[ $VKD3D_VER == "none" ]]
+        then
+            check_variables WINE_D3D_CONFIG "renderer=vulkan"
+        fi
     fi
 
     # хак для XRDP сессии