2.4.0

Merge pull request !17 from RX6900XT/master

spark-dwine-helper/build.sh

@@ -25,7 +25,7 @@ Version: $version
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
-Depends: zenity, p7zip-full, fonts-noto-cjk,deepin-wine-helper(>=5.1) | com.wine-helper.deepin,transhell
+Depends: zenity, p7zip-full, fonts-noto-cjk,transhell
 Section: utils
 Priority: extra
 Recommends: spark-dwine-helper-settings
@@ -85,7 +85,7 @@ Version: $version
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
-Depends: zenity, p7zip-full, fonts-noto-cjk,deepin-wine-helper(>=5.1) | com.wine-helper.deepin,transhell
+Depends: zenity, p7zip-full, fonts-noto-cjk,transhell
 Section: utils
 Priority: extra
 Recommends: spark-dwine-helper-settings
@@ -112,11 +112,11 @@ SIZE=`echo ${SIZE%%.*}`
 
 cat  << EOF >pkg/DEBIAN/control
 Package: spark-dwine-helper-settings
-Version: 1.3.1
+Version: 1.3.2
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
-Depends: spark-dwine-helper(>=1.6),transhell
+Depends: spark-dwine-helper(>=1.6),transhell,zenity
 Section: utils
 Priority: extra
 Multi-Arch: foreign

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_get_tray_window

@@ -0,0 +1,28 @@
+#!/usr/bin/env python2
+# vim: set ts=4 sw=4 fileencoding=utf-8:
+# Luomio <nohappiness@gmail.com>
+# Filename: dde-first-run.py
+# Create Date: 27-03, 13
+
+def get_tray_window():
+    try:
+        import gobject
+        from dbus import glib
+        import dbus
+    except ImportError:
+        return False
+
+    gobject.threads_init()
+    glib.init_threads()
+    bus = dbus.SessionBus()
+    traymanager = bus.get_object("com.deepin.dde.TrayManager", "/com/deepin/dde/TrayManager")
+
+    windows = traymanager.Get("com.deepin.dde.TrayManager","TrayIcons")
+    str="window_id:"
+    for i in xrange(len(windows)):
+        str += '{:#x} '.format(windows[i])
+
+    print(str)
+
+if __name__ == "__main__":
+    get_tray_window()

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_kill.sh

@@ -0,0 +1,277 @@
+#!/bin/bash
+#####因为arm版本的deepin-wine-helper不带这个，又不想破坏x86兼容性，故改名
+APP_NAME="QQ"
+LOG_FILE=$0
+SHELL_DIR=${0%/*}
+if [ $SPECIFY_SHELL_DIR ]; then
+    SHELL_DIR=$SPECIFY_SHELL_DIR
+fi
+
+PUBLIC_DIR="/var/public"
+
+UsePublicDir()
+{
+    if [ -z "$USE_PUBLIC_DIR" ]; then
+        echo "Don't use public dir"
+        return 1
+    fi
+    if [ ! -d "$PUBLIC_DIR" ];then
+        echo "Not found $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -r "$PUBLIC_DIR" ];then
+        echo "Can't read for $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -w "$PUBLIC_DIR" ];then
+        echo "Can't write for $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -x "$PUBLIC_DIR" ];then
+        echo "Can't excute for $PUBLIC_DIR"
+        return 1
+    fi
+
+    return 0
+}
+
+WINE_BOTTLE="$HOME/.deepinwine"
+
+if UsePublicDir;then
+    WINE_BOTTLE="$PUBLIC_DIR"
+fi
+
+get_wine_by_pid()
+{
+    wine_path=$(cat /proc/$1/maps | grep -E "\/wine$|\/wine64$|\/wine |\/wine64 " | head -1 | awk '{print $6}')
+    if [ -z "$wine_path" ];then
+        cat /proc/$1/cmdline| xargs -0 -L1 -I{} echo {} | grep -E "\/wine$|\/wine64$|\/wine |\/wine64 " | head -1
+    else
+        echo $wine_path
+    fi
+}
+
+is_wine_process()
+{
+    wine_module=$(get_wine_by_pid $1)
+    if [ -z "$wine_module" ];then
+        wine_module=$(cat /proc/$1/maps | grep -E "\/wineserver$" | head -1)
+    fi
+    echo $wine_module
+}
+
+get_prefix_by_pid()
+{
+    WINE_PREFIX=$(xargs -0 printf '%s\n' < /proc/$1/environ | grep WINEPREFIX)
+    WINE_PREFIX=${WINE_PREFIX##*=}
+    if [ -z "$WINE_PREFIX" ] && [ -n "$(is_wine_process $1)" ]; then
+        #不指定容器的情况用默认容器目录
+        WINE_PREFIX="$HOME/.wine"
+    fi
+    if [ -n "$WINE_PREFIX" ];then
+        WINE_PREFIX=$(realpath $WINE_PREFIX)
+        echo $WINE_PREFIX
+    fi
+}
+
+get_wineserver()
+{
+    if [ -z "$1" ];then
+        return
+    fi
+    targ_prefix=$(realpath $1)
+    ps -ef | grep wineserver | while read server_info ;do
+        debug_log_to_file "get server info: $server_info"
+        server_pid=$(echo $server_info | awk '{print $2}')
+        server_prefix=$(get_prefix_by_pid $server_pid)
+        debug_log_to_file "get server pid $server_pid, prefix: $server_prefix"
+
+        if [ "$targ_prefix" = "$server_prefix" ];then
+            server=$(echo $server_info | awk '{print $NF}')
+            if [ "-p0" = "$server" ];then
+                server=$(echo $server_info | awk '{print $(NF-1)}')
+            fi
+            debug_log_to_file "get server $server"
+            echo $server
+            return
+        fi
+    done
+}
+
+init_log_file()
+{
+    if [ -d "$DEBUG_LOG" ];then
+        LOG_DIR=$(realpath $DEBUG_LOG)
+        if [ -d "$LOG_DIR" ];then
+            LOG_FILE="${LOG_DIR}/${LOG_FILE##*/}.log"
+            echo "" > "$LOG_FILE"
+            debug_log "LOG_FILE=$LOG_FILE"
+        fi
+    fi
+}
+
+debug_log_to_file()
+{
+    if [ -d "$DEBUG_LOG" ];then
+        strDate=$(date)
+        echo -e "${strDate}:${1}" >> "$LOG_FILE"
+    fi
+}
+
+debug_log()
+{
+    strDate=$(date)
+    echo "${strDate}:${1}"
+}
+
+init_log_file
+
+get_bottle_path_by_process_id()
+{
+    PID_LIST="$1"
+    PREFIX_LIST=""
+
+    for pid_var in $PID_LIST ; do
+        WINE_PREFIX=$(get_prefix_by_pid $pid_var)
+        #去掉重复项
+        for path in $(echo -e $PREFIX_LIST) ; do
+            if [[ $path == "$WINE_PREFIX" ]]; then
+                WINE_PREFIX=""
+            fi
+        done
+        if [ -d "$WINE_PREFIX" ]; then
+            debug_log_to_file "found $pid_var : $WINE_PREFIX"
+            PREFIX_LIST+="\n$WINE_PREFIX"
+        fi
+    done
+    echo -e $PREFIX_LIST
+}
+
+get_pid_by_process_name()
+{
+    PID_LIST=""
+    for pid_var in $(ps -ef | grep -E -i "$1" | grep -v grep | awk '{print $2}');do
+        #通过判断是否加载wine来判断是不是wine进程
+        if [ -n "$(is_wine_process $pid_var)" ];then
+            PID_LIST+=" $pid_var"
+        fi
+    done
+    echo "$PID_LIST"
+}
+
+get_bottle_path_by_process_name()
+{
+    PID_LIST=$(get_pid_by_process_name $1)
+    debug_log_to_file "get pid list: $PID_LIST"
+    get_bottle_path_by_process_id "$PID_LIST"
+}
+
+get_bottle_path()
+{
+    if [ -z "$1" ];then
+        return 0
+    fi
+
+    if [ -f "$1/user.reg" ]; then
+        realpath "$1"
+        return 0
+    fi
+
+    if [ -f "$WINE_BOTTLE/$1/user.reg" ]; then
+        realpath "$WINE_BOTTLE/$1"
+        return 0
+    fi
+    get_bottle_path_by_process_name "$1"
+}
+
+kill_app()
+{
+    debug_log "try to kill $1"
+    for path in $(get_bottle_path $1); do
+        if [ -n "$path" ];then
+            WINESERVER=$(get_wineserver "$path")
+
+            if [ -f "$WINESERVER" ];then
+                debug_log "kill $path by $WINESERVER"
+                env WINEPREFIX="$path" "$WINESERVER" -k
+            fi
+
+            PID_LIST=$(get_pid_by_process_name "exe|wine")
+            for tag_pid in $PID_LIST; do
+                bottle=$(get_bottle_path_by_process_id "$tag_pid")
+                bottle=${bottle:1}
+                if [ "$path" = "$bottle" ];then
+                    echo "kill $tag_pid for $bottle"
+                    kill -9 $tag_pid
+                fi
+            done
+        fi
+    done
+
+    #Kill defunct process
+    ps -ef | grep -E "$USER.*exe.*<defunct>"
+    ps -ef | grep -E "$USER.*exe.*<defunct>" | grep -v grep | awk '{print $2}' | xargs -i kill -9 {}
+}
+
+get_tray_window()
+{
+    $SHELL_DIR/spark_get_tray_window | awk -F: '{print $2}'
+}
+
+get_stacking_window()
+{
+    xprop -root _NET_CLIENT_LIST_STACKING | awk -F# '{print $2}' | sed -e 's/, / /g'
+}
+
+get_window_pid()
+{
+    for winid in $(echo "$1" | sed -e 's/ /\n/g') ;
+    do
+        xprop -id $winid _NET_WM_PID | awk -F= '{print $2}'
+    done
+}
+
+get_window_bottle()
+{
+    debug_log_to_file "get_window_bottle $1"
+    PID_LIST=$(get_window_pid "$1")
+    debug_log_to_file "get_window_bottle pid list: $PID_LIST"
+    get_bottle_path_by_process_id "$PID_LIST"
+}
+
+get_active_bottles()
+{
+    TRAYWINDOWS=$(get_tray_window)
+    STACKINGWINDOWS=$(get_stacking_window)
+    debug_log_to_file "tray window id: $TRAYWINDOWS"
+    debug_log_to_file "stacking window id: $STACKINGWINDOWS"
+    PID_LIST="$TRAYWINDOWS $STACKINGWINDOWS"
+    get_window_bottle "$PID_LIST"
+}
+
+kill_exit_block_app()
+{
+    TAGBOTTLE=$(get_bottle_path $1)
+    debug_log "tag bottle: $TAGBOTTLE"
+    ACTIVEBOTTLES=$(get_active_bottles)
+    debug_log "active bottles: $ACTIVEBOTTLES"
+
+    if [[ "$ACTIVEBOTTLES" != *"$TAGBOTTLE"* ]]; then
+         kill_app "$TAGBOTTLE"
+    fi
+}
+
+#get_active_bottles
+#exit
+
+debug_log "kill $1 $2"
+
+if [ -n "$1" ]; then
+    APP_NAME="$1"
+fi
+
+if [ "$2" = "block" ]; then
+    kill_exit_block_app $APP_NAME $3
+else
+    kill_app $APP_NAME
+fi

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh

@@ -134,7 +134,7 @@ CallProcess()
     is_autostart $DEB_PACKAGE_NAME
     autostart=$?
     if [ $autostart -ne 0 ];then
-        $SHELL_DIR/kill.sh "$BOTTLENAME" block
+        $SHELL_DIR/spark_kill.sh "$BOTTLENAME" block
     fi
 
     #change current dir to excute path
@@ -148,11 +148,23 @@ CallProcess()
     fi
     # Disable winemenubuilder
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe /f
+    # Link to Document
+if [ -L "$WINEPREFIX/drive_c/users/$(logname)/My Documents" ]; then
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ  /v Personal /d "%USERPROFILE%\My Documents" /f
+
+else
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ  /v Personal /d "%USERPROFILE%\Documents" /f
+
+fi
+    
+
+    
+    
     debug_log_to_file "Starting process $* ..."
 
 	#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
 	/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@"
 
     #start autobottle
     if [ $autostart -eq 0 ];then
@@ -164,314 +176,7 @@ CallProcess()
 ###有设置mimetype和自动启动(这个暂时没分析)的功能
 
 ###########专属优化段：
-CallSpark-MailMaster()
-{
-CallProcess "$@"
-sleep 2
-/opt/apps/com.163.dashi.mailmaster.spark/files/disable_mailmaster_shadows
-}
 
-CallSpark-CloudMusic()
-{
-CallProcess "$@"
-sleep 2
-/opt/apps/com.163.music.spark/files/disable_cloudmusic_shadows
-}
-
-CalleCloud()
-{
-    DisableWrite ${WINEPREFIX}/drive_c/users/${USER}/Temp
-    CallProcess "$@"
-}
-
-CallQQMusic()
-{
-    if [ -e ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/QQMusic.exe ]; then
-    sleep 1
-    rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.log
-    else
-       mkdir ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
-       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.dll ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
-       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.exe ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
-       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.rdb ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
-       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.log ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
-       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/QQMusic* ${WINEPREFIX}/drive_c/Program\ Files/Tencent
-       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic
-       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
-       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/*.log
-       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic* ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic
-    fi
-    CallProcess "$@"
-}
-
-CallDouyin()
-{
-    if [ -f "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin" ]; then
-       rm "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin"
-       mv ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/*.tmp ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/douyin
-       chmod 755 ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/douyin
-    fi
-    CallProcess "$@"
-}
-
-CallMuBu()
-{
-    if [ -f "${WINEPREFIX}/drive_c/ProgramData/Microsoft/Windows/Start\ Menu/Programs/MuBu.lnk" ]; then
-       chmod 555 ${WINEPREFIX}/drive_c/ProgramData/Microsoft/Windows/Start\ Menu/Programs/MuBu.lnk
-    fi
-    CallProcess "$@"
-}
-
-CallFlyele() 
-{
-    if [ -w ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports ]; then
-       rm -rf ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports/*
-       chmod 555 ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports
-    fi
-    CallProcess "$@"
-}
-
-CallZhuMu()
-{
-    #change current dir to excute path
-    path=$(dirname "$path")
-    cd "$path"
-    pwd
-
-    #Set default mime type
-    if [ -n "$MIME_TYPE" ]; then
-        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
-    fi
-
-    debug_log_to_file "Starting process $* ..."
-    if [ -n "$2" ];then
-        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" "--url=$2" &
-    else
-        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &
-    fi
-}
-
-CallQQGame()
-{
-    debug_log "run $1"
-    $SHELL_DIR/kill.sh qqgame block
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &
-}
-
-CallQQ()
-{
-    if [ ! -f "$WINEPREFIX/../.QQ_run" ]; then
-        debug_log "first run time"
-        $SHELL_DIR/add_hotkeys
-        $SHELL_DIR/fontconfig
-        touch "$WINEPREFIX/../.QQ_run"
-    fi
-
-    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQ/Bin/QQLiveMPlayer"
-    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQ/Bin/QQLiveMPlayer1"
-    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QzoneMusic"
-
-    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQBrowser"
-    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/QQBrowser"
-    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQBrowserBin"
-    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQBrowserDefault"
-    DisableWrite "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/QQBrowserDefault"
-
-    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQPCMgr"
-    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/QQPCMgr"
-
-    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/HuaYang"
-    DisableWrite "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/HuaYang"
-
-    CallProcess "$@"
-}
-
-
-CallTIM()
-{
-    if [ ! -f "$WINEPREFIX/../.QQ_run" ]; then
-        debug_log "first run time"
-        $SHELL_DIR/add_hotkeys
-####似乎是给dde-control-center添加快捷键
-        $SHELL_DIR/fontconfig
-####暂时无法得知用途和用法
-        # If the bottle not exists, run reg may cost lots of times
-        # So create the bottle befor run reg
-        env WINEPREFIX="$WINEPREFIX" $WINE_CMD uninstaller --list
-        touch $WINEPREFIX/../.QQ_run
-    fi
-
-    CallProcess "$@"
-
-    #disable Tencent MiniBrowser
-    _DeleteRegistry "HKCU\\Software\\Tencent\\MiniBrowser"
-}
-
-CallWeChat()
-{
-    export DISABLE_RENDER_CLIPBOARD=1
-    CallProcess "$@"
-}
-
-CallWangWang()
-{
-    chmod 700 "$WINEPREFIX/drive_c/Program Files/AliWangWang/9.12.10C/wwbizsrv.exe"
-    chmod 700 "$WINEPREFIX/drive_c/Program Files/Alibaba/wwbizsrv/wwbizsrv.exe"
-    if [ $# = 3 ] && [ -z "$3" ];then
-        EXEC_PATH="c:/Program Files/AliWangWang/9.12.10C/WWCmd.exe"
-        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$EXEC_PATH" "$2" &
-    else
-    	CallProcess "$@"
-    fi
-}
-
-CallWXWork()
-{
-    if [ -d "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/Update" ]; then
-        rm -rf "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/Update"
-    fi
-    if [ -d "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/upgrade" ]; then
-        rm -rf "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/upgrade"
-    fi
-    #Support use native file dialog
-
-    CallProcess "$@"
-}
-
-CallDingTalk()
-{
-    debug_log "run $1"
-    $SHELL_DIR/kill.sh DingTalk block
-
-    CallProcess "$@"
-}
-
-
-
-CallMeiTuXiuXiu()
-{
-    #set -- "$1" "${2#file://*}"
-    local path=$(urldecode "$2")
-    path=${path/file:\/\//}
-    set -- "$1" "$path"
-	if [ "$path" ];then 
-    CallProcess "$@"
-	else
-	CallProcess "$1"
-	fi
-}
-
-CallFastReadPDF()
-{
-    #set -- "$1" "${2#file://*}"
-    local path=$(urldecode "$2")
-    path=${path/file:\/\//}
-    set -- "$1" "$path"
-	if [ "$path" ];then 
-    CallProcess "$@"
-	else
-	CallProcess "$1"
-	fi
-}
-
-CallEvernote()
-{
-    #set -- "$1" "${2#file://*}"
-    local path=$(urldecode "$2")
-    path=${path/file:\/\//}
-    set -- "$1" "$path"
-	if [ "$path" ];then 
-    CallProcess "$@"
-	else
-	CallProcess "$1"
-	fi
-}
-
-CallTencentVideo()
-{
-    if [ -f "${WINEPREFIX}/drive_c/Program Files/Tencent/QQLive/Upgrade.dll" ]; then
-        rm -rf "${WINEPREFIX}/drive_c/Program Files/Tencent/QQLive/Upgrade.dll"
-    fi
-
-    CallProcess "$@"
-}
-
-CallFoxmail()
-{
-    sed -i '/LogPixels/d' ${WINEPREFIX}/user.reg
-    CallProcess "$@"
-}
-
-CallTHS()
-{
-    $SHELL_DIR/kill.sh ths block
-
-    debug_log "Start run $1"
-    #get file full path
-    path="$1"
-    path=$(echo ${path/c:/${WINEPREFIX}/drive_c})
-    path=$(echo ${path//\\/\/})
-
-    #kill bloack process
-    name="${path##*/}"
-    $SHELL_DIR/kill.sh "$name" block
-
-    #change current dir to excute path
-    path=$(dirname "$path")
-    cd "$path"
-    pwd
-
-    #Set default mime type
-    if [ -n "$MIME_TYPE" ]; then
-        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
-    fi
-
-    CallProcess "$@"
-}
-
-CallQQGameV2()
-{
-    debug_log "run $1"
-    $SHELL_DIR/kill.sh QQMicroGameBox block
-    CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: 
-}
-
-
-
-CallPsCs6()
-{
-    #get file full path
-    path="$1"
-    path=$(echo ${path/c:/${WINEPREFIX}/drive_c})
-    path=$(echo ${path//\\/\/})
-
-    #kill bloack process
-    name="${path##*/}"
-    $SHELL_DIR/kill.sh "$name" block
-
-    #change current dir to excute path
-    path=$(dirname "$path")
-    cd "$path"
-    pwd
-
-    #Set default mime type
-    if [ -n "$MIME_TYPE" ]; then
-        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
-    fi
-
-    debug_log_to_file "Starting process $* ..."
-
-    CallProcess "$@"
-}
-
-CallIE8()
-{
-    rm -f "$WINEPREFIX/system.reg"
-    cp $APPDIR/system.reg "$WINEPREFIX/system.reg"
-    CallProcess "$@"
-}
-
-#####专属优化段结束
 
 UnixUriToDosPath()
 {
@@ -494,95 +199,16 @@ CallApp()
     FixLink
     debug_log "CallApp $BOTTLENAME arg count $#: $*"
 
-    case $BOTTLENAME in
-        "Deepin-WangWang")
-            CallWangWang "$@"
-            ;;
-        "Deepin-ZhuMu")
-            CallZhuMu "$@"
-            ;;
-        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ"|"Deepin-QQ-Spark")
-            CallQQ "$@"
-            ;;
-        "Deepin-TIM"|"Spark-TIM")
-            CallTIM "$@"
-            ;;
-        "Deepin-QQGame"*)
-            CallQQGame "$@"
-            ;;
-        "Deepin-ATM")
-            CallATM "$@"
-            ;;
-        "Deepin-WeChat")
-            CallWeChat "$@"
-            ;;
-        "Deepin-WXWork"|"Spark-WeCom"|"wxwork-spark-uk")
-            CallWXWork "$@"
-            ;;
-        "Deepin-Dding")
-            CallDingTalk "$@"
-            ;;
-        "Deepin-MTXX")
-            CallMeiTuXiuXiu "$@"
-            ;;
-        "Deepin-FastReadPDF")
-            CallFastReadPDF "$@"
-            ;;
-        "Deepin-Evernote")
-            CallEvernote "$@"
-            ;;
-        "Deepin-TencentVideo")
-            CallTencentVideo "$@"
-            ;;
-        "Deepin-Foxmail")
-            CallFoxmail "$@"
-            ;;
-        "Deepin-THS")
-            CallTHS "$@"
-            ;;
-        "Deepin-QQHlddz")
-            CallQQGameV2 "$1" 363
-            ;;
-        "Deepin-QQBydr")
-            CallQQGameV2 "$1" 1104632801
-            ;;
-        "Deepin-QQMnsj")
-            CallQQGameV2 "$1" 1105856612
-            ;;
-        "Deepin-QQSszb")
-            CallQQGameV2 "$1" 1105640244
-            ;;
-        "Deepin-CS6")
-            CallPsCs6 "$@"
-            ;;
-        "Spark-MuBu")
-            CallMuBu "$@"
-            ;;
-        "Spark-flyele")
-            CallFlyele "$@"
-            ;;
-	 "Spark-douyin")
-            CallDouyin "$@"
-            ;;
-	 "Spark-ecloud")
-            CalleCloud "$@"
-            ;;
-	 "IE8")
-            CallIE8 "$@"
-            ;;
-	 "Spark-QQMusic")
-            CallQQMusic "$@"
-            ;;
-	 "Spark-CloudMusic")
-            CallSpark-CloudMusic "$@" "$@"
-            ;;
-	 "Spark-MailMaster")
-            CallSpark-MailMaster "$@"
-            ;;
-        *)        
-            CallProcess "$@"
-            ;;
-    esac
+APP_CONFIG_PATH="/opt/deepinwine/tools/spark_run_v4_app_configs/${BOTTLENAME}.sh"
+
+if [ -f "$APP_CONFIG_PATH" ]; then
+  echo "执行 ${BOTTLENAME}.sh ..."
+  source $APP_CONFIG_PATH
+else
+  echo "$APP_CONFIG_PATH 文件不存在，执行通用启动"
+  CallProcess "$@"
+fi
+
 }
 ExtractApp()
 {
@@ -632,7 +258,7 @@ UpdateApp()
     esac
 
 	ExtractApp "${WINEPREFIX}.tmpdir"
-	$SHELL_DIR/updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
+	$SHELL_DIR/spark_updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
 
 
 	rm -rf "${WINEPREFIX}.tmpdir"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-CS6.sh

@@ -0,0 +1,22 @@
+    #get file full path
+    path="$1"
+    path=$(echo ${path/c:/${WINEPREFIX}/drive_c})
+    path=$(echo ${path//\\/\/})
+
+    #kill bloack process
+    name="${path##*/}"
+    $SHELL_DIR/spark_kill.sh "$name" block
+
+    #change current dir to excute path
+    path=$(dirname "$path")
+    cd "$path"
+    pwd
+
+    #Set default mime type
+    if [ -n "$MIME_TYPE" ]; then
+        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
+    fi
+
+    debug_log_to_file "Starting process $* ..."
+
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Dding.sh

@@ -0,0 +1,4 @@
+    debug_log "run $1"
+    $SHELL_DIR/spark_kill.sh DingTalk block
+
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Evernote.sh

@@ -0,0 +1,9 @@
+    #set -- "$1" "${2#file://*}"
+    local path=$(urldecode "$2")
+    path=${path/file:\/\//}
+    set -- "$1" "$path"
+	if [ "$path" ];then 
+    CallProcess "$@"
+	else
+	CallProcess "$1"
+	fi

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-FastReadPDF.sh

@@ -0,0 +1,9 @@
+    #set -- "$1" "${2#file://*}"
+    local path=$(urldecode "$2")
+    path=${path/file:\/\//}
+    set -- "$1" "$path"
+	if [ "$path" ];then 
+    CallProcess "$@"
+	else
+	CallProcess "$1"
+	fi

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Foxmail.sh

@@ -0,0 +1,2 @@
+    sed -i '/LogPixels/d' ${WINEPREFIX}/user.reg
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-MTXX.sh

@@ -0,0 +1,9 @@
+    #set -- "$1" "${2#file://*}"
+    local path=$(urldecode "$2")
+    path=${path/file:\/\//}
+    set -- "$1" "$path"
+	if [ "$path" ];then 
+    CallProcess "$@"
+	else
+	CallProcess "$1"
+	fi

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ-Spark.sh

@@ -0,0 +1 @@
+Deepin-QQ.sh

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+if [ ! -f "$WINEPREFIX/../.QQ_run" ]; then
+        debug_log "first run time"
+        $SHELL_DIR/add_hotkeys
+        $SHELL_DIR/fontconfig
+        touch "$WINEPREFIX/../.QQ_run"
+    fi
+
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQ/Bin/QQLiveMPlayer"
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQ/Bin/QQLiveMPlayer1"
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QzoneMusic"
+
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQBrowser"
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/QQBrowser"
+    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQBrowserBin"
+    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQBrowserDefault"
+    DisableWrite "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/QQBrowserDefault"
+
+    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQPCMgr"
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/QQPCMgr"
+
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/HuaYang"
+    DisableWrite "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/HuaYang"
+
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQBydr.sh

@@ -0,0 +1,3 @@
+    debug_log "run $1"
+    $SHELL_DIR/spark_kill.sh QQMicroGameBox block
+    CallProcess "$1" -action:force_download -appid:1104632801 -pid:8 -bin_version:1.1.2.4 -loginuin: 

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQGame.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+    debug_log "run $1"
+    $SHELL_DIR/spark_kill.sh qqgame block
+    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQHlddz.sh

@@ -0,0 +1,3 @@
+    debug_log "run $1"
+    $SHELL_DIR/spark_kill.sh QQMicroGameBox block
+    CallProcess "$1" -action:force_download -appid:363 -pid:8 -bin_version:1.1.2.4 -loginuin: 

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQMnsj.sh

@@ -0,0 +1,3 @@
+    debug_log "run $1"
+    $SHELL_DIR/spark_kill.sh QQMicroGameBox block
+    CallProcess "$1" -action:force_download -appid:1105856612 -pid:8 -bin_version:1.1.2.4 -loginuin: 

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQSszb.sh

@@ -0,0 +1,3 @@
+    debug_log "run $1"
+    $SHELL_DIR/spark_kill.sh QQMicroGameBox block
+    CallProcess "$1" -action:force_download -appid:1105640244 -pid:8 -bin_version:1.1.2.4 -loginuin: 

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-THS.sh

@@ -0,0 +1,23 @@
+   $SHELL_DIR/spark_kill.sh ths block
+
+    debug_log "Start run $1"
+    #get file full path
+    path="$1"
+    path=$(echo ${path/c:/${WINEPREFIX}/drive_c})
+    path=$(echo ${path//\\/\/})
+
+    #kill bloack process
+    name="${path##*/}"
+    $SHELL_DIR/spark_kill.sh "$name" block
+
+    #change current dir to excute path
+    path=$(dirname "$path")
+    cd "$path"
+    pwd
+
+    #Set default mime type
+    if [ -n "$MIME_TYPE" ]; then
+        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
+    fi
+
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-TIM.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+    if [ ! -f "$WINEPREFIX/../.QQ_run" ]; then
+        debug_log "first run time"
+        $SHELL_DIR/add_hotkeys
+####似乎是给dde-control-center添加快捷键
+        $SHELL_DIR/fontconfig
+####暂时无法得知用途和用法
+        # If the bottle not exists, run reg may cost lots of times
+        # So create the bottle befor run reg
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD uninstaller --list
+        touch $WINEPREFIX/../.QQ_run
+    fi
+
+    CallProcess "$@"
+
+    #disable Tencent MiniBrowser
+    _DeleteRegistry "HKCU\\Software\\Tencent\\MiniBrowser"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-TencentVideo.sh

@@ -0,0 +1,5 @@
+    if [ -f "${WINEPREFIX}/drive_c/Program Files/Tencent/QQLive/Upgrade.dll" ]; then
+        rm -rf "${WINEPREFIX}/drive_c/Program Files/Tencent/QQLive/Upgrade.dll"
+    fi
+
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WXWork.sh

@@ -0,0 +1,9 @@
+    if [ -d "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/Update" ]; then
+        rm -rf "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/Update"
+    fi
+    if [ -d "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/upgrade" ]; then
+        rm -rf "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/upgrade"
+    fi
+    #Support use native file dialog
+
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WangWang.sh

@@ -0,0 +1,9 @@
+#/bin/bash
+    chmod 700 "$WINEPREFIX/drive_c/Program Files/AliWangWang/9.12.10C/wwbizsrv.exe"
+    chmod 700 "$WINEPREFIX/drive_c/Program Files/Alibaba/wwbizsrv/wwbizsrv.exe"
+    if [ $# = 3 ] && [ -z "$3" ];then
+        EXEC_PATH="c:/Program Files/AliWangWang/9.12.10C/WWCmd.exe"
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$EXEC_PATH" "$2" &
+    else
+    	CallProcess "$@"
+    fi

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WeChat.sh

@@ -0,0 +1,2 @@
+    export DISABLE_RENDER_CLIPBOARD=1
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-ZhuMu.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+    #change current dir to excute path
+    path=$(dirname "$path")
+    cd "$path"
+    pwd
+
+    #Set default mime type
+    if [ -n "$MIME_TYPE" ]; then
+        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
+    fi
+
+    debug_log_to_file "Starting process $* ..."
+    if [ -n "$2" ];then
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" "--url=$2" &
+    else
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &
+    fi

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/IE8.sh

@@ -0,0 +1,3 @@
+    rm -f "$WINEPREFIX/system.reg"
+    cp $APPDIR/system.reg "$WINEPREFIX/system.reg"
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-CloudMusic.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+CallProcess "$@"
+sleep 2
+/opt/apps/com.163.music.spark/files/disable_cloudmusic_shadows

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-MailMaster.sh

@@ -0,0 +1,3 @@
+CallProcess "$@"
+sleep 2
+/opt/apps/com.163.dashi.mailmaster.spark/files/disable_mailmaster_shadows

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-MuBu.sh

@@ -0,0 +1,4 @@
+    if [ -f "${WINEPREFIX}/drive_c/ProgramData/Microsoft/Windows/Start\ Menu/Programs/MuBu.lnk" ]; then
+       chmod 555 ${WINEPREFIX}/drive_c/ProgramData/Microsoft/Windows/Start\ Menu/Programs/MuBu.lnk
+    fi
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-QQ.sh

@@ -0,0 +1 @@
+Deepin-QQ.sh

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-QQMusic.sh

@@ -0,0 +1,16 @@
+    if [ -e ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/QQMusic.exe ]; then
+    sleep 1
+    rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.log
+    else
+       mkdir ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.dll ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.exe ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.rdb ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.log ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/QQMusic* ${WINEPREFIX}/drive_c/Program\ Files/Tencent
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/*.log
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic* ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic
+    fi
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-TIM.sh

@@ -0,0 +1 @@
+Deepin-TIM.sh

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-WeCom.sh

@@ -0,0 +1 @@
+Deepin-WXWork.sh

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-WeixinTasting.sh

@@ -0,0 +1 @@
+Deepin-WeChat.sh

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-douyin.sh

@@ -0,0 +1,6 @@
+    if [ -f "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin" ]; then
+       rm "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin"
+       mv ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/*.tmp ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/douyin
+       chmod 755 ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/douyin
+    fi
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-ecloud.sh

@@ -0,0 +1,2 @@
+    DisableWrite ${WINEPREFIX}/drive_c/users/${USER}/Temp
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-flyele.sh

@@ -0,0 +1,5 @@
+    if [ -w ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports ]; then
+       rm -rf ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports/*
+       chmod 555 ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports
+    fi
+    CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-weixin.sh

@@ -0,0 +1,37 @@
+echo 
+echo "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣾⡟⠉⠻⣷⡄⠀⠀⠀⠀⠀⠀⢀⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⣴⣶⣶⣿⣿⡄⠀⠀⢀⣤⣾⠿⠻⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣤⣾⣿⣏⡁⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡿⢿⣿⣯⣀⣿⣿⡿⢿⣿⣿⣿⣿⣿⣷⣄⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⣿⣶⣬⡙⠿⠋⣡⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⣀⣀⣀⣀⣀⠀⠀⠀⠀⠀⠈⢻⣿⣿⠟⣁⣴⣤⡙⠻⣿⣿⣿⣿⣿⣿⣿⣿⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠺⢿⣿⣿⣿⢿⠇⠀⠀⠀⠀⠀⠀⠹⣷⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠛⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⣖⣆⣀⣀⣀⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀⠙⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⣿⠟⠛⠛⠛⠛⠛⠛⠛⠷⠿⠿⢿⣷⣶⣤⣤⣀⣸⣿⣿⣿⣿⣿⣿⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠛⢻⡏⠁⣈⢻⠙⣿⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠛⣲⡟⠞⢀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⣿⡇⠀⠀⠀⠀⢀⣀⣀⣤⣤⣤⣤⣤⣶⣶⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣶⣤⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⣿⣷⣶⣾⡿⠿⠿⠛⢛⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⣄⠀⠀⠀⠀⠀⠀⠀⢀⣠⡤⣀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠙⠋⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡄⠀⠀⠀⢠⣾⣿⣿⣿⣿⡆⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⣠⣿⣿⣿⣿⣥⣼⣿⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣆⠀⠀⠸⠽⠻⣿⡿⠟⠁⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣾⣿⣁⣼⣿⣿⣿⣿⣿⢻⣿⡀⠙⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀⣀⣤⣤⣄⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣾⣿⣿⣶⣿⣿⣿⣿⣿⣿⣇⠀⠀⠀⢿⣿⣿⣿⠇⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡄⠀⠀⠀⠉⠉⠁⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⠾⣿⣿⣿⣿⣿⣿⣿⡿⠷⣬⡻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⠀⢘⣿⣿⣿⣿⣿⠏⠀⠀⣀⣤⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠻⣿⣿⣿⣿⣿⣿⣿⣿⠁⠀⠈⠙⢿⣿⣷⣾⣿⠿⣿⣿⣇⣤⣶⣿⣿⠿⠛⠋⠙⠻⣿⣿⣿⣿⣿⣿⣿⣿⣧⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠉⠻⣿⣿⣿⣿⣷⠀⠀⣠⣶⣿⠿⠉⠁⠀⠀⠀⠉⠉⠉⠻⣿⣷⣄⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣤⣤⣤⣤⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠙⠿⣿⣿⣿⣷⠿⡿⠋⠀⠀⠀⠀⣄⢀⣀⠀⠀⠀⠀⠀⠙⢿⣷⣄⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠛⠀⠀⠀⠀⠀
+⣀⣀⠀⠀⠀⠀⢀⣴⣿⣿⠛⠀⠀⢸⣧⡿⠀⠀⣸⠋⠋⠉⢻⡄⠀⠀⠀⠀⠀⠉⢁⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀
+⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣄⠀⠀⠈⠀⠀⠀⢻⣀⣀⣀⣀⡿⠀⠀⠀⠀⠀⠀⠀⢉⣭⣭⣽⣿⣿⣿⣿⣿⣿⣿⣿⣦⣄⠀⠀⠀⠀⠀⣀⣤⡄
+⠘⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⣄⣀⠀⠀⠀⠉⠀⠀⠉⠀⠀⠀⠀⠀⢀⣀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃
+⠀⠈⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢟⣿⣿⣿⣿⣶⣶⡶⣶⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⠀
+⠀⠀⠀⠈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⢿⡸⣿⣿⣿⣿⣎⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⠀⠀⠀
+⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⣽⣿⣿⡟⠁⠀⢙⣿⣿⣿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡏⠉⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⣿⣿⣿⣦⣶⣿⣿⣿⣿⣿⡿⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⢿⣿⣿⣿⣿⣿⣿⣿⡿⠁⠀⠘⣿⣿⡿⠟⠉⢿⣯⣿⣿⣿⠁⠀⠀⠈⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠙⠿⣿⣿⣿⣿⣿⡇⠀⠀⢸⡟⠋⠀⠀⠀⠀⠙⠛⠋⢸⠀⠀⠀⠀⠀⠘⣿⣿⣿⣿⣿⣿⣿⡿⠿⠛⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⢻⣿⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀⠀⠀⢸⡆⠀⠀⠀⠀⠀⢻⣿⣿⣿⣿⠟⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀"
+
+echo "以此纪念2.4.0版本"
+CallProcess "$@"

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Wine-QQ.sh

@@ -0,0 +1 @@
+Deepin-QQ.sh

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/wxwork-spark-uk.sh

@@ -0,0 +1 @@
+Deepin-WXWork.sh

spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_updater

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# 检查是否提供了-c和-s选项
+if [[ ! "$*" =~ "-c" ]] || [[ ! "$*" =~ "-s" ]]; then
+  echo "用法: updater -c <目标目录> -s <源目录> [-v]"
+  exit 1
+fi
+
+# 解析命令行参数
+while getopts ":c:s:v" opt; do
+  case $opt in
+    c)
+      destination_dir=$OPTARG
+      ;;
+    s)
+      source_dir=$OPTARG
+      ;;
+    v)
+      verbose=true
+      ;;
+    \?)
+      echo "无效选项: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "选项 -$OPTARG 需要一个参数." >&2
+      exit 1
+      ;;
+  esac
+done
+
+# 从源目录复制文件到目标目录
+if [ "$verbose" = true ]; then
+  echo "正在从 $source_dir 复制文件到 $destination_dir"
+fi
+
+# 使用cp命令覆盖同名文件
+cp -rf "$source_dir"/* "$destination_dir"
+
+echo "文件复制完成！"
+exit 0
+

spark-dwine-launch/postrm_template

@@ -40,8 +40,8 @@ echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine
 exit
 fi
 
-if [ -e /opt/deepinwine/tools/kill.sh ];then
-/opt/deepinwine/tools/kill.sh $BOTTLE_NAME
+if [ -e /opt/deepinwine/tools/spark_kill.sh ];then
+/opt/deepinwine/tools/spark_kill.sh $BOTTLE_NAME
 ###这里注意，如果没写BOTTLE_NAME,会把QQ杀了
 fi
 

spark-dwine-launch/run-template_v1.sh

@@ -79,9 +79,9 @@ fi
 
 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-if [ "$APPRUN_CMD" = "spark-wine7-devel" ] && [ -z "$ENABLE_DOT_NET" ];then
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
 
-export WINEDLLOVERRIDES="mscoree,mshtml="
+export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
 #### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
 
 fi
@@ -104,7 +104,7 @@ if [ -n "$EXEC_PATH" ];then
     if [ -z "${EXEC_PATH##*.lnk*}" ];then
         $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
     else
-        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
     fi
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"