From 1860bcb1118e410f4183eb61bba9154a21c0038e Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 1 May 2024 22:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E4=B8=8A=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deepinwine/tools/spark_gl-wine/gdid3d.reg | Bin 0 -> 210 bytes .../deepinwine/tools/spark_gl-wine/gl-wine32 | Bin 0 -> 25667 bytes .../deepinwine/tools/spark_gl-wine/gl-wine64 | Bin 0 -> 26401 bytes .../deepinwine/tools/spark_gl-wine/run_gl.sh | 17 ++++ .../deepinwine/tools/spark_run_v4.sh | 83 ++++++++++++------ 5 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gdid3d.reg create mode 100755 spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gl-wine32 create mode 100755 spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gl-wine64 create mode 100755 spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/run_gl.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gdid3d.reg b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gdid3d.reg new file mode 100644 index 0000000000000000000000000000000000000000..d5cf5c2ced5b7143ae26ba835130338bdff3e830 GIT binary patch literal 210 zcmX|*OA5k35Cv;3c!!V!h#)RqsUQe0qESRe#81d3fkX&iUac8HhGx3nqhI&uy`!Y! zMomXcLdKm!t>sC>OJ%NGO0}G@)o*l5xst~W82bA3VjWnpbY{<)DYv|=OYtnD+7 p{xuIXJ1(Z(RepDbZf17SuKFYC6m!$4g-gT!P$?6uh}Wh6{a*uIBVqsm literal 0 HcmV?d00001 diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gl-wine32 b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gl-wine32 new file mode 100755 index 0000000000000000000000000000000000000000..06bc64df563eeb9989195a202854766ffbbd53d1 GIT binary patch literal 25667 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℞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 literal 0 HcmV?d00001 diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/run_gl.sh b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/run_gl.sh new file mode 100755 index 0000000..68118a9 --- /dev/null +++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/run_gl.sh @@ -0,0 +1,17 @@ +#/bin/bash + +cd $(dirname $0) + +runtime_path=/opt/deepinwine/runtime-i386 +if [ -f "$runtime_path/init_runtime.sh" ];then + source "$runtime_path/init_runtime.sh" + + init_runtime + init_32bit_config + echo "use deepinwine runtime" + "$WINELDPATH" ./gl-wine32 + exit $? +fi + +./gl-wine32 +exit $? diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh index b10852e..abffb6d 100755 --- a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh +++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh @@ -21,10 +21,13 @@ APPVER="" APPTAR="files.7z" BOTTLENAME="" WINE_CMD="deepin-wine" -#这里会被后续覆盖,似乎没啥用 +#这里会被后续覆盖 LOG_FILE=$0 PUBLIC_DIR="/var/public" + + + if [ -e /opt/p7zip-legacy/bin/7z ];then log.debug "Using p7zip-legacy as unpacker" UNPACK_CMD=/opt/p7zip-legacy/bin/7z @@ -54,20 +57,13 @@ if [ $SPECIFY_SHELL_DIR ]; then SHELL_DIR=$SPECIFY_SHELL_DIR fi -# Check if some visual feedback is possible -if command -v zenity >/dev/null 2>&1; then + progressbar() { WINDOWID="" zenity --progress --title="$1" --text="$2" --pulsate --width=400 --auto-close --no-cancel || WINDOWID="" zenity --progress --title="$1" --text="$2" --pulsate --width=400 --auto-close } -else - progressbar() - { - cat - - } -fi _DeleteRegistry() { @@ -132,8 +128,14 @@ FixLink() { if [ -d ${WINEPREFIX} ]; then CUR_DIR=$PWD - cd "${WINEPREFIX}/dosdevices" - # Link to Document + cd "${WINEPREFIX}/dosdevices" + check_link ../drive_c c: + check_link / z: + check_link $HOME y: + cd "../drive_c/users/$USER" + check_link "$HOME/Desktop" Desktop + check_link "$HOME/Downloads" Downloads + # Link to Document if [ -L "$WINEPREFIX/drive_c/users/$(whoami)/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 @@ -141,10 +143,6 @@ 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 - rm c: z: y: - ln -s -f ../drive_c c: - ln -s -f / z: - ln -s -f $HOME y: cd $CUR_DIR #ls -l "${WINEPREFIX}/dosdevices" fi @@ -176,6 +174,29 @@ is_autostart() return 1 } #########自动启动相关,等用到了再研究 + +Test_GL_wine() +{ + gl_wine_path="/opt/deepinwine/tools/spark_gl-wine" + + #如果不支持32的GLX,d3d改为gdi的实现 + if [[ ! -f "${WINEPREFIX}/.init_d3d" ]];then + if [[ $WINE_CMD == *"deepin-wine8-stable"* ]];then + gl_wine="${gl_wine_path}/gl-wine64" + else + gl_wine="${gl_wine_path}/run_gl.sh" + fi + + run_gl=`${gl_wine} 2>&1` + + #如果opengl测试程序运行失败,所有进程的渲染方式改为gdi渲染模式 + if [ $? != 0 ];then + WINEPREFIX="$WINEPREFIX" $WINE_CMD regedit /S "${gl_wine_path}/gdid3d.reg" + fi + + touch "${WINEPREFIX}/.init_d3d" + fi +} urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } #######url转义 @@ -194,7 +215,11 @@ CallProcess() if [[ $autostart -ne 0 ]] && [[ "$1" != *"pluginloader.exe" ]];then $SHELL_DIR/spark_kill.sh "$BOTTLENAME" block fi - + #run gl-wine for test opengl + get_arch=`uname -m` + if [[ $get_arch = "x86_64" ]];then + Test_GL_wine + fi #change current dir to excute path path=$(dirname "$path") cd "$path" @@ -211,7 +236,7 @@ CallProcess() - debug_log_to_file "Starting process $* ..." + debug_log "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" @@ -311,12 +336,13 @@ ResetApp() } UpdateApp() { - if [ -f "$WINEPREFIX/PACKAGE_VERSION" ] && [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" = "$APPVER" ]; then - return - fi if [ -d "${WINEPREFIX}.tmpdir" ]; then rm -rf "${WINEPREFIX}.tmpdir" fi + if [ -f "$WINEPREFIX/PACKAGE_VERSION" ] && [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" = "$APPVER" ]; then + return + fi + if [ -f "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_update.sh" ];then source "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_update.sh" CallPreUpdate @@ -348,7 +374,9 @@ RunApp() exit 0 fi if [ -d "$WINEPREFIX" ]; then - UpdateApp + if [ ! -f "$WINEPREFIX/PACKAGE_VERSION" ] || [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" != "$APPVER" ]; then + UpdateApp + fi else DeployApp fi @@ -359,7 +387,9 @@ RunApp() CreateBottle() { if [ -d "$WINEPREFIX" ]; then - UpdateApp + if [ ! -f "$WINEPREFIX/PACKAGE_VERSION" ] || [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" != "$APPVER" ]; then + UpdateApp + fi else DeployApp fi @@ -380,7 +410,7 @@ ParseArgs() fi } -init_log_file +#init_log_file @@ -392,9 +422,6 @@ if [ $# -lt 3 ]; then exit 0 fi -BOTTLENAME="$1" -WINEPREFIX="$HOME/.deepinwine/$1" - APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files" if [ -f "$APPDIR/files.md5sum" ];then @@ -405,6 +432,10 @@ fi debug_log "Run $*" +if [ -z "$WINE_WMCLASS" ]; then + export WINE_WMCLASS="$DEB_PACKAGE_NAME" +fi + #执行lnk文件通过判断第5个参数是否是“/Unix”来判断 if [ "$4" == "/Unix" ];then RunApp "$3" "$4" "$5"