3.4.0

Signed-off-by: Bail <2915289604@qq.com>

.github/workflows/auto-building.yml

@@ -0,0 +1,30 @@
+name: Auto Building Wine Runner
+run-name: ${{ github.actor }} Auto Building Wine Runner 🚀
+on:
+  push:
+  workflow_dispatch:
+jobs:
+  Explore-GitHub-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Building DEB
+        env: 
+          GUSER: ${{ secrets.GUSER }}
+          PASSWORD: ${{ secrets.PASSWORD }}
+          UPLOADURL: ${{ secrets.UPLOADURL }}
+        run: |
+          # 配置环境
+          sudo apt update
+          sudo apt install git dpkg-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qt5-qmake -y
+          git clone https://github.com/gfdgd-xi/deep-wine-runner
+          cd deep-wine-runner
+          make build
+          mv spark-deepin-wine-runner.deb ~
+      - name: upload result
+        uses: actions/upload-artifact@v1
+        with:
+          name: spark-deepin-wine-runner.deb
+          path: /home/runner/spark-deepin-wine-runner.deb
+      
+      
+    

AddWineDebMirrorForDeepin20.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+echo 网址：http://deb.wine.wine-runner.gfdgdxi.top/
+if [[ ! -f /etc/apt/sources.list.d/gfdgdxi-list-winehq.list ]]; then
+    echo 未添加源，现在开始添加！
+    sudo apt update
+    sudo apt install wget gpg
+    if [[ -f /tmp/github.sh ]]; then
+        rm -v /tmp/github.sh
+    fi
+    cd /tmp
+    wget http://deb.wine.wine-runner.gfdgdxi.top/sources/github.sh
+    bash github.sh
+    rm github.sh
+    echo 添加完成，现在安装 Wine！
+else
+    echo 已添加源，忽略，现在安装 Wine！
+    sudo apt update
+fi
+sudo apt install winehq-devel -y
+echo 安装完成，按回车键退出！
+read

BuildDemoConfigFile/com.7zip.demo_23.01spark0_all.json

@@ -0,0 +1,87 @@
+{
+    "Package": [
+        "L",
+        "com.7zip.demo"
+    ],
+    "Version": [
+        "L",
+        "23.01spark0"
+    ],
+    "Description": [
+        "L",
+        "7Zip For Deepin Wine6 Stable"
+    ],
+    "Maintainer": [
+        "L",
+        "gfdgd xi<3025613752@qq.com>"
+    ],
+    "BottleName": [
+        "L",
+        "Spark-7zip"
+    ],
+    "BottlePath": [
+        "L",
+        "/home/gfdgd_xi/.deepinwine/Spark-7zip"
+    ],
+    "WineVersion": [
+        "Co",
+        5
+    ],
+    "DebSavePath": [
+        "L",
+        "/home/gfdgd_xi/Desktop/com.7zip.demo_23.01spark0_all.deb"
+    ],
+    "Desktop": [
+        "List-Desktop",
+        [
+            [
+                "c:/Program Files/7-Zip/7zFM.exe",
+                11,
+                "",
+                "7Zip",
+                "/home/gfdgd_xi/Desktop/Icon_0001.png",
+                ""
+            ]
+        ]
+    ],
+    "UseInstallWineArch": [
+        "Co",
+        0
+    ],
+    "RemoveBash": [
+        "Ch",
+        true
+    ],
+    "CleanBottleByUOS": [
+        "Ch",
+        true
+    ],
+    "ChooseWineHelperValue": [
+        "Ch",
+        true
+    ],
+    "DisabledMono": [
+        "Ch",
+        true
+    ],
+    "DebDepends": [
+        "L",
+        "deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
+    ],
+    "DebRecommend": [
+        "L",
+        ""
+    ],
+    "DebFirstArch": [
+        "Co",
+        0
+    ],
+    "DebArch": [
+        "Co",
+        0
+    ],
+    "SparkHelperConfigPath": [
+        "Str-SparkHelperConfigPath",
+        null
+    ]
+}

ConfigLanguareRunner.py

@@ -43,8 +43,8 @@ programEnv = [
     ["($PROGRAMPATH)", programPath],
     ["($VERSION)", version],
     ["($THANK)", thankText],
-    ["($MAKER)", "RacoonGX 团队，By gfdgd xi"],
+    ["($MAKER)", "gfdgd xi"],
-    ["($COPYRIGHT)", f"©2020~{time.strftime('%Y')} RacoonGX 团队，By gfdgd xi"],
+    ["($COPYRIGHT)", f"©2020~{time.strftime('%Y')} gfdgd xi"],
     ["($?)", "0"],
     ["($PLATFORM)", platform.system()],
     ["($DEBUG)", "1"]
@@ -301,7 +301,7 @@ class Command():
 
         def Version(self):
             print(f"版本：{version}")
-            print(f"©2020~{time.strftime('%Y')} RacoonGX 团队，By gfdgd xi")
+            print(f"©2020~{time.strftime('%Y')} gfdgd xi")
             return 0
 
         def Pause(self) -> int:
@@ -650,7 +650,7 @@ if __name__ == "__main__":
     if len(sys.argv) - optionAll < 2:
         print("Wine 运行器自动配置文件解析器交互环境")
         print(f"版本：{version}")
-        print(f"©2020~{time.strftime('%Y')} RacoonGX 团队，By gfdgd xi")
+        print(f"©2020~{time.strftime('%Y')} By gfdgd xi")
         print("--------------------------------------------------------------")
         while True:
             commandLine = input(">")

InstallBox86-cn.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+if [[ `whoami` != root ]]; then
+    echo 请以 root 权限运行
+    echo 按任意键退出
+    read
+    exit 1
+fi
+PCArch=`dpkg --print-architecture`
+if [[ $PCArch != "aarch64" ]] && [[ $PCArch != "arm64" ]]; then
+    echo 非 ARM 架构，无法继续
+    echo 按任意键退出
+    read
+    exit 1
+fi
+which box86
+if [[ $? == 0 ]]; then
+    echo 已安装，结束
+    echo 按回车键退出
+    read 
+    exit 1
+fi
+echo 使用国内源
+#sudo wget https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list
+sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/debian ./ > /etc/apt/sources.list.d/box86.list"
+wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg 
+echo "adding key..."
+installBox=box86-generic-arm
+if [[ $PCArch == "arm64" ]]; then
+    sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/debian ./ > /etc/apt/sources.list.d/box64.list"
+    wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg
+    installBox="box86-generic-arm box64-generic-arm"
+    sudo dpkg --add-architecture armhf
+fi
+echo " + sudo apt update"
+sudo apt update
+sudo apt install binfmt-support -y
+sudo apt install libc6:armhf -y
+echo apt 源添加完毕！按回车键继续安装 Box86/Box64，若想要停止安装，则请按 Ctrl+C 或按终端右上角 ×（叉叉）退出
+echo 按回车键后将会自动安装包名为 box86-generic-arm、box64-generic-arm（box64 要在 aarch64 系统才可安装）的 Box86/Box64 包（适用于通用 ARM 系统）
+echo 其他特殊版本及其包名可见如下链接（如适用于 rk3399 的版本）：
+echo "    - Box64：https://github.com/ryanfortner/box64-debs/"
+echo "    - Box86：https://github.com/ryanfortner/box86-debs/"
+echo "    - Box64（国内镜像）：http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs"
+echo "    - Box64（国内镜像）：http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs"
+read
+sudo apt install -y $installBox
+echo 安装完成！按回车键退出
+read

InstallBox86.sh

@@ -19,17 +19,29 @@ if [[ $? == 0 ]]; then
     read 
     exit 1
 fi
-#sudo wget https://itai-nelken.github.io/weekly-box86-debs/debian/box86.list -O /etc/apt/sources.list.d/box86.list
+echo 使用 Github 源
-echo deb http://box86.gfdgdxi.top / > /etc/apt/sources.list.d/box86.list
+#sudo wget https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list
+sudo wget https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list
+wget -qO- https://ryanfortner.github.io/box86-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg 
 echo "adding key..."
-wget -qO- http://box86.gfdgdxi.top/KEY.gpg | sudo apt-key add -
+installBox=box86-generic-arm
-installBox=box86
 if [[ $PCArch == "arm64" ]]; then
-    installBox="box86 box64"
+    sudo wget https://ryanfortner.github.io/box64-debs/box64.list -O /etc/apt/sources.list.d/box64.list
+    wget -qO- https://ryanfortner.github.io/box64-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg 
+    installBox="box86-generic-arm box64-generic-arm"
     sudo dpkg --add-architecture armhf
 fi
 echo " + sudo apt update"
 sudo apt update
+sudo apt install binfmt-support -y
+echo apt 源添加完毕！按回车键继续安装 Box86/Box64，若想要停止安装，则请按 Ctrl+C 或按终端右上角 ×（叉叉）退出
+echo 按回车键后将会自动安装包名为 box86-generic-arm、box64-generic-arm（box64 要在 aarch64 系统才可安装）的 Box86/Box64 包（适用于通用 ARM 系统）
+echo 其他特殊版本及其包名可见如下链接（如适用于 rk3399 的版本）：
+echo "    - Box64：https://github.com/ryanfortner/box64-debs/"
+echo "    - Box86：https://github.com/ryanfortner/box86-debs/"
+echo "    - Box64（国内镜像）：https://jihulab.com/gfdgd-xi/box64-debs"
+echo "    - Box64（国内镜像）：https://jihulab.com/gfdgd-xi/box86-debs"
+read
 sudo apt install -y $installBox
 echo 安装完成！按回车键退出
 read

InstallDll.py

@@ -23,6 +23,7 @@ def exit():
     sys.exit()
 # 获取云列表
 sourcesList = [
+    "http://dll.wine-runner.gfdgdxi.top",
     "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/dlls",
     "http://gfdgdxi.msns.cn/wine-runner-list/dlls"
 ]
@@ -31,7 +32,8 @@ print("获取列表中……", end="")
 try:
     lists = json.loads(requests.get(f"{url}/list.json").text)
 except:
-    print("\r列表获取失败！")
+    print("\r列表获取失败！按回车键退出")
+    input()
     exit()
 print("\r列表获取成功！")
 

InstallFoxpro.py

@@ -0,0 +1,105 @@
+#!/usr/bin/env python3
+# 使用系统默认的 python3 运行
+###########################################################################################
+# 作者：gfdgd xi
+# 版本：2.1.0
+# 更新时间：2022年08月25日
+# 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
+# 基于 Python3 构建
+###########################################################################################
+#################
+# 引入所需的库
+#################
+import os
+import sys
+import json
+import updatekiller
+import req as requests
+try:
+    sourcesList = [
+        "http://foxpro.wine-runner.gfdgdxi.top/list.json",
+        "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/Visual FoxPro/list.json"
+    ]
+    change = False
+    for i in sourcesList:
+        try:
+            netList = json.loads(requests.get(i).text)
+            change = True
+            break
+        except:
+            pass
+    if not change:
+        netList = json.loads(requests.get(sourcesList[0]).text)
+except:
+    print("使用离线列表")
+    netList = [
+        ["3.0 Runtime Service Pack 1", "http://foxpro.wine-runner.gfdgdxi.top/VFP3SP1RT.EXE", "VFP3SP1RT.EXE"],
+        ["5.0 Runtime Service Pack 1", "http://foxpro.wine-runner.gfdgdxi.top/VFP5SP1RT.EXE", "VFP5SP1RT.EXE"],
+        ["6.0 Runtime Service Pack 5", "http://foxpro.wine-runner.gfdgdxi.top/VFP6SP5RT.EXE", "VFP6SP5RT.EXE"],
+        ["7.0 Runtime Service Pack 0", "http://foxpro.wine-runner.gfdgdxi.top/VFP7SP0RT.EXE", "VFP7SP0RT.EXE"],
+        ["7.0 Runtime Service Pack 1", "http://foxpro.wine-runner.gfdgdxi.top/VFP7SP1RT.EXE", "VFP7SP1RT.EXE"],
+        ["8.0 Runtime Service Pack 0", "http://foxpro.wine-runner.gfdgdxi.top/VFP8SP0RT.EXE", "VFP8SP0RT.EXE"],
+        ["8.0 Runtime Service Pack 1", "http://foxpro.wine-runner.gfdgdxi.top/VFP8SP1RT.EXE", "VFP8SP1RT.EXE"],
+        ["9.0 Runtime Service Pack 1", "http://foxpro.wine-runner.gfdgdxi.top/VFP9SP1RT.EXE", "VFP9SP1RT.EXE"],
+        ["9.0 Runtime Service Pack 2 with Hotfixes", "http://foxpro.wine-runner.gfdgdxi.top/VFP9SP2RT.EXE", "VFP9SP2RT.EXE"]
+    ]
+def Download(wineBotton: str, id: int, wine: str) -> int:
+    try:
+        os.remove(f"/tmp/deepin-wine-runner-FoxPro/{netList[id][2]}")
+    except:
+        pass
+    os.system(f"aria2c -x 16 -s 16 -d '/tmp/deepin-wine-runner-FoxPro' -o '{netList[id][2]}' \"{netList[id][1]}\"")
+    return os.system(f"WINEPREFIX='{wineBotton}' {wine} '/tmp/deepin-wine-runner-FoxPro/{netList[id][2]}'")
+
+if __name__ == "__main__":
+    if "--help" in sys.argv:
+        print("作者：gfdgd xi")
+        print("版本：1.0.0")
+        print("本程序可以更方便的在 wine 容器中安装 Visual FoxPro")
+        sys.exit()
+    if len(sys.argv) <= 2 or sys.argv[1] == "" or sys.argv[2] == "":
+        print("您未指定需要安装 Visual FoxPro 的容器和使用的 wine，无法继续")
+        print("参数：")
+        print("XXX 参数一 参数二 参数三(可略)")
+        print("参数一为需要安装的容器，参数二为需要使用的wine，参数三为是否缓存（可略），三个参数位置不能颠倒")
+        sys.exit()
+
+    homePath = os.path.expanduser('~')
+    print('''                                          
+ mmmmmm               mmmmm               
+ #       mmm   m   m  #   "#  m mm   mmm  
+ #mmmmm #" "#   #m#   #mmm#"  #"  " #" "# 
+ #      #   #   m#m   #       #     #   # 
+ #      "#m#"  m" "m  #       #     "#m#" 
+                                          
+                                          
+''')
+
+    print("请选择以下的 Visual FoxPro 进行安装（不保证能正常安装运行）")
+    for i in range(0, len(netList)):
+        print(f"{i} Visual FoxPro {netList[i][0]}")
+    while True:
+        try:
+            choose = input("请输入要选择的 Visual FoxPro 版本（输入“exit”退出）：").lower()
+            if choose == "exit":
+                break
+            choose = int(choose)
+        except:
+            print("输入错误，请重新输入")
+            continue
+        if 0 <= choose and choose < len(netList):
+            break
+    if choose == "exit":
+        exit()
+    print(f"您选择了 Visual FoxPro {netList[choose][0]}")
+    if os.path.exists(f"{homePath}/.cache/deepin-wine-runner/vcpp/{netList[choose][2]}"):
+        print("已经缓存，使用本地版本")
+        os.system(f"WINEPREFIX='{sys.argv[1]}' {sys.argv[2]} '{homePath}/.cache/deepin-wine-runner/vcpp/{netList[choose][2]}'")
+        input("安装结束，按回车键退出")
+        exit()
+    print("开始下载")
+    os.system(f"rm -rf '{homePath}/.cache/deepin-wine-runner/vcpp/{netList[choose][2]}'")
+    os.system(f"mkdir -p '{homePath}/.cache/deepin-wine-runner/vcpp'")
+    os.system(f"aria2c -x 16 -s 16 -d '{homePath}/.cache/deepin-wine-runner/vcpp' -o '{netList[choose][2]}' \"{netList[choose][1]}\"")
+    os.system(f"WINEPREFIX='{sys.argv[1]}' {sys.argv[2]} '{homePath}/.cache/deepin-wine-runner/vcpp/{netList[choose][2]}'")
+    input("安装结束，按回车键退出")

InstallNewWineHQ.sh

@@ -17,7 +17,9 @@ echo '" #"# #   #    #"  #  #"  #  #mmmm# #    #'
 echo ' ## ##"   #    #   #  #""""  #    # #    #'
 echo ' #   #  mm#mm  #   #  "#mm"  #    #  #mm#"'
 echo '                                        # '
-                                          
+echo
+echo "WineHQ 官网：https://wiki.winehq.org/"
+echo 当前使用国内镜像源：https://mirrors-i.tuna.tsinghua.edu.cn/help/wine-builds/                                          
 
 ubuntuSource=(
     "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ jammy main | sudo tee /etc/apt/sources.list.d/winehq.list"
@@ -28,11 +30,11 @@ ubuntuSource=(
 debianSource=(
     "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ buster main | sudo tee /etc/apt/sources.list.d/winehq.list"
     "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ bullseye main | sudo tee /etc/apt/sources.list.d/winehq.list"
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ bookworm main | sudo tee /etc/apt/sources.list.d/winehq.list"
 )
 # 选择发行版
-echo "WineHQ 官网：https://wiki.winehq.org/"
+#echo "WineHQ 官网：https://wiki.winehq.org/"
-echo "国内镜像源：https://mirrors-i.tuna.tsinghua.edu.cn/help/wine-builds/"
+#echo "国内镜像源：https://mirrors-i.tuna.tsinghua.edu.cn/help/wine-builds/"
 echo
 echo "选择发行版："
 echo "0. Debian"
@@ -43,7 +45,7 @@ echo "选择系统版本"
 if [ $system = "0" ]; then
     echo "0. Debian 10 (Buster)"
     echo "1. Debian 11 (Bullseye)"
-    echo "2. Debian Testing (Bookworm)"
+    echo "2. Debian 12 (Bookworm)"
 fi
 if [ $system = "1" ]; then
     echo "0. Ubuntu 22.04"

InstallNewWineHQOrg.sh

@@ -0,0 +1,95 @@
+#!/bin/bash
+# 使用系统默认的 bash 运行
+###########################################################################################
+# 作者：gfdgd xi
+# 版本：2.2.0
+# 更新时间：2022年09月25日
+# 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
+# 基于 Python3 构建
+###########################################################################################
+#################
+# 引入所需的库
+#################
+echo                                           
+echo 'm     m   "                  m    m  mmmm '
+echo '#  #  # mmm    m mm    mmm   #    # m"  "m'
+echo '" #"# #   #    #"  #  #"  #  #mmmm# #    #'
+echo ' ## ##"   #    #   #  #""""  #    # #    #'
+echo ' #   #  mm#mm  #   #  "#mm"  #    #  #mm#"'
+echo '                                        # '
+echo
+echo "WineHQ 官网：https://wiki.winehq.org/"
+echo 当前不使用国内镜像源
+
+ubuntuSource=(
+    "sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/winehq-jammy.sources"
+    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/impish/winehq-impish.sources" 
+    "sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/focal/winehq-focal.sources"
+    "sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/bionic/winehq-bionic.sources"
+)
+debianSource=(
+    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/buster/winehq-buster.sources"
+    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources"
+    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources"
+)
+# 选择发行版
+echo "WineHQ 官网：https://wiki.winehq.org/"
+echo "国内镜像源：https://mirrors-i.tuna.tsinghua.edu.cn/help/wine-builds/"
+echo
+echo "选择发行版："
+echo "0. Debian"
+echo "1. Ubuntu"
+read system
+# 选择版本
+echo "选择系统版本"
+if [ $system = "0" ]; then
+    echo "0. Debian 10 (Buster)"
+    echo "1. Debian 11 (Bullseye)"
+    echo "2. Debian 12 (Bookworm)"
+fi
+if [ $system = "1" ]; then
+    echo "0. Ubuntu 22.04"
+    echo "1. Ubuntu 21.10"
+    echo "2. Ubuntu 20.04，Linux Mint 20.x"
+    echo "3. Ubuntu 18.04，Linux Mint 19.x"
+fi
+read systemVersion
+# 选择 Wine
+echo "选择 Wine："
+echo "0. 稳定分支"
+echo "1. 开发分支"
+echo "2. Staging 分支"
+read programVersion
+# 初步配置
+sudo apt-key del "D43F 6401 4536 9C51 D786 DDEA 76F1 A20F F987 672F"
+sudo dpkg --add-architecture i386
+#sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+sudo mkdir -pm755 /etc/apt/keyrings
+sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+# 检测 apt-fast 或 ss-apt-fast 是否存在
+apt="apt"
+which apt-fast > /dev/null
+if [ $? == 0 ]; then
+    apt="apt-fast"
+fi
+which ss-apt-fast > /dev/null
+if [ $? == 0 ]; then
+    apt="ss-apt-fast"
+fi
+which aptss > /dev/null
+if [ $? == 0 ]; then
+    apt="aptss"
+fi
+# 添加源
+if [ $system = "0" ]; then
+    bash -c "${debianSource[$systemVersion]}"
+fi
+if [ $system = "1" ]; then
+    bash -c "${ubuntuSource[$systemVersion]}"
+fi
+sudo $apt update
+# 安装 Wine 
+wineInstall=("sudo $apt install --install-recommends winehq-stable" "sudo $apt install --install-recommends winehq-devel" "sudo $apt install --install-recommends winehq-staging")
+${wineInstall[$programVersion]}
+echo "按回车键退出"
+read

Makefile

@@ -15,6 +15,7 @@ package:
 	mkdir deb/opt/apps/deepin-wine-runner/LANG -pv
 	cp -rv helperset deb/opt/apps/deepin-wine-runner/
 	#cp -rv VM-source/VirtualMachine VM
+	
 	cp -rv VM-source/deepin-wine-runner.svg VM
 	cp -rv VM-source/Windows7X64Auto.iso VM
 	cp -rv VM-source/Windows7X86Auto.iso VM
@@ -22,6 +23,7 @@ package:
 	cp -rv Test/ deb/opt/apps/deepin-wine-runner/
 	cp -rv information.json package-script
 	zip -v -q -r package-script.zip package-script
+	cp -rv InstallBox86-cn.sh deb/opt/apps/deepin-wine-runner/
 	cp -rv VM deb/opt/apps/deepin-wine-runner
 	cp -rv 2048 deb/opt/apps/deepin-wine-runner/
 	cp -rv Download.py deb/opt/apps/deepin-wine-runner/
@@ -31,6 +33,8 @@ package:
 	cp -rv QemuRun.py deb/opt/apps/deepin-wine-runner
 	cp -rv kill.sh deb/opt/apps/deepin-wine-runner
 	cp -rv updatekiller.py deb/opt/apps/deepin-wine-runner
+	cp -rv AddWineDebMirrorForDeepin20.sh deb/opt/apps/deepin-wine-runner
+	cp -rv InstallNewWineHQOrg.sh deb/opt/apps/deepin-wine-runner
 	cp -rv InstallWineOnDeepin23Alpha.py deb/opt/apps/deepin-wine-runner
 	cp -rv wrestool deb/opt/apps/deepin-wine-runner
 	cp -rv Mount.sh deb/opt/apps/deepin-wine-runner
@@ -46,6 +50,9 @@ package:
 	rm -rfv deb/opt/apps/deepin-wine-runner/wine/winelist.json
 	cp -rv req deb/opt/apps/deepin-wine-runner
 	cp -rv pardus-chroot deb/opt/apps/deepin-wine-runner
+	cp -rv winetricks deb/opt/apps/deepin-wine-runner
+	cp -rv WineLib deb/opt/apps/deepin-wine-runner
+	cp -rv InstallFoxpro.py deb/opt/apps/deepin-wine-runner
 	cp -rv BuildDesktop.py deb/opt/apps/deepin-wine-runner
 	cp -rv ChangePassword.sh deb/opt/apps/deepin-wine-runner
 	cp -rv trans deb/opt/apps/deepin-wine-runner
@@ -111,6 +118,8 @@ package:
 	cp -rv RemoveQemuUser.sh deb/opt/apps/deepin-wine-runner
 	cp -rv InstallBox86.sh  deb/opt/apps/deepin-wine-runner
 	cp -rv InstallRuntime   deb/opt/apps/deepin-wine-runner
+	mkdir -pv deb/opt/apps/deepin-wine-runner/entries/
+	cp -rv deb/usr/share/applications deb/opt/apps/deepin-wine-runner/entries/applications
 	python3 UpdateTime.py
 	python3 RemovePycacheFile.py
 	sudo rm -rfv /tmp/spark-deepin-wine-runner-builder/
@@ -140,15 +149,15 @@ package:
 	
 	sudo chown -R root:root /tmp/spark-deepin-wine-runner-builder
 	
-	dpkg -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner.deb
+	dpkg-deb -Z xz -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner.deb
 	sudo rm -rfv /tmp/spark-deepin-wine-runner-builder
 	
-
 install:
 	make build -j$(nproc)
 	sudo apt update ; true
 	#sudo dpkg -i spark-deepin-wine-runner.deb
 	sudo apt reinstall ./spark-deepin-wine-runner.deb -y --allow-downgrades 
+	rm spark-deepin-wine-runner.deb -vf
 
 remove:
 	sudo apt purge spark-deepin-wine-runner  -y

PackageConfig/0/DEBIAN/control

@@ -0,0 +1,10 @@
+Package: @@PACKAGE@@
+Version: @@VERSION@@
+Architecture: @@ARCH@@
+Maintainer: @@MAKER@@
+Depends: @@DEPENDS@@
+Section: non-free/otherosfs
+Priority: optional
+Multi-Arch: foreign
+Installed-Size: @@SIZE@@
+Description: @@DESCRIPTION@@

PackageConfig/0/opt/apps/@@PACKAGE@@/entries/applications/@@PACKAGE@@.desktop

@@ -0,0 +1,14 @@
+[Desktop Entry]
+Categories=;
+Comment=@@NAME@@
+Encoding=UTF-8
+Exec="/opt/apps/@@PACKAGE@@/files/run.sh" --uri
+GenericName=@@NAME@@
+Icon=@@ICONLIST@@
+MimeType=@@MIMETYPE@@
+Name=@@NAME@@.desktop
+StartupNotify=false
+Terminal=false
+Type=Application
+X-Created-By=
+X-Deepin-Vendor=user-custom

PackageConfig/0/opt/apps/@@PACKAGE@@/files/run.sh

@@ -0,0 +1,113 @@
+#!/bin/sh
+
+#   Copyright (C) 2016 Deepin, Inc.
+#
+#   Author:     Li LongYu <lilongyu@linuxdeepin.com>
+#               Peng Hao <penghao@linuxdeepin.com>
+#
+#
+#   Copyright (C) 2022 The Spark Project
+#
+#
+#   Modifier    shenmo <shenmo@spark-app.store>
+#
+#
+#
+
+#######################函数段。下文调用的额外功能会在此处声明
+
+Get_Dist_Name()
+{{
+    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
+        DISTRO='Deepin'
+    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
+        DISTRO='UniontechOS'
+    else
+         DISTRO='OtherOS'
+        fi
+}}
+
+
+####获得发行版名称
+
+#########################预设值段
+
+version_gt() { test "$(echo "$@" | tr " " "
+" | sort -V | head -n 1)" != "$1"; }
+####用于比较版本？未实装
+BOTTLENAME="@@@BOTTLENAME@@@"
+APPVER="@@@APPVER@@@"
+EXEC_PATH="@@@EXEC_PATH@@@"
+##### 软件在wine中的启动路径
+START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+export MIME_TYPE=""
+#####没什么用
+export DEB_PACKAGE_NAME="@@@DEB_PACKAGE_NAME@@@"
+####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
+export APPRUN_CMD="@@@APPRUN_CMD@@@"
+#####wine启动指令，建议
+EXPORT_ENVS=""
+
+export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
+
+ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
+
+export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
+
+export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
+
+DISABLE_ATTACH_FILE_DIALOG=""
+##默认为空。若为1，则不使用系统自带的文件选择，而是使用wine的
+##对于deepin/UOS，大部分的应用都不需要使用wine的，如果有需求（比如wine应用选择的限定种类文件系统的文管不支持）
+##请填1。
+##注意：因为非DDE的环境不确定，所以默认会在非Deepin/UOS发行版上禁用这个功能。如果你确认在适配的发行版上可以正常启动，请注释或者删除下面这段
+
+##############<<<<<<<<<禁用文件选择工具开始
+Get_Dist_Name
+#此功能实现参见结尾函数段
+if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
+DISABLE_ATTACH_FILE_DIALOG="1"
+echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
+echo "如果你想改变这个行为，请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
+echo "To打包者：如果你要打开自带请注意在适配的发行版上进行测试"
+echo "To用户：打包者没有打开这个功能，这证明启用这个功能可能造成运行问题。如果你要修改这个行为，请确保你有一定的动手能力"
+fi
+##############>>>>>>>>>禁用文件选择工具结束
+
+##############<<<<<<<<<屏蔽mono和gecko安装器开始
+##默认屏蔽mono和gecko安装器
+{['''#if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+
+#export WINEDLLOVERRIDES="mscoree,mshtml="
+#echo "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+
+#fi''', '''if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+
+export WINEDLLOVERRIDES="mscoree,mshtml="
+echo "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+
+fi'''][int(disabledMono.isChecked())]}
+##############>>>>>>>>>屏蔽mono和gecko安装器结束
+
+#########################执行段
+
+
+
+
+if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
+    export ATTACH_FILE_DIALOG=1
+fi
+
+if [ -n "$EXPORT_ENVS" ];then
+    export $EXPORT_ENVS
+fi
+
+if [ -n "$EXEC_PATH" ];then
+    if [ -z "${{EXEC_PATH##*.lnk*}}" ];then
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+    else
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+    fi
+else
+    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
+fi

PackageConfig/list.json

@@ -0,0 +1,13 @@
+[
+    "@@PACKAGE@@",
+    "@@VERSION@@",
+    "@@ARCH@@",
+    "@@MAKER@@",
+    "@@DEPENDS@@",
+    "@@SIZE@@",
+    "@@DESCRIPTION@@"
+    "@@ICONLIST@@",
+    "@@NAME@@",
+    "@@MIMETYPE@@",
+    "@@CATEGORIES@@"
+]

QemuSystemInstall.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
-pkexec apt install qemu-system -y
+sudo apt update
+sudo apt install qemu-system qemu-user qemu-efi -y
+sudo apt install qemu-user-static binfmt-support qemu-system-gui -y
 echo 安装完成！按回车键退出
 read

README.md

@@ -1,10 +1,10 @@
 <p width=100px align="center"><img src="https://storage.deepin.org/thread/202208031419283599_deepin-wine-runner.png"></p>
-<h1 align="center">Wine 运行器 3.2.2</h1>
+<h1 align="center">Wine 运行器 3.4.0</h1>
 <hr>
 
 ## 介绍
 Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序，内置了对Wine图形化的支持、各种Wine工具、自制的Wine程序打包器和运行库安装工具等。  
-它同时还内置了基于VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作。  
+它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作，也能在非 X86 架构安装 X86 架构的 Windows 操作系统（但是效率较低）。  
 此外，它还简化了如下命令，让你可以更简便地使用Wine：  
 ```bash
 env WINEPREFIX=容器路径 wine（wine的路径） 可执行文件路径
@@ -44,6 +44,9 @@ env WINEPREFIX=容器路径 wine（wine的路径） 可执行文件路径
 理论上支持全架构，如果 Python 能运行的话  
 非 X86 架构会利用到 `box86`、`exagear`、`qemu` 等技术  
 
+## Wine 运行器自动构建（Newest）
+此只供尝鲜，不保证能用：https://github.com/gfdgd-xi/deep-wine-runner/actions/workflows/auto-building.yml  
+
 ## 目前实现功能（部分）
 1. 用 Wine 运行 EXE
 2. 支持下载/安装 Wine
@@ -70,7 +73,10 @@ env WINEPREFIX=容器路径 wine（wine的路径） 可执行文件路径
 ![图片.png](https://storage.deepin.org/thread/202304192212308212_图片.png)  
 
 ### 龙芯应用合作社
-（找时间再补图）
+
+![图片.png](https://storage.deepin.org/thread/20230603201852396_图片.png)
+
+
 
 ## 分支介绍
 ### main 分支
@@ -130,6 +136,55 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
 ![image.png](https://storage.deepin.org/thread/202207190822204627_image.png)
 
 ## 更新日志 
+### 3.4.0（2023年08月11日）
+**※1、修复简易打包器无法打开的问题以及 Wine 识别错误的问题**  
+**※2、高级打包器支持多 .desktop 分别设置不同的 MimeType**  
+**※3、修复运行器在 Ubuntu 23 的安装问题**  
+**※4、高级打包器支持导出/导入填写信息**  
+**※5、Deepin 23 支持使用 Winetricks**  
+**※6、新增视频教程**  
+**※7、修复虚拟机工具在检测到 Qemu 磁盘但没有安装 Qemu 时无法启动的问题**  
+**※8、修复虚拟机工具的一些问题并调整部分设置**  
+**※9、虚拟机工具支持设置 UEFI 启动**  
+**※10、虚拟机安装工具提供 LoongArch 新世界版本**  
+11、高级打包器支持隐藏输入框以及使用小字体  
+12、打包器提供 bcm 和 dcm wine 支持  
+13、修复星火 wine 配置错误问题  
+14、打包器支持多线程打包  
+15、修复升级工具问题：https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX  
+16、跟进打包器 run.sh 模板  
+17、云沙箱新增 cloud.vdnel.cn  
+18、打包器新增分类 Game、System、AudioVideo  
+19、修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题  
+
+
+![图片.png](https://storage.deepin.org/thread/2023081111212518_图片.png)
+
+
+
+### 3.3.0.1（2023年07月25日）
+**※1、修复运行器打开主界面不进行任何操作但 CPU 占用率过高的问题**  
+**※2、修复运行器运行器（局部）无法正常移除的问题**  
+
+### 3.3.0（2023年07月12日）
+**※1、简易打包器支持选择 Wine 版本以及修改打包生成的 deb 包的架构为 all；**  
+**※2、修改容器自动配置脚本的 Gitlink 源为 Gitee 源**  
+**※3、在安装更多 Wine 处安装 Wine 后主窗口 Wine 版本下拉框自动更新**  
+**※4、设置打包器在 Ubuntu 依旧打包 xz 格式的 deb 包**  
+**※5、修复 Wine 简易打包器 control 文件 Installed-Size 格式不规范的问题**  
+**※6、更换 Box86 源并支持安装 Box64（如果为 aarch64 架构）**  
+**※7、新增 Wine 自建源（支持 Debian10、Deepin20）**  
+**※8、修改 WineHQ 安装器使其支持选择国内清华大学镜像源或 WineHQ 官方源**  
+**※9、新增 Visual FoxPro 安装器**  
+**※10、新增安装局部运行库以解决部分低版本系统运行高版本 Wine 的问题且不与其他运行库和兼容层冲突**  
+**※11、支持调用原版的 Exagear 以及 Qemu User（i386、x86_64） 运行 Wine**  
+12、新增自动构建：https://github.com/gfdgd-xi/deep-wine-runner/actions/workflows/auto-building.yml（只供尝鲜）  
+13、新增 Wine 日构建（在“安装更多 Wine”处可以获取，目前有 i386、amd64、i386+amd64、amd64+wow64 mode、aarch64）  
+14、优化容器清理脚本  
+15、修复部分组件没完全换源的问题，部分组件支持自动换可用源  
+![图片.png](https://storage.deepin.org/thread/202307121216143835_图片.png)  
+![图片.png](https://storage.deepin.org/thread/202307121221299140_图片.png)  
+
 ### 3.2.2（2023年05月12日）
 **※1. 修改源地址（迁出 Gitlink）；**  
 **※2. 修复非 X86 架构运行器主页面虚拟机工具禁用的问题；**  
@@ -588,14 +643,14 @@ Gitlink：https://www.gitlink.org.cn/gfdgd_xi/deep-wine-runner
 ## 运行库下载
 | 架构 | 运行库下载 |
 |-|-|
-| i386 | https://code.gitlink.org.cn/gfdgd_xi/runtime-for-qemu/raw/branch/master/i386-runtime-for-qemu_1.0.0_all.deb |
+| i386 | https://jihulab.com/gfdgd-xi/qemu-runtime/-/raw/main/i386-runtime-for-qemu_1.0.0_all.deb |
-| amd64 | https://code.gitlink.org.cn/gfdgd_xi/runtime-for-qemu/raw/branch/master/amd64-runtime-for-qemu_1.0.0_all.deb |
+| amd64 | https://jihulab.com/gfdgd-xi/qemu-runtime/-/raw/main/amd64-runtime-for-qemu_1.0.0_all.deb |
-| armhf | https://code.gitlink.org.cn/gfdgd_xi/runtime-for-qemu/raw/branch/master/armhf-runtime-for-qemu_1.0.0_all.deb |
+| armhf | https://jihulab.com/gfdgd-xi/qemu-runtime/-/raw/main/armhf-runtime-for-qemu_1.0.0_all.deb |
-| arm64 | https://code.gitlink.org.cn/gfdgd_xi/runtime-for-qemu/raw/branch/master/arm64-runtime-for-qemu_1.0.0_all.deb |
+| arm64 | https://jihulab.com/gfdgd-xi/qemu-runtime/-/raw/main/arm64-runtime-for-qemu_1.0.0_all.deb |
-| mips64el | https://code.gitlink.org.cn/gfdgd_xi/runtime-for-qemu/raw/branch/master/mips64el-runtime-for-qemu_1.0.0_all.deb |
+| mips64el | https://jihulab.com/gfdgd-xi/qemu-runtime/-/raw/main/mips64el-runtime-for-qemu_1.0.0_all.deb |
-| ppc64el | https://code.gitlink.org.cn/gfdgd_xi/runtime-for-qemu/raw/branch/master/ppc64el-runtime-for-qemu_1.0.0_all.deb |
+| ppc64el | https://jihulab.com/gfdgd-xi/qemu-runtime/-/raw/main/ppc64el-runtime-for-qemu_1.0.0_all.deb |
-| riscv64 | https://code.gitlink.org.cn/gfdgd_xi/runtime-for-qemu/raw/branch/master/riscv64-runtime-for-qemu_1.0.0_all.deb |
+| riscv64 | https://jihulab.com/gfdgd-xi/qemu-runtime/-/raw/main/riscv64-runtime-for-qemu_1.0.0_all.deb |
-| s390x | https://code.gitlink.org.cn/gfdgd_xi/runtime-for-qemu/raw/branch/master/s390x-runtime-for-qemu_1.0.0_all.deb |
+| s390x | https://jihulab.com/gfdgd-xi/qemu-runtime/-/raw/main/s390x-runtime-for-qemu_1.0.0_all.deb |
 
 ## 附：用于编译 Wine 的 Docker 容器（Debian10）
 内安装了编译 Wine 所需要的依赖，Wine 编译教程：https://wiki.winehq.org/Building_Wine  

StartVM.sh

@@ -14,13 +14,29 @@ if [[ 0 == $? ]]; then
     exit
 fi
 # 检查是否有 QEMU
-if [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
+which qemu-system-x86_64
+if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
     if [[ -f "$HOME/.config/deepin-wine-runner/QemuSetting.json" ]]; then
         echo 有设置文件，读设置文件
         cd `dirname $0`
         python3 ./VM/StartQemu.py
         exit
     fi
+    if [[ -f $HOME/.config/deepin-wine-runner/QEMU-EFI ]]; then
+        echo 使用 UEFI 启动
+        if [[ -f /usr/share/qemu/OVMF.fd ]]; then
+            qemuUEFI="--bios /usr/share/qemu/OVMF.fd"
+        else
+            if [[ -f `dirname $0`/VM/OVMF.fd ]]; then   
+                qemuUEFI="--bios `dirname $0`/VM/OVMF.fd"
+            fi
+        fi
+        echo $qemuUEFI
+    fi
+    # 查看CPU个数
+    CpuSocketNum=`cat /proc/cpuinfo | grep "cpu cores" | uniq | wc -l`
+    # 查看CPU核心数
+    CpuCoreNum=`grep 'core id' /proc/cpuinfo | sort -u | wc -l`
     # 查看逻辑CPU的个数
     CpuCount=`cat /proc/cpuinfo| grep "processor"| wc -l`
  
@@ -29,11 +45,11 @@ if [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
     use=$(echo "scale=4; $MemTotal / 3" | bc)
     if [[ `arch` == "x86_64" ]]; then
         echo X86 架构，使用 kvm 加速
-        kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" -soundhw all -smp $CpuCount -m ${use}G -net user,hostfwd=tcp::3389-:3389 -display vnc=:5 -display gtk -usb -nic model=rtl8139
+        kvm -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" -soundhw all -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) -m ${use}G -net user,hostfwd=tcp::3389-:3389 -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI
         exit
     fi
     echo 非 X86 架构，不使用 kvm 加速
-    qemu-system-x86_64 --hda "$HOME/Qemu/Windows/Windows.qcow2" -soundhw all -smp $CpuCount -m ${use}G -net user,hostfwd=tcp::3389-:3389 -display vnc=:5 -display gtk -usb -nic model=rtl8139
+    qemu-system-x86_64 --hda "$HOME/Qemu/Windows/Windows.qcow2" -soundhw all -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) -m ${use}G -net user,hostfwd=tcp::3389-:3389 -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI
     exit
 fi
 zenity --question --no-wrap --text="检查到您未创建所指定的虚拟机，是否创建虚拟机并继续？\n如果不创建将无法使用"

VM-source/Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: VirtualMachine
-# Generated by qmake (3.1) (Qt 5.15.8)
+# Generated by qmake (3.1) (Qt 5.15.7)
 # Project:  VirtualMachine.pro
 # Template: app
 # Command: /usr/lib/qt5/bin/qmake -o Makefile VirtualMachine.pro
@@ -84,74 +84,15 @@ DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_BluezQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIdleTime.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KScreen.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KSyntaxHighlighting.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandClient.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandServer.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_charts.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_designer.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \
@@ -162,12 +103,9 @@ DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_help.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
@@ -175,53 +113,21 @@ DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioning.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioningquick.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickcontrols2.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quicktemplates2.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sensors.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uiplugin.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uitools.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webchannel.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_ModemManagerQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_NetworkManagerQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_QApt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \
@@ -279,74 +185,15 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_BluezQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIdleTime.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KScreen.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KSyntaxHighlighting.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandClient.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandServer.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_charts.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_designer.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \
@@ -357,12 +204,9 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_help.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
@@ -370,53 +214,21 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioning.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioningquick.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickcontrols2.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quicktemplates2.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sensors.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uiplugin.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uitools.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webchannel.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_ModemManagerQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_NetworkManagerQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_QApt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \
@@ -452,74 +264,15 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_BluezQt.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIdleTime.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KScreen.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KSyntaxHighlighting.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandClient.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandServer.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_charts.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_designer.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri:
@@ -530,12 +283,9 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_help.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
@@ -543,53 +293,21 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioning.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioningquick.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickcontrols2.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quicktemplates2.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sensors.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uiplugin.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uitools.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webchannel.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_ModemManagerQt.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_NetworkManagerQt.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_QApt.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf:
@@ -694,17 +412,17 @@ compiler_moc_header_clean:
 moc_mainwindow.cpp: mainwindow.h \
 		moc_predefs.h \
 		/usr/lib/qt5/bin/moc
-	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/8 -I/usr/include/x86_64-linux-gnu/c++/8 -I/usr/include/c++/8/backward -I/usr/lib/gcc/x86_64-linux-gnu/8/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp
+	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp
 
 moc_infoutils.cpp: infoutils.h \
 		moc_predefs.h \
 		/usr/lib/qt5/bin/moc
-	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/8 -I/usr/include/x86_64-linux-gnu/c++/8 -I/usr/include/c++/8/backward -I/usr/lib/gcc/x86_64-linux-gnu/8/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include infoutils.h -o moc_infoutils.cpp
+	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include infoutils.h -o moc_infoutils.cpp
 
 moc_qemusetting.cpp: qemusetting.h \
 		moc_predefs.h \
 		/usr/lib/qt5/bin/moc
-	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/8 -I/usr/include/x86_64-linux-gnu/c++/8 -I/usr/include/c++/8/backward -I/usr/lib/gcc/x86_64-linux-gnu/8/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include qemusetting.h -o moc_qemusetting.cpp
+	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include qemusetting.h -o moc_qemusetting.cpp
 
 compiler_moc_objc_header_make_all:
 compiler_moc_objc_header_clean:

VM-source/VirtualMachine.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.8.2, 2023-04-29T19:59:36. -->
+<!-- Written by QtCreator 7.0.1, 2023-08-09T22:56:49. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -37,6 +37,7 @@
    <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
    <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
    <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
    <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
    <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
    <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
@@ -45,23 +46,49 @@
    <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
    <value type="int" key="EditorConfiguration.TabSize">8</value>
    <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
    <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
    <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
    <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
    <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
    <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
   </valuemap>
  </data>
  <data>
   <variable>ProjectExplorer.Project.PluginSettings</variable>
   <valuemap type="QVariantMap">
+   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
+    <value type="bool" key="AutoTest.Framework.Boost">true</value>
+    <value type="bool" key="AutoTest.Framework.CTest">false</value>
+    <value type="bool" key="AutoTest.Framework.Catch">true</value>
+    <value type="bool" key="AutoTest.Framework.GTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
+   <value type="int" key="AutoTest.RunAfterBuild">0</value>
+   <value type="bool" key="AutoTest.UseGlobal">true</value>
    <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
    <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+   <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.BuildSystem</value>
+   <valuemap type="QVariantMap" key="ClangTools">
+    <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
+    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
+    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
+    <value type="int" key="ClangTools.ParallelJobs">2</value>
+    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
+    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
+    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
+    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
+   </valuemap>
   </valuemap>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
+   <value type="QString" key="DeviceType">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.15.6 in PATH (qt5)</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.15.6 in PATH (qt5)</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ab20853c-9d79-473a-820e-8e95c145170e}</value>
@@ -73,127 +100,67 @@
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
-      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
     </valuemap>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
     <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
-    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
-    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
     <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
     <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">VirtualMachine</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/VirtualMachine.pro</value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">VirtualMachine.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/VirtualMachine.pro</value>
-    <value type="QString" key="RunConfiguration.Arguments"></value>
-    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
-    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
     <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
@@ -205,10 +172,10 @@
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">20</value>
+  <value type="int">22</value>
  </data>
  <data>
   <variable>Version</variable>
-  <value type="int">20</value>
+  <value type="int">22</value>
  </data>
 </qtcreator>

VM-source/VirtualMachine.pro.user.4.9-pre1

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.8.2, 2023-07-12T19:05:39. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{4ffd6df9-1365-4837-81b1-582e0e2d1f21}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
+   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.15.6 in PATH (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.15.6 in PATH (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ab20853c-9d79-473a-820e-8e95c145170e}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">VirtualMachine</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/VirtualMachine.pro</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">VirtualMachine.pro</value>
+    <value type="QString" key="RunConfiguration.Arguments"></value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">20</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">20</value>
+ </data>
+</qtcreator>

VM-source/buildvbox.cpp

@@ -12,6 +12,7 @@
 #include <QCoreApplication>
 #include <infoutils.h>
 #include "qemu.h"
+#include <QProcess>
 // 懒得用 QThread 了（要继承）
 #include <thread>
 using namespace std;
@@ -27,6 +28,37 @@ void buildvbox::CleanScreen(){
     system("cls");
 }
 
+// 获取 CPU 个数
+int buildvbox::GetCPUSocket(){
+    // 获取命令返回值
+    QProcess process;
+    process.start("bash", QStringList() << "-c" << "cat /proc/cpuinfo | grep \"cpu cores\" | uniq | wc -l");
+    process.waitForStarted();
+    process.waitForFinished();
+    int value = process.readAllStandardOutput().toInt();
+    process.close();
+    // 判断异常值，例如没挂载 /proc
+    if(value <= 0){
+        value = 1;
+    }
+    return value;
+}
+
+// 获取 CPU 核心数
+int buildvbox::GetCPUCore(){
+    QProcess process;
+    process.start("bash", QStringList() << "-c" << "grep 'core id' /proc/cpuinfo | sort -u | wc -l");
+    process.waitForStarted();
+    process.waitForFinished();
+    int value = process.readAllStandardOutput().toInt();
+    process.close();
+    // 判断异常值，例如没挂载 /proc
+    if(value <= 0){
+        value = 1;
+    }
+    return value;
+}
+
 QString buildvbox::GetNet(){
     QList<QNetworkInterface> netList = QNetworkInterface::allInterfaces();
     foreach(QNetworkInterface net, netList){
@@ -82,7 +114,13 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
             case 1:
                 vm.Create("Windows7_64");
                 break;
+            case 2:
                 vm.Create("WindowsNT_64");
+                break;
+            case 3:
+                vm.Create("WindowsNT_64");
+                vm.EnabledUEFI(true);
+                break;
         }
         vm.CreateDiskControl();
         //vm.CreateDiskControl("storage_controller_2");
@@ -112,7 +150,7 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
             vm.MountISO("/usr/share/virtualbox/VBoxGuestAdditions.iso", "storage_controller_1", 1, 1);
         }*/
 
-        vm.SetCPU(get_nprocs());
+        vm.SetCPU(get_nprocs(), GetCPUSocket(), GetCPUCore());
         long memory = 0;
         long memoryAll = 0;
         long swap = 0;
@@ -146,7 +184,13 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
             case 1:
                 vm.Create("Windows7_64");
                 break;
+            case 2:
                 vm.Create("WindowsNT_64");
+                break;
+            case 3:
+                vm.Create("WindowsNT_64");
+                vm.EnabledUEFI(true);
+                break;
         }
         QDir dir("/home/gfdgd_xi/Qemu/Windows/");
         dir.mkpath("/home/gfdgd_xi/Qemu/Windows/");
@@ -170,7 +214,7 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
             vm.MountISO("/usr/share/virtualbox/VBoxGuestAdditions.iso", "storage_controller_1", 1, 1);
         }
 
-        vm.SetCPU(get_nprocs_conf());
+        vm.SetCPU(get_nprocs(), GetCPUSocket(), GetCPUCore());
         long memory = 0;
         long memoryAll = 0;
         long swap = 0;

VM-source/buildvbox.h

@@ -14,6 +14,8 @@ public:
     void CleanScreen();
     QString GetNet();
     int Download(QString url, QString path, QString fileName);
+    int GetCPUSocket();
+    int GetCPUCore();
 };
 
 #endif // BUILDVBOX_H

VM-source/mainwindow.cpp

@@ -177,6 +177,30 @@ void MainWindow::on_install_clicked()
         }
         break;
     }
+    QFile file(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI");
+    QDir dir(QDir::homePath() + "/.config/deepin-wine-runner");
+    switch (ui->systemVersion->currentIndex()) {
+        case 3:
+            if(!QFile::exists("/usr/share/qemu/OVMF.fd") && !QFile::exists(QCoreApplication::applicationDirPath() + "/OVMF.fd") && ui->vmChooser->currentIndex() == 0){
+                if(QMessageBox::question(this, "提示", "似乎无法找到 UEFI 固件，是否继续创建虚拟机？\nQemu 固件可以在“安装 Qemu”处安装") == QMessageBox::No){
+                    return;
+                }
+            }
+            if(!dir.exists()){
+                dir.mkpath(QDir::homePath() + "/.config/deepin-wine-runner");
+            }
+            if(!QFile::exists(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI")){
+                // 写入用于识别的空文件
+                file.open(QIODevice::WriteOnly);
+                file.write("1");
+                file.close();
+            }
+            break;
+        default:
+            if(ui->vmChooser->currentIndex() == 0 && QFile::exists(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI")){
+                QFile::remove(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI");
+            }
+    }
     buildvbox(ui->isoPath->text(), ui->systemVersion->currentIndex(), ui->vmChooser->currentIndex());
     return;
 }
@@ -188,7 +212,7 @@ void MainWindow::on_getvbox_clicked()
 
 void MainWindow::on_getQemu_clicked()
 {
-    system(("python3 '" + QCoreApplication::applicationDirPath() + "/../RunCommandWithTerminal.py' '" + QCoreApplication::applicationDirPath() + "/../QemuSystemInstall.sh'").toLatin1());
+    system(("python3 '" + QCoreApplication::applicationDirPath() + "/../RunCommandWithTerminal.py' pkexec '" + QCoreApplication::applicationDirPath() + "/../QemuSystemInstall.sh'").toLatin1());
 }
 
 void MainWindow::on_vmChooser_currentIndexChanged(int index)

VM-source/mainwindow.ui

@@ -25,7 +25,7 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>2</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">
@@ -86,7 +86,12 @@
             </item>
             <item>
              <property name="text">
-              <string>其它 Windows 系统（不支持自动安装）</string>
+              <string>其它 Windows 系统（不支持自动安装，传统启动，推荐 Windows 7 及以下）</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>其他 Windows 系统（不支持自动安装，UEFI 启动，推荐 Windows 8 及以上）</string>
              </property>
             </item>
            </widget>

VM-source/qemu.cpp

@@ -53,8 +53,14 @@ int qemu::BootFirst(QString bootDrive){
 int qemu::SetNetBridge(QString netDriver){
     return 0;
 }
-int qemu::SetCPU(int number){
+int qemu::SetCPU(int number, int cpuNum, int coreNum){
-    commandOption += "-smp " + QString::number(number) + " ";
+    // commandOption += "-smp " + QString::number(number) + " ";
+    // 调整调用方法
+    //qDebug() << number << " " << cpuNum << " " << coreNum;
+    qDebug() << "Socket: " << cpuNum;
+    qDebug() << "Core: " << coreNum;
+    qDebug() << "Threads: " << number;
+    commandOption += "-smp " + QString::number(number) + ",sockets=" + QString::number(cpuNum) + ",cores=" + QString::number(coreNum / cpuNum) + ",threads=" + QString::number(number / cpuNum / coreNum) + " ";
     return 0;
 }
 int qemu::SetMemory(int memory){
@@ -70,7 +76,7 @@ int qemu::SetRemoteConnectSetting(int port){
 int qemu::Start(bool unShown){
     qDebug() << commandOption;
     if(Command().GetCommand("arch").replace("\n", "").replace(" ", "") == "x86_64"){
-        return system(("kvm " + commandOption + " &").toLatin1());
+        return system(("kvm -cpu host " + commandOption + " &").toLatin1());
     }
     return system(("qemu-system-x86_64 -nic model=rtl8139 " + commandOption + " &").toLatin1());
 }
@@ -113,3 +119,17 @@ int qemu::SetKeyboardPS2(){
 int qemu::OpenUSB(){
     return 0;
 }
+int qemu::EnabledUEFI(bool status){
+    if(!status){
+        return 0;
+    }
+    if(QFile::exists("/usr/share/qemu/OVMF.fd")){
+        commandOption += "--bios /usr/share/qemu/OVMF.fd ";
+        return 0;
+    }
+    if(QFile::exists(QCoreApplication::applicationDirPath() + "/OVMF.fd")){
+        commandOption += "--bios '" + QCoreApplication::applicationDirPath() + "/OVMF.fd' ";
+        return 0;
+    }
+    return 1;
+}

VM-source/qemu.h

@@ -21,7 +21,7 @@ public:
     int MountISO(QString isoPath, QString controlName="storage_controller_1", int port=1, int device=0);
     int BootFirst(QString bootDrive);
     int SetNetBridge(QString netDriver);
-    int SetCPU(int number);
+    int SetCPU(int number, int cpuNum, int coreNum);
     int SetMemory(int memory);
     int SetRemote(bool setting);
     int SetRemoteConnectSetting(int port=5540);
@@ -38,8 +38,9 @@ public:
     int SetMousePS2();
     int SetKeyboardPS2();
     int OpenUSB();
+    int EnabledUEFI(bool status);
 private:
-    QString commandOption;
+    QString commandOption = "";
 
 };
 

VM-source/vbox.cpp

@@ -44,7 +44,7 @@ int vbox::SetNetBridge(QString netDriver){
     return system(("\"" + managerPath + "\" modifyvm \"" + name +
                    "\" --nic1 bridged --cableconnected1 on --nictype1 82540EM --bridgeadapter1 \"" + netDriver + "\" --intnet1 brigh1 --macaddress1 auto").toLatin1());
 }
-int vbox::SetCPU(int number){
+int vbox::SetCPU(int number, int cpuNum, int coreNum){
     return system(("\"" + managerPath + "\" modifyvm \"" + name + "\" --cpus " + QString::number(number)).toLatin1());
 }
 int vbox::SetMemory(int memory){
@@ -101,3 +101,10 @@ int vbox::SetKeyboardPS2(){
 int vbox::OpenUSB(){
     return system(("\"" + managerPath + "\" modifyvm \"" + name + "\" --usbohci on").toLatin1());
 }
+
+int vbox::EnabledUEFI(bool status){
+    if(status){
+        return system(("\"" + managerPath + "\" modifyvm \"" + name + "\" --firmware=efi").toLatin1());
+    }
+    return system(("\"" + managerPath + "\" modifyvm \"" + name + "\" --firmware=bios").toLatin1());
+}

VM-source/vbox.h

@@ -21,7 +21,7 @@ public:
     int MountISO(QString isoPath, QString controlName="storage_controller_1", int port=1, int device=0);
     int BootFirst(QString bootDrive);
     int SetNetBridge(QString netDriver);
-    int SetCPU(int number);
+    int SetCPU(int number, int cpuNum, int coreNum);
     int SetMemory(int memory);
     int SetRemote(bool setting);
     int SetRemoteConnectSetting(int port=5540);
@@ -38,6 +38,7 @@ public:
     int SetMousePS2();
     int SetKeyboardPS2();
     int OpenUSB();
+    int EnabledUEFI(bool status);
 
 private:
 

VM/StartQemu.py

@@ -13,7 +13,7 @@ def ReadTXT(file: str):
 command = "qemu-system-x86_64"
 #if "--kvm" in sys.argv:
 #    command = "kvm"
-
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 homePath = os.path.expanduser('~')
 try:
     setting = json.loads(ReadTXT(f"{homePath}/.config/deepin-wine-runner/QemuSetting.json"))
@@ -30,4 +30,9 @@ if setting["EnableVNC"]:
     option += f"-display gtk -display vnc=:{setting['VNC']} "
 if setting["EnableSound"]:
     option += "-soundhw all "
+if os.path.exists(f"{homePath}/.config/deepin-wine-runner/QEMU-EFI"):
+    if os.path.exists("/usr/share/qemu/OVMF.fd"):
+        option += "--bios /usr/share/qemu/OVMF.fd "
+    elif os.path.exists(f"{programPath}/OVMF.fd"):
+        option += f"--bios {programPath}/OVMF.fd "
 os.system(f"{command} {option}")

VM/VirtualMachine

@@ -2,7 +2,7 @@
 import os
 import subprocess
 programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
-arch = subprocess.getoutput("arch").replace(" ", "").replace("\n", "")
+arch = subprocess.getoutput("dpkg --print-architecture").replace(" ", "").replace("\n", "")
 if os.path.exists(f"{programPath}/VirtualMachine-{arch}"):
     os.system(f"{programPath}/VirtualMachine-{arch}")
     exit()

WineLib/install.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+CURRENT_DIR=$(cd $(dirname $0); pwd)
+cd $CURRENT_DIR
+if [[ -f $CURRENT_DIR/usr/ ]]; then
+    echo 运行库已安装，按回车键退出
+    read
+    exit
+fi
+aria2c -x 16 -s 16 -d /tmp https://jihulab.com/gfdgd-xi/bwrapruntime/-/raw/main/library.tar.xz
+if [[ $? != 0 ]]; then
+    echo 安装包下载失败！按回车键退出
+    read
+fi
+chmod 777 -Rv .
+tar -xvf /tmp/library.tar.xz
+rm -vf /tmp/library.tar.xz
+echo 安装完成！按回车键退出
+read

WineLib/remove.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+CURRENT_DIR=$(cd $(dirname $0); pwd)
+cd $CURRENT_DIR
+if [[ ! -d $CURRENT_DIR/usr/ ]]; then
+    echo 运行库未安装，按回车键退出
+    read
+    exit
+fi
+rm -rfv lib
+rm -rfv lib64
+rm -rfv usr
+chmod 777 -Rv .
+echo 删除完成！按回车键退出
+read

WineLib/run-more.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+CURRENT_DIR=$1
+if [[ ! -d "$CURRENT_DIR/usr" ]]; then
+    zenity --info --text=未安装运行库，无法运行 --no-wrap
+    exit
+fi
+if [[ ! -d "$CURRENT_DIR/usr/lib64" ]]; then
+    bwrap --dev-bind / / \
+        --ro-bind "$CURRENT_DIR/usr/lib" /lib \
+        --ro-bind "$CURRENT_DIR/usr" /usr \
+        --ro-bind /usr/share /usr/share \
+        --ro-bind /usr/bin /usr/bin \
+        --ro-bind /usr/sbin /usr/sbin \
+        -- "$@"
+    exit
+fi
+if [[ ! -f /lib64 ]] && [[ ! -d /lib64 ]] && [[ ! -L /lib64 ]]; then
+    pkexec ln -s /usr/lib64 /lib64
+fi
+bwrap --dev-bind / / \
+    --ro-bind "$CURRENT_DIR/usr/lib" /lib \
+    --ro-bind "$CURRENT_DIR/usr/lib64" /lib \
+    --ro-bind "$CURRENT_DIR/usr" /usr \
+    --ro-bind /usr/share /usr/share \
+    --ro-bind /usr/bin /usr/bin \
+    --ro-bind /usr/sbin /usr/sbin \
+    -- "$@"

WineLib/run.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+CURRENT_DIR=$(cd $(dirname $0); pwd)
+if [[ ! -d "$CURRENT_DIR/usr" ]]; then
+    zenity --info --text=未安装运行库，无法运行 --no-wrap
+    exit
+fi
+systemNeedCommand=""
+for libr in `ls /usr/lib`
+do
+    if [[ -f /usr/lib/$libr/libc.so.6 ]]; then
+        if [[ ! -f "$CURRENT_DIR/usr/lib/$libr/libc.so.6" ]]; then
+            echo $libr
+            systemNeedCommand="$systemNeedCommand --ro-bind /usr/lib/$libr/ /usr/lib/$libr/ "
+            mkdir -p "$CURRENT_DIR/usr/lib/$libr"
+        fi
+    fi
+done
+for libr in `ls /usr/lib/ld*.so*`
+do
+    if [[ -f $libr ]]; then
+        if [[ ! -f "$CURRENT_DIR/$libr" ]]; then
+            systemNeedCommand="$systemNeedCommand --ro-bind $libr $libr "        
+            touch "$CURRENT_DIR/$libr"
+        else
+            if [[ ! -s "$CURRENT_DIR/$libr" ]]; then
+                systemNeedCommand="$systemNeedCommand --ro-bind $libr $libr "        
+            fi
+        fi
+    fi
+done
+if [[ -d /usr/lib64 ]] && [[ ! -d "$CURRENT_DIR/usr/lib64" ]]; then
+    mkdir -p "$CURRENT_DIR/usr/lib64"
+fi
+if [[ -d /usr/lib64/ ]]; then
+    for libr in `ls /usr/lib64/ld*.so*`
+    do
+        if [[ -f $libr ]]; then
+            if [[ ! -f "$CURRENT_DIR/$libr" ]]; then
+                systemNeedCommand="$systemNeedCommand --ro-bind $libr $libr "        
+                touch "$CURRENT_DIR/$libr"
+            else
+                if [[ ! -s "$CURRENT_DIR/$libr" ]]; then
+                    systemNeedCommand="$systemNeedCommand --ro-bind $libr $libr "        
+                fi
+            fi
+        fi
+    done
+fi
+if [[ ! -d "$CURRENT_DIR/usr/lib/locale" ]]; then
+    systemNeedCommand="$systemNeedCommand --ro-bind /usr/lib/locale /usr/lib/locale "      
+fi
+
+if [[ ! -d "$CURRENT_DIR/usr/lib64" ]]; then
+    bwrap --dev-bind / / \
+        --bind "$CURRENT_DIR/usr/lib" /lib \
+        --bind "$CURRENT_DIR/usr" /usr \
+        --ro-bind /usr/share /usr/share \
+        --ro-bind /usr/bin /usr/bin \
+        --ro-bind /usr/sbin /usr/sbin \
+        $systemNeedCommand \
+        -- "$@"
+    exit
+fi
+if [[ ! -f /lib64 ]] && [[ ! -d /lib64 ]] && [[ ! -L /lib64 ]]; then
+    pkexec ln -s /usr/lib64 /lib64
+fi
+if [[ -L /lib64 ]] || [[ -d /lib64 ]] || [[ -f /lib64 ]];then
+    bwrap --dev-bind / / \
+        --bind "$CURRENT_DIR/usr/lib" /lib \
+        --bind "$CURRENT_DIR/usr/lib64" /lib \
+        --bind "$CURRENT_DIR/usr" /usr \
+        --ro-bind /usr/share /usr/share \
+        --ro-bind /usr/bin /usr/bin \
+        --ro-bind /usr/sbin /usr/sbin \
+        $systemNeedCommand \
+        -- "$@"
+    exit
+fi
+bwrap --dev-bind / / \
+    --bind "$CURRENT_DIR/usr/lib" /lib \
+    --bind "$CURRENT_DIR/usr" /usr \
+    --ro-bind /usr/share /usr/share \
+    --ro-bind /usr/bin /usr/bin \
+    --ro-bind /usr/sbin /usr/sbin \
+    $systemNeedCommand \
+    -- "$@"

cleanbottle.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 if [ $WINE = "" ]; then
-	WINE_CMD="deepin-wine5"
+	WINE_CMD="deepin-wine6-stable"
 else
 	WINE_CMD=$WINE
 fi
@@ -55,7 +55,6 @@ clean_common_temp()
     #remove_file "$BottleBase/users/${USER}"
     purge_dir   "$BottleBase/users/Public/Temp"
     remove_file "$BottleBase/../PACKAGE_VERSION"
-    remove_file "$BottleBase/../update.policy"
     purge_dir   "$BottleBase/deepin"
 }
 

deb/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: spark-deepin-wine-runner
-Version: 3.2.2
+Version: 3.4.0
 Maintainer: gfdgd xi <3025613752@qq.com>
 Homepage: https://gitee.com/gfdgd-xi/deep-wine-runner
 Architecture: all
@@ -8,26 +8,12 @@ Certainty: possible
 Check: binaries
 Type: binary, udeb
 Priority: optional
-Depends: python3, python3-pil, libc6, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, deepin-terminal | mate-terminal | gnome-terminal | xfce4-terminal, python3-dbus, python3-pip, p7zip-full, sudo, python3-pyperclip
+Depends: python3, python3-pil, libc6, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, deepin-terminal | mate-terminal | gnome-terminal | xfce4-terminal, python3-dbus, python3-pip, p7zip-full, sudo, python3-pyperclip, bubblewrap, zenity
-Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, qemu-user, binfmt-support, qemu-user-static
+Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386, libc6:armhf
 Section: utils
-Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner
+Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
-Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner
+Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
+Provides: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
 Installed-Size: 76512
-Description: gfdgd xi 制作的 wine 运行器
+Description: Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序，内置了对Wine图形化的支持、各种Wine工具、自制的Wine程序打包器和运行库安装工具等。
- 3.2.2 更新内容：
+ 它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作，也能在非 X86 架构安装 X86 架构的 Windows 操作系统（但是效率较低）。
- ※1. 修改源地址，脱离 Gitlink；
- ※2. 修复非 X86 架构运行器主页面虚拟机工具禁用的问题。
- 3.2.1 更新内容：
- ※1、Windows 虚拟机安装工具支持非 X86 架构；
- ※2、应用打包器可以与星火应用商店配合构建 arm/all 全架构的 Wine 包；
- ※3、Windows 虚拟机安装工具支持调用 Qemu；
- ※4、新增 Qemu User 运行 Wine 的帮助入口；
- ※5、修复 Windows 虚拟机的自动配置镜像缺少 aria2c.exe 的故障；
- ※6、支持在更新程序版本时自动关闭程序进程；
- 7、运行器和打包器支持调用 spark-wine8；
- 8、修改作者信息；
- 9、新增安装包构建时间；
- 10、优化 Wine 运行器更新策略。
- 更新时间：2023年04月29日
- 作者：gfdgd xi

deb/DEBIAN/postinst

@@ -9,10 +9,10 @@
 #################################################################################################################
 # 非强制性的必应组件，所以成功不成功都行
 # 程序版本号
-version=3.2.1
+version=3.4.0
 echo 安装组件
-python3 -m pip install --upgrade pynput --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
+python3 -m pip install --upgrade pynput --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages > /dev/null 2>&1 | true
-python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
+python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages > /dev/null 2>&1 | true
 echo 执行完成
 echo 移除旧组件
 if [ -d /opt/apps/deepin-wine-runner/arm-package ]; then
@@ -51,8 +51,8 @@ if [ `arch` != "x86_64" ]; then
 	rm -rf /opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
 fi
 # 处理 VM 工具
-vmPath=/opt/apps/deepin-wine-runner/VM/VirtualMachine-`arch`
+vmPath=/opt/apps/deepin-wine-runner/VM/VirtualMachine-`dpkg --print-architecture`
-echo 当前架构为：`arch`
+echo 当前架构为：`dpkg --print-architecture`
 if [ -f $vmPath ]; then
 	echo 虚拟机工具有该架构的预编译文件
 	# 移除辅助文件
@@ -65,19 +65,24 @@ else
 	rm -f /opt/apps/deepin-wine-runner/VM/VirtualMachine-*
 fi
 echo 处理完成！
-# 到时候切换 gpg 源会方便很多
+# 修复 3.3.0.1 Box86 源挂了的问题
-if [ -r /etc/apt/sources.list.d/better-dde.list ]; then
+if [ -f /etc/apt/sources.list.d/box86.list ]; then
-	if [ -d /usr/share/deepin-installer ]; then
+	bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/debian ./ > /etc/apt/sources.list.d/box86.list"
-		# 用于修复 Deepin Community Live CD Install 版签名过期的问题
-		wget -P /tmp/gfdgd-xi-sources https://code.gitlink.org.cn/gfdgd_xi/gfdgd-xi-apt-mirrors/raw/branch/master/gpg.asc
-		rm -rfv /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg | true
-		cp -v /tmp/gfdgd-xi-sources/gpg.asc.gpg /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg
-    	# 用于修复 2022.11.25 Better DDE 导致的 Deepin Community Live CD Install 版问题
-		# 移除 Better DDE 源
-    	rm -rfv /etc/apt/sources.list.d/better-dde.list
-		apt update > /dev/null 2>&1 | true
-	fi
 fi
+# Gitlink 源挂了
+# 到时候切换 gpg 源会方便很多
+#if [ -r /etc/apt/sources.list.d/better-dde.list ]; then
+#	if [ -d /usr/share/deepin-installer ]; then
+#		# 用于修复 Deepin Community Live CD Install 版签名过期的问题
+#		wget -P /tmp/gfdgd-xi-sources https://code.gitlink.org.cn/gfdgd_xi/gfdgd-xi-apt-mirrors/raw/branch/master/gpg.asc
+#		rm -rfv /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg | true
+#		cp -v /tmp/gfdgd-xi-sources/gpg.asc.gpg /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg
+#   	# 用于修复 2022.11.25 Better DDE 导致的 Deepin Community Live CD Install 版问题
+#		# 移除 Better DDE 源
+#    	rm -rfv /etc/apt/sources.list.d/better-dde.list
+#		apt update > /dev/null 2>&1 | true
+#	fi
+#fi
 # 设置目录权限，让用户可读可写，方便后续删除组件
 chmod 777 -R /opt/apps/deepin-wine-runner
 # 向服务器返回安装数加1（不显示内容且忽略错误）

deepin-wine-easy-packager.py

@@ -105,7 +105,7 @@ def ReplaceText(string: str, lists: list):
 
 control = '''Package: @@@Package@@@
 Version: @@@Version@@@
-Architecture: i386
+Architecture: all
 Maintainer: @@@Maintainer@@@
 Depends: @@@Depends@@@
 Section: non-free/otherosfs
@@ -119,7 +119,7 @@ info = f'''{{
     "appid": "@@@Package@@@",
     "name": "@@@Name@@@",
     "version": "@@@Version@@@",
-    "arch": ["i386"],
+    "arch": ["all"],
     "permissions": {{
         "autostart": false,
         "notification": false,
@@ -183,12 +183,15 @@ Get_Dist_Name()
         DISTRO='Deepin'
     elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
         DISTRO='UniontechOS'
+    elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
+        DISTRO='UniontechOS'
     else
 	 DISTRO='OtherOS'
 	fi
 }}
 
 
+
 ####获得发行版名称
 
 #########################预设值段
@@ -200,13 +203,17 @@ APPVER="@@@Version@@@"
 EXEC_PATH="@@@EXEC_PATH@@@"
 ##### 软件在wine中的启动路径
 START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+ENABLE_DOT_NET=""
+####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE=""
-#####没什么用
+
 export DEB_PACKAGE_NAME="@@@Package@@@"
 ####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
-export APPRUN_CMD="deepin-wine6-stable"
+export APPRUN_CMD="@@Wine@@"
 #####wine启动指令，建议
-EXPORT_ENVS=""
+#EXPORT_ENVS="wine的动态链接库路径"
+##例如我的wine应用是使用的dwine6的32位容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
+## 如果用不到就不填，不要删除前面的注释用的#
 
 export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
 
@@ -224,7 +231,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
 
 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
-#此功能实现参见结尾函数段
+#此功能实现参见开头函数段
 if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
@@ -236,12 +243,13 @@ fi
 
 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-#if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
 
-#export WINEDLLOVERRIDES="mscoree,mshtml="
+export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
-#echo "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+export WINEDLLOVERRIDES="control.exe=d"
+#### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
 
-#fi
+fi
 ##############>>>>>>>>>屏蔽mono和gecko安装器结束
 
 #########################执行段
@@ -261,11 +269,12 @@ if [ -n "$EXEC_PATH" ];then
     if [ -z "${{EXEC_PATH##*.lnk*}}" ];then
         $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
     else
-        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
     fi
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
-fi'''
+fi
+'''
 
 desktopFile = f'''#!/usr/bin/env xdg-open
 [Desktop Entry]
@@ -312,9 +321,9 @@ def ReadTxt(path):
         things = file.read()
     return things
 
-def GetEXEVersion(exePath):
+def GetEXEVersion(exePath, bottlePath=get_home() + "/.wine"):
     versionPath = f"/tmp/wine-runner-exe-version-{random.randint(0, 1000)}.txt"
-    if os.system(f"deepin-wine6-stable '{programPath}/GetEXEVersion.exe' '{exePath}' '{versionPath}'"):
+    if os.system(f"WINEPREFIX='{bottlePath}' {chooseWine} '{programPath}/GetEXEVersion.exe' '{exePath}' '{versionPath}'"):
         return "1.0.0"
     try:
         exeVersion = ReadTxt(versionPath).replace("\n", "")
@@ -376,9 +385,9 @@ class RunThread(QtCore.QThread):
     def __init__(self) -> None:
         super().__init__()
     
-    def GetEXEVersion(self, exePath):
+    def GetEXEVersion(self, exePath, bottlePath=get_home() + "/.wine"):
         versionPath = f"/tmp/wine-runner-exe-version-{random.randint(0, 1000)}.txt"
-        self.RunCommand(f"deepin-wine6-stable '{programPath}/GetEXEVersion.exe' '{exePath}' '{versionPath}'")
+        self.RunCommand(f"WINEPREFIX='{bottlePath}' {chooseWine} '{programPath}/GetEXEVersion.exe' '{exePath}' '{versionPath}'")
         try:
             exeVersion = ReadTxt(versionPath).replace("\n", "")
             if exeVersion.replace(" ", "") == "":
@@ -433,7 +442,7 @@ class RunThread(QtCore.QThread):
                 self.RunCommand(f"mkdir -pv '{bottlePath}'")
                 self.RunCommand(f"chmod 777 -Rv '{bottlePath}'")
                 # 禁止生成 .desktop 文件
-                self.RunCommand(f"WINEPREFIX='{bottlePath}' deepin-wine6-stable 'reg' 'add' 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe '/f'")
+                self.RunCommand(f"WINEPREFIX='{bottlePath}' {chooseWine} 'reg' 'add' 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe '/f'")
                 # 写入字体
                 self.RunCommand(f"WINEPREFIX='{bottlePath}' '{programPath}/AutoShell/command/installfont' 1")
                 # 安装包
@@ -441,7 +450,7 @@ class RunThread(QtCore.QThread):
                 global pressCompleteDownload
                 pressCompleteDownload = False
                 installCmpleteButton.setEnabled(True)
-                self.RunCommand(f"WINEPREFIX='{bottlePath}' deepin-wine6-stable '{exePath.text()}' &")  # 非堵塞线程
+                self.RunCommand(f"WINEPREFIX='{bottlePath}' {chooseWine} '{exePath.text()}' &")  # 非堵塞线程
                 
                 # 安装锁，锁解除后才可继续
                 while not pressCompleteDownload:
@@ -481,7 +490,7 @@ class RunThread(QtCore.QThread):
                 exePathInBottle = rightLnk[1]
                 exeName = os.path.splitext(os.path.basename(folderExePath))[0]
                 exePathInSystem = rightLnk[1].replace("\\", "/").replace("c:", f"{bottlePath}/drive_c")
-                debPackageVersion = self.GetEXEVersion(exePathInSystem)
+                debPackageVersion = self.GetEXEVersion(exePathInSystem, bottlePath)
                 cpNow = False
                 for i in iconList:
                     path = i[1].replace("wineBottonPath", bottlePath).lower()
@@ -497,7 +506,7 @@ class RunThread(QtCore.QThread):
                 # 绿色软件
                 self.RunCommand(f"mkdir -pv '{bottlePath}'")
                 self.RunCommand(f"chmod 777 -Rv '{bottlePath}'")
-                self.RunCommand(f"WINEPREFIX='{bottlePath}' deepin-wine6-stable exit")
+                self.RunCommand(f"WINEPREFIX='{bottlePath}' {chooseWine} exit")
                 folderExePath = os.path.dirname(exePath.text())               
                 exePathInBottle = f"c:/Program Files/{os.path.basename(folderExePath)}/{exeName}"
                 exeName = os.path.splitext(os.path.basename(os.path.basename(exePath.text())))[0]
@@ -505,9 +514,9 @@ class RunThread(QtCore.QThread):
                 self.RunCommand(f"'{programPath}/wrestool' '{exePath.text()}' -x -t 14 > '{debBuildPath}/{programIconPath}'")
                 # 拷贝文件到容器
                 self.RunCommand(f"cp -rv '{folderExePath}' '{bottlePath}/drive_c/Program Files'")
-                debPackageVersion = self.GetEXEVersion(exePath.text())
+                debPackageVersion = self.GetEXEVersion(exePath.text(), bottlePath)
-            debDescription = f"{exeName} By Deepin Wine 6 Stable And Build By Wine Runner Easy Packager"
+            debDescription = f"{exeName} By Build By Wine Runner Easy Packager"
-            debDepends = "deepin-wine6-stable, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
+            debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
             self.RunCommand(f"mkdir -pv '{debBuildPath}/DEBIAN'")
             self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/files'")
             self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/entries/applications'")
@@ -539,10 +548,11 @@ class RunThread(QtCore.QThread):
                 ["@@@Maintainer@@@", debMaintainer],
                 ["@@@Depends@@@", debDepends],
                 ["@@@Description@@@", debDescription],
-                ["@@@Installed-Size@@@", str(buildProgramSize)],
+                ["@@@Installed-Size@@@", str(int(buildProgramSize))],
                 ["@@@Name@@@", exeName],
                 ["@@@EXEC_PATH@@@", exePathInBottle],
-                ["@@@Icon@@@", programIconPath]
+                ["@@@Icon@@@", programIconPath],
+                ["@@@Wine@@@", chooseWine]
             ]
             debControl = ReplaceText(control, replaceMap)
             debPostrm = ReplaceText(postrm, replaceMap)
@@ -562,7 +572,7 @@ class RunThread(QtCore.QThread):
             self.RunCommand(f"chmod -Rv 755 '{debBuildPath}/opt/apps/{debPackageName}/entries/applications/'*.desktop")
             ########### 打包 deb
             print(debPackageVersion)
-            self.RunCommand(f"dpkg -b '{debBuildPath}' '{desktopPath}/{debPackageName}_{debPackageVersion}_i386.deb'")
+            self.RunCommand(f"dpkg-deb -Z xz -z $(($(grep -c processor < /proc/cpuinfo)*2)) -b '{debBuildPath}' '{desktopPath}/{debPackageName}_{debPackageVersion}_all.deb'")
             self.info.emit("打包完成！")
             self.disbledAll.emit(False)
             ########### 移除临时文件
@@ -580,6 +590,8 @@ class RunThread(QtCore.QThread):
 #/home/gfdgd_xi/Downloads/XPcalc.exe
 def RunBuildThread():
     global buildThread
+    global chooseWine
+    chooseWine = wineList[wineChooser.currentIndex()]
     buildThread = RunThread()
     buildThread.showLogText.connect(ShowText)
     buildThread.error.connect(ErrorMessage)
@@ -602,6 +614,7 @@ def BrowserExe():
     if filePath[0] != "" or filePath[0] != None:
         exePath.setText(filePath[0])
 
+chooseWine = ""
 if __name__ == "__main__":
     programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
     iconPath = "{}/deepin-wine-runner.svg".format(programPath)
@@ -616,12 +629,32 @@ if __name__ == "__main__":
     widget = QtWidgets.QWidget()
     layout = QtWidgets.QGridLayout()
     exePath = QtWidgets.QLineEdit()
+    wineChooser = QtWidgets.QComboBox()
     browserExeButton = QtWidgets.QPushButton("浏览……")
     logText = QtWidgets.QTextBrowser()
     logText.setStyleSheet("""
         background-color: black;
         color: white;
     """)
+    wineChooserList = [
+        "使用 Spark Wine8 打包应用",
+        "使用 Spark Wine7 Devel 打包应用",
+        "使用 Deepin Wine6 Stable 打包应用",
+        "使用 Deepin Wine5 Stable 打包应用",
+        "使用 Deepin Wine5 打包应用",
+        "使用 Deepin Wine2 打包应用"
+    ]
+    wineChooserIndex = 2
+    wineList = ["spark-wine8", "spark-wine7-devel", "deepin-wine6-stable", "deepin-wine5-stable", "deepin-wine5", "deepin-wine"]
+    if os.system("which deepin-wine6-stable"):
+        for i in range(len(wineList)):
+            if not os.system(f"which '{wineList[i]}'"):
+                wineChooserIndex = i
+                break
+    chooseWine = wineList[wineChooserIndex]
+    wineChooserList[wineChooserIndex] = f"{wineChooserList[wineChooserIndex]}（推荐，如无特殊需求不建议更换）"
+    wineChooser.addItems(wineChooserList)
+    wineChooser.setCurrentIndex(wineChooserIndex)
     controlLayout = QtWidgets.QHBoxLayout()
     buildButton = QtWidgets.QPushButton("现在打包……")
     installCmpleteButton = QtWidgets.QPushButton("安装程序执行完成")
@@ -637,8 +670,9 @@ if __name__ == "__main__":
     layout.addWidget(QtWidgets.QLabel("选择 EXE："), 0, 0)
     layout.addWidget(exePath, 0, 1)
     layout.addWidget(browserExeButton, 0, 2)
-    layout.addLayout(controlLayout, 1, 1)
+    layout.addWidget(wineChooser, 1, 1)
-    layout.addWidget(logText, 2, 0, 1, 3)
+    layout.addLayout(controlLayout, 2, 1)
+    layout.addWidget(logText, 3, 0, 1, 3)
     widget.setLayout(layout)
     window.setCentralWidget(widget)
     window.setWindowTitle(f"Wine 运行器 {version}——简易打包器")

deepin-wine-packager.py

@@ -77,6 +77,9 @@ def disabled_or_NORMAL_all(choose):
     buildDebDir.setDisabled(choose)
     debDepends.setDisabled(choose)
     debRecommend.setDisabled(choose)
+    debFirstArch.setDisabled(choose)
+    helperConfigPathButton.setDisabled(choose)
+    helperConfigPathText.setDisabled(choose)
     #if not choose:
     #    ChangeArchCombobox()
     #    ChangeWine()
@@ -497,12 +500,15 @@ Get_Dist_Name()
         DISTRO='Deepin'
     elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
         DISTRO='UniontechOS'
+    elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
+        DISTRO='UniontechOS'
     else
 	 DISTRO='OtherOS'
 	fi
 }}
 
 
+
 ####获得发行版名称
 
 #########################预设值段
@@ -514,13 +520,18 @@ APPVER="@@@APPVER@@@"
 EXEC_PATH="@@@EXEC_PATH@@@"
 ##### 软件在wine中的启动路径
 START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+{['''ENABLE_DOT_NET=true''', 'ENABLE_DOT_NET=""'][int(disabledMono.isChecked())]}
+####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE=""
-#####没什么用
+
+
 export DEB_PACKAGE_NAME="@@@DEB_PACKAGE_NAME@@@"
 ####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
 export APPRUN_CMD="@@@APPRUN_CMD@@@"
 #####wine启动指令，建议
-EXPORT_ENVS=""
+#EXPORT_ENVS="wine的动态链接库路径"
+##例如我的wine应用是使用的dwine6的32位容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
+## 如果用不到就不填，不要删除前面的注释用的#
 
 export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
 
@@ -538,7 +549,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
 
 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
-#此功能实现参见结尾函数段
+#此功能实现参见开头函数段
 if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
@@ -550,17 +561,13 @@ fi
 
 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-{['''#if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
 
-#export WINEDLLOVERRIDES="mscoree,mshtml="
+export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
-#echo "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+export WINEDLLOVERRIDES="control.exe=d"
+#### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
 
-#fi''', '''if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+fi
-
-export WINEDLLOVERRIDES="mscoree,mshtml="
-echo "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
-
-fi'''][int(disabledMono.isChecked())]}
 ##############>>>>>>>>>屏蔽mono和gecko安装器结束
 
 #########################执行段
@@ -580,11 +587,12 @@ if [ -n "$EXEC_PATH" ];then
     if [ -z "${{EXEC_PATH##*.lnk*}}" ];then
         $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
     else
-        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
     fi
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
-fi"""
+fi
+"""
                         ][chooseWineHelperValue.isChecked()],
                         "info": f'''{{
     "appid": "{e1_text.text()}",
@@ -1514,7 +1522,7 @@ Icon={a[i]}
 Exec="/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(iconUiList[i][0].text().replace(line, "/")))[0]}.sh" {command}
 Name={iconUiList[i][3].text()}
 Comment={e3_text.text()}
-MimeType={e10_text.text()}
+MimeType={iconUiList[i][5].text()}
 GenericName={e1_text.text()}
 Terminal=false
 StartupNotify=false
@@ -1556,6 +1564,12 @@ StartupNotify=false
                         #write_txt(f"{debPackagePath}/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(i[0].text().replace(line, '/')))[0]}_with_exagear.sh", ReplaceText(debInformation[debArch.currentIndex()]["run_with_exagear.sh"], replaceMap))
             if debArch.currentIndex() != 2:                    
                 write_txt("{}/opt/apps/{}/info".format(debPackagePath, e1_text.text()), debInformation[debArch.currentIndex()]["info"])
+            if helperConfigPath != None and helperConfigPath != "":
+                os.makedirs(f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs")
+                if e6_text.text()[-3: ] == ".7z":
+                    shutil.copy(helperConfigPath, f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs/{os.path.splitext(e6_text.text())[0]}.sh")
+                else:
+                    shutil.copy(helperConfigPath, f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs/{e6_text.text()}.sh")
             ################
             # 修改文件权限
             ################
@@ -1575,7 +1589,7 @@ StartupNotify=false
             ################
             if not self.build:
                 self.label.emit("正在构建 deb 包……")
-                self.run_command("bash -c 'dpkg -b \"{}\" \"{}\"'".format(debPackagePath, e12_text.text()))
+                self.run_command("bash -c 'dpkg-deb -Z xz -z $(($(grep -c processor < /proc/cpuinfo)*2)) -b \"{}\" \"{}\"'".format(debPackagePath, e12_text.text()))
             ################
             # 删除临时文件
             ################
@@ -1670,19 +1684,119 @@ def ChangeArchCombobox():
 def InstallDeb():
     os.system(f"xdg-open '{e12_text.text()}'")
 
+def OpenConfigFile():
+    path = QtWidgets.QFileDialog.getOpenFileName(window, "打开列表", get_home(), "JSON 文件(*.json);;所有文件(*.*)")
+    try:
+        if path[0] == "" and path[0] == None:
+            return
+        try:
+            with open(path[0], "r") as file:
+                openInfo = json.loads(file.read())
+        except:
+            traceback.print_exc()
+            QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
+            return
+        for i in openInfo:
+            option = openInfo[i][0]
+            if option == "L":
+                allInfoList[i][1].setText(openInfo[i][1])
+            elif option == "Co":
+                allInfoList[i][1].setCurrentIndex(openInfo[i][1])
+            elif option == "Ch":
+                allInfoList[i][1].setChecked(openInfo[i][1])
+            elif option == "Str-SparkHelperConfigPath":
+                allInfoList[i][1] = openInfo[i][1]
+                if openInfo[i][1] != None:
+                    helperConfigPathText.setText(os.path.basename(openInfo[i][1]))
+            elif option == "List-Desktop":
+                if len(openInfo[i][1]) > 1:
+                    for k in openInfo[i][1][1:]:
+                        AddTab(k)
+            
+                for k in range(len(openInfo[i][1][0])):
+                    try:
+                        iconUiList[0][k].setText(openInfo[i][1][0][k])
+                    except:
+                        try:
+                            iconUiList[0][k].setCurrentIndex(openInfo[i][1][0][k])
+                        except:
+                            print(k)
+                            traceback.print_exc()
+    except:
+        traceback.print_exc()
+        QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
+
+def SaveConfigList():
+    saveInfo = {}
+    try:
+        for i in allInfoList:
+            option = allInfoList[i][0]
+            print(i)
+            if option == "L":
+                saveInfo[i] = ["L", allInfoList[i][1].text()]
+            elif option == "Co":
+                saveInfo[i] = ["Co", allInfoList[i][1].currentIndex()]
+            elif option == "Ch":
+                saveInfo[i] = ["Ch", allInfoList[i][1].isChecked()]
+            elif option == "Str-SparkHelperConfigPath":
+                saveInfo[i] = ["Str-SparkHelperConfigPath", allInfoList[i][1]]
+            elif option == "List-Desktop":
+                print("aaa")
+                desktopTabList = []
+            
+                for d in allInfoList[i][1]:
+                    desktopInfoList = []
+                    for k in d:
+                        try:
+                            desktopInfoList.append(k.text())
+                        except:
+                            try:
+                                desktopInfoList.append(k.currentIndex())
+                            except:
+                                traceback.print_exc()
+                    desktopTabList.append(desktopInfoList)
+                saveInfo[i] = ["List-Desktop", desktopTabList]
+        path = QtWidgets.QFileDialog.getSaveFileName(window, "保存列表", get_home(), "JSON 文件(*.json);;所有文件(*.*)")
+        print(path)
+        if path[0] != "" and path[0] != None:
+            try:
+                with open(path[0], "w") as file:
+                    file.write(json.dumps(saveInfo, ensure_ascii=False, indent=4))
+            except:
+                traceback.print_exc()
+                QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
+    except:
+        traceback.print_exc()
+        QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
+
+def ClearHelperConfigPathText():
+    global helperConfigPath
+    helperConfigPath = None
+    helperConfigPathText.setText("点击浏览按钮指定软件包适配脚本")
+
+def BrowserHelperConfigPathText():
+    global helperConfigPath
+    path = QtWidgets.QFileDialog.getOpenFileName(window, "选择 sh 文件", get_home(), "shell 脚本(*.sh);;所有文件(*.*)")[0]
+    if path == "" or path == None:
+        return
+    helperConfigPath = path
+    helperConfigPathText.setText(os.path.basename(path))
+
 def ChangeWine():
     useInstallWineArch.setEnabled(os.path.exists(wine[wineVersion.currentText()]))
-    debDepends.setText([f"{wine[wineVersion.currentText()]}, deepin-wine-helper (>= 5.1.30-1), fonts-wqy-microhei, fonts-wqy-zenhei",
+    debDepends.setText([f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, deepin-wine-helper (>= 5.1.30-1), fonts-wqy-microhei, fonts-wqy-zenhei",
-                        f"{wine[wineVersion.currentText()]}, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
+                        f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
                         ][int(chooseWineHelperValue.isChecked())])
     debRecommend.setText("")
+    helperConfigPathText.setEnabled(chooseWineHelperValue.isChecked())
+    helperConfigPathButton.setEnabled(chooseWineHelperValue.isChecked())
     if os.path.exists(wine[wineVersion.currentText()]):
         debDepends.setText(["deepin-wine-helper (>= 5.1.30-1)",
                         "spark-dwine-helper | store.spark-app.spark-dwine-helper"
                         ][int(chooseWineHelperValue.isChecked())])
-        if "deepin-wine5-stable" in wine[wineVersion.currentText()]:
+        #if "deepin-wine5-stable" in wine[wineVersion.currentText()]:
-            debDepends.setText("libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses, deepin-wine-plugin-virtual")
+        #    debDepends.setText("libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses, deepin-wine-plugin-virtual")
-            debRecommend.setText("libcapi20-3, libcups2, libdbus-1-3, libfontconfig1, libfreetype6, libglu1-mesa | libglu1, libgnutls30 | libgnutls28 | libgnutls26, libgsm1, libgssapi-krb5-2, libjpeg62-turbo | libjpeg8, libkrb5-3, libodbc1, libosmesa6, libpng16-16 | libpng12-0, libsane | libsane1, libsdl2-2.0-0, libtiff5, libv4l-0, libxcomposite1, libxcursor1, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, libxslt1.1, libxxf86vm1")
+        #    debRecommend.setText("libcapi20-3, libcups2, libdbus-1-3, libfontconfig1, libfreetype6, libglu1-mesa | libglu1, libgnutls30 | libgnutls28 | libgnutls26, libgsm1, libgssapi-krb5-2, libjpeg62-turbo | libjpeg8, libkrb5-3, libodbc1, libosmesa6, libpng16-16 | libpng12-0, libsane | libsane1, libsdl2-2.0-0, libtiff5, libv4l-0, libxcomposite1, libxcursor1, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, libxslt1.1, libxxf86vm1")
 
 # 获取用户桌面目录
 def get_desktop_path():
@@ -1953,12 +2067,13 @@ def ChangeTapTitle():
 
 mapLink = []
 
-def AddTab():
+def AddTab(defaultValue=[]):
     global mapLink
     button2 = QtWidgets.QPushButton(transla.transe("U", "浏览……"))
     e7_text = QtWidgets.QLineEdit()
     e8_text = QtWidgets.QLineEdit()
     e9_text = QtWidgets.QLineEdit()
+    e10_text = QtWidgets.QLineEdit()
     e15_text = QtWidgets.QLineEdit()
     iconTab1 = QtWidgets.QWidget()
     option1_text = QtWidgets.QComboBox()
@@ -1974,6 +2089,7 @@ def AddTab():
     desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "wine 容器里需要运行的可执行文件的参数：")), 8, 0, 1, 1)
     desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的名称（※必填）：")), 9, 0, 1, 1)
     desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的图标：")), 10, 0, 1, 1)
+    desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", ".desktop 的 MimeType：")), 11, 0, 1, 1)
     iconTab1.setLayout(desktopIconTabLayout)
     desktopIconTab.addTab(iconTab1, f"图标{desktopIconTab.count() + 1}")
     desktopIconTabLayout.addWidget(e7_text, 6, 1, 1, 1)
@@ -1982,6 +2098,7 @@ def AddTab():
     desktopIconTabLayout.addWidget(e8_text, 9, 1, 1, 1)
     desktopIconTabLayout.addWidget(e9_text, 10, 1, 1, 1)
     desktopIconTabLayout.addWidget(button2, 10, 2, 1, 1)
+    desktopIconTabLayout.addWidget(e10_text, 11, 1, 1, 1)
     e8_text.setWhatsThis(transla.transe("U", """填写该软件的中文或英文名称。"""))
     e9_text.setWhatsThis(transla.transe("U", """图标只支持PNG格式和SVG格式，其他格式无法显示。"""))
     e15_text.setWhatsThis(transla.transe("U", "程序参数，如%u，一般不需要"))
@@ -2000,7 +2117,17 @@ Utility=工具软件或其他应用。
     e7_text.textChanged.connect(ChangeTapTitle)
     e7_text.setPlaceholderText("例如 c:/Program Files/Tencent/QQ/Bin/QQ.exe")
     e9_text.setPlaceholderText(transla.transe("U", "支持 png 和 svg 格式，不支持 ico 格式"))
-    iconUiList.append([e7_text, option1_text, e15_text, e8_text, e9_text])
+    e10_text.setWhatsThis(transla.transe("U", "快捷方式的 MimeType 项，一般为空即可"))
+    iconUiList.append([e7_text, option1_text, e15_text, e8_text, e9_text, e10_text])
+    if defaultValue != []:
+        for i in range(len(iconUiList[-1])):
+            try:
+                iconUiList[-1][i].setText(defaultValue[i])
+            except:
+                try:
+                    iconUiList[-1][i].setCurrentIndex(defaultValue[i])
+                except:
+                    traceback.print_exc()
     print(iconUiList)
 
 def DelTab():
@@ -2033,6 +2160,16 @@ def LockBottleName():
 def get_now_lang()->"获取当前语言":
     return os.getenv('LANG')
 
+def SetFont(size):
+    font = QtGui.QFont(defaultFont)
+    if size == 1:
+        window.setFont(defaultFont)    
+        return
+    font.setPixelSize(int(defaultFont.pixelSize() / size))
+    font.setPointSize(int(defaultFont.pointSize() / size))
+    window.setFont(font)
+
+
 bottleNameLock = False
 ###############
 # 程序信息
@@ -2062,6 +2199,7 @@ except:
     pass
 os.chdir("/")
 iconUiList = []
+helperConfigPath = None
 iconPath = "{}/deepin-wine-runner.svg".format(programPath)
 information = json.loads(readtxt(f"{programPath}/information.json"))
 version = information["Version"]
@@ -2089,6 +2227,11 @@ tips = transla.transe("U", """提示：
 app = QtWidgets.QApplication(sys.argv)
 window = QtWidgets.QMainWindow()
 widget = QtWidgets.QWidget()
+defaultFont = window.font()
+#hScroll = QtWidgets.QScrollArea()
+#hScroll.setWidget(widget)
+#hScroll.verticalScrollBar().setValue(hScroll.verticalScrollBar().maximum())
+#hScroll.horizontalScrollBar().setValue(hScroll.horizontalScrollBar().maximum())
 widgetLayout = QtWidgets.QGridLayout()
 # 设置变量以修改和获取值项
 wineVersion = QtWidgets.QComboBox()
@@ -2125,10 +2268,22 @@ debArch = QtWidgets.QComboBox()
 debArch.addItems(["默认选项", "arm64(box86+exagear)"])
 #debArch.addItems(["i386", "arm64(box86+exagear)", "all(crossover)"])
 textbox1 = QtWidgets.QTextBrowser()
-option1_text.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office", "Translation", "Development", "Utility"])
+option1_text.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office", "Translation", "Development", "Utility", "Game", "AudioVideo", "System"])
 option1_text.setCurrentText("Network")
 wineFrame = QtWidgets.QHBoxLayout()
 chooseWineHelperValue = QtWidgets.QCheckBox(transla.transe("U", "使用星火wine helper\n（如不勾选默认为deepin-wine-helper）"))
+helperConfigPathLayout = QtWidgets.QHBoxLayout()
+helperConfigPathButton = QtWidgets.QPushButton("浏览")
+helperConfigPathText = QtWidgets.QLabel("点击浏览按钮指定软件包适配脚本")
+helperConfigPathLayout.addWidget(helperConfigPathButton)
+helperConfigPathLayout.addWidget(helperConfigPathText)
+helperConfigPathButton.clicked.connect(BrowserHelperConfigPathText)
+helperConfigPathButton.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+helperConfigPathMenu = QtWidgets.QMenu(window)
+delHelperConfigPath = QtWidgets.QAction("取消选择")
+delHelperConfigPath.triggered.connect(ClearHelperConfigPathText)
+helperConfigPathMenu.addAction(delHelperConfigPath)
+helperConfigPathButton.customContextMenuRequested.connect(lambda: helperConfigPathMenu.exec_(QtGui.QCursor.pos()))
 button1.clicked.connect(button1_cl)
 button2.clicked.connect(lambda: button2_cl(0))
 mapLink.append(e9_text)
@@ -2167,6 +2322,7 @@ desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示
 desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "wine 容器里需要运行的可执行文件的参数：")), 8, 0, 1, 1)
 desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的名称（※必填）：")), 9, 0, 1, 1)
 desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的图标：")), 10, 0, 1, 1)
+desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", ".desktop 的 MimeType：")), 11, 0, 1, 1)
 iconTab1.setLayout(desktopIconTabLayout)
 #desktopIconTab.setTabPosition(QtWidgets.QTabWidget.East)
 desktopIconTab.addTab(iconTab1, "默认图标")
@@ -2187,7 +2343,8 @@ desktopIconTabLayout.addWidget(e15_text, 8, 1, 1, 1)
 desktopIconTabLayout.addWidget(e8_text, 9, 1, 1, 1)
 desktopIconTabLayout.addWidget(e9_text, 10, 1, 1, 1)
 desktopIconTabLayout.addWidget(button2, 10, 2, 1, 1)
-iconUiList.append([e7_text, option1_text, e15_text, e8_text, e9_text])
+desktopIconTabLayout.addWidget(e10_text, 11, 1, 1, 1)
+iconUiList.append([e7_text, option1_text, e15_text, e8_text, e9_text, e10_text])
 print(iconUiList)
 widgetLayout.addLayout(wineFrame, 6, 1, 1, 1)
 widgetLayout.addWidget(e12_text, 7, 1, 1, 1)
@@ -2217,13 +2374,12 @@ moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 包选项
 moreSettingLayout.addWidget(rmBash)
 moreSettingLayout.addWidget(cleanBottonByUOS)
 moreSettingLayout.addWidget(chooseWineHelperValue)
+moreSettingLayout.addLayout(helperConfigPathLayout)
 moreSettingLayout.addWidget(disabledMono)
 moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 的依赖(强制，如无特殊需求默认即可)：")))
 moreSettingLayout.addWidget(debDepends)
 moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 的推荐依赖(非强制，一般默认即可)：")))
 moreSettingLayout.addWidget(debRecommend)
-moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的 MimeType：")))
-moreSettingLayout.addWidget(e10_text)
 moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "打包 deb 架构：")))
 moreSettingLayout.addWidget(debFirstArch)
 moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "打包选项：")))
@@ -2246,10 +2402,16 @@ e7_text.setPlaceholderText("例如 c:/Program Files/Tencent/QQ/Bin/QQ.exe")
 e9_text.setPlaceholderText(transla.transe("U", "支持 png 和 svg 格式，不支持 ico 格式"))
 # 菜单栏
 menu = window.menuBar()
-programmenu = menu.addMenu(transla.transe("U", "程序"))
+programmenu = menu.addMenu(transla.transe("U", "程序（&P）"))
 debMenu = menu.addMenu(transla.transe("U", "deb 包"))
 uploadSparkStore = menu.addMenu(transla.transe("U", "投稿到星火应用商店"))
 help = menu.addMenu(transla.transe("U", "帮助"))
+openFile = QtWidgets.QAction(transla.transe("U", "打开配置文件"))
+saveFile = QtWidgets.QAction(transla.transe("U", "保存配置文件"))
+setMiniFont = QtWidgets.QAction(transla.transe("U", "使用小字体"))
+setDefaultFont = QtWidgets.QAction(transla.transe("U", "使用默认大小字体"))
+hideShowText = QtWidgets.QAction(transla.transe("U", "隐藏输出框"))
+hideShowText.setCheckable(True)
 exit = QtWidgets.QAction(transla.transe("U", "退出程序"))
 debE = QtWidgets.QAction(transla.transe("U", "只读取 Control 信息"))
 debX = QtWidgets.QAction(transla.transe("U", "读取所有（需解包，时间较久）"))
@@ -2261,8 +2423,24 @@ else:
     uploadSparkStoreProgram.setDisabled(True)
 tip = QtWidgets.QAction(transla.transe("U", "小提示"))
 getPdfHelp = QtWidgets.QAction(transla.transe("U", "Wine运行器和Wine打包器傻瓜式使用教程（小白专用）\nBy @雁舞白沙"))
+videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
+videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
+videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
+videoHelp.addAction(videoHelpAction)
+openFile.triggered.connect(OpenConfigFile)
+saveFile.triggered.connect(SaveConfigList)
+setMiniFont.triggered.connect(lambda: SetFont(1.2))
+setDefaultFont.triggered.connect(lambda: SetFont(1))
+hideShowText.triggered.connect(lambda: textbox1.setHidden(hideShowText.isChecked()))
 exit.triggered.connect(window.close)
 tip.triggered.connect(helps)
+programmenu.addAction(openFile)
+programmenu.addAction(saveFile)
+programmenu.addSeparator()
+programmenu.addAction(setMiniFont)
+programmenu.addAction(setDefaultFont)
+programmenu.addAction(hideShowText)
+programmenu.addSeparator()
 programmenu.addAction(exit)
 debMenu.addAction(debE)
 debMenu.addAction(debX)
@@ -2270,7 +2448,7 @@ uploadSparkStore.addAction(uploadSparkStoreProgram)
 uploadSparkStore.addAction(uploadSparkStoreWebsize)
 debE.triggered.connect(lambda: ReadDeb(False))
 debX.triggered.connect(lambda: ReadDeb(True))
-uploadSparkStoreWebsize.triggered.connect(lambda: webbrowser.open_new_tab("https://upload.deepinos.org"))
+uploadSparkStoreWebsize.triggered.connect(lambda: webbrowser.open_new_tab("https://upload.deepinos.org.cn"))
 uploadSparkStoreProgram.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"/opt/spark-store-submitter/bin/spark-store-submitter '{e12_text.text()}'"]).start())
 getPdfHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://bbs.deepin.org/post/246837"))
 help.addAction(tip)
@@ -2292,16 +2470,17 @@ window.setCentralWidget(widget)
 window.setWindowTitle(f"wine 应用打包器 {version}")
 window.setWindowIcon(QtGui.QIcon(iconPath))
 window.resize(int(window.frameSize().width() * 2.1), int(window.frameSize().height()))
-e1_text.setWhatsThis("""com.XXX.deepin
+e1_text.setWhatsThis("""安装包的包名，推荐类似 com.xxx.spark 这种倒置域名的格式，当然类似 spark-xxx 这种也可以，但是包名只能含有<b>小写字母（a-z）、数字（0-9）、加号（+）和减号（-）、以及点号(.)</b>，软件包名最短长度为两个字符，且包名必须以字母开头。""")
-XXX指windows软件的英文名称，可以自定义名称，但最好是用软件解压安装后自动生成的英文名称，如：dingtalk。包名只能含有小写字母（a-z）、数字（0-9）、加号（+）和减号（-）、以及点号(.)，软件包名最短长度为两个字符，且包名必须以字母开头。""")
 # 创建控件
-e2_text.setWhatsThis(transla.transe("U", """6.5.50（随便填写或填写该软件的windows版本的版本号，6.5.50只是示例）。"""))
+e2_text.setWhatsThis(transla.transe("U", """安装包的版本号，一般推荐格式为 <b><u>程序版本号</u>spark<u>修订号</u></b>，例如 23.01spark0，23.01 就是程序版本号，0 为修订号，代表第一版版本"""))
-e3_text.setWhatsThis(transla.transe("U", """随便填写或使用该软件的windows版本的软件简介。"""))
+e3_text.setWhatsThis(transla.transe("U", """安装包的说明，随意但最好能程序的介绍之类方便用户快速了解安装包内容的文字，推荐只用英文"""))
-e4_text.setWhatsThis(transla.transe("U", """填写自己的网名，若是自用软件，不上架至应用商店，不进行后续维护，可随便填写。"""))
+e4_text.setWhatsThis(transla.transe("U", """安装包的维护者，推荐格式为：<b><u>打包者</u>&lt;<u>邮箱</u>&gt;</b> ，例如 gfdgd xi&lt;3025613752@qq.com&gt;，多个打包者用半角符号“,”分隔"""))
 e5_text.setWhatsThis(f"<p>解压容器到其它机器的容器名称，一般自动带出</p><p><img src='{programPath}/Icon/Screen/202211121646232464_image.png'></p>")
 e6_text.setWhatsThis(transla.transe("U", f"要打包的容器所在路径，也可以选择已经好打包的 7z 文件，一般自动带出"))
-e7_text.setWhatsThis("""可执行文件的运行路径格式是“C:/XXX/XXX.exe”（不包含引号）""")
+e7_text.setWhatsThis("""程序在 wine 容器的路径，格式一般为 c:/xxx/xxx.exe""")
 debArch.setWhatsThis(transla.transe("U", "选择生成 deb 包所对应的架构"))
+wineVersion.setWhatsThis("deb 包使用的 Wine")
+option1_text.setWhatsThis("程序在启动器的快捷方式分类")
 rmBash.setWhatsThis(transla.transe("U", "清理容器无用内容，一般建议勾选，最新版本默认勾选，如果有特殊需求（如容器内有 mono、gecko 等）建议取消勾选"))
 debDepends.setWhatsThis(transla.transe("U", "生成 deb 包所需的依赖，一般情况下默认即可"))
 debRecommend.setWhatsThis(transla.transe("U", "生成 deb 包的推荐依赖，一般情况下为空即可"))
@@ -2311,15 +2490,20 @@ option1_text.setWhatsThis("""点击右侧的下拉箭头，选择该软件所属
 Network=网络应用；
 Chat=即时通讯或社交沟通；
 Video=视频播放；
+Audio=音乐欣赏；
+AudioVideo=视频播放；
 Graphics=图形图像；
+Game=游戏娱乐；
 Office=办公学习；
 Translation=阅读翻译；
 Development=软件开发；
+Reading=阅读翻译；
+System=系统管理；
 Utility=工具软件或其他应用。
 不明白英文的可以百度查询一下软件分类名称的意思。
 注意：此时选择的软件分类名称决定了该软件打包后再安装时会安装在启动器中的哪个软件分类目录中。""")
-e8_text.setWhatsThis(transla.transe("U", """填写该软件的中文或英文名称。"""))
+e8_text.setWhatsThis(transla.transe("U", """在启动器快捷方式的名称"""))
-e9_text.setWhatsThis(transla.transe("U", """图标只支持PNG格式和SVG格式，其他格式无法显示。"""))
+e9_text.setWhatsThis(transla.transe("U", """在启动器快捷方式的图标（不支持 ico 格式，推荐使用 svg、png 格式）"""))
 e10_text.setWhatsThis(transla.transe("U", "快捷方式的 MimeType 项，一般为空即可"))
 option1_text.setWhatsThis(transla.transe("U", "打包的 Wine 版本，根据实际情况选择（如果打包 arm 包将不会提供选择）"))
 e12_text.setWhatsThis(transla.transe("U", "打包出的 deb 生成的位置，一般自动生成"))
@@ -2329,6 +2513,28 @@ buildDebDir.setWhatsThis(transla.transe("U", "构建 deb 包目录，但不打
 textbox1.setWhatsThis(transla.transe("U", "查看打包过程中命令返回内容"))
 button5.setWhatsThis(transla.transe("U", "点击该按钮打包生成 deb"))
 installDeb.setWhatsThis(transla.transe("U", "调用默认的 deb 安装工具安装生成的 deb"))
+
+allInfoList = {
+    "Package": ["L", e1_text],
+    "Version": ["L", e2_text],
+    "Description": ["L", e3_text],
+    "Maintainer": ["L", e4_text],
+    "BottleName": ["L", e5_text],
+    "BottlePath": ["L", e6_text],
+    "WineVersion": ["Co", wineVersion],
+    "DebSavePath": ["L", e12_text],
+    "Desktop": ["List-Desktop", iconUiList],
+    "UseInstallWineArch": ["Co", useInstallWineArch],
+    "RemoveBash": ["Ch", rmBash],
+    "CleanBottleByUOS": ["Ch", cleanBottonByUOS],
+    "ChooseWineHelperValue": ["Ch", chooseWineHelperValue],
+    "DisabledMono": ["Ch", disabledMono],
+    "DebDepends": ["L", debDepends],
+    "DebRecommend": ["L", debRecommend],
+    "DebFirstArch": ["Co", debFirstArch],
+    "DebArch": ["Co", debArch],
+    "SparkHelperConfigPath": ["Str-SparkHelperConfigPath", helperConfigPath]
+}
 #window.setWindowFlag(QtGui.Qt)
 window.show()
 sys.exit(app.exec_())

deepin-wine-runner-update-bug

@@ -45,9 +45,6 @@ def OpenGiteeIssues():
 def OpenGithubIssues():
     webbrowser.open_new_tab("https://github.com/gfdgd-xi/deep-wine-runner/issues")
 
-def OpenGitlinkIssues():
-    webbrowser.open_new_tab("https://www.gitlink.org.cn/gfdgd_xi/deep-wine-runner/issues")
-
 # 获取用户主目录
 def get_home()->"获取用户主目录":
     return os.path.expanduser('~')
@@ -75,11 +72,9 @@ updateButton = QtWidgets.QPushButton("提交")
 otherUpload = QtWidgets.QHBoxLayout()
 giteeButton = QtWidgets.QPushButton("Gitee Issues")
 githubButton = QtWidgets.QPushButton("Github Issues")
-gitlinkButton = QtWidgets.QPushButton("Gitlink Issues")
 otherUpload.addWidget(QtWidgets.QLabel("如果无法正常反馈，可以用其他方式反馈："))
 otherUpload.addWidget(giteeButton)
 otherUpload.addWidget(githubButton)
-otherUpload.addWidget(gitlinkButton)
 otherUpload.addSpacerItem(QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
 starMenu.addItems(["5分", "4分", "3分", "2分", "1分"])
 widgetLayout.addWidget(QtWidgets.QLabel("你的昵称："), 0, 0, 1, 1)
@@ -94,7 +89,6 @@ widgetLayout.addLayout(otherUpload, 3, 0, 1, 5)
 widgetLayout.addWidget(updateButton, 3, 5, 1, 1)
 giteeButton.clicked.connect(OpenGiteeIssues)
 githubButton.clicked.connect(OpenGithubIssues)
-gitlinkButton.clicked.connect(OpenGitlinkIssues)
 updateButton.clicked.connect(UpdateButtonClick)
 widget.setLayout(widgetLayout)
 window.setCentralWidget(widget)

information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "3.2.2",
+    "Version": "3.4.0",
     "Time": "未知",
     "Thank": [
         "感谢 RacoonGX 的付出与贡献",

mainwindow.py

@@ -14,12 +14,12 @@ import os
 import sys
 import time
 import json
-import pyperclip
 import random
 import base64
 import shutil
 import hashlib
 import platform
+import pyperclip
 import threading
 import traceback
 import webbrowser
@@ -54,6 +54,14 @@ if sys.version_info[1] < 6:
 # 程序所需事件
 ###################
 
+def MiniMode(mode):
+    for i in [sparkWineSetting, qemuMenu, installLib, log, safeWebsize,
+              checkValue, virtualMachine, killProgram, killBottonProgram,
+              fontAppStore, wineConfig, trasButton, button5,
+              saveDesktopFileOnLauncher, label_r_2, combobox1,
+              leftDown]:
+        i.setVisible(not mode)
+
 # 打开程序官网
 def OpenProgramURL():
     webbrowser.open_new_tab(programUrl)
@@ -782,7 +790,9 @@ def RunWineProgram(wineProgram, history = False, Disbled = True):
 
 class RunWinetricksThread(QtCore.QThread):
     signal = QtCore.pyqtSignal(str)
-    def __init__(self):
+    bwrap = QtCore.pyqtSignal(str)
+    def __init__(self, bwrap):
+        self.bwrap = bwrap
         super().__init__()
 
     def run(self):
@@ -803,13 +813,40 @@ class RunWinetricksThread(QtCore.QThread):
                     QtWidgets.QMessageBox.critical(widget, "错误", "无法解压资源")
                     return
                 os.remove(f"{programPath}/dlls-arm.7z")
+        ## 获取 WineServer 路径
+        wineServer = None
+        winePath = wine[o1.currentText()]
+        winePath = winePath.replace(f"bash '{programPath}/WineLib/run.sh'", "").strip()
+        # 判断类似 xxx-server 的 WineServer
+        if not os.system(f"{winePath}-server") >> 8:
+            wineServer = f"{winePath}-server"
+        # 判断类似 deepin-wine6-stable 的 WineServer
+        elif os.path.exists(f"/opt/{winePath}/bin/wineserver"):
+            wineServer = f"/opt/{winePath}/bin/wineserver"
+        elif os.path.exists(winePath):
+            wineServer = os.path.normpath(f"{winePath}/../wineserver")
+        runtime = ""
+        if self.bwrap:
+            runtime = f"'{programPath}/WineLib/run.sh'"
+        winetricksPath = "winetricks"
+        if os.system("which winetricks") >> 8:
+            winetricksPath = f"'{programPath}/winetricks'"
+        print(wineServer)
+        wineProgramP = wine[o1.currentText()].replace(f"bash '{programPath}/WineLib/run.sh'", "").strip()
+        wineProgramP = subprocess.getoutput(f"which {wineProgramP}").strip()
         if setting["TerminalOpen"]:
             res = ""
             # 用终端开应该不用返回输出内容了
-            OpenTerminal(f"WINEPREFIX='{wineBottonPath}' {option} WINE=" + subprocess.getoutput(f"which {wine[o1.currentText()]}").replace(" ", "").replace("\n", "") + f" winetricks --gui {wineUsingOption}")
+            if wineServer == None:
+                OpenTerminal(f"WINEPREFIX='{wineBottonPath}' {option} WINE='{wineProgramP}' {runtime} {winetricksPath} --gui {wineUsingOption}")
+            else:
+                OpenTerminal(f"WINEPREFIX='{wineBottonPath}' {option} WINESERVER='{wineServer}' WINE='{wineProgramP}' {runtime} {winetricksPath} --gui {wineUsingOption}")
             #res = subprocess.Popen([f"'{programPath}/launch.sh' deepin-terminal -C \"WINEPREFIX='{wineBottonPath}' {option} WINE=" + subprocess.getoutput(f"which {wine[o1.currentText()]}").replace(" ", "").replace("\n", "") + f" winetricks --gui {wineUsingOption}\" --keep-open"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         else:    
-            res = subprocess.Popen([f"WINEPREFIX='{wineBottonPath}' {option} WINE='" + subprocess.getoutput(f"which {wine[o1.currentText()]}").replace(" ", "").replace("\n", "") + "' winetricks --gui"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            if wineServer == None:
+                res = subprocess.Popen([f"WINEPREFIX='{wineBottonPath}' {option} WINE='{wineProgramP}' {runtime} {winetricksPath} --gui"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            else:
+                res = subprocess.Popen([f"WINEPREFIX='{wineBottonPath}' {option} WINESERVER='{wineServer}' WINE='{wineProgramP}' {runtime} {winetricksPath} --gui"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         # 实时读取程序返回
         while res.poll() is None:
             try:
@@ -823,6 +860,24 @@ class RunWinetricksThread(QtCore.QThread):
         DisableButton(False)
 
 runWinetricks = None
+def RunWinetricksWithWineLib():
+    global runWinetricks
+    DisableButton(True)
+    if not CheckProgramIsInstall(wine[o1.currentText()]) and o1.currentText() != "基于 linglong 的 deepin-wine6-stable（不推荐）" and o1.currentText() != "基于 UOS exagear 的 deepin-wine6-stable" and o1.currentText() != "基于 UOS box86 的 deepin-wine6-stable":
+        if not CheckProgramIsInstall(wine[o1.currentText()]) and not o1.currentText() in untipsWine:
+            DisableButton(False)
+            return
+    if o1.currentText() == "基于 UOS box86 的 deepin-wine6-stable" or o1.currentText() == "基于 UOS exagear 的 deepin-wine6-stable":
+        if not os.path.exists(f"{programPath}/dlls-arm"):
+            if os.system(f"7z x -y \"{programPath}/dlls-arm.7z\" -o\"{programPath}\""):
+                QtWidgets.QMessageBox.critical(widget, "错误", "无法解压资源")
+                return
+            os.remove(f"{programPath}/dlls-arm.7z")
+    returnText.setText("")
+    runWinetricks = RunWinetricksThread(False)
+    runWinetricks.signal.connect(QT.ShowWineReturn)
+    runWinetricks.start()
+
 def RunWinetricks():
     global runWinetricks
     DisableButton(True)
@@ -837,7 +892,7 @@ def RunWinetricks():
                 return
             os.remove(f"{programPath}/dlls-arm.7z")
     returnText.setText("")
-    runWinetricks = RunWinetricksThread()
+    runWinetricks = RunWinetricksThread(False)
     runWinetricks.signal.connect(QT.ShowWineReturn)
     runWinetricks.start()
 
@@ -899,6 +954,13 @@ def InstallVB():
         wineBottonPath = e1.currentText()
     OpenTerminal(f"'{programPath}/InstallVisualBasicRuntime.py' '{wineBottonPath}' '{wine[o1.currentText()]}' {int(setting['RuntimeCache'])}")
 
+def InstallFoxPro():
+    if e1.currentText() == "":
+        wineBottonPath = setting["DefultBotton"]
+    else:
+        wineBottonPath = e1.currentText()
+    OpenTerminal(f"'{programPath}/InstallFoxpro.py' '{wineBottonPath}' '{wine[o1.currentText()]}' {int(setting['RuntimeCache'])}")
+
 def InstallVisualStudioCPlusPlus():
     if e1.currentText() == "":
         wineBottonPath = setting["DefultBotton"]
@@ -1892,6 +1954,13 @@ class ValueCheck():
 def ChangePath():
     e1.setCurrentText(f'{setting["DefultBotton"]}/{os.path.splitext(os.path.basename(e2.currentText()))[0]}')
 
+def ConnectRemoteWindowsPC(ip: str):
+    if os.system("which xfreerdp"):
+        if QtWidgets.QMessageBox.question(window, "提示", "未检测到 xfreerdp，是否立即安装？") == QtWidgets.QMessageBox.Yes:
+            OpenTerminal("sudo apt install xfreerdp -y")
+        return
+    os.system(f"xfreerdp '{ip}'")
+
 def UploadLog():
     if QtWidgets.QMessageBox.question(window, "提示", "您确定要上传吗？上传内容将不会公开，将用于加强日志分析功能") == QtWidgets.QMessageBox.Yes:
         text = QtWidgets.QInputDialog.getMultiLineText(window, "输入内容", "输入描述信息")
@@ -1957,6 +2026,8 @@ def getFileFolderSize(fileOrFolderPath):
         if os.path.isfile(fileOrFolderPath):
             totalSize = os.path.getsize(fileOrFolderPath)  # 5041481
             return totalSize
+        if os.path.islink(fileOrFolderPath):
+            return 0
         if os.path.isdir(fileOrFolderPath):
             with os.scandir(fileOrFolderPath) as dirEntryList:
                 for curSubEntry in dirEntryList:
@@ -2200,13 +2271,18 @@ programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 #############
 # 检测 Wine
 #############
-try:
+def CheckWine():
+    global wine
+    global untipsWine
+    global canUseWine
+    try:
         wine = {
             "基于 UOS box86 的 deepin-wine6-stable": f"WINEPREDLL='{programPath}/dlls-arm' WINEDLLPATH=/opt/deepin-wine6-stable/lib BOX86_NOSIGSEGV=1 /opt/deepin-box86/box86 /opt/deepin-wine6-stable/bin/wine ",
             "基于 UOS exagear 的 deepin-wine6-stable": f"WINEPREDLL='{programPath}/dlls-arm' WINEDLLPATH=/opt/deepin-wine6-stable/lib /opt/exagear/bin/ubt_x64a64_al --path-prefix {get_home()}/.deepinwine/debian-buster --utmp-paths-list {get_home()}/.deepinwine/debian-buster/.exagear/utmp-list --vpaths-list {get_home()}/.deepinwine/debian-buster/.exagear/vpaths-list --opaths-list {get_home()}/.deepinwine/debian-buster/.exagear/opaths-list --smo-mode fbase --smo-severity smart --fd-limit 8192 --foreign-ubt-binary /opt/exagear/bin/ubt_x32a64_al -- /opt/deepin-wine6-stable/bin/wine ",
             "使用 Flatpak 安装的 Wine": "flatpak run org.winehq.Wine",
             "deepin-wine6 stable": "deepin-wine6-stable", 
             "deepin-wine5 stable": "deepin-wine5-stable", 
+            "spark-wine": "spark-wine",
             "spark-wine7-devel": "spark-wine7-devel", 
             "spark-wine8": "spark-wine8",
             "deepin-wine": "deepin-wine", 
@@ -2223,8 +2299,8 @@ try:
             canUseWine.append("基于 UOS box86 的 deepin-wine6-stable")
         if os.path.exists("/opt/exagear/bin/ubt_x64a64_al") and os.path.exists("/opt/deepin-wine6-stable/bin/wine"):
             canUseWine.append("基于 UOS exagear 的 deepin-wine6-stable")
-    if not os.system("which exagear") and os.path.exists("/opt/deepin-wine6-stable/bin/wine"):
+        #if not os.system("which exagear") and os.path.exists("/opt/deepin-wine6-stable/bin/wine"):
-        canUseWine.append("基于 exagear 的 deepin-wine6-stable")
+            #canUseWine.append("基于 exagear 的 deepin-wine6-stable")
         for i in wine.keys():
             if not os.system(f"which '{wine[i]}'"):
                 canUseWine.append(i)
@@ -2243,6 +2319,8 @@ try:
                 except:
                     pass
         # 读取自定义安装的 Wine（需要解包的才能使用）
+        global qemuBottleList
+        global qemuPath
         qemuBottleList = []
         qemuPath = f"{get_home()}/.deepin-wine-runner-ubuntu-images"
         if not os.system("which qemu-i386-static"):
@@ -2259,6 +2337,13 @@ try:
                                     d,
                                     bottlePath
                                 ])
+
+        global shellHistory
+        global findExeHistory
+        global wineBottonHistory
+        global isoPath
+        global isoPathFound
+        global setting
         shellHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/ShellHistory.json")).values())
         findExeHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/FindExeHistory.json")).values())
         wineBottonHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/WineBottonHistory.json")).values())
@@ -2309,20 +2394,50 @@ try:
                                     f"box64  "
                                 ]
                             )
-                    if os.system("which exagear") == 0:
+                        if os.system("which qemu-i386") == 0 and subprocess.getoutput("arch") != "x86_64" and subprocess.getoutput("arch") != "i386" and subprocess.getoutput("arch") != "i686":
                             nameValue.append(
                                 [
-                                "基于 exagear 的 ",
+                                    "基于 qemu-i386 的 ",
-                                f"exagear  "
+                                    f"qemu-i386  "
                                 ]
                             )
-                    if os.path.exists("/opt/exagear/bin/ubt_x64a64_al"):
+                        if os.system("which qemu-x86_64") == 0 and subprocess.getoutput("arch") != "x86_64" and subprocess.getoutput("arch") != "i386" and subprocess.getoutput("arch") != "i686":
+                            nameValue.append(
+                                [
+                                    "基于 qemu-x86_64 的 ",
+                                    f"qemu-x86_64  "
+                                ]
+                            )
+                        if os.path.exists("/opt/exagear/bin/ubt_x64a64_al") and os.path.exists(f"{get_home()}/.deepinwine/debian-buster"):
                             nameValue.append(
                                 [
                                     "基于 UOS exagear 的 ",
                                     f"WINEPREDLL='{programPath}/dlls-arm' WINEDLLPATH=/opt/deepin-wine6-stable/lib /opt/exagear/bin/ubt_x64a64_al --path-prefix {get_home()}/.deepinwine/debian-buster --utmp-paths-list {get_home()}/.deepinwine/debian-buster/.exagear/utmp-list --vpaths-list {get_home()}/.deepinwine/debian-buster/.exagear/vpaths-list --opaths-list {get_home()}/.deepinwine/debian-buster/.exagear/opaths-list --smo-mode fbase --smo-severity smart --fd-limit 8192 --foreign-ubt-binary /opt/exagear/bin/ubt_x32a64_al --  "
                                 ]
                             )
+                        if os.system("which exagear") == 0:
+                            nameValue.append(
+                                [
+                                    "运行 exagear 容器内的 ",
+                                    f"exagear -- "
+                                ]
+                            )
+
+                        if os.path.exists("/opt/exagear/bin/ubt_x64a64_al"):
+                            nameValue.append(
+                                [
+                                    "使用 ubt_x64a64_al 运行",
+                                    "/opt/exagear/bin/ubt_x64a64_al -- "
+                                ]
+                            )
+                        
+                        if os.path.exists("/opt/exagear/bin/ubt_x32a64_al"):
+                            nameValue.append(
+                                [
+                                    "使用 ubt_x32a64_al 运行",
+                                    "/opt/exagear/bin/ubt_x32a64_al -- "
+                                ]
+                            )
                         for g in qemuBottleList:
                             nameValue.append([
                                 f"使用qemu-{g[0]}-static 调用容器{g[1]}运行 ",
@@ -2356,8 +2471,9 @@ try:
                             wine[f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64"] = f"{k[1]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64"
                             canUseWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64")
                             untipsWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/wine-x86_64")
+            
         except:
-        pass
+            traceback.print_exc()
         try:
             for i in os.listdir(f"{get_home()}/.deepinwine/"):
                 if os.path.exists(f"{get_home()}/.deepinwine/{i}/bin/wine"):
@@ -2367,12 +2483,35 @@ try:
                     wine[f"{get_home()}/.deepinwine/{i}/bin/wine64"] = f"{get_home()}/.deepinwine/{i}/bin/wine64"
                     canUseWine.append(f"{get_home()}/.deepinwine/{i}/bin/wine64")
         except:
-        pass
+            traceback.print_exc()
-except:
+        try:
+            canUseWineOld = canUseWine[:]
+            for i in canUseWineOld:
+                if os.path.exists(f"{programPath}/WineLib/usr"):
+                    wine[f"使用运行器的运行库运行 {i}"] = f"bash '{programPath}/WineLib/run.sh' {wine[i]}"
+                    canUseWine.append(f"使用运行器的运行库运行 {i}")
+                    untipsWine.append(f"使用运行器的运行库运行 {i}")
+            if os.path.exists("/opt/exagear/images"):
+                for k in os.listdir("/opt/exagear/images"):
+                    if not os.path.isdir(f"/opt/exagear/images/{k}"):
+                        continue
+                    for i in canUseWineOld:
+                        wine[f"使用Exagear容器运行库运行 {i}"] = f"bash '{programPath}/WineLib/run-more.sh' '/opt/exagear/images/{k}' {wine[i]}"
+                        canUseWine.append(f"使用Exagear容器运行库运行 {i}")
+                        untipsWine.append(f"使用Exagear容器运行库运行 {i}")
+            #if os.path.exists(f"{get_home()}/.deepinwine/debian-buster"):
+                #for i in canUseWineOld:
+                    #wine[f"使用UOS Exagear容器运行库运行 {i}"] = f"bash '{programPath}/WineLib/run-more.sh' '{get_home()}/.deepinwine/debian-buster' {wine[i]}"
+                    #canUseWine.append(f"使用UOS Exagear容器运行库运行 {i}")
+                    #untipsWine.append(f"使用UOS Exagear容器运行库运行 {i}")
+        except:
+            traceback.print_exc()
+    except:
         traceback.print_exc()
         app = QtWidgets.QApplication(sys.argv)
         QtWidgets.QMessageBox.critical(None, "错误", f"无法读取配置，无法继续\n{traceback.format_exc()}")
         sys.exit(1)
+CheckWine()
 
 # transla.transe
 
@@ -2402,24 +2541,31 @@ exe路径\' 参数 \'
 即可（单引号需要输入）；
 5、wine 容器如果没有指定，则会默认为 ~/.wine；
 6、如果可执行文件比较大的话，会出现点击“获取该程序运行情况”出现假死的情况，因为正在后台读取 SHA1，只需要等一下即可（读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关）；
-7、对于非 X86 的用户来说，请不要使用本程序自带的 Wine 安装程序和 Windows 虚拟机安装功能（检测到为非 X86 架构会自动禁用）；
+7、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；''')
-8、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；
+updateThingsString = transla.transe("U", '''※1、修复简易打包器无法打开的问题以及 Wine 识别错误的问题
-9、在使用 linglong 包的 Wine 应用时，必须安装至少一个 linglong 的使用 Wine 软件包才会出现该选项，
+※2、高级打包器支持多 .desktop 分别设置不同的 MimeType
-而程序识别到的 Wine 是按 linglong 的使用 Wine 软件包名的字母排序第一个的 Wine，且生成的容器不在用户目录下，而是在容器的用户目录下（~/.deepinwine、/tmp、桌面、下载、文档等被映射的目录除外），
+※3、修复运行器在 Ubuntu 23 的安装问题
-同理需要运行的 EXE 也必须在被映射的目录内；
+※4、高级打包器支持导出/导入填写信息
-10、如果是使用 Deepin 23 的 Wine 安装脚本，请切记——安装过程会临时添加 Deepin 20 的 apt 源，不要中断安装以及
+※5、Deepin 23 支持使用 Winetricks
-<b>千万不要中断后不删除源的情况下 apt upgrade ！！！</b>中断后只需重新打开脚本输入 repair 或者随意安装一个 Wine（会自动执行恢复操作）即可
+※6、新增视频教程
-以及此脚本安装的 Wine 无法保证 100% 能使用，以及副作用是会提示；
+※7、修复虚拟机工具在检测到 Qemu 磁盘但没有安装 Qemu 时无法启动的问题
-<code>N: 鉴于仓库 'https://community-packages.deepin.com/beige beige InRelease' 不支持 'i386' 体系结构，跳过配置文件 'main/binary-i386/Packages' 的获取。</code>''')
+※8、修复虚拟机工具的一些问题并调整部分设置
-updateThingsString = transla.transe("U", '''※1. 修改源地址（迁出 Gitlink）；
+※9、虚拟机工具支持设置 UEFI 启动
-※2. 修复非 X86 架构运行器主页面虚拟机工具禁用的问题；
+※10、虚拟机安装工具提供 LoongArch 新世界版本
-3、部分组件支持选择最优源。
+11、高级打包器支持隐藏输入框以及使用小字体
-''')
+12、打包器提供 bcm 和 dcm wine 支持
+13、修复星火 wine 配置错误问题
+14、打包器支持多线程打包
+15、修复升级工具问题：https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX
+16、跟进打包器 run.sh 模板
+17、云沙箱新增 cloud.vdnel.cn
+18、打包器新增分类 Game、System、AudioVideo
+19、修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题''')
 for i in information["Thank"]:
     thankText += f"{i}\n"
-updateTime = "2023年05月10日"
+updateTime = "2023年08月11日"
 aboutProgram = transla.transe("U", """<p>Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序，内置了对Wine图形化的支持、各种Wine工具、自制的Wine程序打包器和运行库安装工具等。</p>
-<p>它同时还内置了基于VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作。</p>
+<p>它同时还内置了基于VirtualBox/Qemu制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作。</p>
 <pre>
 
 一个图形化了如下命令的程序（最简单格式）
@@ -2596,11 +2742,14 @@ button_r_6 = QtWidgets.QPushButton(transla.transe("U", "RegShot"))
 button_r_6.clicked.connect(lambda: RunWineProgram(f"{programPath}/RegShot/regshot.exe"))
 programManager.addWidget(button_r_6, 3, 4, 1, 1)
 sparkWineSetting = QtWidgets.QPushButton(transla.transe("U", "星火wine配置"))
-sparkWineSetting.clicked.connect(lambda: threading.Thread(target=os.system, args=["/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"]).start())
+sparkWineSetting.clicked.connect(lambda: threading.Thread(target=os.system, args=["bash /opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"]).start())
 programManager.addWidget(sparkWineSetting, 3, 6, 1, 1)
 wineAutoConfig = QtWidgets.QPushButton(transla.transe("U", "自动/手动配置 Wine 容器"))
 wineAutoConfig.clicked.connect(WineBottonAutoConfig)
 programManager.addWidget(wineAutoConfig, 3, 8, 1, 1)
+wineBottleReboot = QtWidgets.QPushButton(transla.transe("U", "重启指定Wine容器"))
+wineBottleReboot.clicked.connect(lambda: RunWineProgram(f"wineboot' '-k"))
+programManager.addWidget(wineBottleReboot, 3, 10, 1, 1)
 # 权重
 button5.setSizePolicy(size)
 saveDesktopFileOnLauncher.setSizePolicy(size)
@@ -2623,7 +2772,8 @@ mainLayout.setColumnStretch(1, 1)
 mainLayout.addWidget(returnText, 0, 1, 2, 1)
 
 # 版权
-copy = QtWidgets.QLabel(f"""\n程序版本：{version}，<b>提示：Wine 无法保证可以运行所有的 Windows 程序，如果想要运行更多 Windows 程序，可以考虑虚拟机和双系统</b><br>
+copy = QtWidgets.QLabel(f"""程序版本：{version}，<b>提示：Wine 无法保证可以运行所有的 Windows 程序，如果想要运行更多 Windows 程序，可以考虑虚拟机和双系统</b><br/>
+<b>注：部分二进制兼容层会自动注册 binfmt（如原版的 Box86/64、Qemu User Static），则意味着无需在 Wine 版本那里特别指定兼容层，直接指定 Wine 即可</b><br/>
 ©2020~{time.strftime("%Y")} gfdgd xi""")
 mainLayout.addWidget(copy, 2, 0, 1, 1)
 
@@ -2649,10 +2799,13 @@ programmenu = menu.addMenu(transla.transe("U", "程序(&P)"))
 p1 = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine.png"), transla.transe("U", "安装 wine(&I)"))
 installWineOnDeepin23 = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine23P.png"), transla.transe("U", "安装 wine(只限Deepin23 Preview)"))
 installWineOnDeepin23Alpha = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine23A.png"), transla.transe("U", "安装 wine(只限Deepin23 Alpha)"))
-installWineHQ = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine.png"), transla.transe("U", "安装 WineHQ"))
+installWineHQOrg = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine.png"), transla.transe("U", "安装 WineHQ（官方源）"))
+installWineHQ = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine.png"), transla.transe("U", "安装 WineHQ（国内清华大学镜像源）"))
 installMoreWine = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/more-wine.png"), transla.transe("U", "安装更多 Wine"))
 downloadChrootBottle = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/CHROOT.png"), transla.transe("U", "下载 Chroot 容器"))
-installBox86 = QtWidgets.QAction(QtGui.QIcon.fromTheme("box"), transla.transe("U", "安装 Box86"))
+installBox86CN = QtWidgets.QAction(QtGui.QIcon.fromTheme("box"), transla.transe("U", "安装 Box86/Box64（国内源）"))
+installBox86 = QtWidgets.QAction(QtGui.QIcon.fromTheme("box"), transla.transe("U", "安装 Box86/Box64（国外 Github 源）"))
+addWineDebMirrorForDeepin20 = QtWidgets.QAction(QtGui.QIcon(f"{programPath}/Icon/Function/wine.png"), transla.transe("U", "添加 Wine 运行器源以安装较新版本的 WineHQ（支持 Deepin20/Debian10）"))
 p2 = QtWidgets.QAction(QtGui.QIcon.fromTheme("settings"), transla.transe("U", "设置程序(&S)"))
 enabledAll = QtWidgets.QAction(transla.transe("U", "强制启用所有被禁用的组件（不推荐）"))
 p3 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(47), transla.transe("U", "清空软件历史记录(&C)"))
@@ -2663,8 +2816,11 @@ programmenu.addAction(p1)
 programmenu.addAction(installWineOnDeepin23)
 programmenu.addAction(installWineOnDeepin23Alpha)
 programmenu.addAction(installWineHQ)
+programmenu.addAction(installWineHQOrg)
+programmenu.addAction(addWineDebMirrorForDeepin20)
 programmenu.addAction(installMoreWine)
 programmenu.addAction(downloadChrootBottle)
+programmenu.addAction(installBox86CN)
 programmenu.addAction(installBox86)
 programmenu.addSeparator()
 programmenu.addAction(p2)
@@ -2679,10 +2835,23 @@ p1.triggered.connect(InstallWine)
 installWineOnDeepin23.triggered.connect(InstallWineOnDeepin23)
 installWineOnDeepin23Alpha.triggered.connect(InstallWineOnDeepin23Alpha)
 installWineHQ.triggered.connect(InstallWineHQ)
-installMoreWine.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/wine/installwine'"]).start())
+installWineHQOrg.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"{programPath}/InstallNewWineHQOrg.sh"]).start())
+addWineDebMirrorForDeepin20.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"bash '{programPath}/AddWineDebMirrorForDeepin20.sh'"]).start())
+def InstallMoreWine():
+    os.system(f"'{programPath}/wine/installwine'")
+    # 更新 Wine 列表
+    CheckWine()
+    o1.clear()
+    if setting["AutoWine"]:
+        o1.addItems(canUseWine)
+    else:
+        o1.addItems(wine.keys())
+#installMoreWine.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/wine/installwine'"]).start())
+installMoreWine.triggered.connect(InstallMoreWine)
 downloadChrootBottle.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/QemuDownload.py'"]).start())
 p2.triggered.connect(ProgramSetting.ShowWindow)
 enabledAll.triggered.connect(lambda: DisableButton(False))
+installBox86CN.triggered.connect(lambda: OpenTerminal(f"pkexec bash '{programPath}/InstallBox86-cn.sh'"))
 installBox86.triggered.connect(lambda: OpenTerminal(f"pkexec bash '{programPath}/InstallBox86.sh'"))
 p3.triggered.connect(CleanProgramHistory)
 cleanCache.triggered.connect(CleanProgramCache)
@@ -2696,7 +2865,7 @@ w3 = QtWidgets.QAction(QtGui.QIcon.fromTheme("font"), transla.transe("U", "安
 w4 = QtWidgets.QAction(transla.transe("U", "删除选择的 Wine 容器"))
 cleanBottonUOS = QtWidgets.QAction(transla.transe("U", "清理 Wine 容器（基于 Wine 适配活动脚本）"))
 wineKeyboardLnk = QtWidgets.QAction(transla.transe("U", "Wine 快捷键映射"))
-w5 = QtWidgets.QAction(QtGui.QIcon.fromTheme("deb"), transla.transe("U", "打包 wine 应用"))
+w5 = QtWidgets.QAction(QtGui.QIcon.fromTheme("deb"), transla.transe("U", "打包 wine 应用（专业用户使用）"))
 w6 = QtWidgets.QAction(QtGui.QIcon.fromTheme("deb"), transla.transe("U", "使用官方 Wine 适配活动的脚本进行打包"))
 easyPackager = QtWidgets.QAction(QtGui.QIcon.fromTheme("deb"), transla.transe("U", "使用简易打包器进行打包（小白且无特殊需求建议使用这个）"))
 getDllOnInternet = QtWidgets.QAction(QtGui.QIcon.fromTheme("1CD8_rundll32.0"), transla.transe("U", "从互联网获取DLL"))
@@ -2725,6 +2894,7 @@ wineOption.addSeparator()
 wm1 = wineOption.addMenu(transla.transe("U", "在指定 Wine、容器安装组件"))
 wm1_1 = QtWidgets.QAction(transla.transe("U", "在指定wine、指定容器安装 .net framework"))
 wm1_2 = QtWidgets.QAction(transla.transe("U", "在指定wine、指定容器安装 Visual Studio C++"))
+wm1_8 = QtWidgets.QAction(transla.transe("U", "在指定wine、指定容器安装 Visual FoxPro"))
 wm1_3 = QtWidgets.QAction(transla.transe("U", "在指定wine、指定容器安装 MSXML"))
 wm1_4 = QtWidgets.QAction(transla.transe("U", "在指定wine、指定容器安装 gecko"))
 wm1_5 = QtWidgets.QAction(QtGui.QIcon.fromTheme("mono"), transla.transe("U", "在指定wine、指定容器安装 mono"))
@@ -2732,6 +2902,7 @@ wm1_7 = QtWidgets.QAction(transla.transe("U", "在指定wine、指定容器安
 wm1_6 = QtWidgets.QAction(transla.transe("U", "在指定wine、指定容器安装其它运行库"))
 wm1.addAction(wm1_1)
 wm1.addAction(wm1_2)
+wm1.addAction(wm1_8)
 wm1.addAction(wm1_3)
 wm1.addAction(wm1_4)
 wm1.addAction(wm1_5)
@@ -2756,11 +2927,14 @@ w8 = QtWidgets.QAction(transla.transe("U", "设置 run_v3.sh 的文管为 Deepin
 w9 = QtWidgets.QAction(transla.transe("U", "设置 run_v3.sh 的文管为 Wine 默认文管"))
 w10 = QtWidgets.QAction(transla.transe("U", "重新安装 deepin-wine-helper"))
 w11 = QtWidgets.QAction(QtGui.QIcon.fromTheme("winetricks"), transla.transe("U", "使用winetricks打开指定容器"))
+w11WithWineLib = QtWidgets.QAction(QtGui.QIcon.fromTheme("winetricks"), transla.transe("U", "使用winetricks打开指定容器（使用Wine运行器运行库）"))
+w11WithWineLib.setDisabled(True)
 settingRunV3Sh.addAction(w8)
 settingRunV3Sh.addAction(w9)
 settingRunV3Sh.addAction(w10)
 wineOption.addSeparator()
 wineOption.addAction(w11)
+#wineOption.addAction(w11WithWineLib)
 wineOption.addSeparator()
 optionCheckDemo = wineOption.addMenu(transla.transe("U", "组件功能测试"))
 vbDemo = QtWidgets.QAction(transla.transe("U", "测试 Visual Basic 6 程序"))
@@ -2837,8 +3011,10 @@ w8.triggered.connect(SetDeepinFileDialogDeepin)
 w9.triggered.connect(SetDeepinFileDialogDefult)
 w10.triggered.connect(SetDeepinFileDialogRecovery)
 w11.triggered.connect(lambda: RunWinetricks())
+w11WithWineLib.triggered.connect(lambda: RunWinetricksWithWineLib())
 wm1_1.triggered.connect(lambda: threading.Thread(target=InstallNetFramework).start())
 wm1_2.triggered.connect(lambda: threading.Thread(target=InstallVisualStudioCPlusPlus).start())
+wm1_8.triggered.connect(lambda: threading.Thread(target=InstallFoxPro).start())
 wm1_3.triggered.connect(lambda: threading.Thread(target=InstallMSXML).start())
 wm1_4.triggered.connect(lambda: threading.Thread(target=InstallMonoGecko, args=["gecko"]).start())
 wm1_5.triggered.connect(lambda: threading.Thread(target=InstallMonoGecko, args=["mono"]).start())
@@ -2902,12 +3078,15 @@ safeWebsize = menu.addMenu(transla.transe("U", "云沙箱(&C)"))
 s1 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(9), transla.transe("U", "360 沙箱云"))
 s2 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(9), transla.transe("U", "微步云沙箱"))
 s3 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(9), transla.transe("U", "VIRUSTOTAL"))
+s4 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(9), transla.transe("U", "计算机病毒防御技术国家工程实验室"))
 safeWebsize.addAction(s1)
 safeWebsize.addAction(s2)
 safeWebsize.addAction(s3)
+safeWebsize.addAction(s4)
 s1.triggered.connect(lambda: webbrowser.open_new_tab("https://ata.360.net/"))
 s2.triggered.connect(lambda: webbrowser.open_new_tab("https://s.threatbook.cn/"))
 s3.triggered.connect(lambda: webbrowser.open_new_tab("https://www.virustotal.com/"))
+s4.triggered.connect(lambda: webbrowser.open_new_tab("https://cloud.vdnel.cn/"))
 
 log = menu.addMenu(transla.transe("U", "日志(&L)"))
 getDllInfo = QtWidgets.QAction(transla.transe("U", "查询 Dll"))
@@ -2935,11 +3114,68 @@ def AddLib(install: QtWidgets.QAction, uninstall, menu, info):
     menu.addAction(install)
     menu.addAction(uninstall)
 
+installLib = menu.addMenu(transla.transe("U", "应用运行库(&R)"))
+howtouseQemuUser = QtWidgets.QAction(transla.transe("U", "Qemu User 使用教程（配合运行库实现在非 X86 架构运行 X86 Wine）"))
+howtouseQemuUser.triggered.connect(lambda: webbrowser.open_new_tab("https://www.bilibili.com/read/cv23185651"))
+runnerlibinfo = QtWidgets.QAction("只在运行器使用的运行库（不与其他运行库以及兼容层冲突）")
+installRunnerLib = QtWidgets.QAction("安装运行库")
+statusRunnerLib = QtWidgets.QAction("当前状态：未安装")
+removeRunnerLib = QtWidgets.QAction("移除运行库")
+runnerlibinfo.setDisabled(True)
+statusRunnerLib.setDisabled(True)
+removeRunnerLib.setDisabled(True)
+installLib.addAction(howtouseQemuUser)
+installLib.addSeparator()
+installLib.addAction(runnerlibinfo)
+installLib.addAction(statusRunnerLib)
+installLib.addAction(installRunnerLib)
+installLib.addAction(removeRunnerLib)
+diyRunnerLib = installLib.addMenu("定制运行库")
+diyRunnerLib.setDisabled(True)
+diyRunnerLibRemoveTips = QtWidgets.QAction("移除库")
+diyRunnerLibRemoveTips.setDisabled(True)
+diyRunnerLib.addAction(diyRunnerLibRemoveTips)
+installRunnerLib.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"bash '{programPath}/WineLib/install.sh'"]).start())
+removeRunnerLib.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"bash '{programPath}/WineLib/remove.sh'"]).start())
+if os.path.exists(f"{programPath}/WineLib/usr"):
+    installRunnerLib.setDisabled(True)
+    removeRunnerLib.setEnabled(True)
+    diyRunnerLib.setEnabled(True)
+    w11WithWineLib.setEnabled(True)
+    statusRunnerLib.setText("当前状态：已安装")
+    libPathList = []
+    mapLink = []
+    def AddRunnerLib(number, name):
+        global diyRunnerLib
+        action = QtWidgets.QAction(f"{name}")
+        mapLink.append(action)
+        action.triggered.connect(lambda: DelRunnerLib(int(str(number))))
+        diyRunnerLib.addAction(action)    
+    def DelRunnerLib(number):
+        os.system(f"rm -rf '{libPathList[number]}'")
+        QtWidgets.QMessageBox.information(window, "提示", "删除完成！")
+        mapLink[number].setDisabled(True)
+    for libPath in [f"{programPath}/WineLib/usr/lib", f"{programPath}/WineLib/usr/lib64"]:
+        for i in os.listdir(libPath):
+            if not os.path.isdir(f"{libPath}/{i}"):
+                try:
+                    if not os.path.getsize(f"{libPath}/{i}"):
+                        continue
+                except:
+                    continue
+                libPathList.append(f"{libPath}/{i}")
+                AddRunnerLib(len(libPathList) - 1, f"{i}")
+            else:
+                if not os.path.exists(f"{libPath}/{i}/libc.so.6"):
+                    continue
+                libPathList.append(f"{libPath}/{i}/")
+                AddRunnerLib(len(libPathList) - 1, f"{i}/")
+    print(libPathList)
 if os.path.exists(f"{programPath}/InstallRuntime"):
-    installLib = menu.addMenu(transla.transe("U", "应用运行库(&R)"))
+    installLib.addSeparator()
-    howtouseQemuUser = QtWidgets.QAction(transla.transe("U", "Qemu User 使用教程（配合运行库实现在非 X86 架构运行 X86 Wine）"))
+    systemalllibinfo = QtWidgets.QAction("全局运行库（与其他运行库以及部分兼容层冲突）")    
-    howtouseQemuUser.triggered.connect(lambda: webbrowser.open_new_tab("https://gitee.com/gfdgd-xi/deep-wine-runner/wikis/%E4%BD%BF%E7%94%A8%E5%B8%AE%E5%8A%A9/%E9%9D%9EX86%E6%9E%B6%E6%9E%84PC/%E4%BD%BF%E7%94%A8Qemu%20User%E8%BF%90%E8%A1%8CWine%EF%BC%88%E6%94%AF%E6%8C%81%E5%85%A8%E6%9E%B6%E6%9E%84%EF%BC%89"))
+    systemalllibinfo.setDisabled(True)
-    installLib.addAction(howtouseQemuUser)
+    installLib.addAction(systemalllibinfo)
     installQemuMenu = installLib.addMenu(transla.transe("U", "安装 Qemu User"))
     installQemu = QtWidgets.QAction(transla.transe("U", "安装 Qemu User"))
     removeQemu = QtWidgets.QAction(transla.transe("U", "卸载 Qemu User"))
@@ -2967,6 +3203,11 @@ if len(qemuBottleList) >= 1:
     configMenu.triggered.connect(ConfigQemu)
     print(qemuBottleList)
 
+videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
+videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
+videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
+videoHelp.addAction(videoHelpAction)
+
 help = menu.addMenu(transla.transe("U", "帮助(&H)"))
 runStatusWebSize = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "查询程序在 Wine 的运行情况"))
 h1 = help.addMenu(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "程序官网"))
@@ -3002,10 +3243,7 @@ help.addSeparator()
 wikiHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "程序 Wiki"))
 help.addAction(wikiHelp)
 videoHelp = help.addMenu(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
-easyHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "简易使用教程"))
+videoHelp.addAction(videoHelpAction)
-buildHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "打包教程"))
-videoHelp.addAction(easyHelp)
-videoHelp.addAction(buildHelp)
 help.addSeparator()
 help.addAction(h5)
 help.addAction(h6)
@@ -3028,8 +3266,6 @@ h3.triggered.connect(UpdateThings)
 wineRunnerHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://bbs.deepin.org/post/246837"))
 h4.triggered.connect(ThankWindow)
 wikiHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://gfdgd-xi.github.io/wine-runner-wiki"))
-easyHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://www.bilibili.com/video/BV1ma411972Y"))
-buildHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://www.bilibili.com/video/BV1EU4y1k7zr"))
 h5.triggered.connect(UpdateWindow.ShowWindow)
 h6.triggered.connect(WineRunnerBugUpload)
 fenUpload.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"python3 '{programPath}/ProgramFen.py'"]).start())
@@ -3058,7 +3294,7 @@ else:
     o1.addItems(wine.keys())
 # 禁用被精简掉的控件
 for i in [
-    [[p1, installWineOnDeepin23, installWineHQ, installMoreWine], f"{programPath}/InstallWineOnDeepin23.py"],
+    [[p1, installWineOnDeepin23, installWineHQ, installWineHQOrg, installMoreWine], f"{programPath}/InstallWineOnDeepin23.py"],
     [[w5], f"{programPath}/deepin-wine-packager.py"],
     [[w6], f"{programPath}/deepin-wine-packager-with-script.py"],
     [[p1, v1], f"{programPath}/RunVM.sh"],
@@ -3075,6 +3311,7 @@ if subprocess.getoutput("arch").lower() != "x86_64":
     #virtualMachine.setDisabled(True)
     #v1.setDisabled(True)
     installWineHQ.setDisabled(True)
+    installWineHQOrg.setDisabled(True)
     pass
 o1.setCurrentText(setting["DefultWine"])
 e1.setEditText(setting["DefultBotton"])
@@ -3091,5 +3328,6 @@ if o1.currentText() == "":
     canUseWine.append("没有识别到任何Wine，请在菜单栏“程序”安装Wine或安装任意Wine应用")
     o1.addItem("没有识别到任何Wine，请在菜单栏“程序”安装Wine或安装任意Wine应用")
 
-
+# Mini 模式
+# MiniMode(True)
 sys.exit(app.exec_())

package-script/debian/postrm

@@ -2,24 +2,55 @@
 if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
 
 echo "清理卸载残留"
-CONTAINER_NAME="@deb_package_name@"
+BOTTLE_NAME="@public_bottle_name@" #在引号中填写容器名
+PACK_NAME="@deb_package_name@"   #在引号中填写软件包名
+ACTIVEX_NAME="" #activex相关，若未使用，可不设置
+MAKE_AUTOSTART="" #如果先前设置了开机自启，则在此处填写1
 
-if [ -z $CONTAINER_NAME ];then
+
+
+### 以下为功能段，若只用于打包则以下内容可不看，只填写上方即可
+
+make_autostart()
+{
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d "/home/$username/.config/autostart" ]
+        then
+            rm /home/$username/.config/autostart/$PACK_NAME.desktop
+        fi
+    done
+}
+
+
+
+if [ -n "$MAKE_AUTOSTART" ]; then
+    make_autostart
+fi
+
+
+if [ -n "$ACTIVEX_NAME" ]; then
+    rm /usr/lib/mozilla/plugins/libpipelight-$ACTIVEX_NAME.so
+fi
+
+
+if [ -z $BOTTLE_NAME ];then
 echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine/ 下删除"
 exit
 fi
 
-if [ -e /opt/deepinwine/tools/kill.sh ];then
+if [ -e /opt/deepinwine/tools/spark_kill.sh ];then
-/opt/deepinwine/tools/kill.sh $CONTAINER_NAME
+/opt/deepinwine/tools/spark_kill.sh $BOTTLE_NAME
-###这里注意，如果没写CONTAINER_NAME,会把QQ杀了
+###这里注意，如果没写BOTTLE_NAME,会把QQ杀了
 fi
 
 for username in $(ls /home)  
     do
       echo /home/$username
-        if [ -d /home/$username/.deepinwine/$CONTAINER_NAME ]  
+        if [ -d /home/$username/.deepinwine/$BOTTLE_NAME ]  
         then
-        rm -rf /home/$username/.deepinwine/$CONTAINER_NAME
+        rm -rf /home/$username/.deepinwine/$BOTTLE_NAME
         fi
     done
 else

package-script/information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "3.2.2",
+    "Version": "3.4.0",
     "Time": "未知",
     "Thank": [
         "感谢 RacoonGX 的付出与贡献",

package-script/mkicons.sh

@@ -76,6 +76,12 @@ make_icon()
             make_png
         fi
     else
+	cp deepin-wine-runner.svg "$tmp"
+	if command -v inkscape > /dev/null 2>&1; then
+	    make_svg
+	else
+	    make_png
+	fi
         echo "wrestool failed"
     fi
     rm $tmp

package-script/package.py

@@ -82,9 +82,9 @@ export deb_version_string="{versionName.text()}"
 #读取和最终解压的包名
 export bottle_name="{bottonName.text()}"
 
-export package_depends="deepin-wine6-stable:amd64 (>= 6.0.0.12-1), spark-dwine-helper | store.spark-app.spark-dwine-helper"
+export package_depends="deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper"
 export apprun_cmd="deepin-wine6-stable"
-#export package_depends="deepin-wine5-stable:amd64 (>= 5.0.29-1), spark-dwine-helper | store.spark-app.spark-dwine-helper"
+#export package_depends="deepin-wine5-stable | deepin-wine5-stable-bcm | deepin-wine5-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper"
 #export apprun_cmd="deepin-wine5-stable"
 
 # rm -fr final.dir/
@@ -201,7 +201,7 @@ debPath = QtWidgets.QPushButton(transla.transe("U", "deb 包生成目录"))
 buildDeb.setSizePolicy(size)
 debPath.setSizePolicy(size)
 commandReturn = QtWidgets.QTextBrowser()
-typeName.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office", "Translation", "Development", "Utility", "System"])
+typeName.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office", "Translation", "Development", "Utility", "Game", "AudioVideo", "System"])
 controlFrame.addWidget(buildDeb)
 controlFrame.addWidget(debPath)
 widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "程序中文名：")), 0, 0, 1, 1)
@@ -245,6 +245,10 @@ uploadSparkStore.addAction(uploadSparkStoreProgram)
 uploadSparkStore.addAction(uploadSparkStoreWebsize)
 uploadSparkStoreWebsize.triggered.connect(lambda: webbrowser.open_new_tab("https://upload.deepinos.org"))
 uploadSparkStoreProgram.triggered.connect(lambda: threading.Thread(target=os.system, args=["/opt/spark-store-submitter/bin/spark-store-submitter"]).start())
+videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
+videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
+videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
+videoHelp.addAction(videoHelpAction)
 helpMenu = menu.addMenu(transla.transe("U", "帮助"))
 help = QtWidgets.QAction(transla.transe("U", "帮助"))
 help.triggered.connect(ShowHelp)

package-script/script-packager.sh

@@ -2,7 +2,7 @@
 #export elephant_deb_package_name=""
 run_sh_dir=""
 elephant_run_sh_dir=""
-start_shell="/opt/deepinwine/tools/run_v4.sh"
+start_shell="/opt/deepinwine/tools/spark_run_v4.sh"
 if [[ -n "$SPECIFY_SHELL_PATH" ]] && [[ "$SPECIFY_SHELL_PATH" == "/opt/apps"* ]];then
     start_shell="$SPECIFY_SHELL_PATH"
 fi

package-script/template/run.sh

@@ -4,18 +4,113 @@
 #
 #   Author:     Li LongYu <lilongyu@linuxdeepin.com>
 #               Peng Hao <penghao@linuxdeepin.com>
+#
+#
+#   Copyright (C) 2022 The Spark Project
+#
+#
+#   Modifier    shenmo <shenmo@spark-app.store>
+#
+#
+#
 
+#######################函数段。下文调用的额外功能会在此处声明
+
+Get_Dist_Name()
+{
+    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
+        DISTRO='Deepin'
+    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
+        DISTRO='UniontechOS'
+    elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
+        DISTRO='UniontechOS'
+    else
+	 DISTRO='OtherOS'
+	fi
+}
+
+
+####获得发行版名称
+
+#########################预设值段
+
+version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
+####用于比较版本？未实装
 BOTTLENAME="@public_bottle_name@"
 APPVER="@deb_version_string@"
 EXEC_PATH="@exec_path@"
+##### 软件在wine中的启动路径
 START_SHELL_PATH="@start_shell_path@"
+ENABLE_DOT_NET=""
+####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE="@mime_type@"
+
 export DEB_PACKAGE_NAME="@deb_package_name@"
+####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
 export APPRUN_CMD="@apprun_cmd@"
-export PATCH_LOADER_ENV="@patch_loader@"
+#####wine启动指令，建议
+#EXPORT_ENVS="wine的动态链接库路径"
+##例如我的wine应用是使用的dwine6的32位容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
+## 如果用不到就不填，不要删除前面的注释用的#
+
+export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
+
+ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
+
+export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
+
+export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
+
+DISABLE_ATTACH_FILE_DIALOG=""
+##默认为空。若为1，则不使用系统自带的文件选择，而是使用wine的
+##对于deepin/UOS，大部分的应用都不需要使用wine的，如果有需求（比如wine应用选择的限定种类文件系统的文管不支持）
+##请填1。
+##注意：因为非DDE的环境不确定，所以默认会在非Deepin/UOS发行版上禁用这个功能。如果你确认在适配的发行版上可以正常启动，请注释或者删除下面这段
+
+##############<<<<<<<<<禁用文件选择工具开始
+Get_Dist_Name
+#此功能实现参见开头函数段
+if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
+DISABLE_ATTACH_FILE_DIALOG="1"
+echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
+echo "如果你想改变这个行为，请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
+echo "To打包者：如果你要打开自带请注意在适配的发行版上进行测试"
+echo "To用户：打包者没有打开这个功能，这证明启用这个功能可能造成运行问题。如果你要修改这个行为，请确保你有一定的动手能力"
+fi
+##############>>>>>>>>>禁用文件选择工具结束
+
+##############<<<<<<<<<屏蔽mono和gecko安装器开始
+##默认屏蔽mono和gecko安装器
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
+
+export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
+export WINEDLLOVERRIDES="control.exe=d"
+#### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+
+fi
+##############>>>>>>>>>屏蔽mono和gecko安装器结束
+
+#########################执行段
+
+
+
+
+if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
+    export ATTACH_FILE_DIALOG=1
+fi
+
+if [ -n "$EXPORT_ENVS" ];then
+    export $EXPORT_ENVS
+fi
 
 if [ -n "$EXEC_PATH" ];then
-    $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+    if [ -z "${EXEC_PATH##*.lnk*}" ];then
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+    else
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+    fi
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
 fi
+
+

updatekiller.py

@@ -8,9 +8,10 @@ PIDFILE = '/tmp/deepin-wine-runner.pid'
 #程序结束时清理pid
 @atexit.register
 def remove_pid():
+    '''程序结束时清理pid'''
     with open(PIDFILE) as pidfile:
         pidlst = pidfile.readlines()
-    pidlst.remove(str(PID)+'\n')
+    pidlst.remove(str(PID)+'\n')    #移除记录中的pid
     with open(PIDFILE,'w') as pidfile:
         pidfile.writelines(pidlst)
 
@@ -21,7 +22,7 @@ def main():
             os.kill(int(i),15)
         except ProcessLookupError:
             pass
-    os.remove(PIDFILE)
+##    os.remove(PIDFILE)    #因修复#I6ZRZX而注释
 
 #当该程序被直接执行时，执行结束进程操作。如果是导入的形式，则只是记录pid
 if __name__ == '__main__':

wine install

@@ -74,4 +74,17 @@ if not choose == "N":
     os.system("apt update -o Dir::Etc::sourcelist=\"sources.list.d/sparkstore.list\"     -o Dir::Etc::sourceparts=\"-\" -o APT::Get::List-Cleanup=\"0\"")
     os.system("sudo apt update")
     os.system("sudo apt install spark-wine7-devel -y")
+print("请问是否要安裝 spark-wine8-wow及其套件？（需要添加星火应用商店的仓库）[Y/N]", end=' ')
+choose = input().upper()
+if not choose == "N":
+    if os.path.exists("/etc/apt/sources.list.d/sparkstore.list"):
+        os.system("sudo apt install spark-wine8-wow -y")
+    os.system("sudo touch /etc/apt/sources.list.d/sparkstore.list")
+    os.system("echo 'deb [by-hash=force] https://d.store.deepinos.org.cn/ /' | sudo tee '/etc/apt/sources.list.d/sparkstore.list'")
+    os.system("mkdir -p /tmp/spark-store-install")
+    os.system("wget -O /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc")
+    os.system("cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg")
+    os.system("apt update -o Dir::Etc::sourcelist=\"sources.list.d/sparkstore.list\"     -o Dir::Etc::sourceparts=\"-\" -o APT::Get::List-Cleanup=\"0\"")
+    os.system("sudo apt update")
+    os.system("sudo apt install spark-wine8-wow -y")
 print("全部完成！")

wine/installwine

@@ -77,7 +77,7 @@ class Ui_MainWindow(object):
         _translate = QtCore.QCoreApplication.translate
         self.menu = MainWindow.menuBar()
         self.changeSources = self.menu.addMenu(_translate("MainWindow", "更换源"))
-        self.gitlinkAction = QtWidgets.QAction(_translate("MainWindow", "Gitlink 源（推荐）"))
+        self.gitlinkAction = QtWidgets.QAction(_translate("MainWindow", "Gitee 源（推荐）"))
         self.kgithubAction = QtWidgets.QAction(_translate("MainWindow", "KGithub 源"))
         self.ipv6Action = QtWidgets.QAction(_translate("MainWindow", "Github 源1（国内访问不稳定）"))
         self.githubAction = QtWidgets.QAction(_translate("MainWindow", "Github 源2（国内访问不稳定）"))
@@ -177,7 +177,9 @@ def ReadInternetInformation():
     global internetJsonList
     # C++ 版本是用 curl 的，考虑到 Python 用 requests 反而方便，于是不用 curl
     try:
-        internetJsonList = json.loads(requests.get(f"{internetWineSource}/information.json").text)
+        text = requests.get(f"{internetWineSource}/information.json").text
+        print(text)
+        internetJsonList = json.loads(text)
     except:
         traceback.print_exc()
         QtWidgets.QMessageBox.critical(window, "错误", "无法连接服务器！")
@@ -360,7 +362,7 @@ if __name__ == "__main__":
     internetWineSourceList = [
         "http://wine.wine-runner.gfdgdxi.top/",
         "https://kgithub.com/gfdgd-xi/wine-mirrors-websize/raw/master/",
-        "https://code.gitlink.org.cn/gfdgd_xi/wine-mirrors/raw/branch/master/",
+        "https://gitee.com/gfdgd-xi/wine-mirrors-websize/raw/master/",
         "https://github.com/gfdgd-xi/wine-mirrors-websize/raw/master/",
         "http://127.0.0.1/wine-mirrors/"  # 本地测试源
         ]

wineautobuild-action-7z-aarch64-daily.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+apt update
+apt install git sudo gpg wget dpkg-dev aria2 -y
+sudo apt update
+# 添加源
+sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+echo "deb-src [signed-by=/usr/share/keyrings/winehq-archive.key] https://dl.winehq.org/wine-builds/ubuntu/ focal main" > /etc/apt/sources.list.d/winehq-bionic.list
+sudo apt update
+# 编译
+mkdir /wine
+cd /wine
+#sudo apt build-dep wget -y
+#sudo apt source wget
+
+#sudo apt source wine
+sudo apt install fakeroot p7zip-full aptitude lld -y
+sudo aptitude install flex bison libfreetype6-dev libjpeg-dev libpng-dev libxslt1-dev libxml2-dev libxrender-dev libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev prelink libasound2-dev -y
+sudo aptitude install flex bison gettext make gcc  gcc-mingw-w64 libasound2-dev libasound2-dev libpulse-dev libpulse-dev -y
+sudo aptitude install libdbus-1-dev libdbus-1-dev libfontconfig1-dev libfontconfig1-dev libfreetype6-dev libfreetype6-dev libgnutls28-dev libgnutls28-dev libpng-dev libpng-dev libtiff-dev libtiff-dev libgl-dev libgl-dev libunwind-dev libunwind-dev libx11-dev libx11-dev libxml2-dev libxml2-dev libxslt1-dev libxslt1-dev libgstreamer1.0-dev -y
+sudo aptitude install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev libmpg123-dev libmpg123-dev libosmesa6-dev libosmesa6-dev libudev-dev libudev-dev libvkd3d-dev libvkd3d-dev libvulkan-dev libvulkan-dev libcapi20-dev libcapi20-dev liblcms2-dev liblcms2-dev libcups2-dev libcups2-dev libgphoto2-dev libgphoto2-dev libsane-dev libsane-dev libgsm1-dev libgsm1-dev libkrb5-dev libkrb5-dev libldap2-dev libldap2-dev samba-dev ocl-icd-opencl-dev ocl-icd-opencl-dev libpcap-dev libpcap-dev libusb-1.0-0-dev libusb-1.0-0-dev libv4l-dev libv4l-dev libopenal-dev libopenal-dev libxcomposite-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxi-dev libxi-dev libxrandr-dev libxrandr-dev libxinerama-dev libxinerama-dev -y
+sudo apt install clang llvm -y
+sudo apt install "llvm*" -y
+sudo apt build-dep wine -y
+# 获取数据
+url=`cat /wine-url.txt`
+version=`cat /wine-version.txt`
+type=`cat /wine-type.txt`
+cpu=$(cat /proc/cpuinfo | grep processor | wc -l)
+#aria2c -x 16 -s 16 $url
+#tar -xvf `basename $url`
+git clone git://source.winehq.org/git/wine.git
+echo Wine version `date` > wine/VERSION
+mv wine wine-$version
+#cd wine-$version
+## 编译64位
+mkdir build64
+cd build64
+sudo aptitude install libpcsclite-dev libsdl2-dev samba-dev -y
+../wine-$version/configure 
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+# 打7z包
+echo Building Time: `date`, source from git://source.winehq.org/git/wine.git > info.txt
+7z a /wine/wine-daily-ubuntu22.04-aarch64.7z *
+cd /wine
+rm -rfv program
+
+## 移除临时文件（不写了，反正 Github Action 会自动销毁）

wineautobuild-action-7z-aarch64.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+apt update
+apt install sudo gpg wget dpkg-dev aria2 -y
+sudo apt update
+# 添加源
+sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+echo "deb-src [signed-by=/usr/share/keyrings/winehq-archive.key] https://dl.winehq.org/wine-builds/ubuntu/ focal main" > /etc/apt/sources.list.d/winehq-bionic.list
+sudo apt update
+# 编译
+mkdir /wine
+cd /wine
+#sudo apt build-dep wget -y
+#sudo apt source wget
+
+#sudo apt source wine
+sudo apt install fakeroot p7zip-full aptitude lld -y
+sudo aptitude install flex bison libfreetype6-dev libjpeg-dev libpng-dev libxslt1-dev libxml2-dev libxrender-dev libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev prelink libasound2-dev -y
+sudo aptitude install flex bison gettext make gcc  gcc-mingw-w64 libasound2-dev libasound2-dev libpulse-dev libpulse-dev -y
+sudo aptitude install libdbus-1-dev libdbus-1-dev libfontconfig1-dev libfontconfig1-dev libfreetype6-dev libfreetype6-dev libgnutls28-dev libgnutls28-dev libpng-dev libpng-dev libtiff-dev libtiff-dev libgl-dev libgl-dev libunwind-dev libunwind-dev libx11-dev libx11-dev libxml2-dev libxml2-dev libxslt1-dev libxslt1-dev libgstreamer1.0-dev -y
+sudo aptitude install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev libmpg123-dev libmpg123-dev libosmesa6-dev libosmesa6-dev libudev-dev libudev-dev libvkd3d-dev libvkd3d-dev libvulkan-dev libvulkan-dev libcapi20-dev libcapi20-dev liblcms2-dev liblcms2-dev libcups2-dev libcups2-dev libgphoto2-dev libgphoto2-dev libsane-dev libsane-dev libgsm1-dev libgsm1-dev libkrb5-dev libkrb5-dev libldap2-dev libldap2-dev samba-dev ocl-icd-opencl-dev ocl-icd-opencl-dev libpcap-dev libpcap-dev libusb-1.0-0-dev libusb-1.0-0-dev libv4l-dev libv4l-dev libopenal-dev libopenal-dev libxcomposite-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxi-dev libxi-dev libxrandr-dev libxrandr-dev libxinerama-dev libxinerama-dev -y
+sudo apt install clang llvm -y
+sudo apt install "llvm*" -y
+sudo apt build-dep wine -y
+# 获取数据
+url=`cat /wine-url.txt`
+version=`cat /wine-version.txt`
+type=`cat /wine-type.txt`
+cpu=$(cat /proc/cpuinfo | grep processor | wc -l)
+aria2c -x 16 -s 16 $url
+tar -xvf `basename $url`
+#cd wine-$version
+## 编译64位
+mkdir build64
+cd build64
+sudo aptitude install libpcsclite-dev libsdl2-dev samba-dev -y
+../wine-$version/configure 
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+# 打7z包
+7z a /wine/wine-$type-$version-ubuntu22.04-aarch64.7z *
+cd /wine
+rm -rfv program
+
+## 移除临时文件（不写了，反正 Github Action 会自动销毁）

wineautobuild-action-7z-daily.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+dpkg --add-architecture i386
+apt update
+apt install sudo git gpg wget dpkg-dev aria2 -y
+sudo apt update
+# 添加源
+sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+echo "deb-src [signed-by=/usr/share/keyrings/winehq-archive.key] https://dl.winehq.org/wine-builds/ubuntu/ focal main" > /etc/apt/sources.list.d/winehq-bionic.list
+sudo apt update
+# 编译
+mkdir /wine
+cd /wine
+#sudo apt build-dep wget -y
+#sudo apt source wget
+sudo apt build-dep wine -y
+#sudo apt source wine
+sudo apt install fakeroot p7zip-full -y
+sudo apt install flex bison gettext make gcc gcc-multilib gcc-mingw-w64 libasound2-dev libasound2-dev:i386 libpulse-dev libpulse-dev:i386 libdbus-1-dev libdbus-1-dev:i386 libfontconfig1-dev libfontconfig1-dev:i386 libfreetype6-dev libfreetype6-dev:i386 libgnutls28-dev libgnutls28-dev:i386 libjpeg62-turbo-dev libjpeg62-turbo-dev:i386 libpng-dev libpng-dev:i386 libtiff-dev libtiff-dev:i386 libgl-dev libgl-dev:i386 libunwind-dev libunwind-dev:i386 libx11-dev libx11-dev:i386 libxml2-dev libxml2-dev:i386 libxslt1-dev libxslt1-dev:i386 libgstreamer1.0-dev libgstreamer1.0-dev:i386 libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev:i386 libmpg123-dev libmpg123-dev:i386 libosmesa6-dev libosmesa6-dev:i386 libudev-dev libudev-dev:i386 libvkd3d-dev libvkd3d-dev:i386 libvulkan-dev libvulkan-dev:i386 libcapi20-dev libcapi20-dev:i386 liblcms2-dev liblcms2-dev:i386 libcups2-dev libcups2-dev:i386 libgphoto2-dev libgphoto2-dev:i386 libsane-dev libsane-dev:i386 libgsm1-dev libgsm1-dev:i386 libkrb5-dev libkrb5-dev:i386 libldap2-dev libldap2-dev:i386 samba-dev ocl-icd-opencl-dev ocl-icd-opencl-dev:i386 libpcap-dev libpcap-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 libv4l-dev libv4l-dev:i386 libopenal-dev libopenal-dev:i386 libxcomposite-dev libxcomposite-dev:i386 libxcursor-dev libxcursor-dev:i386 libxi-dev libxi-dev:i386 libxrandr-dev libxrandr-dev:i386 libxinerama-dev libxinerama-dev:i386 -y
+sudo apt install flex:i386 bison:i386 qt4-qmake:i386 libfreetype6-dev:i386 libjpeg-dev:i386 libpng-dev:i386 libxslt1-dev:i386 libxml2-dev:i386 libxrender-dev:i386 libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 freeglut3-dev:i386 prelink:i386 libasound2-dev:i386 g++-multilib gcc-multilib g++-multilib -y
+# 获取数据
+url=`cat /wine-url.txt`
+version=`cat /wine-version.txt`
+type=`cat /wine-type.txt`
+cpu=$(cat /proc/cpuinfo | grep processor | wc -l)
+#aria2c -x 16 -s 16 $url
+#tar -xvf `basename $url`
+git clone git://source.winehq.org/git/wine.git
+echo Wine version `date` > wine/VERSION
+mv wine wine-$version
+#cd wine-$version
+## 编译64位
+mkdir build64
+cd build64
+sudo apt install libpcsclite-dev libsdl2-dev samba-dev -y
+../wine-$version/configure --enable-win64
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+# 打7z包
+echo Building Time: `date`, source from git://source.winehq.org/git/wine.git > info.txt
+7z a /wine/wine-daily-debian10-amd64.7z *
+cd /wine
+rm -rfv program
+## 构建 32 + 64 位（混合）
+mkdir build32
+cd build32
+sudo apt install libpcsclite-dev:i386 libsdl2-dev:i386 samba-dev:i386 -y
+PKG_CONFIG_PATH=/usr/lib32 ../wine-$version/configure --with-wine64=../build64
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../build64
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+# 打7z包
+echo Building Time: `date`, source from git://source.winehq.org/git/wine.git > info.txt
+7z a /wine/wine-daily-debian10-x86_64.7z *
+cd /wine
+rm -rfv program
+## 构建纯 32 位
+mkdir build32-only
+cd build32-only
+../wine-$version/configure
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+# 打7z包
+echo Building Time: `date`, source from git://source.winehq.org/git/wine.git > info.txt
+7z a /wine/wine-daily-debian10-i386.7z *
+cd /wine
+rm -rfv program
+## 移除临时文件（不写了，反正 Github Action 会自动销毁）

wineautobuild-action-7z-wow64-daily.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+dpkg --add-architecture i386
+apt update
+apt install git sudo gpg wget dpkg-dev aria2 -y
+sudo apt update
+# 添加源
+sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+echo "deb-src [signed-by=/usr/share/keyrings/winehq-archive.key] https://dl.winehq.org/wine-builds/ubuntu/ focal main" > /etc/apt/sources.list.d/winehq-bionic.list
+sudo apt update
+# 编译
+mkdir /wine
+cd /wine
+#sudo apt build-dep wget -y
+#sudo apt source wget
+sudo apt build-dep wine -y
+#sudo apt source wine
+sudo apt install fakeroot p7zip-full -y
+sudo apt install flex bison gettext make gcc gcc-multilib gcc-mingw-w64 libasound2-dev libasound2-dev:i386 libpulse-dev libpulse-dev:i386 libdbus-1-dev libdbus-1-dev:i386 libfontconfig1-dev libfontconfig1-dev:i386 libfreetype6-dev libfreetype6-dev:i386 libgnutls28-dev libgnutls28-dev:i386 libjpeg62-turbo-dev libjpeg62-turbo-dev:i386 libpng-dev libpng-dev:i386 libtiff-dev libtiff-dev:i386 libgl-dev libgl-dev:i386 libunwind-dev libunwind-dev:i386 libx11-dev libx11-dev:i386 libxml2-dev libxml2-dev:i386 libxslt1-dev libxslt1-dev:i386 libgstreamer1.0-dev libgstreamer1.0-dev:i386 libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev:i386 libmpg123-dev libmpg123-dev:i386 libosmesa6-dev libosmesa6-dev:i386 libudev-dev libudev-dev:i386 libvkd3d-dev libvkd3d-dev:i386 libvulkan-dev libvulkan-dev:i386 libcapi20-dev libcapi20-dev:i386 liblcms2-dev liblcms2-dev:i386 libcups2-dev libcups2-dev:i386 libgphoto2-dev libgphoto2-dev:i386 libsane-dev libsane-dev:i386 libgsm1-dev libgsm1-dev:i386 libkrb5-dev libkrb5-dev:i386 libldap2-dev libldap2-dev:i386 samba-dev ocl-icd-opencl-dev ocl-icd-opencl-dev:i386 libpcap-dev libpcap-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 libv4l-dev libv4l-dev:i386 libopenal-dev libopenal-dev:i386 libxcomposite-dev libxcomposite-dev:i386 libxcursor-dev libxcursor-dev:i386 libxi-dev libxi-dev:i386 libxrandr-dev libxrandr-dev:i386 libxinerama-dev libxinerama-dev:i386 -y
+sudo apt install flex:i386 bison:i386 qt4-qmake:i386 libfreetype6-dev:i386 libjpeg-dev:i386 libpng-dev:i386 libxslt1-dev:i386 libxml2-dev:i386 libxrender-dev:i386 libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 freeglut3-dev:i386 prelink:i386 libasound2-dev:i386 g++-multilib gcc-multilib g++-multilib -y
+# 获取数据
+url=`cat /wine-url.txt`
+version=`cat /wine-version.txt`
+type=`cat /wine-type.txt`
+cpu=$(cat /proc/cpuinfo | grep processor | wc -l)
+#aria2c -x 16 -s 16 $url
+#tar -xvf `basename $url`
+git clone git://source.winehq.org/git/wine.git
+echo Wine version `date` > wine/VERSION
+mv wine wine-$version
+# 使用 wow64 support
+sudo apt install libpcsclite-dev libsdl2-dev samba-dev -y
+mkdir build
+cd build
+../wine-$version/configure --enable-archs=i386,x86_64
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+echo Building Time: `date`, source from git://source.winehq.org/git/wine.git > info.txt
+7z a /wine/wine-wow64-daily-debian10-amd64.7z *

wineautobuild-action-7z-wow64.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+dpkg --add-architecture i386
+apt update
+apt install sudo gpg wget dpkg-dev aria2 -y
+sudo apt update
+# 添加源
+sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+echo "deb-src [signed-by=/usr/share/keyrings/winehq-archive.key] https://dl.winehq.org/wine-builds/ubuntu/ focal main" > /etc/apt/sources.list.d/winehq-bionic.list
+sudo apt update
+# 编译
+mkdir /wine
+cd /wine
+#sudo apt build-dep wget -y
+#sudo apt source wget
+sudo apt build-dep wine -y
+#sudo apt source wine
+sudo apt install fakeroot p7zip-full -y
+sudo apt install flex bison gettext make gcc gcc-multilib gcc-mingw-w64 libasound2-dev libasound2-dev:i386 libpulse-dev libpulse-dev:i386 libdbus-1-dev libdbus-1-dev:i386 libfontconfig1-dev libfontconfig1-dev:i386 libfreetype6-dev libfreetype6-dev:i386 libgnutls28-dev libgnutls28-dev:i386 libjpeg62-turbo-dev libjpeg62-turbo-dev:i386 libpng-dev libpng-dev:i386 libtiff-dev libtiff-dev:i386 libgl-dev libgl-dev:i386 libunwind-dev libunwind-dev:i386 libx11-dev libx11-dev:i386 libxml2-dev libxml2-dev:i386 libxslt1-dev libxslt1-dev:i386 libgstreamer1.0-dev libgstreamer1.0-dev:i386 libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev:i386 libmpg123-dev libmpg123-dev:i386 libosmesa6-dev libosmesa6-dev:i386 libudev-dev libudev-dev:i386 libvkd3d-dev libvkd3d-dev:i386 libvulkan-dev libvulkan-dev:i386 libcapi20-dev libcapi20-dev:i386 liblcms2-dev liblcms2-dev:i386 libcups2-dev libcups2-dev:i386 libgphoto2-dev libgphoto2-dev:i386 libsane-dev libsane-dev:i386 libgsm1-dev libgsm1-dev:i386 libkrb5-dev libkrb5-dev:i386 libldap2-dev libldap2-dev:i386 samba-dev ocl-icd-opencl-dev ocl-icd-opencl-dev:i386 libpcap-dev libpcap-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 libv4l-dev libv4l-dev:i386 libopenal-dev libopenal-dev:i386 libxcomposite-dev libxcomposite-dev:i386 libxcursor-dev libxcursor-dev:i386 libxi-dev libxi-dev:i386 libxrandr-dev libxrandr-dev:i386 libxinerama-dev libxinerama-dev:i386 -y
+sudo apt install flex:i386 bison:i386 qt4-qmake:i386 libfreetype6-dev:i386 libjpeg-dev:i386 libpng-dev:i386 libxslt1-dev:i386 libxml2-dev:i386 libxrender-dev:i386 libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 freeglut3-dev:i386 prelink:i386 libasound2-dev:i386 g++-multilib gcc-multilib g++-multilib -y
+# 获取数据
+url=`cat /wine-url.txt`
+version=`cat /wine-version.txt`
+type=`cat /wine-type.txt`
+cpu=$(cat /proc/cpuinfo | grep processor | wc -l)
+aria2c -x 16 -s 16 $url
+tar -xvf `basename $url`
+# 使用 wow64 support
+sudo apt install libpcsclite-dev libsdl2-dev samba-dev -y
+mkdir build
+cd build
+../wine-$version/configure --enable-archs=i386,x86_64
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+7z a /wine/wine-$type-wow64-$version-debian10-amd64.7z *

wineautobuild-action-7z.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+dpkg --add-architecture i386
+apt update
+apt install sudo gpg wget dpkg-dev aria2 -y
+sudo apt update
+# 添加源
+sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+echo "deb-src [signed-by=/usr/share/keyrings/winehq-archive.key] https://dl.winehq.org/wine-builds/ubuntu/ focal main" > /etc/apt/sources.list.d/winehq-bionic.list
+sudo apt update
+# 编译
+mkdir /wine
+cd /wine
+#sudo apt build-dep wget -y
+#sudo apt source wget
+sudo apt build-dep wine -y
+#sudo apt source wine
+sudo apt install fakeroot p7zip-full -y
+sudo apt install flex bison gettext make gcc gcc-multilib gcc-mingw-w64 libasound2-dev libasound2-dev:i386 libpulse-dev libpulse-dev:i386 libdbus-1-dev libdbus-1-dev:i386 libfontconfig1-dev libfontconfig1-dev:i386 libfreetype6-dev libfreetype6-dev:i386 libgnutls28-dev libgnutls28-dev:i386 libjpeg62-turbo-dev libjpeg62-turbo-dev:i386 libpng-dev libpng-dev:i386 libtiff-dev libtiff-dev:i386 libgl-dev libgl-dev:i386 libunwind-dev libunwind-dev:i386 libx11-dev libx11-dev:i386 libxml2-dev libxml2-dev:i386 libxslt1-dev libxslt1-dev:i386 libgstreamer1.0-dev libgstreamer1.0-dev:i386 libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev:i386 libmpg123-dev libmpg123-dev:i386 libosmesa6-dev libosmesa6-dev:i386 libudev-dev libudev-dev:i386 libvkd3d-dev libvkd3d-dev:i386 libvulkan-dev libvulkan-dev:i386 libcapi20-dev libcapi20-dev:i386 liblcms2-dev liblcms2-dev:i386 libcups2-dev libcups2-dev:i386 libgphoto2-dev libgphoto2-dev:i386 libsane-dev libsane-dev:i386 libgsm1-dev libgsm1-dev:i386 libkrb5-dev libkrb5-dev:i386 libldap2-dev libldap2-dev:i386 samba-dev ocl-icd-opencl-dev ocl-icd-opencl-dev:i386 libpcap-dev libpcap-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 libv4l-dev libv4l-dev:i386 libopenal-dev libopenal-dev:i386 libxcomposite-dev libxcomposite-dev:i386 libxcursor-dev libxcursor-dev:i386 libxi-dev libxi-dev:i386 libxrandr-dev libxrandr-dev:i386 libxinerama-dev libxinerama-dev:i386 -y
+sudo apt install flex:i386 bison:i386 qt4-qmake:i386 libfreetype6-dev:i386 libjpeg-dev:i386 libpng-dev:i386 libxslt1-dev:i386 libxml2-dev:i386 libxrender-dev:i386 libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 freeglut3-dev:i386 prelink:i386 libasound2-dev:i386 g++-multilib gcc-multilib g++-multilib -y
+# 获取数据
+url=`cat /wine-url.txt`
+version=`cat /wine-version.txt`
+type=`cat /wine-type.txt`
+cpu=$(cat /proc/cpuinfo | grep processor | wc -l)
+aria2c -x 16 -s 16 $url
+tar -xvf `basename $url`
+#cd wine-$version
+## 编译64位
+mkdir build64
+cd build64
+sudo apt install libpcsclite-dev libsdl2-dev samba-dev -y
+../wine-$version/configure --enable-win64
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+# 打7z包
+7z a /wine/wine-$type-$version-debian10-amd64.7z *
+cd /wine
+rm -rfv program
+## 构建 32 + 64 位（混合）
+mkdir build32
+cd build32
+sudo apt install libpcsclite-dev:i386 libsdl2-dev:i386 samba-dev:i386 -y
+PKG_CONFIG_PATH=/usr/lib32 ../wine-$version/configure --with-wine64=../build64
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../build64
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+# 打7z包
+7z a /wine/wine-$type-$version-debian10-x86_64.7z *
+cd /wine
+rm -rfv program
+## 构建纯 32 位
+mkdir build32-only
+cd build32-only
+../wine-$version/configure
+make -j$cpu
+mkdir ../program
+make install -j$cpu DESTDIR=../program
+cd ../program/usr/local/
+# 打7z包
+7z a /wine/wine-$type-$version-debian10-i386.7z *
+cd /wine
+rm -rfv program
+## 移除临时文件（不写了，反正 Github Action 会自动销毁）

wineautobuild-action-debian9.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+dpkg --add-architecture i386
+apt update
+apt install sudo gpg wget dpkg-dev -y
+sudo apt update
+# 添加源
+sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+echo "deb-src [signed-by=/usr/share/keyrings/winehq-archive.key] http://dl.winehq.org/wine-builds/ubuntu/ bionic main" > /etc/apt/sources.list.d/winehq-bionic.list
+echo nameserver 8.8.8.8 > /etc/resolv.conf
+sudo apt update
+# 编译
+mkdir /wine
+cd /wine
+#sudo apt build-dep wget -y
+#sudo apt source wget
+sudo apt build-dep wine -y
+sudo apt source wine
+sudo apt install fakeroot -y
+sudo apt install flex bison gettext make gcc gcc-multilib gcc-mingw-w64 libasound2-dev libasound2-dev:i386 libpulse-dev libpulse-dev:i386 libdbus-1-dev libdbus-1-dev:i386 libfontconfig1-dev libfontconfig1-dev:i386 libfreetype6-dev libfreetype6-dev:i386 libgnutls28-dev libgnutls28-dev:i386 libjpeg62-turbo-dev libjpeg62-turbo-dev:i386 libpng-dev libpng-dev:i386 libtiff-dev libtiff-dev:i386 libgl-dev libgl-dev:i386 libunwind-dev libunwind-dev:i386 libx11-dev libx11-dev:i386 libxml2-dev libxml2-dev:i386 libxslt1-dev libxslt1-dev:i386 libgstreamer1.0-dev libgstreamer1.0-dev:i386 libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev:i386 libmpg123-dev libmpg123-dev:i386 libosmesa6-dev libosmesa6-dev:i386 libudev-dev libudev-dev:i386 libvkd3d-dev libvkd3d-dev:i386 libvulkan-dev libvulkan-dev:i386 libcapi20-dev libcapi20-dev:i386 liblcms2-dev liblcms2-dev:i386 libcups2-dev libcups2-dev:i386 libgphoto2-dev libgphoto2-dev:i386 libsane-dev libsane-dev:i386 libgsm1-dev libgsm1-dev:i386 libkrb5-dev libkrb5-dev:i386 libldap2-dev libldap2-dev:i386 samba-dev ocl-icd-opencl-dev ocl-icd-opencl-dev:i386 libpcap-dev libpcap-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 libv4l-dev libv4l-dev:i386 libopenal-dev libopenal-dev:i386 libxcomposite-dev libxcomposite-dev:i386 libxcursor-dev libxcursor-dev:i386 libxi-dev libxi-dev:i386 libxrandr-dev libxrandr-dev:i386 libxinerama-dev libxinerama-dev:i386 -y
+sudo apt install flex:i386 bison:i386 qt4-qmake:i386 libfreetype6-dev:i386 libjpeg-dev:i386 libpng-dev:i386 libxslt1-dev:i386 libxml2-dev:i386 libxrender-dev:i386 libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 freeglut3-dev:i386 prelink:i386 libasound2-dev:i386 g++-multilib gcc-multilib g++-multilib -y
+cd */
+dpkg-buildpackage -b -nc
+# 移除无用包
+rm ../*dbg*.deb -vrf
+rm ../*dbgsym*.deb -vrf

wineautobuild-action.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+dpkg --add-architecture i386
+apt update
+apt install sudo gpg wget dpkg-dev -y
+sudo apt update
+# 添加源
+sudo wget -nc -O /usr/share/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+echo "deb-src [signed-by=/usr/share/keyrings/winehq-archive.key] https://dl.winehq.org/wine-builds/ubuntu/ focal main" > /etc/apt/sources.list.d/winehq-bionic.list
+sudo apt update
+# 编译
+mkdir /wine
+cd /wine
+#sudo apt build-dep wget -y
+#sudo apt source wget
+sudo apt build-dep wine -y
+sudo apt source wine
+sudo apt install fakeroot -y
+sudo apt install flex bison gettext make gcc gcc-multilib gcc-mingw-w64 libasound2-dev libasound2-dev:i386 libpulse-dev libpulse-dev:i386 libdbus-1-dev libdbus-1-dev:i386 libfontconfig1-dev libfontconfig1-dev:i386 libfreetype6-dev libfreetype6-dev:i386 libgnutls28-dev libgnutls28-dev:i386 libjpeg62-turbo-dev libjpeg62-turbo-dev:i386 libpng-dev libpng-dev:i386 libtiff-dev libtiff-dev:i386 libgl-dev libgl-dev:i386 libunwind-dev libunwind-dev:i386 libx11-dev libx11-dev:i386 libxml2-dev libxml2-dev:i386 libxslt1-dev libxslt1-dev:i386 libgstreamer1.0-dev libgstreamer1.0-dev:i386 libgstreamer-plugins-base1.0-dev libgstreamer-plugins-base1.0-dev:i386 libmpg123-dev libmpg123-dev:i386 libosmesa6-dev libosmesa6-dev:i386 libudev-dev libudev-dev:i386 libvkd3d-dev libvkd3d-dev:i386 libvulkan-dev libvulkan-dev:i386 libcapi20-dev libcapi20-dev:i386 liblcms2-dev liblcms2-dev:i386 libcups2-dev libcups2-dev:i386 libgphoto2-dev libgphoto2-dev:i386 libsane-dev libsane-dev:i386 libgsm1-dev libgsm1-dev:i386 libkrb5-dev libkrb5-dev:i386 libldap2-dev libldap2-dev:i386 samba-dev ocl-icd-opencl-dev ocl-icd-opencl-dev:i386 libpcap-dev libpcap-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 libv4l-dev libv4l-dev:i386 libopenal-dev libopenal-dev:i386 libxcomposite-dev libxcomposite-dev:i386 libxcursor-dev libxcursor-dev:i386 libxi-dev libxi-dev:i386 libxrandr-dev libxrandr-dev:i386 libxinerama-dev libxinerama-dev:i386 -y
+sudo apt install flex:i386 bison:i386 qt4-qmake:i386 libfreetype6-dev:i386 libjpeg-dev:i386 libpng-dev:i386 libxslt1-dev:i386 libxml2-dev:i386 libxrender-dev:i386 libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 freeglut3-dev:i386 prelink:i386 libasound2-dev:i386 g++-multilib gcc-multilib g++-multilib -y
+cd */
+dpkg-buildpackage -b -nc
+# 移除无用包
+rm ../*dbg*.deb -vrf
+rm ../*dbgsym*.deb -vrf

其他Windows无法正常创建虚拟机的问题

@@ -0,0 +1,3 @@
+[main acff44e] 修复选择vbox-
+ 2 files changed, 1198 insertions(+), 2 deletions(-)
+ create mode 100644 VM-source/.qtc_clangd/compile_commands.json