Upgrade WeChat to 2.9.0.114

Signed-off-by: Codist <countstarlight@gmail.com>

6 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd834c9ad716..578103d2290b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-wechat
 	pkgdesc = Tencent WeChat (com.wechat) on Deepin Wine For Archlinux
-	pkgver = 2.9.0.112
+	pkgver = 2.9.0.114
 	pkgrel = 1
 	url = https://weixin.qq.com/
 	install = deepin-wine-wechat.install
@@ -20,15 +20,15 @@ pkgbase = deepin-wine-wechat
 	depends = lib32-libldap
 	conflicts = deepin-wechat
 	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_2.6.8.65deepin0_i386.deb
-	source = WeChatSetup-2.9.0.112.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
+	source = WeChatSetup-2.9.0.114.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
 	source = run.sh
 	source = reg.patch
 	source = shadow.exe
 	md5sums = fe31cf4f0f6186fc1c99adc1512f5305
-	md5sums = 1c2052b1e4e4d27b746b3723683619ac
-	md5sums = c1af7dde992a30815c185152527fbd0d
+	md5sums = 4e8a6b02e3090d7277669f849b80007a
+	md5sums = 5a5e340c27759cf4ce4b078206b6c424
 	md5sums = f264f961704f2aa1d480971b0e58617a
-	md5sums = 0138f993c99d899e609bad85c2c9a15c
+	md5sums = d83f1c3845f28abd81cbfd215089d3d8
 
 pkgname = deepin-wine-wechat
 
diff --git a/PKGBUILD b/PKGBUILD
index e017124b4b3a..357d80ce54ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Codist <countstarlight@gmail.com>
 
 pkgname=deepin-wine-wechat
-pkgver=2.9.0.112
+pkgver=2.9.0.114
 wechat_installer=WeChatSetup
 deepinwechatver=2.6.8.65deepin0
 pkgrel=1
@@ -19,10 +19,10 @@ source=("$_mirror/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_${deepinwe
   "reg.patch"
   "shadow.exe")
 md5sums=('fe31cf4f0f6186fc1c99adc1512f5305'
-  '1c2052b1e4e4d27b746b3723683619ac'
-  'c1af7dde992a30815c185152527fbd0d'
+  '4e8a6b02e3090d7277669f849b80007a'
+  '5a5e340c27759cf4ce4b078206b6c424'
   'f264f961704f2aa1d480971b0e58617a'
-  '0138f993c99d899e609bad85c2c9a15c')
+  'd83f1c3845f28abd81cbfd215089d3d8')
 
 build() {
   msg "Extracting DPKG package ..."
diff --git a/README.md b/README.md
index d6241d9f522f..b600b0f72f59 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
     <img src="https://travis-ci.org/countstarlight/deepin-wine-wechat-arch.svg?branch=master" alt="Build Status">
   </a>
   <a href="https://pc.weixin.qq.com/">
-    <img src="https://img.shields.io/badge/WeChat-2.9.0.112-blue.svg" alt="WeChat Version">
+    <img src="https://img.shields.io/badge/WeChat-2.9.0.114-blue.svg" alt="WeChat Version">
   </a>
   <a href="https://aur.archlinux.org/packages/deepin-wine-wechat/">
     <img src="https://img.shields.io/aur/version/deepin-wine-wechat.svg" alt="AUR Version">
@@ -112,6 +112,7 @@ sudo pacman -U #下载的包名
 
 | 微信版本  | wine版本 | 兼容性 |                             备注                             | deepin-wine版本 | 兼容性 | 备注 |
 | :-------: | :------: | :----: | :----------------------------------------------------------: | :-------------: | :----: | :--: |
+| 2.9.0.114 |   5.6    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
 | 2.9.0.112 |   5.5    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
 | 2.8.0.133 |   5.3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
 | 2.8.0.112 | 5.0-rc4  |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
@@ -265,6 +266,7 @@ CallApp()
 
 ## 更新日志
 
+* 2020-04-24 WeChat-2.9.0.114
 * 2020-04-20 WeChat-2.9.0.112
 * 2020-03-08 WeChat-2.8.0.133
 * 2020-02-10 WeChat-2.8.0.121
diff --git a/run.sh b/run.sh
index 5481bec78b3f..c0707dc94f0e 100755
--- a/run.sh
+++ b/run.sh
@@ -10,7 +10,7 @@ WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat"
 APPDIR="/opt/deepinwine/apps/Deepin-WeChat"
 APPVER="2.6.8.65deepin0"
 WECHAT_INSTALLER="WeChatSetup"
-WECHAT_VER="2.9.0.112"
+WECHAT_VER="2.9.0.114"
 APPTAR="files.7z"
 PACKAGENAME="com.wechat"
 WINE_CMD="wine"
@@ -28,6 +28,8 @@ CallApp()
 	if [ ! -f "$WINEPREFIX/reinstalled" ]
 	then
 		touch $WINEPREFIX/reinstalled
+		# stop the previous version of 'shadow.exe'
+		pkill -f "shadow.exe"
 		env WINEDLLOVERRIDES="winemenubuilder.exe=d" WINEPREFIX="$WINEPREFIX" $WINE_CMD $APPDIR/$WECHAT_INSTALLER-$WECHAT_VER.exe &
 	else
         #Support use native file dialog
diff --git a/shadow.cpp b/shadow.cpp
index 30ca5bb5540c..cdeff75f8768 100644
--- a/shadow.cpp
+++ b/shadow.cpp
@@ -2,12 +2,13 @@
 LPCTSTR windowClassName = L"popupshadow";
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine, int nCmdShow)
 {
-    for (;;){
+    while (true) {
         HWND h = FindWindowEx(NULL, NULL, windowClassName, NULL);
-        if (h != NULL) {
+        if (h != NULL && IsWindowVisible(h)) {
+            ShowWindow(h, SW_HIDE);
             ShowWindow(h, SW_HIDE);
         }
         Sleep(3000);
     }
     return 0;
-}
\ No newline at end of file
+}
diff --git a/shadow.exe b/shadow.exe
index 48a299776881..dc4478e4e385 100755
--- a/shadow.exe
+++ b/shadow.exe