1.6.4

henrypp · May 31, 2017 · 02707d0 · 02707d0
1 parent 7336e08
commit 02707d0
Show file tree

Hide file tree

Showing 10 changed files with 306 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+v1.6.4 (31 May 2017)
++ added fallback if blocklist and/or system rules not found
++ added more dropped events logging (win7 and above)
+- fixed dropped events subscription duplicate (win7 and above)
+- fixed run as admin does not work sometimes
+- updated blocklist
+- fixed bugs
+
 v1.6.3 (27 May 2017)
 + generate unique session key at startup
 - fixed custom app rules crash on delete

diff --git a/bin/History.txt b/bin/History.txt
@@ -1,3 +1,11 @@
+v1.6.4 (31 May 2017)
++ added fallback if blocklist and/or system rules not found
++ added more dropped events logging (win7 and above)
+- fixed dropped events subscription duplicate (win7 and above)
+- fixed run as admin does not work sometimes
+- updated blocklist
+- fixed bugs
+
 v1.6.3 (27 May 2017)
 + generate unique session key at startup
 - fixed custom app rules crash on delete

diff --git a/bin/blocklist.xml b/bin/blocklist.xml
@@ -4,7 +4,7 @@
 <!-- Last-Modified: Mon, 29 May 2017 14:30:26 +0000 -->
 
 <?xml version="1.0"?>
-<root>
+<root timestamp="1496068226">
 	<item name="extra_13.80.12.54" rule="13.80.12.54" dir="0" protocol="0" version="0" is_block="1" is_enabled="0" />
 	<item name="extra_13.107.3.128" rule="13.107.3.128" dir="0" protocol="0" version="0" is_block="1" is_enabled="0" />
 	<item name="extra_13.107.21.200" rule="13.107.21.200" dir="0" protocol="0" version="0" is_block="1" is_enabled="0" />

diff --git a/bin/rules_system.xml b/bin/rules_system.xml
diff --git a/src/main.cpp b/src/main.cpp
diff --git a/src/main.h b/src/main.h
diff --git a/src/res/blocklist.xml b/src/res/blocklist.xml
diff --git a/src/res/rules_system.xml b/src/res/rules_system.xml
diff --git a/src/resource.h b/src/resource.h
@@ -376,6 +376,10 @@
 
 #define IDS_STATUS_ERROR 10006
 
+// RC data
+#define IDR_RULES_BLOCKLIST 1
+#define IDR_RULES_SYSTEM 2
+
 // Icons
 #define IDI_MAIN 100
 #define IDI_INACTIVE 101

diff --git a/src/resource.rc b/src/resource.rc