From 5f1cfb02ffd89395d7c6d0bc4ff2febd39d6be83 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 6 Jun 2009 16:14:36 +0000
Subject: [PATCH] fixed bug #2725883 - NSIS installers always show warning on
 Windows 7

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5974 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/MakeLangId/MakeLangId.xml | 6 ++++++
 Contrib/Makensisw/makensisw.xml   | 6 ++++++
 Contrib/zip2exe/zip2exe.xml       | 6 ++++++
 Source/build.cpp                  | 4 ++--
 Source/manifest.cpp               | 1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Contrib/MakeLangId/MakeLangId.xml b/Contrib/MakeLangId/MakeLangId.xml
index ec0f63e1..0964b911 100644
--- a/Contrib/MakeLangId/MakeLangId.xml
+++ b/Contrib/MakeLangId/MakeLangId.xml
@@ -14,4 +14,10 @@
 </requestedPrivileges>
 </security>
 </trustInfo>
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+<application>
+<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+</application>
+</compatibility>
 </assembly>
diff --git a/Contrib/Makensisw/makensisw.xml b/Contrib/Makensisw/makensisw.xml
index 4ba9030f..69aa6811 100644
--- a/Contrib/Makensisw/makensisw.xml
+++ b/Contrib/Makensisw/makensisw.xml
@@ -14,4 +14,10 @@
 </requestedPrivileges>
 </security>
 </trustInfo>
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+<application>
+<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+</application>
+</compatibility>
 </assembly>
diff --git a/Contrib/zip2exe/zip2exe.xml b/Contrib/zip2exe/zip2exe.xml
index c905437d..2151853e 100644
--- a/Contrib/zip2exe/zip2exe.xml
+++ b/Contrib/zip2exe/zip2exe.xml
@@ -14,4 +14,10 @@
 </requestedPrivileges>
 </security>
 </trustInfo>
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+<application>
+<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+</application>
+</compatibility>
 </assembly>
diff --git a/Source/build.cpp b/Source/build.cpp
index 64753e4c..80087c39 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -2248,9 +2248,9 @@ int CEXEBuild::UpdatePEHeader()
 {
   try {
     PIMAGE_NT_HEADERS headers = CResourceEditor::GetNTHeaders(m_exehead);
-    // workaround for bug #2697027
+    // workaround for bug #2697027, #2725883
     headers->OptionalHeader.MajorImageVersion = 6;
-    headers->OptionalHeader.MinorImageVersion = 0;
+    headers->OptionalHeader.MinorImageVersion = 1;
   } catch (std::runtime_error& err) {
     ERROR_MSG("Error updating PE headers: %s\n", err.what());
     return PS_ERROR;
diff --git a/Source/manifest.cpp b/Source/manifest.cpp
index 9d1789f4..c5fbd105 100644
--- a/Source/manifest.cpp
+++ b/Source/manifest.cpp
@@ -57,6 +57,7 @@ string generate(comctl comctl_selection, exec_level exec_level_selection)
     xml += "<trustInfo xmlns=\"urn:schemas-microsoft-com:asm.v3\"><security><requestedPrivileges><requestedExecutionLevel level=\"";
     xml += level;
     xml += "\" uiAccess=\"false\"/></requestedPrivileges></security></trustInfo>";
+    xml += "<compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\"><application><supportedOS Id=\"{35138b9a-5d96-4fbd-8e2d-a2440225f93a}\"/><supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\"/></application></compatibility>";
   }
 
   xml += "</assembly>";