Add preliminary Inno Setup 5.6.2 support

foesmm · Sep 8, 2018 · 5cf1cb3 · 5cf1cb3
1 parent 73b6033
commit 5cf1cb3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 
 innoextract 1.8 (WIP)
+ - Added preliminary support for Inno Setup 5.6.2 installers
  - Added support for installers using an alternative setup loader magic
  - Added support for using boost_{zlib,bzip2} when statically linking Boost
  - Added support for an Inno Setup 5.5.7/5.6.0 variant with an uppercase (U) in the data version string

diff --git a/src/setup/header.cpp b/src/setup/header.cpp
@@ -236,6 +236,13 @@ void header::load(std::istream & is, const version & version) {
 	} else {
 		setup_mutex.clear();
 	}
+	if(version >= INNO_VERSION(5, 6, 1)) {
+		is >> util::encoded_string(changes_environment, version.codepage());
+		is >> util::encoded_string(changes_associations, version.codepage());
+	} else {
+		changes_environment.clear();
+		changes_associations.clear();
+	}
 	if(version >= INNO_VERSION(5, 2, 5)) {
 		is >> util::ansi_string(license_text);
 		is >> util::ansi_string(info_before);
@@ -498,7 +505,9 @@ void header::load(std::istream & is, const version & version) {
 		if(version < INNO_VERSION(1, 3, 21)) {
 			flagreader.add(OverwriteUninstRegEntries);
 		}
-		flagreader.add(ChangesAssociations);
+		if(version < INNO_VERSION(5, 6, 1)) {
+			flagreader.add(ChangesAssociations);
+		}
 	}
 	if(version >= INNO_VERSION(1, 3, 21)) {
 		if(version < INNO_VERSION(5, 3, 8)) {
@@ -562,7 +571,7 @@ void header::load(std::istream & is, const version & version) {
 	if(version >= INNO_VERSION(4, 2, 2)) {
 		flagreader.add(EncryptionUsed);
 	}
-	if(version >= INNO_VERSION(5, 0, 4)) {
+	if(version >= INNO_VERSION(5, 0, 4) && version < INNO_VERSION(5, 6, 1)) {
 		flagreader.add(ChangesEnvironment);
 	}
 	if(version >= INNO_VERSION(5, 1, 7) && !version.unicode) {

diff --git a/src/setup/header.hpp b/src/setup/header.hpp
@@ -154,6 +154,8 @@ struct header {
 	std::string uninstallable;
 	std::string close_applications_filter;
 	std::string setup_mutex;
+	std::string changes_environment;
+	std::string changes_associations;
 	std::string license_text;
 	std::string info_before;
 	std::string info_after;