Merge branch 'preview'

Block-List.en-US.md

@@ -0,0 +1,59 @@
+# Block List
+The sub items stand for products that may be affected by this tool.
+- 360
+    - 360 Safe
+    - 360 Antivirus
+    - 360 Browser
+    - 360 Safe Suite (Safe + Antivirus + Browser)
+- 2345
+    - 2345 Browser
+    - 2345 Safeguard
+- 6789
+    - 6789 Zip
+- Baidu
+    - Baidu Safeguard
+    - Baidu AntiVirus
+    - Baidu Browser
+    - Baidu NetDisk
+- Baofeng Video
+- Toutiao Video
+- Driver Life
+- Funshion Video
+- Format Factory
+- Kuai Zip
+- Kingsoft
+    - Kingsoft Antivirus
+    - Liebao Browser
+    - WPS Office
+- Kugou
+- Kuwo
+- LeTV
+- PPTV
+- iQIYI
+- Rising
+    - Rising Antivirus
+- Adware
+- Ruanmei
+- Sogou
+    - Sogou Pinyin IME
+    - Sogou Browser
+- Sohu
+    - Sohu Video
+- Taobao/UC
+    - Ali Wangwang
+    - UC Browser
+- Tencent
+    - Tencent QQ
+    - TIM
+    - Tencent PC Manager
+    - QQ Browser
+- Thunder
+    - Thunder X
+    - Thunder 9
+    - Thunder Video Player
+    - Thunder Game Accelerator
+    - Thunder Game Box
+- Youku
+- YY
+    - YY VoIP
+    - YY Browser

Block-List.zh-CN.md

@@ -1,27 +1,59 @@
 # 屏蔽列表
+子项目表示可能会受屏蔽影响的产品, 也可能有未在此列表的产品受影响.
 - 360
+    - 360安全卫士
+    - 360杀毒
+    - 360浏览器
+    - 360安全套装(卫士+杀毒+浏览器)
 - 2345
+    - 2345浏览器
+    - 2345卫士
+- 6789
+    - 6789压缩
 - 百度
+    - 百度卫士
+    - 百度杀毒
+    - 百度浏览器
+    - 百度网盘
 - 暴风影音
 - 头条视频
 - 驱动人生
 - 风行
 - 格式工厂
 - 快压
 - 金山
+    - 金山毒霸
+    - 猎豹浏览器
+    - WPS Office
 - 酷狗
 - 酷我
 - 乐视
-- 网易
 - PPTV
 - 爱奇艺
 - 瑞星
+    - 瑞星杀毒
 - 广告下载器
 - 软媒
 - 搜狗
+    - 搜狗拼音
+    - 搜狗浏览器
 - 搜狐
+    - 搜狐影音
 - 淘宝/UC
+    - 阿里旺旺
+    - UC浏览器
 - 腾讯
+    - 腾讯QQ
+    - TIM
+    - 腾讯电脑管家
+    - QQ浏览器
 - 迅雷
+    - 迅雷X
+    - 迅雷9
+    - 迅雷影音
+    - 网游加速器
+    - 迅雷游戏盒子
 - 优酷
-- YY语音/浏览器
+- YY
+    - YY语音
+    - YY浏览器

README.en-US.md

@@ -0,0 +1,44 @@
+# Malware Patch
+[中文版](README.md)
+
+Prevent UAC authorization of Chinese malware, no need to run in background.
+
+Project inspired by [Windows apps that amaze us](https://amazing-apps.gitbooks.io/windows-apps-that-amaze-us/content/en/blacklist.html).
+
+## CLI Usage
+- No parameter : Open GUI.
+- `--silent-update` : Silently check and download update.
+- `--disallow-all` : Disallow all UAC authorizations of malwares.
+- `--allow-all` : Allow all UAC authorizations of malwares.
+- `--remove` : Clean up temp files used for update.
+- `--allow` : Select a program (from "Open File" dialog) and allow UAC authorization of it.
+> The selected program must be signed because this app uses its digital signature to identify the program, the same below
+- `--disallow` : Select a program and disallow UAC authorization of it.
+- `--allow=file`: Allow UAC authorization of `file`.
+- `--disallow=file`: Disallow UAC authorization of `file`.
+
+## System Support
+- Windows 10
+- Windows 8.1
+- *Windows 7* (**Not tested yet**)
+
+## Language Support
+- English
+- 简体中文
+
+## Block Lists
+- [English](Block-List.en-US.md)
+- [简体中文](Block-List.zh-CN.md)
+
+## Example
+### Before
+
+<img height="250" alt="Before" src="before.png">
+
+### Disallow it and save
+
+<img height="250" alt="Disallow it and save" src="disallow.png">
+
+### After
+
+<img height="250" alt="After" src="after.png">

README.md

@@ -1,42 +1,44 @@
-# Malware Patch
-[中文版](README.zh-CN.md)
+# 软件屏蔽器
+[English version](README.en-US.md)
+
+阻止指定软件的管理员授权, 无需后台运行.
+
+项目灵感来源:[Windows apps that amaze us](https://amazing-apps.gitbooks.io/windows-apps-that-amaze-us/zh-CN/blacklist.html).
+
+## 命令行参数
+- 无参数 : 启动图形界面.
+- `--silent-update` : 在后台进行更新.
+- `--disallow-all` : 屏蔽所有支持的软件.
+- `--allow-all` : 允许所有支持的软件.
+- `--remove` : 清理更新的缓存文件.
+- `--allow`: (从"打开文件"对话框)选择并允许程序.
+> 程序必须拥有数字签名,因为本功能使用其数字签名实现,下同
+- `--disallow`: 选择并屏蔽程序.
+- `--allow=file`: 允许传入的`file`.
+- `--disallow=file`: 屏蔽传入的`file`.
+
+## 系统支持
+- Windows 10
+- Windows 8.1
+- *Windows 7* (**尚未测试**)
 
-Prevent UAC authorization of Chinese malwares, **no** need to run in background.
+## 语言支持
+- 简体中文
+- English
 
-Project inspired by [Windows apps that amaze us](https://amazing-apps.gitbooks.io/windows-apps-that-amaze-us/content/en/blacklist.html).
+## 屏蔽列表
+- [简体中文](Block-List.zh-CN.md)
+- [English](Block-List.en-US.md)
 
-*This repository contains only version info and binary.*
+## 例子
+### 屏蔽前
 
-## CLI Usage
-- No parameter : Open GUI.
-- `--silent-update` : Silently check and download update.
-- `--disallow-all` : Disallow all UAC authorizations of malwares.
-- `--allow-all` : Allow all UAC authorizations of malwares.
-- `--proxy=127.0.0.1:8000` : Set proxy for `--silent-update`.
-- `--remove` : Clean up temp files used for update.
-- `--allow=file`: Allow UAC authorization of `file`. (The `file` must be signed because app uses its digital signature to identify the program, same for disallow)
-- `--disallow=file`: Disallow UAC authorization of `file`.
+<img height="250" alt="屏蔽前" src="before.png">
 
-## About Temp Files
-Currently this app only store new version file as `__mwp.exe` in the same directory. You can delete it manually after update.
+### 屏蔽并保存
 
-## System Support
-- Windows 10
-- Windows 8/8.1
-- *Windows 7* (**Not tested yet**)
+<img height="250" alt="屏蔽并保存" src="disallow.png">
 
-## Language Support
-- English
-- 简体中文
-
-## Block Lists
-- [English](Block-List.en.md)
-- [简体中文](Block-List.zh-CN.md)
+### 屏蔽后
 
-## Example
-### Before
-![Before](before.png)
-### Disallow it and save
-![Disallow it and save](disallow.png)
-### After
-![After](after.png)
+<img height="250" alt="屏蔽后" src="after.png">

mwp-ver.txt

@@ -1 +1 @@
-2.6.0.0
+2.9.1.0

src/MalwarePatch.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.16
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MalwarePatch", "MalwarePatch\MalwarePatch.csproj", "{769D2F79-D71B-4F5F-A61F-B1EF3A4C7414}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{769D2F79-D71B-4F5F-A61F-B1EF3A4C7414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{769D2F79-D71B-4F5F-A61F-B1EF3A4C7414}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{769D2F79-D71B-4F5F-A61F-B1EF3A4C7414}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{769D2F79-D71B-4F5F-A61F-B1EF3A4C7414}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

src/MalwarePatch/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    </startup>
+</configuration>

src/MalwarePatch/App.xaml

@@ -0,0 +1,41 @@
+<Application
+  x:Class="MalwarePatch.App"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:wpf="clr-namespace:Ace.Wpf;assembly=Ace"
+  xmlns:lang="clr-namespace:MalwarePatch.Languages">
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary
+          Source="Assets/Icons.xaml" />
+        <ResourceDictionary
+          Source="Assets/Icons.UserCertificates.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+      <SolidColorBrush
+        x:Key="DwmColor"
+        Color="{x:Static wpf:DwmEffect.ColorizationColor}" />
+      <SolidColorBrush
+        x:Key="Foreground"
+        Color="#F8F8F8" />
+      <SolidColorBrush
+        x:Key="TitleBarBackground"
+        Color="#263238" />
+      <SolidColorBrush
+        x:Key="TitleBarForeground"
+        Color="#8FFF" />
+      <SolidColorBrush
+        x:Key="Background"
+        Color="#324049" />
+      <SolidColorBrush
+        x:Key="ToolbarBackground"
+        Color="#703B699D" />
+      <SolidColorBrush
+        x:Key="ProgressBackground"
+        Color="#2000" />
+      <SolidColorBrush
+        x:Key="ProgressForeground"
+        Color="#448CB9" />
+    </ResourceDictionary>
+  </Application.Resources>
+</Application>