支持导入.7z包时自动移除部分特殊符号

.gitignore

@@ -5,3 +5,4 @@ VM-source/Makefile
 *.rpm
 *.pro.user
 .vscode
+build-*-Debug

ExePreview/.gitignore

@@ -0,0 +1,74 @@
+# This file is used to ignore files which are generated
+# ----------------------------------------------------------------------------
+
+*~
+*.autosave
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.rej
+*.so
+*.so.*
+*_pch.h.cpp
+*_resource.rc
+*.qm
+.#*
+*.*#
+core
+!core/
+tags
+.DS_Store
+.directory
+*.debug
+Makefile*
+*.prl
+*.app
+moc_*.cpp
+ui_*.h
+qrc_*.cpp
+Thumbs.db
+*.res
+*.rc
+/.qmake.cache
+/.qmake.stash
+
+# qtcreator generated files
+*.pro.user*
+CMakeLists.txt.user*
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.sdf
+*.opensdf
+*.vcxproj
+*vcxproj.*
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# Python byte code
+*.pyc
+
+# Binaries
+# --------
+*.dll
+*.exe
+

ExePreview/ExePreview.json

@@ -0,0 +1,3 @@
+{
+    "Keys": ["application/x-ms-dos-executable", "application/x-msi", "application/x-ms-shortcut"]
+}

ExePreview/ExePreview.pro

@@ -0,0 +1,31 @@
+QT += gui
+
+TEMPLATE = lib
+CONFIG += plugin core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+INCLUDEPATH += /usr/include/dde-file-manager/
+DISTFILES += dfmpreview-wine-runner-plugin.json
+
+CONFIG += c++17
+
+# You can make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += \
+    dfmexepreview.cpp \
+    main.cpp
+
+HEADERS += \
+    dfmexepreview.h \
+    main.h
+
+DISTFILES += ExePreview.json
+
+# Default rules for deployment.
+unix {
+    target.path = $$[QT_INSTALL_PLUGINS]/generic
+}
+!isEmpty(target.path): INSTALLS += target

ExePreview/dfmexepreview.cpp

@@ -0,0 +1,59 @@
+#include "dfmexepreview.h"
+
+#include <dfileservices.h>
+
+DFMExePreview::DFMExePreview(QObject *parent) : DFMFilePreview(parent)
+{
+
+}
+
+DFMExePreview::~DFMExePreview()
+{
+    if (m_view) {
+        m_view->deleteLater();
+        m_view = NULL;
+    }
+    if (m_statusBar) {
+        m_statusBar->deleteLater();
+        m_statusBar = NULL;
+    }
+}
+
+void DFMExePreview::initialize(QWidget *window, QWidget *statusBar)
+{
+    Q_UNUSED(window)
+    Q_UNUSED(statusBar)
+    if (!m_view) {
+        m_view = new QLabel();
+    }
+    if (!m_statusBar) {
+        m_statusBar = new QLabel();
+    }
+}
+
+bool DFMExePreview::setFileUrl(const DUrl &url)
+{
+    m_url = url;
+    m_view->setText("114514");
+    return 1;
+}
+
+DUrl DFMExePreview::fileUrl() const
+{
+    return m_url;
+}
+
+QWidget *DFMExePreview::contentWidget() const
+{
+    return m_view;
+}
+
+QWidget *DFMExePreview::statusBarWidget() const
+{
+    return m_statusBar;
+}
+
+QString DFMExePreview::title() const
+{
+    return m_title;
+}

ExePreview/dfmexepreview.h

@@ -0,0 +1,28 @@
+#ifndef DFMEXEPREVIEW_H
+#define DFMEXEPREVIEW_H
+
+#include <QObject>
+#include <dfmfilepreview.h>
+#include <QLabel>
+
+class DFMExePreview : public DFM_NAMESPACE::DFMFilePreview
+{
+    Q_OBJECT
+public:
+    explicit DFMExePreview(QObject *parent = NULL);
+    ~DFMExePreview();
+    virtual void initialize(QWidget *window, QWidget *statusBar) Q_DECL_OVERRIDE;
+    virtual bool setFileUrl(const DUrl &url) Q_DECL_OVERRIDE;
+    virtual DUrl fileUrl() const Q_DECL_OVERRIDE;
+    virtual QWidget *contentWidget() const Q_DECL_OVERRIDE;
+    virtual QWidget *statusBarWidget() const Q_DECL_OVERRIDE;
+    virtual QString title() const Q_DECL_OVERRIDE;
+
+protected:
+    DUrl m_url;
+    QLabel *m_view = NULL;
+    QLabel *m_statusBar = NULL;
+    QString m_title;
+};
+
+#endif // DFMEXEPREVIEW_H

ExePreview/main.cpp

@@ -0,0 +1,17 @@
+#include "main.h"
+#include "dfmexepreview.h"
+
+GenericPlugin::GenericPlugin(QObject *parent)
+    : DFM_NAMESPACE::DFMFilePreviewPlugin(parent)
+{
+}
+
+/*QObject *GenericPlugin::create(const QString &name, const QString &spec)
+{
+
+}*/
+DFM_NAMESPACE::DFMFilePreview *GenericPlugin::create(const QString &key)
+{
+    Q_UNUSED(key);
+    return new DFMExePreview;
+}

ExePreview/main.h

@@ -0,0 +1,22 @@
+#define DFMFilePreviewFactoryInterface_ood "com.deepin.filemanager.DFMFilePreviewFactoryInterface_WineRunner"
+
+#ifndef MAIN_H
+#define MAIN_H
+
+#include <QGenericPlugin>
+#include <dfmfilepreviewplugin.h>
+
+class GenericPlugin : public DFM_NAMESPACE::DFMFilePreviewPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "ExePreview.json")
+
+public:
+    explicit GenericPlugin(QObject *parent = nullptr);
+    virtual DFM_NAMESPACE::DFMFilePreview *create(const QString &key);
+
+
+
+};
+
+#endif // MAIN_H

InstallMono.py

@@ -17,7 +17,7 @@ import traceback
 try:
     import pyquery
 except:
-    os.system("python3 -m pip install --upgrade pyquery --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple")
+    os.system("python3 -m pip install --upgrade pyquery --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages")
 
 if "--help" in sys.argv:
     print("作者：gfdgd xi")
@@ -127,4 +127,4 @@ except:
     file.write(programVersion)
     file.close()
 if exitInputShow:
-    input("安装结束，按回车键退出")
+    input("安装结束，按回车键退出")

Makefile

@@ -49,6 +49,7 @@ package-deb:
 	cp -rv VM-source/*.fd VM
 	cp -rv wine/ deb/opt/apps/deepin-wine-runner/
 	cp -rv Test/ deb/opt/apps/deepin-wine-runner/
+	cp -rv dxvk/ deb/opt/apps/deepin-wine-runner
 	cp -rv information.json package-script
 	zip -v -q -r package-script.zip package-script
 	cp -rv InstallBox86-cn.sh deb/opt/apps/deepin-wine-runner/
@@ -116,7 +117,6 @@ package-deb:
 	cp -rv UpdateGeek.sh deb/opt/apps/deepin-wine-runner
 	cp -rv AppStore.py deb/opt/apps/deepin-wine-runner
 	cp -rv InstallWineOnDeepin23.py deb/opt/apps/deepin-wine-runner
-	cp -rv dxvk.7z deb/opt/apps/deepin-wine-runner
 	cp -rv InstallFont.py deb/opt/apps/deepin-wine-runner
 	cp -rv CheckDLL deb/opt/apps/deepin-wine-runner
 	cp -rv InstallLat.sh deb/opt/apps/deepin-wine-runner

Model/__init__.py

@@ -14,12 +14,14 @@ programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 terminal = ""
 terminalList = [
     "deepin-terminal",
+    "deepin-terminal-gtk",
     "mate-terminal",
     "gnome-terminal",
     "xfce4-terminal"
 ]
 terminalEnd = {
     f"{programPath}/../launch.sh\" \"deepin-terminal": ["-e", 0],
+    f"{programPath}/../launch.sh\" \"deepin-terminal-gtk": ["-e", 0],
     "mate-terminal": ["-e", 1],
     "gnome-terminal": ["--", 0],
     "xfce4-terminal": ["-e", 1]
@@ -28,6 +30,8 @@ for i in terminalList:
     if not os.system(f"which {i}"):
         if i == "deepin-terminal":
             i = f"{programPath}/../launch.sh\" \"deepin-terminal"
+        if i == "deepin-terminal-gtk":
+            i = f"{programPath}/../launch.sh\" \"deepin-terminal-gtk"
         terminal = i
         break
 if terminal == "":

README.md

@@ -11,6 +11,8 @@ Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程
 而且对于部分 Wine 应用适配者来说，提供了图形化的打包工具，以及提供了一些常用工具以及运行库的安装方式，以及能安装多种不同的 Wine 以测试效果，能极大提升适配效率。  
 且对于 Deepin23 用户做了特别优化，以便能在缺少 i386 运行库的情况下运行 Wine32。同时也为非 X86 架构用户提供了 Box86/64、Qemu User 的安装方式  
 
+当前支持 amd64、arm64、mips64el、loong64（新世界）、loongarch64（旧世界）、riscv64  
+
 注：  
 **在使用运行器时不要随便动  .deepinwine 下的容器，否则会导致安装的 wine 应用无法正常打开**  
 **除非你有把握不会损坏容器**  

StartVM.sh

@@ -16,6 +16,7 @@ if [[ 0 == $? ]]; then
     exit
 fi
 # 检查是否有 QEMU
+export PATH=/opt/apps/deepin-wine-runner-qemu-system-extra/files/usr/local/bin:$PATH
 which qemu-system-x86_64
 if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
     if [[ -f "$HOME/.config/deepin-wine-runner/QemuSetting.json" ]]; then
@@ -24,6 +25,10 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         python3 ./VM/StartQemu.py
         exit
     fi
+    # 判断是否有安装增强 Qemu
+    if [[ -f /opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh ]]; then
+        qemuMore=/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh
+    fi
     # 查看CPU个数
     CpuSocketNum=`cat /proc/cpuinfo | grep "cpu cores" | uniq | wc -l`
     # 查看CPU核心数
@@ -63,7 +68,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         ./VM/kvm-ok
         if [[ $? == 0 ]] && [[ `arch` == "x86_64" ]]; then
             echo X86 架构，使用 kvm 加速
-            qemu-system-x86_64 --enable-kvm -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+            $qemuMore qemu-system-x86_64 --enable-kvm -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
                 -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
                 -device AC97 -device ES1370 -device intel-hda -device hda-duplex  \
@@ -88,6 +93,9 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
                 qemuPath="bwrap --dev-bind / / --bind ./VM/MipsQemu/usr/lib/mips64el-linux-gnuabi64/qemu/ui-gtk.so /usr/lib/mips64el-linux-gnuabi64/qemu/ui-gtk.so ./VM/MipsQemu/usr/bin/qemu-system-x86_64"
             fi
         fi
+        if [[ $qemuMore != "" ]]; then
+            qemuPath=$qemuMore 
+        fi
         echo 不使用 kvm 加速
         $qemuPath --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
@@ -111,7 +119,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         echo $qemuUEFI
         ./VM/kvm-ok
         if [[ $? == 0 ]] && [[ `arch` == "aarch64" ]]; then
-            qemu-system-arm --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+            $qemuMore qemu-system-arm --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
                 -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
                 -cpu max -M virt -device virtio-gpu-pci \
@@ -123,7 +131,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
                 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all 
             exit
         fi
-        qemu-system-arm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+        $qemuMore qemu-system-arm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
             -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
             -cpu max -M virt -device virtio-gpu-pci \
@@ -149,7 +157,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         echo $qemuUEFI
         ./VM/kvm-ok
         if [[ $? == 0 ]] && [[ `arch` == "aarch64" ]]; then
-            qemu-system-aarch64 --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+            $qemuMore qemu-system-aarch64 --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
                 -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
                 -cpu max -M virt \
@@ -162,7 +170,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
                 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all 
             exit
         fi
-        qemu-system-aarch64 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
+        $qemuMore qemu-system-aarch64 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
             -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
             -cpu max -M virt \

deb/DEBIAN/control

@@ -8,7 +8,7 @@ Certainty: possible
 Check: binaries
 Type: binary, udeb
 Priority: optional
-Depends: python3, python3-pil, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, xfce4-terminal | deepin-terminal | mate-terminal | gnome-terminal, python3-dbus, python3-pip, p7zip-full | p7zip-legacy, sudo, python3-pyperclip, bubblewrap, zenity, tree, dpkg, fakeroot
+Depends: python3, python3-pil, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, deepin-terminal-gtk | xfce4-terminal | deepin-terminal | mate-terminal | gnome-terminal, python3-dbus, python3-pip, p7zip-full | p7zip-legacy, sudo, python3-pyperclip, bubblewrap, zenity, tree, dpkg, fakeroot
 Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386, libc6:armhf, libwine, qemu-system, qemu-full, alien, spark-deepin-wine-runner-qemu-system-extra, deepin-wine8-stable | spark-wine | spark-wine9 | spark-wine9-wow | spark-wine8 | spark-wine8-wow | spark-wine7-devel | deepin-wine6-stable | deepin-wine5-stable | deepin-wine5 | deepin-wine | wine
 Section: utils
 Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52

deepin-wine-packager.py

@@ -2255,20 +2255,10 @@ def ChangeBottleName():
     if len(e2_text.text()) > 0:
         if ord(e2_text.text()[0]) < 48 or ord(e2_text.text()[0]) > 57:
             e2_text.setText(e2_text.text()[1:])
-    if bottleNameLock:
-        return
-    if os.path.basename(e6_text.text()) == ".wine" or e6_text.text() == "":
-        bottleNameChangeLock = True
-        e5_text.setText(e1_text.text())
-        return
+    # 调整逻辑，容器名默认与包名相同
     bottleNameChangeLock = True
-    e5_text.setText(os.path.basename(e6_text.text().replace(" ", "")))
+    e5_text.setText(e1_text.text())
 
-def LockBottleName():
-    global bottleNameLock
-    if bottleNameChangeLock:
-        return
-    bottleNameLock = True
 
 # 获取当前语言
 def get_now_lang()->"获取当前语言":
@@ -2419,14 +2409,13 @@ installDeb.clicked.connect(InstallDeb)
 wineFrame.addWidget(wineVersion)
 e1_text.textChanged.connect(ChangeBottleName)
 e2_text.textChanged.connect(ChangeBottleName)
-e5_text.textChanged.connect(LockBottleName)
 e6_text.textChanged.connect(ChangeBottleName)
 e7_text.textChanged.connect(ChangeTapTitle)
 widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要打包的 deb 包的包名（※必填）：")), 0, 0, 1, 1)
 widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 包版本号（※必填）：")), 1, 0, 1, 1)
 widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 包说明（※必填）：")), 2, 0, 1, 1)
 widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 包维护者（※必填）：")), 3, 0, 1, 1)
-widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要解压 wine 容器的名称（※必填）：")), 4, 0, 1, 1)
+widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "Wine 容器名称（※必填，推荐默认）：")), 4, 0, 1, 1)
 widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要打包 wine 容器的路径（※必填）：")), 5, 0, 1, 1)
 desktopIconTab = QtWidgets.QTabWidget()
 controlWidget = QtWidgets.QWidget()
@@ -2680,14 +2669,18 @@ allInfoList = {
 SetFont(app)
 #window.setWindowFlag(QtGui.Qt)
 
-# 设置滚动条
-areaScroll = QtWidgets.QScrollArea(window)
-areaScroll.setWidgetResizable(True)
-areaScroll.setWidget(widget)
-areaScroll.setFrameShape(QtWidgets.QFrame.NoFrame)
-
-window.setCentralWidget(areaScroll)
-window.resize(int(app.primaryScreen().availableGeometry().size().width() * 0.9), int(app.primaryScreen().availableGeometry().size().height() * 0.9))
+window.setCentralWidget(widget)
+# 判断是否为小屏幕，是则设置滚动条并全屏
+if (window.frameGeometry().width() > app.primaryScreen().availableGeometry().size().width() * 0.8 or 
+   window.frameGeometry().height() > app.primaryScreen().availableGeometry().size().height() * 0.9):
+    # 设置滚动条
+    areaScroll = QtWidgets.QScrollArea(window)
+    areaScroll.setWidgetResizable(True)
+    areaScroll.setWidget(widget)
+    areaScroll.setFrameShape(QtWidgets.QFrame.NoFrame)
+    window.setCentralWidget(areaScroll)
+    window.showMaximized()  # 设置全屏
+window.show()
 
 window.show()
 sys.exit(app.exec_())

dxvk/setup_dxvk.sh

@@ -0,0 +1,219 @@
+#!/usr/bin/env bash
+function wait(){
+	echo Press Enter To Exit
+	read
+}
+# default directories
+dxvk_lib32=${dxvk_lib32:-"x32"}
+dxvk_lib64=${dxvk_lib64:-"x64"}
+
+# figure out where we are
+basedir="$(dirname "$(readlink -f "$0")")"
+
+# figure out which action to perform
+action="$1"
+
+case "$action" in
+install)
+  ;;
+uninstall)
+  ;;
+*)
+  echo "Unrecognized action: $action"
+  echo "Usage: $0 [install|uninstall] [--without-dxgi] [--symlink]"
+  exit 1
+esac
+
+# process arguments
+shift
+
+with_dxgi=true
+file_cmd="cp -v --reflink=auto"
+
+while (($# > 0)); do
+  case "$1" in
+  "--without-dxgi")
+    with_dxgi=false
+    ;;
+  "--symlink")
+    file_cmd="ln -s -v"
+    ;;
+  esac
+  shift
+done
+
+# check wine prefix before invoking wine, so that we
+# don't accidentally create one if the user screws up
+if [ -n "$WINEPREFIX" ] && ! [ -f "$WINEPREFIX/system.reg" ]; then
+  echo "$WINEPREFIX:"' Not a valid wine prefix.' >&2
+  exit 1
+fi
+
+# find wine executable
+export WINEDEBUG=-all
+# disable mscoree and mshtml to avoid downloading
+# wine gecko and mono
+export WINEDLLOVERRIDES="mscoree,mshtml="
+
+# 专门添加，为了可以使用自定义的 wine
+wine=$WINE
+wine64=$WINE64
+wineboot="$WINE wineboot"
+if [[ $WINE == "" ]];then
+   wine="wine"
+fi
+if [[ $WINE64 == "" ]];then
+   wine64="wine64"
+fi
+
+# $PATH is the way for user to control where wine is located (including custom Wine versions).
+# Pure 64-bit Wine (non Wow64) requries skipping 32-bit steps.
+# In such case, wine64 and winebooot will be present, but wine binary will be missing,
+# however it can be present in other PATHs, so it shouldn't be used, to avoid versions mixing.
+wine_path=$(dirname "$(which $wineboot)")
+wow64=true
+if ! [ -f "$wine_path/$wine" ]; then
+   wine=$wine64
+   wow64=false
+fi
+
+# resolve 32-bit and 64-bit system32 path
+winever=$($wine --version | grep wine)
+if [ -z "$winever" ]; then
+    echo "$wine:"' Not a wine executable. Check your $wine.' >&2
+    exit 1
+fi
+
+# ensure wine placeholder dlls are recreated
+# if they are missing
+$wineboot -u
+
+win64_sys_path=$($wine64 winepath -u 'C:\windows\system32' 2> /dev/null)
+win64_sys_path="${win64_sys_path/$'\r'/}"
+if $wow64; then
+  win32_sys_path=$($wine winepath -u 'C:\windows\system32' 2> /dev/null)
+  win32_sys_path="${win32_sys_path/$'\r'/}"
+fi
+
+if [ -z "$win32_sys_path" ] && [ -z "$win64_sys_path" ]; then
+  echo 'Failed to resolve C:\windows\system32.' >&2
+  wait
+  exit 1
+fi
+
+# create native dll override
+overrideDll() {
+  $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /d native /f >/dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    echo -e "Failed to add override for $1"
+    wait
+    exit 1
+  fi
+}
+
+# remove dll override
+restoreDll() {
+  $wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /f > /dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    echo "Failed to remove override for $1"
+  fi
+}
+
+# copy or link dxvk dll, back up original file
+installFile() {
+  dstfile="${1}/${3}.dll"
+  srcfile="${basedir}/${2}/${3}.dll"
+
+  if [ -f "${srcfile}.so" ]; then
+    srcfile="${srcfile}.so"
+  fi
+
+  if ! [ -f "${srcfile}" ]; then
+    echo "${srcfile}: File not found. Skipping." >&2
+    return 1
+  fi
+
+  if [ -n "$1" ]; then
+    if [ -f "${dstfile}" ] || [ -h "${dstfile}" ]; then
+      if ! [ -f "${dstfile}.old" ]; then
+        mv -v "${dstfile}" "${dstfile}.old"
+      else
+        rm -v "${dstfile}"
+      fi
+      $file_cmd "${srcfile}" "${dstfile}"
+    else
+      echo "${dstfile}: File not found in wine prefix" >&2
+      return 1
+    fi
+  fi
+  return 0
+}
+
+# remove dxvk dll, restore original file
+uninstallFile() {
+  dstfile="${1}/${3}.dll"
+  srcfile="${basedir}/${2}/${3}.dll"
+
+  if [ -f "${srcfile}.so" ]; then
+    srcfile="${srcfile}.so"
+  fi
+
+  if ! [ -f "${srcfile}" ]; then
+    echo "${srcfile}: File not found. Skipping." >&2
+    return 1
+  fi
+
+  if ! [ -f "${dstfile}" ] && ! [ -h "${dstfile}" ]; then
+    echo "${dstfile}: File not found. Skipping." >&2
+    return 1
+  fi
+
+  if [ -f "${dstfile}.old" ]; then
+    rm -v "${dstfile}"
+    mv -v "${dstfile}.old" "${dstfile}"
+    return 0
+  else
+    return 1
+  fi
+}
+
+install() {
+  installFile "$win64_sys_path" "$dxvk_lib64" "$1"
+  inst64_ret="$?"
+
+  inst32_ret=-1
+  if $wow64; then
+    installFile "$win32_sys_path" "$dxvk_lib32" "$1"
+    inst32_ret="$?"
+  fi
+
+  if (( ($inst32_ret == 0) || ($inst64_ret == 0) )); then
+    overrideDll "$1"
+  fi
+}
+
+uninstall() {
+  uninstallFile "$win64_sys_path" "$dxvk_lib64" "$1"
+  uninst64_ret="$?"
+
+  uninst32_ret=-1
+  if $wow64; then
+    uninstallFile "$win32_sys_path" "$dxvk_lib32" "$1"
+    uninst32_ret="$?"
+  fi
+
+  if (( ($uninst32_ret == 0) || ($uninst64_ret == 0) )); then
+    restoreDll "$1"
+  fi
+}
+
+# skip dxgi during install if not explicitly
+# enabled, but always try to uninstall it
+if $with_dxgi || [ "$action" == "uninstall" ]; then
+  $action dxgi
+fi
+
+$action d3d9
+$action d3d10core
+$action d3d11
+wait

mainwindow.py

@@ -142,6 +142,10 @@ def runexebutton(self):
 class QT:
     message = None
     def ShowWineReturn(things):
+        global unUseLnk
+        unUseLnk = True
+        # 不显示超链接
+        #returnText.setStyleSheet(returnText.styleSheet() + "a {color: white; text-decoration: none;}")
         returnText.insertPlainText(things)
 
     def ShowHistory(temp):
@@ -1018,11 +1022,6 @@ def InstallMSXML():
     OpenTerminal(f"'{programPath}/InstallMsxml.py' '{wineBottonPath}' '{wine[o1.currentText()]}' {int(setting['RuntimeCache'])}")
 
 def InstallDXVK():
-    if not os.path.exists(f"{programPath}/dxvk"):
-        if os.system(f"7z x -y \"{programPath}/dxvk.7z\" -o\"{programPath}\""):
-            QtWidgets.QMessageBox.critical(widget, "错误", "无法解压资源")
-            return
-        os.remove(f"{programPath}/dxvk.7z")
     if e1.currentText() == "":
         wineBottonPath = setting["DefultBotton"]
     else:
@@ -2723,8 +2722,11 @@ returnText = QtWidgets.QTextBrowser()
 getUpdate = GetUpdateToShow()
 getUpdate.signal.connect(returnText.setHtml)
 getUpdate.start()
+unUseLnk = False
 def ReturnTextOpenUrl(url):
     print(url)
+    if unUseLnk:
+        return
     if url.url() == "http://update.gfdgdxi.top/update-wine-runner":
         UpdateWindow.ShowWindow()
     elif url.url() == "http://update.gfdgdxi.top/information-wine-runner":
@@ -3332,14 +3334,19 @@ if o1.currentText() == "":
     o1.addItem("没有识别到任何Wine，请在菜单栏“程序”安装Wine或安装任意Wine应用")
 SetFont(setting["FontSize"])
 
-# 设置滚动条
-areaScroll = QtWidgets.QScrollArea(window)
-areaScroll.setWidgetResizable(True)
-areaScroll.setWidget(widget)
-areaScroll.setFrameShape(QtWidgets.QFrame.NoFrame)
+window.setCentralWidget(widget)
+# 判断是否为小屏幕，是则设置滚动条并全屏
+if (window.frameGeometry().width() > app.primaryScreen().availableGeometry().size().width() * 0.8 or 
+   window.frameGeometry().height() > app.primaryScreen().availableGeometry().size().height() * 0.9):
+    # 设置滚动条
+    areaScroll = QtWidgets.QScrollArea(window)
+    areaScroll.setWidgetResizable(True)
+    areaScroll.setWidget(widget)
+    areaScroll.setFrameShape(QtWidgets.QFrame.NoFrame)
+    window.setCentralWidget(areaScroll)
+    window.showMaximized()  # 设置全屏
+window.show()
 
-window.setCentralWidget(areaScroll)
-window.resize(int(app.primaryScreen().availableGeometry().size().width() * 0.9), int(app.primaryScreen().availableGeometry().size().height() * 0.9))
 
 # Mini 模式
 # MiniMode(True)

wine/installwine

@@ -16,6 +16,7 @@ import sys
 import json
 import traceback
 import requests
+import webbrowser
 programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 sys.path.append(f"{programPath}/../")
 from Model import *
@@ -68,6 +69,8 @@ class Ui_MainWindow(object):
         self.deleteZip.setObjectName("deleteZip")
         self.horizontalLayout.addWidget(self.deleteZip)
         self.addOtherWine = QtWidgets.QPushButton(self.centralWidget)
+        self.downloadWineFromCloudDisk = QtWidgets.QPushButton(self.centralWidget)
+        self.horizontalLayout.addWidget(self.downloadWineFromCloudDisk)
         self.horizontalLayout.addWidget(self.addOtherWine)
         spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout.addItem(spacerItem2)
@@ -109,7 +112,8 @@ class Ui_MainWindow(object):
         self.delButton.setText(_translate("MainWindow", ">>"))
         self.unzip.setText(_translate("MainWindow", "不解压Wine资源文件"))
         self.deleteZip.setText(_translate("MainWindow", "删除下载的资源包，只解压保留（两个选项都选相互抵消）"))
-        self.addOtherWine.setText(_translate("MainWindow", "导入自己的Wine"))
+        self.addOtherWine.setText(_translate("MainWindow", "导入 Wine 7z 包"))
+        self.downloadWineFromCloudDisk.setText(_translate("MainWindow", "从网盘下载 Wine"))
 
 def ReadLocalInformation():
     try:
@@ -132,7 +136,7 @@ def ReadLocalInformation():
             QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
 
 def InstallOtherWine():
-    path = QtWidgets.QFileDialog.getOpenFileName(window, "选择 Wine", os.getenv("~"), "wine(wine);;wine64(wine64);;全部文件(*.*)")
+    path = QtWidgets.QFileDialog.getOpenFileName(window, "选择 Wine 运行器 Wine 7z 包", os.getenv("~"), "Wine 运行器 Wine 7z 包(*.7z);;全部文件(*.*)")
     if path[0] == "" or not path[1]:
         return
     try:
@@ -140,14 +144,23 @@ def InstallOtherWine():
         rfile = open(f"{programPath}/winelist.json", "r")
         list = json.loads(rfile.read())
         rfile.close()
-        # 创建映射
-        name = os.path.basename(os.path.dirname(os.path.dirname(path[0])))
-        if name == "" or name == None:
-            name = f"useradd-wine-{random.randint(0, 99999)}"
-        #binPath = os.path.dirname(os.path.dirname(path[0]))
-        os.makedirs(f"{programPath}/{name}/bin")
-        if os.system(f"ln -s '{path[0]}' '{programPath}/{name}/bin/wine'") != 0:
-            QtWidgets.QMessageBox.critical(window, "新建wine映射失败")
+        name = os.path.splitext(os.path.basename(path[0]))[0]
+        removeSymbol = ["(", ")", "（", "）", " ", "!", "@", "#", 
+                        "$", "%", "^", "&", "*", "=", "[", "]",
+                        "{", "}", "\\", "/", "|", "?",
+                        "<", ">", "·", "「", ";", ":", "：",
+                        "？", "《", "》", "，", "。", ",", ".",
+                        "`", "~", "～", "、"]
+        for i in removeSymbol:
+            name.replace(i, "")
+        unpackPath = f"{programPath}/{name}"
+        shellCommand = f"""mkdir -p \"{unpackPath}\"
+7z x -y \"{path[0]}\" -o\"{unpackPath}\"
+"""
+        shellFile = open("/tmp/depein-wine-runner-wine-install.sh", "w")
+        shellFile.write(shellCommand)
+        shellFile.close()
+        OpenTerminal("bash /tmp/depein-wine-runner-wine-install.sh")
         # C++ 版注释：不直接用 readwrite 是因为不能覆盖写入
         file = open(f"{programPath}/winelist.json", "w")
         list.append(name)
@@ -357,6 +370,10 @@ def on_delButton_clicked():
         traceback.print_exc()
         QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
 
+def on_downloadWineFromCloudDisk_clicked():
+    QtWidgets.QMessageBox.information(window, "提示", "即将在浏览器打开下载页面\n访问密码为 2061")
+    webbrowser.open_new_tab("http://ctfile.gfdgdxi.top/d/31540479-61624693-080e74?p=2061")
+
 # 获取当前语言
 def get_now_lang()->"获取当前语言":
     return os.getenv('LANG')
@@ -403,6 +420,7 @@ if __name__ == "__main__":
     # 连接信号
     ui.addButton.clicked.connect(on_addButton_clicked)
     ui.delButton.clicked.connect(on_delButton_clicked)
+    ui.downloadWineFromCloudDisk.clicked.connect(on_downloadWineFromCloudDisk_clicked)
     ui.addOtherWine.clicked.connect(InstallOtherWine)
     ui.changeSourcesGroup.triggered.connect(ChangeSources)
     ## 加载内容