Update to v2.12.0.0

mwp-ver.txt

@@ -1 +1 @@
-2.11.0.0
+2.12.0.0

src/MalwarePatch/App.xaml

@@ -18,6 +18,9 @@
       <SolidColorBrush
         x:Key="Foreground"
         Color="#F8F8F8" />
+      <SolidColorBrush
+        x:Key="ScrollThumb"
+        Color="#1FFF" />
       <SolidColorBrush
         x:Key="TitleBarBackground"
         Color="#263238" />

src/MalwarePatch/App.xaml.cs

@@ -17,44 +17,44 @@
 
 namespace MalwarePatch
 {
-    public partial class App : Application
+  public partial class App : Application
+  {
+    protected override void OnStartup(StartupEventArgs e)
     {
-        protected override void OnStartup(StartupEventArgs e)
-        {
-            AppDomain.CurrentDomain.AssemblyResolve += assemblyResolveHandler;
-            //StartupUri = new Uri("MainWindow.xaml", UriKind.RelativeOrAbsolute);
-            base.OnStartup(e);
-            // CultureInfo.CurrentUICulture = new CultureInfo("en-US");
-            AppJumpList.CreateJumpList();
+      AppDomain.CurrentDomain.AssemblyResolve += assemblyResolveHandler;
+      // StartupUri = new Uri("MainWindow.xaml", UriKind.RelativeOrAbsolute);
+      base.OnStartup(e);
+      // CultureInfo.CurrentUICulture = new CultureInfo("en-US");
+      AppJumpList.CreateJumpList();
 #if DEBUG
-            File.AppendAllText($"args.txt", string.Join(" ", e.Args));
+      File.AppendAllText($"args.txt", string.Join(" ", e.Args));
 #endif
-            if (SilentUpdater.TryParse(e.Args) ||
-                UserCertificateCli.TryParse(e.Args) ||
-                MalwareChecker.TryParse(e.Args))
-            {
-                Shutdown();
-            }
-            else
-            {
-                Updater.InstallUpdateAndRun(this, e.Args);
-            }
-        }
-        static Assembly assemblyResolveHandler(object s, ResolveEventArgs e)
-        {
-            var dllName = new AssemblyName(e.Name).Name + ".dll";
-            var assembly = Assembly.GetExecutingAssembly();
-            var resourceName = assembly.GetManifestResourceNames().FirstOrDefault(name => name.EndsWith(dllName));
-            if (resourceName == null)
-            {
-                return null;
-            }
-            using (var stream = assembly.GetManifestResourceStream(resourceName))
-            {
-                var assemblyData = new byte[stream.Length];
-                stream.Read(assemblyData, 0, assemblyData.Length);
-                return Assembly.Load(assemblyData);
-            }
-        }
+      if (SilentUpdater.TryParse(e.Args) ||
+          UserCertificateCli.TryParse(e.Args) ||
+          MalwareChecker.TryParse(e.Args))
+      {
+        Shutdown();
+      }
+      else
+      {
+        Updater.InstallUpdateAndRun(this, e.Args);
+      }
     }
+    static Assembly assemblyResolveHandler(object s, ResolveEventArgs e)
+    {
+      var dllName = new AssemblyName(e.Name).Name + ".dll";
+      var assembly = Assembly.GetExecutingAssembly();
+      var resourceName = assembly.GetManifestResourceNames().FirstOrDefault(name => name.EndsWith(dllName));
+      if (resourceName == null)
+      {
+        return null;
+      }
+      using (var stream = assembly.GetManifestResourceStream(resourceName))
+      {
+        var assemblyData = new byte[stream.Length];
+        stream.Read(assemblyData, 0, assemblyData.Length);
+        return Assembly.Load(assemblyData);
+      }
+    }
+  }
 }

src/MalwarePatch/Assets/certificate-map.json

@@ -11,7 +11,10 @@
     "360 browser 256.2020.02.cer",
     "360 wallpaper 2022.01.cer",
     "360 wallpaper 256.2022.01.cer",
-    "360 browser 2022.01.cer"
+    "360 browser 2022.01.cer",
+    "360 browser 256.2022.04.cer",
+    "360 ludashi 2022.04.cer",
+    "360 ludashi 256.2022.04.cer"
   ],
   "2345": [
     "2345.cer",
@@ -30,6 +33,9 @@
     "6789 256.cer",
     "6789 256.2019.4.cer"
   ],
+  "Aogewei": [
+    "aogewei 256.2022.04.cer"
+  ],
   "Baidu": [
     "baidu.cer",
     "baidusp.cer",
@@ -40,6 +46,10 @@
     "baidu netdisk.cer",
     "baidu netdisk 256.cer"
   ],
+  "Baishengtong": [
+    "baishengtong 2022.04.cer",
+    "baishengtong 256.2022.04.cer"
+  ],
   "Baofeng": [
     "baofeng.cer",
     "baofeng 256.cer",
@@ -79,6 +89,13 @@
     "7654 note 2021.10.cer",
     "7654 note 256.2021.10.cer"
   ],
+  "Higeshi": [
+    "higeshi 2022.04.cer",
+    "higeshi 256.2022.04.cer"
+  ],
+  "Huya": [
+    "huya 256.2022.04.cer"
+  ],
   "KuaiZip": [
     "kuaizip.cer",
     "kuaizip 256.cer"
@@ -146,13 +163,19 @@
     "xingcheng (at) 256.cer",
     "shabake 256.2021.10.cer",
     "fengqi (at) 2022.01.cer",
-    "fengqi (at) 256.2022.01.cer"
+    "fengqi (at) 256.2022.01.cer",
+    "tingfengyu (at) 256.2022.04.cer",
+    "tuling times 256.2022.04.cer"
   ],
   "Ruanmei": [
     "ruanmei.cer",
     "ruanmei 256.cer",
     "ruanmei 256.2019.1.cer"
   ],
+  "Shaji": [
+    "shaji 2022.04.cer",
+    "shaji 256.2022.04.cer"
+  ],
   "Sogou": [
     "sogou.cer",
     "sogou 256.cer",
@@ -195,15 +218,22 @@
     "thunder accel 256.cer",
     "thunder player 2018.12.cer",
     "thunder player 256.2018.12.cer",
-	  "thunder 2020.1.cer",
-	  "thunder 256.2020.1.cer"
+    "thunder 2020.1.cer",
+    "thunder 256.2020.1.cer"
+  ],
+  "Xundu": [
+    "xundu 256.2022.04.cer"
   ],
   "Youku": [
     "youku.cer",
     "youku 256.cer",
     "youku 2018.8.cer",
     "youku 256.2018.8.cer"
   ],
+  "Yunbiao": [
+    "yunbiao 2022.04.cer",
+    "yunbiao 256.2022.04.cer"
+  ],
   "YY": [
     "yy.cer",
     "yy 256.cer",
@@ -212,7 +242,8 @@
     "yy 256.2018.12.cer",
     "yy 2020.1.cer",
     "yy 256.2020.1.cer",
-    "yy 256.2021.02.cer"
+    "yy 256.2021.02.cer",
+    "yy 256.2022.04.cer"
   ],
   "ZhongCheng": [
     "zhongcheng (flash cn) 256.2022.01.cer"

src/MalwarePatch/Assets/display-names.json

@@ -3,13 +3,17 @@
     "360": "360",
     "2345": "2345",
     "6789": "6789",
+    "Aogewei": "Aogewei",
     "Baidu": "Baidu",
+    "Baishengtong": "Baishengtong",
     "Baofeng": "Baofeng Video",
     "DongfangToutiao": "Toutiao Video",
     "DriverLife": "Driver Life",
     "Funshion": "Funshion",
     "FormatFactory": "Format Factory",
     "HeiNote": "Hei Note",
+    "Higeshi": "Hi Ge Shi",
+    "Huya": "Huya",
     "KuaiZip": "Kuai Zip",
     "Kingsoft": "Kingsoft",
     "Kugou": "Kugou",
@@ -18,28 +22,35 @@
     "PPTV": "PPTV",
     "iQIYI": "iQIYI",
     "Rising": "Rising",
-    "Riyue": "Adware",
+    "Riyue": "P2P Adware",
     "Ruanmei": "Ruanmei",
+    "Shaji": "Yongchu",
     "Sogou": "Sogou",
     "Sohu": "Sohu",
     "Taobao": "UC",
     "Tencent": "Tencent",
     "Thunder": "Thunder",
+    "Xundu": "Xundu",
     "Youku": "Youku",
+    "Yunbiao": "Yunbiao",
     "YY": "YY",
     "ZhongCheng": "FlashCN"
   },
   "zh-CN": {
     "360": "360",
     "2345": "2345",
     "6789": "6789",
+    "Aogewei": "奥格威",
     "Baidu": "百度",
+    "Baishengtong": "百胜通",
     "Baofeng": "暴风影音",
     "DongfangToutiao": "头条视频",
     "DriverLife": "驱动人生",
     "Funshion": "风行",
     "FormatFactory": "格式工厂",
     "HeiNote": "小黑记事本",
+    "Higeshi": "嗨格式",
+    "Huya": "虎牙",
     "KuaiZip": "快压",
     "Kingsoft": "金山",
     "Kugou": "酷狗",
@@ -48,14 +59,17 @@
     "PPTV": "PPTV",
     "iQIYI": "爱奇艺",
     "Rising": "瑞星",
-    "Riyue": "广告下载器",
+    "Riyue": "P2P下载器",
     "Ruanmei": "软媒",
+    "Shaji": "永楚",
     "Sogou": "搜狗",
     "Sohu": "搜狐",
     "Taobao": "UC",
     "Tencent": "腾讯",
     "Thunder": "迅雷",
+    "Xundu": "迅读",
     "Youku": "优酷",
+    "Yunbiao": "云表",
     "YY": "YY",
     "ZhongCheng": "国内版Flash"
   }

src/MalwarePatch/Assets/malware-remote-info.json

@@ -31,6 +31,10 @@
     "fixed": [],
     "match": []
   },
+  "Baishengtong": {
+    "fixed": [ "https://www.shiyide.com/download/?windows" ],
+    "match": []
+  },
   "Baofeng": {
     "fixed": [
       "http://dl.baofeng.com/baofeng5/bf5_new.exe"
@@ -64,7 +68,17 @@
     "match": [
       {
         "url": "http://heinote.7654.com/#firstPage",
-        "regex": "href=\"(http://d.heinoteft.top/downloads/.+.exe)\"",
+        "regex": "href=\"(http://d.heinoteft.com/downloads/.+.exe)\"",
+        "group": 1
+      }
+    ]
+  },
+  "Higeshi": {
+    "fixed": [],
+    "match": [
+      {
+        "url": "http://heinote.7654.com/#firstPage",
+        "regex": "href=\"(https://dl-next.aunbox.cn/channel?.+?)\"",
         "group": 1
       }
     ]
@@ -83,7 +97,7 @@
     "fixed": [],
     "match": [
       {
-        "url": "http://www.ijinshan.com/",
+        "url": "https://www.ijinshan.com/",
         "regex": "//cd001.www.duba.net/duba/install/packages/ever/.+?.exe",
         "group": 0
       },
@@ -143,6 +157,10 @@
       }
     ]
   },
+  "Shaji": {
+    "fixed": [ "https://softdl.ahhxwavi.cn/pc/pdfconvert/PDFConverter_guanwang-1.exe" ],
+    "match": []
+  },
   "Sogou": {
     "fixed": [],
     "match": [
@@ -211,11 +229,21 @@
       }
     ]
   },
+  "Xundu": {
+    "fixed": [],
+    "match": [
+      {
+        "url": "http://yijirecovery.com/html/index/",
+        "regex": "href=\"(http://archive.yijirecovery.com/.+?.exe)",
+        "group": 1
+      }
+    ]
+  },
   "YY": {
     "fixed": [],
     "match": [
       {
-        "url": "http://www.yy.com/web/pcyy_download/",
+        "url": "https://www.yy.com/web/pcyy_download/",
         "regex": "window\\.location\\.href=\"(.*?)\"",
         "group": 1
       }