diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c3553f8..6e6288e1 100644 --- 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 index 7c3553f8..6e6288e1 100644 --- 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 index e600c8fb..2949afdc 100644 --- a/bin/blocklist.xml +++ b/bin/blocklist.xml @@ -4,7 +4,7 @@ - + diff --git a/bin/rules_system.xml b/bin/rules_system.xml index 33f7ec36..0d127072 100644 Binary files a/bin/rules_system.xml and b/bin/rules_system.xml differ diff --git a/src/main.cpp b/src/main.cpp index 4c63e46e..51ceb198 100644 Binary files a/src/main.cpp and b/src/main.cpp differ diff --git a/src/main.h b/src/main.h index 910f18db..0bffe4cd 100644 Binary files a/src/main.h and b/src/main.h differ diff --git a/src/res/blocklist.xml b/src/res/blocklist.xml new file mode 100644 index 00000000..2949afdc --- /dev/null +++ b/src/res/blocklist.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/res/rules_system.xml b/src/res/rules_system.xml new file mode 100644 index 00000000..0d127072 Binary files /dev/null and b/src/res/rules_system.xml differ diff --git a/src/resource.h b/src/resource.h index f20b28b4..c8b226b8 100644 --- 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 index 5aa9098f..471c0efa 100644 Binary files a/src/resource.rc and b/src/resource.rc differ