update gpg

修改：     deb/usr/share/applications/spark-deepin-wine-runner.desktop

API/Python/__init__.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+# 使用系统默认的 python3 运行
+###########################################################################################
+# 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
+# 版本：2.4.0
+# 更新时间：2022年10月15日
+# 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
+# 基于 Python3 构建
+###########################################################################################
+#################
+# 加入路径
+#################
+import os
+import sys
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
+sys.path.append(f"{programPath}/../../")
+#################
+# 引入所需的库（正式内容）
+#################
+import os
+import sys
+import ConfigLanguareRunner
+class Old:
+    wine = ""
+    wineprefix = ""
+    def __init__(self, wine = "", wineprefix = "") -> None:
+        self.wine = os.getenv("WINE") if wine == "" else wine
+        self.wineprefix = os.getenv("WINEPREFIX") if wine == "" else wineprefix
+
+    def runCommand(self, command: str) -> None:
+        com = ConfigLanguareRunner.Command(command)
+        print(com.GetCommandList())
+        return com.Run(com.GetCommandList(), self.wineprefix, self.wine)
+
+    def runList(self, command: list) -> None:
+        return ConfigLanguareRunner.Command("").Run(command, self.wineprefix, self.wine)
+
+class Bash:
+    wine = ""
+    wineprefix = ""
+    def __init__(self, wine = "", wineprefix = "") -> None:
+        self.wine = os.getenv("WINE") if wine == "" else wine
+        self.wineprefix = os.getenv("WINEPREFIX") if wine == "" else wineprefix
+
+    def runCommand(self, command: str) -> int:
+        return os.system(f"'{programPath}/../../AutoShell/main.py' -c \"{command}\"")
+
+    def runList(self, command: list) -> int:
+        commandStr = ""
+        for k in command:
+            for i in k:
+                commandStr += f"'{i}' "
+            commandStr += ";"
+        return os.system(f"'{programPath}/../../AutoShell/main.py' -c \"{commandStr}\"")

API/demo/a.py

@@ -0,0 +1,3 @@
+import WineRunner
+WineRunner.Bash("a").runList([["thank"], ["version"]])
+#WineRunner.Bash("a").runCommand("thank")

AutoConfig.py

@@ -2,8 +2,8 @@
 # 使用系统默认的 python3 运行
 ###########################################################################################
 # 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
-# 版本：2.1.0
+# 版本：2.4.0
-# 更新时间：2022年08月25日
+# 更新时间：2022年10月25日
 # 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
 # 基于 Python3 构建
 ###########################################################################################
@@ -12,15 +12,280 @@
 #################
 import os
 import sys
+import base64
 import json
 import traceback
 import req as requests
 import PyQt5.QtWidgets as QtWidgets
 from UI.AutoConfig import *
 from Model import *
+try:
+    import PyQt5.QtWebEngineWidgets as QtWebEngineWidgets
+    webeng = True
+except:
+    print("未安装此依赖库")
+    webeng = False
 
-urlSources = "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/auto"
+urlSourcesList = [
+    "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/auto",  # Gitlink 源
+    "https://gitee.com/gfdgd-xi/deep-wine-runner-auto-configuration-script/raw/master/",  # Gitee 源
+    "https://gfdgd-xi.github.io/deep-wine-runner-auto-configuration-script/",  # Github 源
+    "http://gfdgdxi.msns.cn/wine-runner-list/auto/",  # 备用源1，纯 IPv6 源
+    "http://120.25.153.144/deep-wine-runner-auto-configuration-script/",  # 备用源2
+    "http://gfdgdxi.free.idcfengye.com/wine-runner-list/auto/",  # 备用源 3
+    "http://127.0.0.1/wine-runner-list/auto/"  # 本地测试源
+]
+urlSources = urlSourcesList[0]
 lists = []
+class ProgramRunStatusUpload():
+    msgWindow = None
+    starLayout = None
+    fen = None
+    starList = []
+    sha1Value = ""
+    programName = None
+    def ChangeStar():
+        if ProgramRunStatusUpload.fen.currentIndex() > 5:
+            for i in ProgramRunStatusUpload.starList:
+                i.setText(f"<img src='{programPath}/Icon/BadStar.svg' width=25>")
+            return
+        for i in range(ProgramRunStatusUpload.fen.currentIndex()):
+            ProgramRunStatusUpload.starList[i].setText(f"<img src='{programPath}/Icon/Star.svg' width=25>")
+        head = ProgramRunStatusUpload.fen.currentIndex() 
+        end = len(ProgramRunStatusUpload.starList)
+        for i in range(head, end):
+            ProgramRunStatusUpload.starList[i].setText(f"<img src='{programPath}/Icon/UnStar.svg' width=25>")
+        
+    def ShowWindow(sha="", title=""):
+        ProgramRunStatusUpload.starList = []
+        ProgramRunStatusUpload.sha1Value = sha
+        ProgramRunStatusUpload.msgWindow = QtWidgets.QMainWindow()
+        msgWidget = QtWidgets.QWidget()
+        msgWidgetLayout = QtWidgets.QGridLayout()
+        ProgramRunStatusUpload.programName = QtWidgets.QLineEdit()
+        ProgramRunStatusUpload.fen = QtWidgets.QComboBox()
+        ProgramRunStatusUpload.starLayout = QtWidgets.QHBoxLayout()
+        upload = QtWidgets.QPushButton(QtCore.QCoreApplication.translate("U", "上传"))
+        upload.clicked.connect(ProgramRunStatusUpload.Upload)
+        if title != "":
+            ProgramRunStatusUpload.programName.setText(title)
+            ProgramRunStatusUpload.programName.setDisabled(True)
+        # 生成星星列表
+        for i in [1, 1, 1, 1, 0]:
+            ProgramRunStatusUpload.starList.append(QtWidgets.QLabel(f"<img src='{programPath}/Icon/{['Un', ''][i]}Star.svg' width=25>"))
+            ProgramRunStatusUpload.starLayout.addWidget(ProgramRunStatusUpload.starList[-1])
+        ProgramRunStatusUpload.starLayout.addItem(QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
+        ProgramRunStatusUpload.programName.setPlaceholderText(QtCore.QCoreApplication.translate("U", "如果这个程序和程序名确实是合法还是检测到敏感词，改为“NULL”即可"))
+        ProgramRunStatusUpload.fen.addItems(["0分", "1分", "2分", "3分", "4分", "5分"])
+        ProgramRunStatusUpload.fen.setCurrentIndex(4)
+        ProgramRunStatusUpload.fen.currentIndexChanged.connect(ProgramRunStatusUpload.ChangeStar)
+        msgWidgetLayout.addWidget(QtWidgets.QLabel(QtCore.QCoreApplication.translate("U", "程序名：")), 0, 0)
+        msgWidgetLayout.addWidget(QtWidgets.QLabel(QtCore.QCoreApplication.translate("U", "评分：")), 1, 0)
+        msgWidgetLayout.addWidget(ProgramRunStatusUpload.programName, 0, 1)
+        msgWidgetLayout.addWidget(ProgramRunStatusUpload.fen, 1, 1)
+        msgWidgetLayout.addLayout(ProgramRunStatusUpload.starLayout, 2, 1)
+        msgWidgetLayout.addWidget(upload, 3, 1)
+        msgWidget.setLayout(msgWidgetLayout)
+        ProgramRunStatusUpload.msgWindow.setCentralWidget(msgWidget)
+        ProgramRunStatusUpload.msgWindow.setWindowTitle(QtCore.QCoreApplication.translate("U", "上传程序运行情况"))
+        ProgramRunStatusUpload.msgWindow.setWindowIcon(QtGui.QIcon(iconPath))
+        ProgramRunStatusUpload.msgWindow.show()
+
+    def Upload():
+        try:
+            #if ProgramRunStatusUpload.sha1Value == "":
+                #ProgramRunStatusUpload.sha1Value = ProgramRunStatusUpload.GetSHA1(e2.currentText())
+            QtWidgets.QMessageBox.information(None, QtCore.QCoreApplication.translate("U", "提示"), requests.post(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0OjMwMjUwL2Jhc2g=").decode("utf-8"), {
+            "BashName": ProgramRunStatusUpload.sha1Value,
+            "Fen": ProgramRunStatusUpload.fen.currentIndex()
+            }).json()["Error"])
+        except:
+            traceback.print_exc()
+            QtWidgets.QMessageBox.critical(None, QtCore.QCoreApplication.translate("U", "错误"), QtCore.QCoreApplication.translate("U", "数据上传失败！"))
+
+class InformationWindow():
+    def ShowWindow():
+        #webeng = False
+        # 获取选中项
+        try:
+            choose = ui.searchList.selectionModel().selectedIndexes()[0].data()
+        except:
+            QtWidgets.QMessageBox.critical(window, "错误", "您未选择任何配置文件")
+            return
+        fileName = ""
+        for i in lists:
+            print(i)
+            if i[0] == choose:
+                fileName = i[1]
+                break
+        aboutHtml = ""
+        try:
+            get = requests.get(f"{urlSources}/information/{fileName}.txt")
+            if get.status_code / 100 != 2 and get.status_code / 100 != 3:
+                int("Bad")
+            about = get.text
+            aboutHtml = str(about)
+            if not "<" in about:
+                # 非 Html 标签
+                for i in about.splitlines():
+                    about += f"<p>{i}</p>\n"
+                #about = f"<pre>{about}</pre>"
+            about = f"<h1>关于“{choose}”的介绍</h1>\n{about}"
+        except:
+            traceback.print_exc()
+            about = f"<h1>关于“{choose}”的介绍</h1>\n<p>暂无此程序的介绍</p>"
+        try:
+            import requests as r
+            fenlists = requests.get(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci9iYXNoYXBwLw==").decode("utf-8") + fileName + base64.b64decode("L2FsbC5qc29u").decode("utf-8"), timeout=1000).json()
+            tipsInfo = ""
+        except:
+            fenlists = [0, 0, 0, 0, 0]
+            tipsInfo = "暂时无人提交此脚本运行情况，是否立即提交？"
+        maxHead = fenlists.index(max(fenlists))
+        allNumber = 0
+        for i in fenlists:
+            allNumber += i
+        try:
+            maxNumber = max(fenlists) / allNumber * 100
+            if tipsInfo == "":
+                tipsInfo = f"有{maxNumber}%的用户选择了这个评分"
+        except:
+            pass
+        end = 5
+        starHtml = ""
+        if maxHead > 5:
+            for i in range(end):
+                if webeng:
+                    starHtml += f"<img src='https://code.gitlink.org.cn/gfdgd_xi/deep-wine-runner/raw/branch/main/Icon/BadStar.svg' width=50>\n"
+                else:
+                    starHtml += f"<img src='{programPath}/Icon/BadStar.svg' width=50>\n"
+        else:
+            for i in range(maxHead):
+                if webeng:
+                    starHtml += f"<img src='https://code.gitlink.org.cn/gfdgd_xi/deep-wine-runner/raw/branch/main/Icon/Star.svg' width=50>\n"
+                else:
+                    starHtml += f"<img src='{programPath}/Icon/Star.svg' width=50>\n"
+            head = maxHead
+            for i in range(head, end):
+                if webeng:
+                    starHtml += f"<img src='https://code.gitlink.org.cn/gfdgd_xi/deep-wine-runner/raw/branch/main/Icon/UnStar.svg' width=50>"
+                else:
+                    starHtml += f"<img src='{programPath}/Icon/UnStar.svg' width=50>"
+        about += f"\n<hr/><h1>评分情况</h1>\n<p align='center'>{starHtml}</p>\n<p align='center'>{tipsInfo}</p>"
+        message = QtWidgets.QDialog()
+        messageLayout = QtWidgets.QVBoxLayout()
+        if webeng:
+            informationText = QtWebEngineWidgets.QWebEngineView()
+            print(aboutHtml)
+            if aboutHtml[:7] == "Visit: ":
+                url = aboutHtml[7:].splitlines()[0]
+                print(url)
+                informationText.setUrl(QtCore.QUrl(url.strip()))
+            else:
+                #informationText.linkClicked.connect(lambda: print("a"))
+                try:
+                    with open("/tmp/deepin-wine-runner-information.html", "w") as file:
+                        file.write(about)
+                    informationText.setUrl(QtCore.QUrl("file:///tmp/deepin-wine-runner-information.html"))
+                except:
+                    traceback.print_exc()
+                    informationText.setHtml(about)    
+                #informationText.urlChanged.connect(lambda: informationText.setUrl(QtCore.QUrl("https://gfdgd-xi.github.io")))
+        else:
+            informationText = QtWidgets.QTextBrowser()
+            informationText.setHtml(about)
+        uploadFen = QtWidgets.QPushButton("提交评分")
+        uploadFen.clicked.connect(lambda: ProgramRunStatusUpload.ShowWindow(fileName, choose))
+        
+        #informationText.setUrl(QtCore.QUrl("https://gfdgd-xi.github.io"))
+        messageLayout.addWidget(informationText)
+        messageLayout.addWidget(uploadFen)
+        message.setWindowTitle(f"关于“{choose}”的介绍")
+        message.resize(int(message.frameSize().width() * 1.5), int(message.frameSize().height()))
+        message.setLayout(messageLayout)
+        #message.setWindowModality(ApplicationModal);
+        message.show()
+        message.exec_()
+
+class ProgramRunStatusShow():
+    msgWindow = None
+    def ShowWindow():
+        global lists
+        # 获取选中项
+        try:
+            choose = ui.searchList.selectionModel().selectedIndexes()[0].data()
+        except:
+            QtWidgets.QMessageBox.critical(window, "错误", "您未选择任何配置文件")
+            return
+        fileName = ""
+        for i in lists:
+            print(i)
+            if i[0] == choose:
+                fileName = i[1]
+                break
+        try:
+            fenlists = requests.get(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci9iYXNoYXBwLw==").decode("utf-8") + fileName + base64.b64decode("L2FsbC5qc29u").decode("utf-8")).json()
+            #r = requests.get(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci9hcHAv").decode("utf-8") + sha + base64.b64decode("L3RpdGxlLnR4dA==").decode("utf-8"))
+            #r.encoding = "utf-8"
+            #title = r.text
+            tipsInfo = ""
+        except:
+            #traceback.print_exc()
+            fenlists = [0, 0, 0, 0, 0]
+            tipsInfo = "暂时无人提交此脚本运行情况，是否立即提交？"
+            
+        maxHead = fenlists.index(max(fenlists))
+        allNumber = 0
+        for i in fenlists:
+            allNumber += i
+        try:
+            maxNumber = max(fenlists) / allNumber * 100
+            if tipsInfo == "":
+                tipsInfo = f"有{maxNumber}%的用户选择了这个评分"
+        except:
+            pass
+        ProgramRunStatusShow.msgWindow = QtWidgets.QMainWindow()
+        msgWidget = QtWidgets.QWidget()
+        msgWidgetLayout = QtWidgets.QGridLayout()
+        starLayout = QtWidgets.QHBoxLayout()
+        uploadButton = QtWidgets.QPushButton(QtCore.QCoreApplication.translate("U", "点此上传运行情况"))
+        uploadButton.clicked.connect(lambda: ProgramRunStatusUpload.ShowWindow(fileName, choose))
+        msgWidgetLayout.addWidget(QtWidgets.QLabel(QtCore.QCoreApplication.translate("U", "综合评价：")), 0, 0)
+        msgWidgetLayout.addLayout(starLayout, 0, 1)
+        msgWidgetLayout.addWidget(QtWidgets.QLabel(tipsInfo), 1, 0, 1, 2)
+        #msgWidgetLayout.addWidget(QtWidgets.QLabel("" if dateVersion == "" else f"数据版本：{dateVersion}"), 2, 0, 1, 2)
+        msgWidgetLayout.addWidget(uploadButton, 3, 0, 1, 2)
+        end = 5
+        if maxHead > 5:
+            for i in range(end):
+                starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/BadStar.svg' width=50>"))
+        else:
+            for i in range(maxHead):
+                starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/Star.svg' width=50>"))
+            head = maxHead
+            for i in range(head, end):
+                starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/UnStar.svg' width=50>"))
+        msgWidget.setLayout(msgWidgetLayout)
+        ProgramRunStatusShow.msgWindow.setCentralWidget(msgWidget)
+        ProgramRunStatusShow.msgWindow.setWindowIcon(QtGui.QIcon(iconPath))
+        ProgramRunStatusShow.msgWindow.setWindowTitle(f"脚本“{choose}”运行情况")
+        ProgramRunStatusShow.msgWindow.show()
+
+def UploadFen():
+    global lists
+    # 获取选中项
+    try:
+        choose = ui.searchList.selectionModel().selectedIndexes()[0].data()
+    except:
+        QtWidgets.QMessageBox.critical(window, "错误", "您未选择任何配置文件")
+        return
+    fileName = ""
+    for i in lists:
+        print(i)
+        if i[0] == choose:
+            fileName = i[1]
+            break
+    ProgramRunStatusUpload.ShowWindow(fileName, choose)
 
 class Connect:
     def SearchBotton_Clicked():
@@ -33,7 +298,7 @@ class Connect:
             return
         for i in lists:
             # 显示筛选的内容
-            if ui.searchThings.text() in i[0]:
+            if ui.searchThings.text().upper() in i[0].upper():
                 nmodel.appendRow(QtGui.QStandardItem(i[0]))
         ui.searchList.setModel(nmodel)
 
@@ -89,7 +354,7 @@ class Connect:
         if "($" in things:
             OpenTerminal(f"env WINE='{wine}' WINEPREFIX='{wineprefix}' '{programPath}/ConfigLanguareRunner.py' '{path[0]}' --system")
         # 执行脚本
-        OpenTerminal(f"env WINE='{wine}' WINEPREFIX='{wineprefix}' '{programPath}/AutoShell/main.py' '{path[0]}'")
+        OpenTerminal(f"env WINEARCH='{os.getenv('WINEARCH')}' WINEDEBUG='{os.getenv('WINEDEBUG')}' WINE='{wine}' WINEPREFIX='{wineprefix}' '{programPath}/AutoShell/main.py' '{path[0]}'")
         #process = QtCore.QProcess()
         #process.start(f"{programPath}/launch.sh", ["deepin-terminal", "-e", "env", f"WINE={wine}", f"WINEPREFIX={wineprefix}", f"{programPath}/ConfigLanguareRunner.py", path[0], "--system"])
         #process.waitForFinished()
@@ -101,6 +366,26 @@ def readtxt(path):
     f.close()  # 关闭文本对象
     return str  # 返回结果
 
+def ChangeSources():
+    global urlSources
+    sources = [ui.actionGitlink, ui.actionGitee, ui.actionGithub, ui.action_IPv6, ui.action_2, ui.action_3, ui.action]
+    for i in range(0, len(sources)):
+        if sources[i].isChecked():
+            urlSources = urlSourcesList[i]
+            # 解析云列表
+            try:
+                # 获取列表
+                lists = json.loads(requests.get(f"{urlSources}/list.json").text)
+                # 解释列表并显示在 GUI 上
+                nmodel = QtGui.QStandardItemModel(window)
+                for i in lists:
+                    nmodel.appendRow(QtGui.QStandardItem(i[0]))
+                ui.searchList.setModel(nmodel)
+            except:
+                traceback.print_exc()
+                QtWidgets.QMessageBox.critical(window, "提示", "无法连接服务器")
+            break
+
 if __name__ == "__main__":
     homePath = os.path.expanduser('~')
     programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
@@ -119,12 +404,30 @@ if __name__ == "__main__":
     ui.setupUi(window)
     window.setWindowTitle(f"Wine 运行器 {version}——容器自动配置部署脚本")
     window.setWindowIcon(QtGui.QIcon(f"{programPath}/deepin-wine-runner.svg"))
+    iconPath = "{}/deepin-wine-runner.svg".format(programPath)
     window.show()
+    #ui.actionGitlink.setExclusive(True)
+    sourcesGroup = QtWidgets.QActionGroup(window)
+    sourcesGroup.addAction(ui.actionGitlink)
+    sourcesGroup.addAction(ui.actionGitee)
+    sourcesGroup.addAction(ui.actionGithub)
+    sourcesGroup.addAction(ui.action_IPv6)
+    sourcesGroup.addAction(ui.action_2)
+    sourcesGroup.addAction(ui.action_3)
+    sourcesGroup.addAction(ui.action)
+    sourcesGroup.triggered.connect(ChangeSources)
+    sourcesGroup.setExclusive(True)
+    #for i in [ui.actionGitlink, ui.actionGitee, ui.actionGithub, ui.action_IPv6, ui.action]:
+        #i.triggered.connect(ChangeSources)
+        #pass
     # 连接信号和槽
     ui.saerchBotton.clicked.connect(Connect.SearchBotton_Clicked)
+    ui.uploadFen.clicked.connect(UploadFen)
+    ui.getInfoButton.clicked.connect(InformationWindow.ShowWindow)
     ui.runBotton.clicked.connect(Connect.RunBotton_Clicked)
     ui.openFile.triggered.connect(Connect.OpenFile_Triggered)
     ui.exitProgram.triggered.connect(window.close)
+    ui.getFen.clicked.connect(ProgramRunStatusShow.ShowWindow)
     # 解析云列表
     try:
         # 获取列表
@@ -137,4 +440,5 @@ if __name__ == "__main__":
     except:
         traceback.print_exc()
         QtWidgets.QMessageBox.critical(window, "提示", "无法连接服务器")
+    
     app.exec_()

AutoShell/command/bat

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/changeversion

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/createbotton

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/disbledWinebottlecreatelink

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/disbledhttpproxy

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/disbledopengl

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/disbledwinecrashdialog

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/download

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/enabledWinebottlecreatelink

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/enabledhttpproxy

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/enabledopengl

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/enabledwinecrashdialog

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/error

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/info

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installdll

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installdxvk

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installfont

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installgecko

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installmono

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installmsxml

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installnet

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installother

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+# 加入路径
+import os
+import sys
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
+sys.path.append(f"{programPath}/../../")
+import ConfigLanguareRunner
+# 符号转移
+argv = []
+for i in sys.argv[1:]:
+    argv.append(i.replace(" ", "\\ "))
+com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
+com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installsparkcorefont

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installvb

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+# 加入路径
+import os
+import sys
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
+sys.path.append(f"{programPath}/../../")
+import ConfigLanguareRunner
+# 符号转移
+argv = []
+for i in sys.argv[1:]:
+    argv.append(i.replace(" ", "\\ "))
+com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
+com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/installvcpp

@@ -11,3 +11,5 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/killallwineserver

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/pause

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/reg

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/stopdll

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/taskmgr

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/thank

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/version

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/warning

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/winecfg

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

AutoShell/command/winver

@@ -11,3 +11,4 @@ for i in sys.argv[1:]:
     argv.append(i.replace(" ", "\\ "))
 com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}")
 com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE"))
+sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))

ConfigLanguareRunner-help.json

@@ -31,11 +31,12 @@
     "enabledhttpproxy": "设置指定容器代理\n参数数量：2\n参数介绍：代理服务器地址+端口",
     "disbledhttpproxy": "禁用指定容器代理\n参数数量：0\n参数介绍：无",
     "enabledwinecrashdialog": "启用 Wine 容器程序崩溃提示窗口\n参数数量：0\n参数介绍：无",
-    "disbledwinecrashdialog": "启用 Wine 容器程序崩溃提示窗口\n参数数量：0\n参数介绍：无",
+    "disbledwinecrashdialog": "禁用 Wine 容器程序崩溃提示窗口\n参数数量：0\n参数介绍：无",
     "disbledWinebottlecreatelink": "禁止 Wine 容器生成快捷方式\n参数数量：0\n参数介绍：无",
     "enabledWinebottlecreatelink": "允许 Wine 容器生成快捷方式\n参数数量：0\n参数介绍：无",
     "killall": "杀死指定进程\n参数数量：1\n参数介绍：进程名",
     "control": "打开控制面板\n参数数量：0\n参数介绍：无",
     "taskmgr": "打开任务管理器\n参数数量：0\n参数介绍：无",
-    "killallwineserver": "杀死所有 Wine 程序\n参数数量：0\n参数介绍：无"
+    "killallwineserver": "杀死所有 Wine 程序\n参数数量：0\n参数介绍：无",
+    "installvb": "安装指定的 VB 运行库到指定容器\n参数数量：1\n参数介绍：在安装 Visual Basic Runtime 工具的编号，如 4 Visual Basic Runtime Visual Basic 6"
 }

ConfigLanguareRunner.py

@@ -3,7 +3,7 @@
 ###########################################################################################
 # 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
 # 版本：2.1.0
-# 更新时间：2022年08月25日
+# 更新时间：2022年10月05日
 # 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
 # 基于 Python3 构建
 ###########################################################################################
@@ -109,7 +109,9 @@ class Command():
         "enabledwinecrashdialog",
         "disbledwinecrashdialog",
         "disbledWinebottlecreatelink",
-        "enabledWinebottlecreatelink"
+        "enabledWinebottlecreatelink",
+        "installvb",
+        "installother"
     ]
 
     def __init__(self, commandString: str) -> None:
@@ -391,6 +393,14 @@ class Command():
             self.command = ["bat", "reg", "add", "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings", "/v", "ProxyEnable", "/t", "REG_DWORD", "/d", "00000000", "/f"]
             self.Bat()
 
+        def InstallVB(self):
+            import InstallVisualBasicRuntime
+            return InstallVisualBasicRuntime.Download(self.wineBottonPath, int(self.command[1]), self.wine)
+
+        def InstallOther(self):
+            import InstallOther
+            return InstallOther.Download(self.wineBottonPath, int(self.command[1]), self.wine)
+
         # 可以运行的命令的映射关系
         # 可以被使用的命令的映射
         commandList = {
@@ -431,7 +441,9 @@ class Command():
             "enabledwinecrashdialog": EnabledWineCrashDialog,
             "disbledwinecrashdialog": DisbledWineCrashDialog,
             "disbledWinebottlecreatelink": DisbledWineBottleCreateLink,
-            "enabledWinebottlecreatelink": EnabledWineBottleCreateLink
+            "enabledWinebottlecreatelink": EnabledWineBottleCreateLink,
+            "installvb": InstallVB,
+            "installother": InstallOther
         }
 
         # 参数数列表
@@ -474,7 +486,9 @@ class Command():
             "enabledwinecrashdialog": [0],
             "disbledwinecrashdialog": [0],
             "disbledWinebottlecreatelink": [0],
-            "enabledWinebottlecreatelink": [0]
+            "enabledWinebottlecreatelink": [0],
+            "installvb": [1],
+            "installother": [1]
         }
         windowsUnrun = [
             "createbotton",
@@ -546,6 +560,10 @@ class Command():
                     break
 
 app = QtWidgets.QApplication(sys.argv)
+if os.getenv("WINE") != None:
+    programEnv[1][1] = os.getenv("WINE")
+if os.getenv("WINEPREFIX") != None:
+    programEnv[0][1] = os.getenv("WINEPREFIX")
 if __name__ == "__main__":
     optionAll = 0
     if "--debug" in sys.argv:
@@ -553,10 +571,6 @@ if __name__ == "__main__":
     if "--system" in sys.argv:
         programEnv[2][1] = "1"
         optionAll += 1
-    if os.getenv("WINE") != None:
-        programEnv[1][1] = os.getenv("WINE")
-    if os.getenv("WINEPREFIX") != None:
-        programEnv[0][1] = os.getenv("WINEPREFIX")
     if len(sys.argv) - optionAll < 2:
         print("Wine 运行器自动配置文件解析器交互环境")
         print(f"版本：{version}")
@@ -568,7 +582,7 @@ if __name__ == "__main__":
                 break
             com = Command(commandLine)
             com.Run(com.GetCommandList(), programEnv[0][1], programEnv[1][1])
-        exit()
+        sys.exit(int(programEnv[9][1]))
     # 读取文件
     try:
         file = open(sys.argv[1], "r")
@@ -582,3 +596,4 @@ if __name__ == "__main__":
     print(f"©2020~{time.strftime('%Y')} gfdgd xi、为什么您不喜欢熊出没和阿布呢")
     print("--------------------------------------------------------------")
     com.Run(com.GetCommandList(), programEnv[0][1], programEnv[1][1])
+    sys.exit(int(programEnv[9][1]))

InstallDll.py

@@ -21,7 +21,11 @@ def exit():
         sys.exit()
     sys.exit()
 # 获取云列表
-url = "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/dlls"
+sourcesList = [
+    "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/dlls",
+    "http://gfdgdxi.msns.cn/wine-runner-list/dlls"
+]
+url = sourcesList[0]
 print("获取列表中……", end="")
 try:
     lists = json.loads(requests.get(f"{url}/list.json").text)
@@ -49,8 +53,8 @@ def Download(wineBotton, dllName, urlPart, wine: str) -> bool:
         pass
     os.system(f"aria2c -x 16 -s 16 -d '{wineBotton}/drive_c/windows/system32' -o '{dllName}' '{urlPart}'")
     #print(f"WINEPREFIX='{wineBotton}' {wine} reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v {os.path.splitext(dllName)[0]} /d native /f")
-    os.system(f"WINEPREFIX='{wineBotton}' {wine} reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v {os.path.splitext(dllName)[0]} /d native /f")
+    return os.system(f"WINEPREFIX='{wineBotton}' {wine} reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v {os.path.splitext(dllName)[0]} /d native /f")
-    return 0
+    #return 0
 
 def exit():
     input("按回车键退出")

InstallFont.py

@@ -17,7 +17,11 @@ import shutil
 import req as requests
 homePath = os.path.expanduser('~')
 try:
-    fontList = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/fonts/list.json").text)
+    sources = [
+        "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/fonts/list.json",
+        "http://gfdgdxi.msns.cn/wine-runner-list/fonts/list.json"
+        ]
+    fontList = json.loads(requests.get(sources[0]).text)
 except:
     fontList = [
     ["fake_simsun.ttc", "https://gitlink.org.cn/api/attachments/392168", "simsun.ttc", "fake_simsun.ttc（会替换容器内的宋体，且与 deepin 有问题）"],

InstallMsxml.py

@@ -15,7 +15,11 @@ import sys
 import json
 import req as requests
 try:
-    msxmlList = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/msxml/list.json").text)
+    sourcesList = [
+        "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/msxml/list.json",
+        "http://gfdgdxi.msns.cn/wine-runner-list/msxml/list.json"
+    ]
+    msxmlList = json.loads(requests.get(sourcesList[0]).text)
 except:
     msxmlList = [
         ["MSXML 4.0 SP2", "https://www.gitlink.org.cn/api/attachments/390679?gfdgd_xi", "msxml6.0.msi"],
@@ -25,7 +29,7 @@ except:
 
 def Download(wineBotton: str, id: int, wine: str):
     os.system(f"aria2c -x 16 -s 16 -d \"/tmp/deepin-wine-runner-msxml/\" -o \"{msxmlList[id][2]}\" \"{msxmlList[id][1]}\"")
-    os.system(f"WINEPREFIX='{wineBotton}' {wine} msiexec /i \"/tmp/deepin-wine-runner-msxml/{msxmlList[id][2]}\"")
+    return os.system(f"WINEPREFIX='{wineBotton}' {wine} msiexec /i \"/tmp/deepin-wine-runner-msxml/{msxmlList[id][2]}\"")
 
 if __name__ == "__main__":
     if "--help" in sys.argv:

InstallNetFramework.py

@@ -15,7 +15,11 @@ import sys
 import json
 import req as requests
 try:
-    netList = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/net/list.json").text)
+    sourcesList = [
+        "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/net/list.json",
+        "http://gfdgdxi.msns.cn/wine-runner-list/net/list.json"
+    ]
+    netList = json.loads(requests.get(sourcesList[0]).text)
 except:
     netList = [
         ["Microsoft® .NET Framework 1.1 版可转散发套件", "https://download.microsoft.com/download/8/2/7/827bb1ef-f5e1-4464-9788-40ef682930fd/dotnetfx.exe"],
@@ -48,7 +52,7 @@ except:
 def Download(wineBotton: str, id: int, wine: str):
     programName = os.path.split(netList[id][1])[1]
     os.system(f"aria2c -x 16 -s 16 -d \"/tmp/deepin-wine-runner-net\" -o \"{programName}\" \"{netList[id][1]}\"")
-    os.system(f"WINEPREFIX='{wineBotton}' {wine} '/tmp/deepin-wine-runner-net/{programName}'")
+    return os.system(f"WINEPREFIX='{wineBotton}' {wine} '/tmp/deepin-wine-runner-net/{programName}'")
 
 if __name__ == "__main__":
     if "--help" in sys.argv:

InstallOther.py

@@ -14,7 +14,29 @@ import os
 import sys
 import json
 import req as requests
+try:
+    sourcesList = [
+        "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/other/list.json",
+        "http://gfdgdxi.msns.cn/wine-runner-list/other/list.json"
+    ]
+    msxmlList = json.loads(requests.get(sourcesList[0]).text)
+except:
+    msxmlList = [
+        ["Windows Script 5.7 for Windows XP", "https://download.microsoft.com/download/f/f/e/ffea3abf-b55f-4924-b5a5-bde0805ad67c/scripten.exe", "exe", "scripten.exe"],
+        ["Windows Management Instrumentation 1.50.1131", "https://www.gitlink.org.cn/api/attachments/390680", "exe", "WMITools.exe"]  
+    ]
 
+def Download(wineBotton: str, id: int, wine: str) -> int:
+    try:
+        os.remove(f"/tmp/deepin-wine-runner-other/{msxmlList[id][2]}")
+    except:
+        pass
+    os.system(f"aria2c -x 16 -s 16 -d '/tmp/deepin-wine-runner-other' -o '{msxmlList[id][3]}' \"{msxmlList[id][1]}\"")
+    if msxmlList[id][2] == "exe":
+        return os.system(f"WINEPREFIX='{wineBotton}' {wine} '/tmp/deepin-wine-runner-other/{msxmlList[id][3]}'")
+    if msxmlList[id][2] == "msi":
+        return os.system(f"WINEPREFIX='{wineBotton}' {wine} msiexec /i '/tmp/deepin-wine-runner-other/{msxmlList[id][3]}'")
+if __name__ == "__main__": 
     if "--help" in sys.argv:
         print("作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢")
         print("版本：1.0.0")
@@ -37,13 +59,6 @@ print('''
                                    
                                    
 ''')
-try:
-    msxmlList = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/other/list.json").text)
-except:
-    msxmlList = [
-        ["Windows Script 5.7 for Windows XP", "https://download.microsoft.com/download/f/f/e/ffea3abf-b55f-4924-b5a5-bde0805ad67c/scripten.exe", "exe", "scripten.exe"],
-        ["Windows Management Instrumentation 1.50.1131", "https://www.gitlink.org.cn/api/attachments/390680", "exe", "WMITools.exe"]  
-    ]
     print("请选择以下的应用进行安装（不保证能正常安装运行）")
     for i in range(0, len(msxmlList)):
         print(f"{i}、{msxmlList[i][0]}")

InstallVisualBasicRuntime.py

@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+# 使用系统默认的 python3 运行
+###########################################################################################
+# 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
+# 版本：2.1.0
+# 更新时间：2022年10月05日
+# 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
+# 基于 Python3 构建
+###########################################################################################
+#################
+# 引入所需的库
+#################
+import os
+import sys
+import json
+import req as requests
+try:
+    sourcesList = [
+        "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vb/list.json",
+        "http://gfdgdxi.msns.cn/wine-runner-list/vb/list.json"
+    ]
+    netList = json.loads(requests.get().text)
+except:
+    netList = [
+        ["Visual Basic 1(DOS application)", "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vb/vbrun100.exe", "vbrun100.exe"],
+        ["Visual Basic 2(DOS application)", "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vb/vbrun200.exe", "vbrun200.exe"],
+        ["Visual Basic 3", "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vb/vb3run.exe", "vb3run.exe"], 
+        ["Visual Basic 4", "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vb/vb4run.exe", "vb4run.exe"], 
+        ["Visual Basic 6", "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vb/vbrun60sp4.exe", "vbrun60sp4.exe"]
+    ]
+def Download(wineBotton: str, id: int, wine: str) -> int:
+    try:
+        os.remove(f"/tmp/deepin-wine-runner-vb/{netList[id][2]}")
+    except:
+        pass
+    os.system(f"aria2c -x 16 -s 16 -d '/tmp/deepin-wine-runner-vb' -o '{netList[id][2]}' \"{netList[id][1]}\"")
+    return os.system(f"WINEPREFIX='{wineBotton}' {wine} '/tmp/deepin-wine-runner-vb/{netList[id][2]}'")
+
+if __name__ == "__main__":
+    if "--help" in sys.argv:
+        print("作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢")
+        print("版本：1.0.0")
+        print("本程序可以更方便的在 wine 容器中安装 Visual Basic Runtime")
+        sys.exit()
+    if len(sys.argv) <= 2 or sys.argv[1] == "" or sys.argv[2] == "":
+        print("您未指定需要安装 Visual Basic Runtime 的容器和使用的 wine，无法继续")
+        print("参数：")
+        print("XXX 参数一 参数二 参数三(可略)")
+        print("参数一为需要安装的容器，参数二为需要使用的wine，参数三为是否缓存（可略），三个参数位置不能颠倒")
+        sys.exit()
+
+    homePath = os.path.expanduser('~')
+    print('''              
+ m    m mmmmm 
+ "m  m" #    #
+  #  #  #mmmm"
+  "mm"  #    #
+   ##   #mmmm"
+              
+              
+''')
+
+    print("请选择以下的 Visual Basic Runtime 进行安装（不保证能正常安装运行）")
+    for i in range(0, len(netList)):
+        print(f"{i} Visual Basic Runtime {netList[i][0]}")
+    while True:
+        try:
+            choose = input("请输入要选择的 Visual Basic Runtime 版本（输入“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 Basic Runtime {netList[choose][0]}")
+    if os.path.exists(f"{homePath}/.cache/deepin-wine-runner/vb/{netList[choose][2]}"):
+        print("已经缓存，使用本地版本")
+        os.system(f"WINEPREFIX='{sys.argv[1]}' {sys.argv[2]} '{homePath}/.cache/deepin-wine-runner/vb/{netList[choose][2]}'")
+        input("安装结束，按回车键退出")
+        exit()
+    print("开始下载")
+    os.system(f"rm -rf '{homePath}/.cache/deepin-wine-runner/vb/{netList[choose][2]}'")
+    os.system(f"mkdir -p '{homePath}/.cache/deepin-wine-runner/vb'")
+    os.system(f"aria2c -x 16 -s 16 -d '{homePath}/.cache/deepin-wine-runner/vb' -o '{netList[choose][2]}' \"{netList[choose][1]}\"")
+    os.system(f"WINEPREFIX='{sys.argv[1]}' {sys.argv[2]} '{homePath}/.cache/deepin-wine-runner/vb/{netList[choose][2]}'")
+    input("安装结束，按回车键退出")

InstallVisualCPlusPlus.py

@@ -15,7 +15,11 @@ import sys
 import json
 import req as requests
 try:
-    netList = json.loads(requests.get("https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vscpp/list.json").text)
+    sourcesList = [
+        "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vscpp/list.json",
+        "http://gfdgdxi.msns.cn/wine-runner-list/vscpp/list.json"
+    ]
+    netList = json.loads(requests.get().text)
 except:
     netList = [
         ["VC6 运行库", "https://code.gitlink.org.cn/gfdgd_xi/wine-runner-list/raw/branch/master/vscpp/VC6RedistSetup_deu.exe"],
@@ -38,7 +42,7 @@ def Download(wineBotton: str, id: int, wine: str) -> int:
     except:
         pass
     os.system(f"aria2c -x 16 -s 16 -d '/tmp/deepin-wine-runner-vcpp' -o '{netList[id][2]}' \"{netList[id][1]}\"")
-    os.system(f"WINEPREFIX='{wineBotton}' {wine} '/tmp/deepin-wine-runner-vcpp/{netList[id][2]}'")
+    return os.system(f"WINEPREFIX='{wineBotton}' {wine} '/tmp/deepin-wine-runner-vcpp/{netList[id][2]}'")
 
 if __name__ == "__main__":
     if "--help" in sys.argv:

LANG/deepin-wine-packager-en_US.ts

@@ -1,200 +1,200 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>U</name>
     <message>
         <location filename="../deepin-wine-packager.py" line="30"/>
         <source>选择 wine 容器</source>
-        <translation type="unfinished">Choose Wine Botton</translation>
+        <translation>Choose Wine Botton</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="35"/>
         <source>选择图标文件</source>
-        <translation type="unfinished">Choose Icon Files</translation>
+        <translation>Choose Icon Files</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="40"/>
         <source>保存 deb 包</source>
-        <translation type="unfinished">Save Deb</translation>
+        <translation>Save Deb</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="103"/>
         <source>提示</source>
-        <translation type="unfinished">Tips</translation>
+        <translation>Tips</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="103"/>
         <source>打包将会改动现在选择的容器，是否继续？</source>
-        <translation type="unfinished">Build deb package will change choose botton, are you continuing?</translation>
+        <translation>Build deb package will change choose botton, are you continuing?</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1162"/>
         <source>浏览……</source>
-        <translation type="unfinished">Browser...</translation>
+        <translation>Browser...</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1164"/>
         <source>打包……</source>
-        <translation type="unfinished">Build...</translation>
+        <translation>Build...</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1165"/>
         <source>安装打包完成的 deb……</source>
-        <translation type="unfinished">Install Build Deb...</translation>
+        <translation>Install Build Deb...</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1166"/>
         <source>根据填写内容打包模板</source>
-        <translation type="unfinished">Build Deb Formwork</translation>
+        <translation>Build Deb Formwork</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1169"/>
         <source>设置卸载该 deb 后自动删除该容器</source>
-        <translation type="unfinished">When remove this deb, it will remove botton auto</translation>
+        <translation>When remove this deb, it will remove botton auto</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1170"/>
         <source>使用统信 Wine 生态适配活动容器清理脚本</source>
-        <translation type="unfinished">Clean Wine Botton (By UOS Wine Activity Shell)</translation>
+        <translation>Clean Wine Botton (By UOS Wine Activity Shell)</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1177"/>
         <source>使用星火wine helper
 （如不勾选默认为deepin-wine-helper）</source>
-        <translation type="unfinished">Use Spark Wine Helper(If you don&apos;t checked, will use deepin-wine-helper)</translation>
+        <translation>Use Spark Wine Helper(If you don&apos;t checked, will use deepin-wine-helper)</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1187"/>
         <source>要打包的 deb 包的包名（※必填）：</source>
-        <translation type="unfinished">Build Deb Package Name(*Must):</translation>
+        <translation>Build Deb Package Name(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1188"/>
         <source>要打包的 deb 包的版本号（※必填）：</source>
-        <translation type="unfinished">Build Deb Package Version(*Must):</translation>
+        <translation>Build Deb Package Version(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1189"/>
         <source>要打包的 deb 包的说明（※必填）：</source>
-        <translation type="unfinished">Build Deb Package Description(*Must):</translation>
+        <translation>Build Deb Package Description(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1190"/>
         <source>要打包的 deb 包的维护者（※必填）：</source>
-        <translation type="unfinished">Build Deb Package Maintainer(*Must):</translation>
+        <translation>Build Deb Package Maintainer(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1191"/>
         <source>要解压的 wine 容器的容器名（※必填）：</source>
-        <translation type="unfinished">Deb Use Wine Botton Unzip Name(*Must):</translation>
+        <translation>Deb Use Wine Botton Unzip Name(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1192"/>
         <source>要解压的 wine 容器（※必填）：</source>
-        <translation type="unfinished">Deb Use Wine Botton Path(*Must):</translation>
+        <translation>Deb Use Wine Botton Path(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1193"/>
         <source>wine 容器里需要运行的可执行文件路径（※必填）：</source>
-        <translation type="unfinished">Deb Use Wine Botton Program Path(*Must):</translation>
+        <translation>Deb Use Wine Botton Program Path(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1194"/>
         <source>要显示的 .desktop 文件的分类（※必填）：</source>
-        <translation type="unfinished">Program Link Type(*Must):</translation>
+        <translation>Program Link Type(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1195"/>
         <source>wine 容器里需要运行的可执行文件的参数（选填）：</source>
-        <translation type="unfinished">Deb Use Wine Botton Program Option:</translation>
+        <translation>Deb Use Wine Botton Program Option:</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1196"/>
         <source>要显示的 .desktop 文件的名称（※必填）：</source>
-        <translation type="unfinished">Program Link Name(*Must):</translation>
+        <translation>Program Link Name(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1197"/>
         <source>要显示的 .desktop 文件的图标（选填）：</source>
-        <translation type="unfinished">Program Link Icon Path:</translation>
+        <translation>Program Link Icon Path:</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1198"/>
         <source>选择打包的 wine 版本（※必选）：</source>
-        <translation type="unfinished">Build Deb Using Wine Version(*Must):</translation>
+        <translation>Build Deb Using Wine Version(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1199"/>
         <source>打包 deb 的保存路径（※必填）：</source>
-        <translation type="unfinished">Build Deb Save Path(*Must):</translation>
+        <translation>Build Deb Save Path(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1220"/>
         <source>高级设置</source>
-        <translation type="unfinished">More Setting</translation>
+        <translation>More Setting</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1223"/>
         <source>deb 包的依赖(如无特殊需求默认即可)</source>
-        <translation type="unfinished">Deb Depends</translation>
+        <translation>Deb Depends</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1225"/>
         <source>deb 包的推荐依赖(非强制，一般默认即可)</source>
-        <translation type="unfinished">Deb Recommends</translation>
+        <translation>Deb Recommends</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1230"/>
         <source>Wine 位数(只限本地需要打包集成的Wine)：
 提示：32位的Wine不能使用64位容器</source>
-        <translation type="unfinished">Deb Use Wine Architecture :
+        <translation>Deb Use Wine Architecture :
 Tips: X86 Wine is unable to use x86 botton</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1233"/>
         <source>deb 包选项：</source>
-        <translation type="unfinished">Deb Option:</translation>
+        <translation>Deb Option:</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1237"/>
         <source>deb 的依赖(强制，如无特殊需求默认即可)：</source>
-        <translation type="unfinished">Deb Depends:</translation>
+        <translation>Deb Depends:</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1239"/>
         <source>deb 的推荐依赖(非强制，一般默认即可)：</source>
-        <translation type="unfinished">Deb Recommends:</translation>
+        <translation>Deb Recommends:</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1241"/>
         <source>要显示的 .desktop 文件的 MimeType：</source>
-        <translation type="unfinished">Program Link MimeType(*Must):</translation>
+        <translation>Program Link MimeType(*Must):</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1243"/>
         <source>打包 deb 架构：</source>
-        <translation type="unfinished">Build Deb Architecture:</translation>
+        <translation>Build Deb Architecture:</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1253"/>
         <source>程序</source>
-        <translation type="unfinished">Program</translation>
+        <translation>Program</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1254"/>
         <source>帮助</source>
-        <translation type="unfinished">Help</translation>
+        <translation>Help</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1255"/>
         <source>退出程序</source>
-        <translation type="unfinished">Exit Program</translation>
+        <translation>Exit Program</translation>
     </message>
     <message>
         <location filename="../deepin-wine-packager.py" line="1256"/>
         <source>小提示</source>
-        <translation type="unfinished">Tips</translation>
+        <translation>Tips</translation>
     </message>
 </context>
 </TS>

Makefile

@@ -2,6 +2,7 @@ build:
 	#cd VM-source && qmake
 	#cd VM-source && make
 	#cd wine && make
+	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/api                          VM
@@ -12,6 +13,7 @@ build:
 	zip -v -q -r package-script.zip package-script
 	cp -rv VM                                     deb/opt/apps/deepin-wine-runner
 	cp -rv AllInstall.py                          deb/opt/apps/deepin-wine-runner
+	cp -rv kill.sh                          deb/opt/apps/deepin-wine-runner
 	cp -rv req                          deb/opt/apps/deepin-wine-runner
 	cp -rv RegShot                          deb/opt/apps/deepin-wine-runner
 	cp -rv BeCyIconGrabber.exe                    deb/opt/apps/deepin-wine-runner
@@ -21,6 +23,7 @@ build:
 	cp -rv deepin-wine-runner-update-bug          deb/opt/apps/deepin-wine-runner
 	cp -rv deepin-wine-runner.svg                 deb/opt/apps/deepin-wine-runner
 	cp -rv deepin-wine-venturi-setter.py          deb/opt/apps/deepin-wine-runner
+	cp -rv InstallVisualBasicRuntime.py           deb/opt/apps/deepin-wine-runner
 	cp -rv DisabledOpengl.reg                     deb/opt/apps/deepin-wine-runner
 	cp -rv EnabledOpengl.reg                      deb/opt/apps/deepin-wine-runner
 	cp -rv geek.exe                               deb/opt/apps/deepin-wine-runner
@@ -47,21 +50,25 @@ build:
 	cp -rv dlls-arm.7z                               deb/opt/apps/deepin-wine-runner
 	cp -rv deepin.list                               deb/opt/apps/deepin-wine-runner
 	cp -rv sparkstore.list                           deb/opt/apps/deepin-wine-runner
-	cp -rv wined3d.dll.so.7z                         deb/opt/apps/deepin-wine-runner
+	cp -rv arm-package.7z                         deb/opt/apps/deepin-wine-runner
+	cp -rv exa.7z                         deb/opt/apps/deepin-wine-runner
 	cp -rv clean-unuse-program.py                    deb/opt/apps/deepin-wine-runner
 	cp -rv InstallNewWineHQ.sh                       deb/opt/apps/deepin-wine-runner
 	cp -rv cleanbottle.sh                            deb/opt/apps/deepin-wine-runner
 	cp -rv StartVM.sh                                deb/opt/apps/deepin-wine-runner
 	#cp -rv deepin-wine-runner-create-botton.py       deb/opt/apps/deepin-wine-runner
 	cp -rv Icon                                      deb/opt/apps/deepin-wine-runner
+	cp -rv ConfigLanguareRunner-help.json            deb/opt/apps/deepin-wine-runner
 	cp -rv gtkGetFileNameDlg                         deb/opt/apps/deepin-wine-runner
 	cp -rv LANG/*.qm                                      deb/opt/apps/deepin-wine-runner/LANG
 	cp -rv InstallDll.py                                      deb/opt/apps/deepin-wine-runner/LANG
 	cp -rv ConfigLanguareRunner.py                      deb/opt/apps/deepin-wine-runner
 	cp -rv AutoConfig.py                      deb/opt/apps/deepin-wine-runner
-	cp -rv UI/*.py                    deb/opt/apps/deepin-wine-runner/UI
+	cp -rv UI                    deb/opt/apps/deepin-wine-runner/
 	cp -rv InstallDll.py              deb/opt/apps/deepin-wine-runner
 	cp -rv Model              deb/opt/apps/deepin-wine-runner
+	cp -rv API                deb/opt/apps/deepin-wine-runner
+	cp -rv key                deb/opt/apps/deepin-wine-runner
 	dpkg -b deb spark-deepin-wine-runner.deb
 	
 

README.md

@@ -1,5 +1,5 @@
 <p width=100px align="center"><img src="https://storage.deepin.org/thread/202208031419283599_deepin-wine-runner.png"></p>
-<h1 align="center">Wine 运行器 2.3.0</h1>
+<h1 align="center">Wine 运行器 2.4.1</h1>
 <hr>
 
 ## 介绍
@@ -10,7 +10,7 @@ env WINEPREFIX=容器路径 wine（wine的路径） 可执行文件路径
 让你可以简易方便的使用 wine  
 是使用 Python3 的 PyQt5 构建的    
 （自己美术功底太差，图标只能在网络上找了）    
-（测试平台：deepin 20.7；UOS 家庭版 21.3.1；Ubuntu 22.04；Ubuntu 20.04；UOS 专业版 1050）    
+（测试平台：deepin 20.7.1；UOS 家庭版 21.3.1；Ubuntu 22.04；Ubuntu 20.04；UOS 专业版 1050；openkylin）    
 ![截图_选择区域_20221002221112.png](https://storage.deepin.org/thread/202210022215217037_截图_选择区域_20221002221112.png)  
 而打包器可以方便的把您的 wine 容器打包成 deb 包供他人使用，程序创建的 deb 构建临时文件夹目录树如下：  
 ```bash
@@ -102,6 +102,36 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
 ![image.png](https://storage.deepin.org/thread/202207190822204627_image.png)
 
 ## 更新日志 
+### 2.4.1（2022年11月06日）
+**※1、不基于生态适配活动脚本的打包器支持只生成制作容器的 7z 包**  
+**※2、两个打包器的容器自动删除脚本添加 kill.sh**  
+**※3、Wine 运行器支持杀死对应容器进程**  
+**※4、容器自动配置脚本和 Wine 安装器支持切换源**  
+5、非生态适配脚本打包器追加运行参数改为 --uri XXX 而非直接 XXX  
+6、两个打包器新增星火应用商店投稿入口  
+7、优化开启 Windows 虚拟机功能在未安装 VirtualBox 时的提示  
+8、Reg Shot 版本从 1.8.3-beta1V5 升级到 1.9.0  
+9、Geek Uninstaller 版本从 1.5.1.161 升级到 1.5.1.163  
+10、容器自动配置脚本添加 installother 命令、修复返回值传递问题  
+11、不显示 pip 安装库的提示信息（因为不是很核心的库）  
+12、非基于生态适配活动脚本的打包器默认勾选卸载该 deb 后自动删除容器、使用统信活动容器清理脚本、使用星火 wine helper  
+13、优化文案  
+![image.png](https://storage.deepin.org/thread/202211061755115167_image.png)
+### 2.4.0（2022年10月25日）
+**※1、新增 VB Runtime 组件安装工具**  
+**※2、优化自动配置容器搜索功能，搜索不区分大小写**  
+**※3、新增 Wine 容器快捷键映射功能**  
+**※4、修复在 arm 架构运行 Wine 时提示无法解压资源的问题**  
+**※5、修复右键无法找到 Wine 运行器打开方式的问题**  
+**※6、修复了容器自动配置脚本 GUI 解析器无法指定 Wine、容器以及位数的功能**  
+**※7、容器自动配置脚本支持评分功能以及脚本内容介绍功能**  
+**※8、支持添加自定义安装的 Wine**  
+**※9、打包器打包的 arm 包支持同时支持 UOS 的 box86 和 exagear**  
+**※10、提供了 Python 的自动配置脚本 API**  
+![截图_选择区域_20221026213608.png](https://storage.deepin.org/thread/202210262151486316_截图_选择区域_20221026213608.png)
+![截图_选择区域_20221026213546.png](https://storage.deepin.org/thread/202210262151481582_截图_选择区域_20221026213546.png)
+
+
 ### 2.3.0（2022年10月02日）
 **※1、自动配置解释器支持 bash 语法（新版底层调用 bash，旧版任然使用旧版解析引擎）**  
 **※2、修复缺失 wimtools 依赖导致无法正常安装的问题**  
@@ -340,6 +370,21 @@ make run
 ```bash
 make install
 ```
+## Openkylin 如何安装这个 Wine 运行器？
+首先添加作者的源：    
+Gitlink 源（国内推荐）：    
+```bash
+wget https://code.gitlink.org.cn/gfdgd_xi/gfdgd-xi-apt-mirrors/raw/branch/master/sources/gitlink.sh && bash gitlink.sh && rm gitlink.sh
+```
+Github 源（国外推荐）：    
+```bash
+wget https://gfdgd-xi.github.io/gfdgd-xi-apt-mirrors/sources/github.sh && bash github.sh && rm github.sh
+```
+上面二选一，添加完后执行  
+```bash
+sudo apt install spark-deepin-wine-runner
+```
+即可自动补全依赖安装（说实话 openkylin 缺的依赖好多）  
 
 ## 对于 Deepin/UOS（AMD64 平台）小白如何使用该程序？
 下面是送给小白的 wine 运行器简单使用方法，先声明，wine 并***不能完美的运行所有 exe 文件***，利用此 wine 运行器简易安装可执行文件的方法如下：  
@@ -397,6 +442,9 @@ Gitlink：https://www.gitlink.org.cn/gfdgd_xi/deep-wine-runner
 + https://github.com/gfdgd-xi/deep-wine-runner
 + https://www.gitlink.org.cn/gfdgd_xi/deep-wine-runner
 
+## 程序下载量
+![](https://gfdgd-xi.github.io/images/wine-runner.svg)  
+
 ## Star 一下吧
 开发不易，原创艰难，给一个 Star 吧，你的 Star 是我继续开发的动力  
 [![star](https://gitee.com/gfdgd-xi/deep-wine-runner/badge/star.svg?theme=dark)](https://gitee.com/gfdgd-xi/deep-wine-runner/stargazers)

RegShot/History.txt

@@ -0,0 +1,244 @@
+
+History of Regshot
+
+Download latest version at:
+http://sourceforge.net/projects/regshot/
+
+-------------------------------------------------
+*: Note you may interest
+!: Changes made
++: Function added
+-: Function deleted
+-------------------------------------------------
+
+V1.9.0 2013-02-02
+! Testing purpose only (there may be some bugs left in it due to Unicode and x64 changes)
++ Add 64-Bit builds
++ Add Unicode builds with .hivu files (not compatible with ANSI .hiv files)
++ Structure of hive files enhanced, while keeping backwards compatibility for ANSI builds
++ Skip list checks now also against the single key/value/file name additionally to checking the complete path
++ Add a proper manifest file to enable UAC elevation
++ Symbol files released for all builds
+! Add support for various compilers
+! Various code cleanups
+* New program icon (thanks to the PortableApps guys)
+* All Regshot versions can be build via WDK
+
+V1.8.2 2007-11-03
+! Change some calls to ANSI version (lstrcmp->strcmp...)
+! Use risk . and .. compare
+! Use HeapAlloc instead of GlobalAlloc, danger but slightly faster, see source code
+! Html differ color from e0e0e0 to e0f0e0 [Thanks Charles!]
++ Add French language fixed, Kazakh language.
++ Add new style browse for folder by Belogorokhov Youri! (NT+)
++ Do not save setting to regshot.ini when there is no such ini file
+ (idea from "alan borer" in my msg board)
++ Fix crash bug in former version if start from cmd window
+! Minor changes and minor bug fixed
+
+V1.8.1 2007-06-20
+! Fix a Crash bug in 1.8.0! (LoadHive()->ReadFile())
++ Dir chains comparison is more human.
++ "UseLongRegHead" option added in regshot.ini to compatible with undoReg (1.46)
+* "UseLongRegHead=1" means using "HKEY_LOCAL_MACHINE" instead of "HKLM", default 0
+* Do not compare shots saved with different "UseLongRegHead" option!
+
+V1.8.0 2007-06-15 (Its TiANWEi reloaded)
+! Fix file chain break bug in 1.7
+! Fix several pointer mis-point (lpComputer, etc)
+! Code maintenance (split, rename, OMG)
+! File attribute dir code adjust
+! Value mode section of html output is colored [Thanks HANDLE!]
++ Fileshots are now saved in hive (you must be waiting for this ^_^)
++ Use GPLv2 license
+
+V1.7, 1.7.1, and 1.7.2 2004-02-25 until 2004-03-05 This version is made by tulipfan[CCG]!
+* Minimize file size from 44k to 28k, thanks to y0da
+! When shot file, "."&".." not show
+* Instead of using "rgst152.dat", the config moved to "regshot.ini"
++ Skip List function is added both for reg and file's shot
++ 1.7.1 add 2 languages
++ 1.7.2 fix language codepage bug thanks Bata Gy<47>rgy!
+
+V1.61a,b,c,d,e,e+,e1-e5 2002-07-13 until 2003-01-01
++ Add 2 languages[1 in 1.61b], Fixed 1.
+! SeparatorBar misplaced in Popup menu in some OS,
+  Hope to fix it! [Thanks Dchenka]
+! Fix Output path bug found by itschy!
++ Add Japanese language by Kentaro Okude!
++ Add Polish language by Adam Mikusi<73>ski!
++ Add Serbian language by Wiz from Yugoslavia!1.61e1
++ Add Hebrew language by Jack Gorji! 1.61e1
++ Add Galego language by Xos?Ant<6E>n Vicente Rodr<64>guez [e2]
++ Add Hrvatski language by Obelix[[e3]
++ Add Bulgarian language by Alex Simidchiev[e4]
++ Add Svenska language by joup@algonet.se[e5]
+
+V1.61 2002-03-30
++ Clear shots separately
++ Show translators name in About Dialog
++ Add Nederlands, T<>rk<72>e, <20>esky language support
+! Optimize some codes
+
+V1.60[test] 2002-03-25
++ Snapshots can be saved into "Hive" files
+
+V1.55 2002-03-11
+- Cut off "Dynamic Monitor" Function
++ Compare log file are saved with the name of the
+  comment you input!
+
+V1.54b 2002-02-28
+! Fix bug that "rgst152.dat" was misplaced.
++ Add Deutsch language support.
+
+V1.54a 2002-02-22
+! Fix bug that made in 1.54 [Cannot save mask in
+  Monitor window]
++ Minor changes, add Italian language strings.
+* Some friends reported that Monitor Window may hang
+  up, but I have not encounter it myself, I will
+  debug later.
+
+V1.54 2002-01-27
++ Multi Language interface and inner strings
+
+V1.53 2001-12-16
++ Show progress during compare
+! New counter refresh method
+! URL change to regshot.yeah.net
+
+V1.52c 2001-12-10
++ Browse button in static window
+
+V1.52b 2001-11-18
++ Pause "||" added in dynamic window
++ Save function added in dynamic window
+
+V1.52a 2001-11-16
++ Output-path in static window
++ Ring3TD name catch and filter in dynamic window
+
+V1.52 2001-11-10
++ Dynamic monitor window under Win9x
+  read readme.txt for detail!
+! rgst150a.dat -> rgst152.dat
+
+V1.51, 1.51a 2001-10-25
+! Fix crash bug in 1.50e when scan folders!!
++ Scan unlimited number of drivers [folders]
+
+V1.50e 2001-10-18
++ Scan up to 26 drivers[folders] separated with ";"
+- Text log don't wrap at too long data for the
+  3rd party software analysis
+
+V1.50d 2001-09-29
+! Deal with more non-standard(invalid) reg values
+
+V1.50c 2001-09-28
+! Crash bug fixed when grab some non-standard value
+* Thanks firstk@21cn.com for testing debug version!
+
+V1.50b 2001-09-22
+! NULL folder name minor bug fixed
+
+V1.50a 2001-09-10
+* Teachers Day!
++ Files and folders scan! [maybe whole partition!]
+! log filename fixed
+! regshot.dat -> rgst150.dat
+
+V1.40c 2001-09-05
++ Comments field for compare log
+! Due to HTML viewer's limit, some change made
+
+V1.40b 2001-09-04
++ Show keys and values counts during registry grab
++ Show elapse time during registry grab
++ Refresh dialog box during registry grab
++ Show icon on sysmenu
+! New string api
+! Minor changes on memory allocation
+
+V1.40a 2001-09-01
+* This is a brand-new version!
+! New data structure, more detailed output.
++ HTML document compare log output.
+- Some checkbox.
+
+-------------------------------------------------
+
+Version 1.30c 2001-08-2?
+! Getsystime -> Getlocaltime
+! H.L.K -> H.M
+! Little changes
+
+Version 1.30b 2001-08-13
+- Some ASM code
+- Some exception handler
+- Some old function
+* Great Thanks to Mr.Zhangl!!!
+
+Debug Version 1.20b 2001-08-10
+* This is a debug version to Mr. ZhangL
+
+Debug Version 1.20a 2001-08-09
+* This is a debug version to Mr. ZhangL
+! Pointers unclear bug fixed
+! Dbytes bug fixed
+
+Debug Version 1.2  2001-08-08
+* This is a debug version to Mr. ZhangL
++ New debuglog output
+
+Debug Version 1.1  2001-08-07
+* This is a debug version to Mr. ZhangL
++ New debuglog "debug_keyqueryinfo.log" output
+
+Debug Version 1.0 2001-08-07
+* This is a debug version to Mr. ZhangL
+* Four month apart from my cute Regshot!
++ debug_keyopen.log
+  debug_keyclose.log
+  debug_keyqueryinfo.log
+  debug_keycannotbeopen.log
+* My PC has no Win2000 installed, so I email this
+  version to Zhangl, and he email me the logfile!
+
+Version 1.10 2001-04-09
+* One and a half year apart from my Regshot!
+! Fixed bugs on NT4
+
+Version 1.01j 1999-12-29
+- NT4 bug cannot be found?? So sad!
+- Not packed with UPX any more
+
+Version 1.01i 1999-12-04
++ Compare log save to different files, max 10000!
++ Turtor file (turtor.txt) added in release pack.
+* Found bugs on NT, bug I cannot fix it
+
+Version 1.01h 1999-11-25
+! Found bugs on NT sp3
+
+Version 1.01g 1999-10
+! Windows version detection error fixed.
++ Exterviewer edit box.
+
+Version 1.01f 1999-10
+! New method of compare
++ ASM codes
++ Notpad.exe called to show the log
++ New Icon.
+- Bmp logo.
+
+Version 1.01e
+* Mostly like 1.01d, bugs fixed.
+
+Version 1.01d
+! Use direct "=" instead "lstrcat()", faster!
+! Larger listBox
+
+Version before 1.01c
+* I don't remember so much!:))

RegShot/License.txt

@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

RegShot/ReadMe.txt

@@ -0,0 +1,152 @@
+
+Readme file of Regshot 1.9.0 (2013-02-02)
+
+-----------------
+Introduction:
+-----------------
+Regshot is a small, free and open-source registry compare utility that allows you to quickly
+take a snapshot of your registry and then compare it with a second one - done after doing
+system changes or installing a new software product. The changes report can be produced in
+text or HTML format and contains a list of all modifications that have taken place between
+the two snapshots. In addition, you can also specify folders (with subfolders) to be
+scanned for changes as well.
+(Most of above text was copied from webattack.com, thanks :)
+
+
+-----------------
+Usage:
+-----------------
+(1) Click the "1st shot" button
+It pops up a menu which contains several items:
+ (A) "Shot", to take a snapshot only, and it will not be kept if you exit Regshot program;
+ (B) "Shot and save...", to take a snapshot of your registry and save the whole registry to
+     a "hive" file and you can keep it in your hard disk for future use;
+ (C) "Load...", to load a "hive" file previous saved.
+If you want to monitor your file system, just check the "Scan Dir [dir..]" checkbox
+and input the folder names below it. Note: Regshot has the ability to scan multiple
+folders, just separate them with ";", Regshot will also scan the subfolders of the current
+folders you entered.
+
+(2) Run any program that may change your windows registry or the file system
+
+(3) Click the "2nd shot" button
+
+(4) Select your output LOG file type, "text" or "HTML", default is "text"
+
+(5) Enter your comment for this action into the "comment field", e.g.: "Changes made after
+winzip started". The comment will only be saved into the comparison log files not into "hive" files
+
+(6) Click the "Compare" button
+Regshot will do the comparison job now (auto detect which shot is newer), when it is finished,
+Regshot will automatically load the comparison log as you defined above, the log files are
+saved  in the directory where "Output path" is defined, default is your Windows Temp Path,
+it was named as the "comment" you input, if the "comment field" is empty or invalid, the
+log will be name as "~resxxxx.txt" or "~resxxxx.htm" where "xxxx" is 0000-9999.
+
+(7) Click the "Clear" button
+The two snapshots (or separately) previous made will be cleared and you can begin a new job.
+Note: "Clear" does not erase the log files!
+
+(8) To quit Regshot, just click the "Quit" button
+
+(9) You can change the language of the Regshot at main window, all words are saved in the
+file "language.ini". View it for details!
+
+(10) New to 1.7: regshot.dat now changed to regshot.ini, skip dirs and skip registry keys
+are included. The executable's size is smaller!
+
+(11) New to 1.8:
+File shots are now saved in hive file.
+"UseLongRegHead" option added in regshot.ini to compatible with undoReg (1.46)
+"UseLongRegHead=1" means using "HKEY_LOCAL_MACHINE" instead of "HKLM", default 0
+Do not compare shots saved with different "UseLongRegHead" option! (limit gone in 1.9.0)
+
+(12) New to 1.9.0:
+x64 and Unicode versions.
+You can compare shots saved with different "UseLongRegHead" option.
+Loading ANSI hive files in Unicode builds and vice versa is not supported.
+
+
+-----------------
+Thanks:
+-----------------
+Alexander Romanenko   -- Former space provider! http://www.ist.md/
+Ivan                  -- Former space provider! http://www.digitalnuke.com/
+Toye                  -- Release!
+zhangl                -- Debug!
+firstk                -- Debug!
+mssoft                -- Test!
+dreamtheater          -- Test!
+Gonzalo               -- Spanish
+ArLang<EFBFBD><EFBFBD><EFBFBD><EFBFBD>            -- Chinese
+Mikhail A.Medvedev    -- Russian[Thanks!]
+Kenneth Aarseth       -- Norsk
+Marcel Drappier       -- French
+Vittorio "Capoccione" -- Italian
+Gnatix                -- Deutsch
+Murat KASABOGLU       -- T<>rk<72>e
+Paul Lowagie          -- Nederlands
+ondra                 -- <20>esky
+AVE7                  -- Fixed Deutsch!
+Pau Bosch i Crespo    -- Catalan
+Michael Papadakis     -- Greek
+Per Bryldt            -- Danish
+Rajah                 -- Latvian
+Leandro               -- Portuguese
+Roland Turcan         -- Slovak
+Kentaro Okude         -- Japanese
+Adam Mikusi<73>ski       -- Polish
+Computer Wizard[Wiz]  -- Serbian
+Jack Gorji             -- Hebrew
+Xos?Ant<6E>n Vicente Rodr<64>guez --Galego
+Obelix                -- Hrvatski
+Alex Simidchiev       -- Bulgarian
+joup@algonet.se       -- Svenska
+Bata Gy<47>rgy           -- Hungarian
+Dmitry P.             -- Ukrainian
+Mr Anonyme,Charles    -- French Update
+kazakh                -- Erzhan Erbolatuly
+
+Nick Reid             -- Advice
+tongjiawang           -- Many help!
+
+Franck Uberto, Patrick Whitted, Walter Bergner, Jim McMahon, Fred Bailey,
+Dchenka, itschy, HANDLE and all those we forgot to mention!!
+
+
+-----------------
+LICENSE:
+-----------------
+
+Copyright 2011-2013 The Regshot Team : TiANWEi, Maddes, XhmikosR
+Copyright 1999-2003,2007,2011 TiANWEi
+Copyright 2004 tulipfan
+Copyright 2007 Belogorokhov Youri
+
+* License remark:
+* TiANWEi - Original Author of Regshot, 1999-now
+* Maddes  http://www.maddes.net/ - Coder and Maintainer, 2011-now
+* XhmikosR - Coder and Maintainer, 2011-now
+* Tulipfan (tfx) was the Designer & Coder of "Skiplist functions, regshot.ini setup, REGSHOT_TITLE define", he made the release 1.7.
+* Belogorokhov Youri (HANDLE) was the contributor of "a better html color idea, a new style browse dialog function" in 1.8.
+
+Multi-language translations are the property of their respective owner.
+
+Regshot is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+Regshot is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Regshot; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+-----------------
+The Regshot Team:
+-----------------
+http://sourceforge.net/projects/regshot/

RegShot/gpl.txt

@@ -1,339 +0,0 @@
-            GNU GENERAL PUBLIC LICENSE
-               Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-            GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-             END OF TERMS AND CONDITIONS
-
-        How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

RegShot/language.ini

@@ -1,6 +1,3 @@
-[Current]
-Current=English
-
 [English]
 1=Keys:
 2=Values:
@@ -406,7 +403,7 @@ Translator=Gnatix & AVE7
 10=Werte ge<67>ndert:
 11=Dateien hinzugef<65>gt:
 12=Dateien gel<65>scht:
-13=Dateiattribute ge<67>ndert:
+13=Dateien [Attribute?] ge<67>ndert:
 14=Ordner hinzugef<65>gt:
 15=Ordner gel<65>scht:
 16=Ordnerattribute ge<67>ndert:
@@ -437,7 +434,7 @@ Translator=Gnatix & AVE7
 41=&Schu<68>
 42=Schu<EFBFBD> + Spei&chern...
 43=La&den...
-44=&Leeren
+44=Alle &Leeren
 45=Leeren &1. Schu<68>
 46=Leeren &2. Schu<68>
 

RegShot/regshot.ini

@@ -1,6 +1,7 @@
 [Setup]
 Flag=1
 ExtDir=
+Language=
 OutDir=
 UseLongRegHead=0
 

RunVM.sh

@@ -2,16 +2,16 @@
 # 使用系统默认的 bash 运行
 ###########################################################################################
 # 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
-# 版本：1.7.0
+# 版本：2.4.1
-# 更新时间：2022年07月15日
+# 更新时间：2022年11月06日
 # 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
 # 基于 Python3 的 tkinter 构建
 ###########################################################################################
 cd `dirname $0`
-which VBoxManage
+which VBoxManage1
 if test $? == 0 ; then
     VM/VirtualMachine
     exit
 fi
-echo 未安装 VirtualBox，开始安装，安装结束重新运行即可
+zenity --info --no-wrap --text="未安装 VirtualBox，请自行安装 VirtualBox 并重新运行"
-./launch.sh deepin-terminal -C "pkexec apt install virtualbox-6.1 -y && zenity --info --text=\"安装完毕，关闭此对话框和安装终端重新运行程序即可\" --no-wrap" --keep-open
+#./launch.sh deepin-terminal -C "pkexec apt install virtualbox-6.1 -y && zenity --info --text=\"安装完毕，关闭此对话框和安装终端重新运行程序即可\" --no-wrap" --keep-open

TestShell/arm-postinst.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+#DEB_PATH=/opt/apps/aaa
+DEB_PATH=.
+if [ -f $DEB_PATH/files/wined3d.dll.so ] && [ -d "/usr/lib/nvidia" ];then
+	mv $DEB_PATH/files/wined3d.dll.so $DEB_PATH/files/dlls
+fi
+
+KUNPENG="0x48"
+cpu_vendor=$(lscpu | grep Vendor | awk '{print $3}')
+KIRIN=`cat /proc/cpuinfo | grep Kirin`
+if [ ! -z "$KIRIN" ];then
+        mv $DEB_PATH/files/*.so $DEB_PATH/files/dlls
+fi
+
+## check if the cpu support arm32 instruction or not, 126 means unsupported
+/opt/deepin-box86/box86 -v
+CHECK_ARM32=$?
+
+IMAGE_VER=10deepin3
+IMAGE_DIR=/opt/deepin-wine-exagear-images/debian-buster
+ARCHIVE_FILE=files.7z
+
+download_image() {
+	pushd /var/cache/apt/archives >/dev/null
+	apt download deepin-wine-exagear-images
+	dpkg -x deepin-wine-exagear-images*.deb /
+	rm deepin-wine-exagear-images*.deb
+	echo $IMAGE_VER > $IMAGE_DIR/VERSION 
+	popd >/dev/null
+}
+
+move_box86_runsh() {
+    if [[ -f $DEB_PATH/files/run_with_exagear.sh ]]; then
+        echo 单图标
+        mv $DEB_PATH/files/run_with_exagear.sh $DEB_PATH/files/run.sh
+    else
+        echo 多图标
+        for shell_path in $(ls $DEB_PATH/files/*_with_exagear.sh)
+            do
+            name=${shell_path#$DEB_PATH/files/}
+            name=${name%_with_exagear.sh}
+            mv $shell_path $DEB_PATH/files/$name.sh
+            done
+    fi
+}
+
+move_exagear_runsh() {
+    if [[ -f $DEB_PATH/files/run_with_exagear.sh ]]; then
+        echo 单图标
+        mv $DEB_PATH/files/run_with_box86.sh $DEB_PATH/files/run.sh
+    else
+        echo 多图标
+        for shell_path in $(ls $DEB_PATH/files/*_with_box86.sh)
+            do
+            name=${shell_path#$DEB_PATH/files/}
+            name=${name%_with_box86.sh}
+            mv $shell_path $DEB_PATH/files/$name.sh
+            done
+    fi
+}
+
+if [[ "$KUNPENG" == "$cpu_vendor" ]] || [[ $CHECK_ARM32 != 0 ]];then
+	echo "use exagear as emulator..."
+	if [ ! -d /opt/exagear/bin ];then
+		mkdir /opt/exagear/bin -p
+	fi
+
+	if [ ! -e /opt/exagear/bin/ubt_x32a64_al ];then
+		cp $DEB_PATH/files/exa/ubt_x32a64_al /opt/exagear/bin/ubt_x32a64_al
+	fi
+
+	if [ ! -e /opt/exagear/bin/ubt_x64a64_al ];then
+		cp $DEB_PATH/files/exa/ubt_x64a64_al /opt/exagear/bin/ubt_x64a64_al
+	fi
+    move_exagear_runsh
+	mv $DEB_PATH/files/exa/wineserver /opt/deepin-wine6-stable/bin/wineserver
+else
+	echo "use box86 as emulator..."
+    move_box86_runsh
+	mv $DEB_PATH/files/run_with_box86.sh $DEB_PATH/files/run.sh
+fi
+
+true