Add preliminary support for Inno Setup 6.1.0

CHANGELOG

@@ -1,5 +1,6 @@
 
 innoextract 1.9 (TBD)
+ - Added preliminary support for Inno Setup 6.1.0
  - Added support for a modified Inno Setup 5.4.2 variant
  - Fixed output directory being created for unsupported installers
  - Fixed some safe non-ASCII characters being stripped from filenames

src/setup/icon.cpp

@@ -58,6 +58,14 @@ void icon_entry::load(std::istream & is, const info & i) {
 		app_user_model_id.clear();
 	}
 	
+	if(i.version >= INNO_VERSION(6, 1, 0)) {
+		const size_t guid_size = 16;
+		app_user_model_toast_activator_clsid.resize(guid_size);
+		is.read(&app_user_model_toast_activator_clsid[0], std::streamsize(guid_size));
+	} else {
+		app_user_model_toast_activator_clsid.clear();
+	}
+	
 	load_version_data(is, i.version);
 	
 	icon_index = util::load<boost::int32_t>(is, i.version.bits());
@@ -98,6 +106,9 @@ void icon_entry::load(std::istream & is, const info & i) {
 	if(i.version >= INNO_VERSION(5, 5, 0)) {
 		flagreader.add(PreventPinning);
 	}
+	if(i.version >= INNO_VERSION(6, 1, 0)) {
+		flagreader.add(HasAppUserModelToastActivatorCLSID);
+	}
 	
 	options = flagreader;
 }

src/setup/icon.hpp

@@ -48,6 +48,7 @@ struct icon_entry : public item {
 		FolderShortcut,
 		ExcludeFromShowInNewInstall,
 		PreventPinning,
+		HasAppUserModelToastActivatorCLSID,
 		// obsolete options:
 		RunMinimized
 	);
@@ -65,6 +66,7 @@ struct icon_entry : public item {
 	std::string icon_file;
 	std::string comment;
 	std::string app_user_model_id;
+	std::string app_user_model_toast_activator_clsid;
 	
 	int icon_index;
 	

src/setup/run.cpp

@@ -103,6 +103,9 @@ void run_entry::load(std::istream & is, const info & i) {
 	if(i.version >= INNO_VERSION(5, 2, 0)) {
 		flagreader.add(RunAsOriginalUser);
 	}
+	if(i.version >= INNO_VERSION(6, 1, 0)) {
+		flagreader.add(DontLogParameters);
+	}
 	
 	options = flagreader;
 }

src/setup/run.hpp

@@ -49,7 +49,8 @@ struct run_entry : public item {
 		HideWizard,
 		Bits32,
 		Bits64,
-		RunAsOriginalUser
+		RunAsOriginalUser,
+		DontLogParameters
 	);
 	
 	enum wait_condition {

src/setup/version.cpp

@@ -180,6 +180,7 @@ const known_version versions[] = {
 	{ "Inno Setup Setup Data (5.6.2)",     /* prerelease */ INNO_VERSION_EXT(5, 6,  2, 0), 0 },
 	{ "Inno Setup Setup Data (5.6.2) (u)", /* prerelease */ INNO_VERSION_EXT(5, 6,  2, 0), version::Unicode },
 	{ "Inno Setup Setup Data (6.0.0) (u)",                  INNO_VERSION_EXT(6, 0,  0, 0), version::Unicode },
+	{ "Inno Setup Setup Data (6.1.0) (u)",                  INNO_VERSION_EXT(6, 1,  0, 0), version::Unicode },
 };
 
 } // anonymous namespace