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
This commit is contained in:
kichik 2009-06-06 16:14:36 +00:00
parent 1c747e74cf
commit 5f1cfb02ff
5 changed files with 21 additions and 2 deletions

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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;

View file

@ -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>";