From 361f3cf85987ae5f72215250bb58e335c4ca6ecb Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Sat, 30 Sep 2023 09:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96wine=E6=89=93=E5=85=A5deb?=
 =?UTF-8?q?=E5=8C=85=E7=9A=84run.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deepin-wine-packager.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/deepin-wine-packager.py b/deepin-wine-packager.py
index dc96537..a08b5a4 100755
--- a/deepin-wine-packager.py
+++ b/deepin-wine-packager.py
@@ -1291,38 +1291,54 @@ extract_archive()
     fi
 }}
 
+ACTIVEX_NAME=""
 BOTTLENAME="{e5_text.text()}"
 APPVER="{e2_text.text()}"
 EXEC_PATH="@@@EXEC_PATH@@@"
 START_SHELL_PATH="{["/opt/deepinwine/tools/run_v4.sh", "/opt/deepinwine/tools/spark_run_v4.sh"][int(chooseWineHelperValue.isChecked())]}"
 export MIME_TYPE=""
+export MIME_EXEC=""
 export DEB_PACKAGE_NAME="{e1_text.text()}"
 export APPRUN_CMD="$HOME/.deepinwine/{os.path.basename(wine[wineVersion.currentText()]).replace('.7z', '')}/bin/{useInstallWineArch.currentText()}"
+EXPORT_ENVS=""
+EXEC_NAME="@@@EXEC_NAME@@@"
 export PATCH_LOADER_ENV=""
 export FILEDLG_PLUGIN="/opt/apps/$DEB_PACKAGE_NAME/files/gtkGetFileNameDlg"
-DISABLE_ATTACH_FILE_DIALOG="1"
+DISABLE_ATTACH_FILE_DIALOG=""
 export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
 
 DEEPIN_WINE_BIN_DIR=`dirname $APPRUN_CMD`
 DEEPIN_WINE_DIR=`dirname $DEEPIN_WINE_BIN_DIR`
 ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
 
+export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
+
+ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
+
+export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
+
+export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
+
 if [ -n "$PATCH_LOADER_ENV" ] && [ -n "$EXEC_PATH" ];then
     export $PATCH_LOADER_ENV
 fi
 
 extract_archive "$ARCHIVE_FILE_DIR/wine_archive.7z" "$ARCHIVE_FILE_DIR/wine_archive.md5sum" "$DEEPIN_WINE_DIR"
 
-if [ -d "$DEEPIN_WINE_BIN_DIR" ] && [ "$DEEPIN_WINE_BIN_DIR" != "." ];then
-    export DEEPIN_WINE_BIN_DIR
-fi
-
 if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
     export ATTACH_FILE_DIALOG=1
 fi
 
+if [ -n "$EXPORT_ENVS" ];then
+    export $EXPORT_ENVS
+fi
+
 if [ -n "$EXEC_PATH" ];then
-    $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+    if [ -z "${{EXEC_PATH##*.lnk*}}" ];then
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+    else
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+    fi
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
 fi