replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[PECOFF] Fix spelling in manifest XML. 

llvm-svn: 193375
This commit is contained in:
Rui Ueyama 2013-10-24 22:08:19 +00:00
parent 68642d3118
commit 5d32d96f91
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/lib/Driver/WinLinkDriver.cpp
View File

@ -223,14 +223,14 @@ std::string createManifestXml(PECOFFLinkingContext &ctx) {
out << "<?xml version=\"1.0\" standalone=\"yes\"?>\n"
<< "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\"\n"
<< " manifestVersion=\"1.0\">\n"
<< " <trustinfo>\n"
<< " <trustInfo>\n"
<< " <security>\n"
<< " <requestedPrivileges>\n"
<< " <requestedExecutionLevel level=" << ctx.getManifestLevel()
<< " uiAccess=" << ctx.getManifestUiAccess() << "/>\n"
<< " </requestedPrivileges>\n"
<< " </security>\n"
<< " </trustinfo>\n";
<< " </trustInfo>\n";
const std::string &dependency = ctx.getManifestDependency();
if (!dependency.empty()) {
out << " <dependency>\n"

12
lld/test/pecoff/manifest.test
View File

@ -7,13 +7,13 @@
MANIFEST: ?xml version="1.0" standalone="yes"?>
MANIFEST: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
MANIFEST: manifestVersion="1.0">
MANIFEST: <trustinfo>
MANIFEST: <trustInfo>
MANIFEST: <security>
MANIFEST: <requestedPrivileges>
MANIFEST: <requestedExecutionLevel level='asInvoker' uiAccess='false'/>
MANIFEST: </requestedPrivileges>
MANIFEST: </security>
MANIFEST: </trustinfo>
MANIFEST: </trustInfo>
MANIFEST: </assembly>
# RUN: lld -flavor link /out:%t2.exe /subsystem:console /force /opt:noref \
@ -23,13 +23,13 @@ MANIFEST: </assembly>
UAC: ?xml version="1.0" standalone="yes"?>
UAC: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
UAC: manifestVersion="1.0">
UAC: <trustinfo>
UAC: <trustInfo>
UAC: <security>
UAC: <requestedPrivileges>
UAC: <requestedExecutionLevel level='requireAdministrator' uiAccess='true'/>
UAC: </requestedPrivileges>
UAC: </security>
UAC: </trustinfo>
UAC: </trustInfo>
UAC: </assembly>
# RUN: lld -flavor link /out:%t3.exe /subsystem:console /force /opt:noref \
@ -39,13 +39,13 @@ UAC: </assembly>
DEPENDENCY: ?xml version="1.0" standalone="yes"?>
DEPENDENCY: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
DEPENDENCY: manifestVersion="1.0">
DEPENDENCY: <trustinfo>
DEPENDENCY: <trustInfo>
DEPENDENCY: <security>
DEPENDENCY: <requestedPrivileges>
DEPENDENCY: <requestedExecutionLevel level='asInvoker' uiAccess='false'/>
DEPENDENCY: </requestedPrivileges>
DEPENDENCY: </security>
DEPENDENCY: </trustinfo>
DEPENDENCY: </trustInfo>
DEPENDENCY: <dependency>
DEPENDENCY: <dependentAssembly>
DEPENDENCY: <assemblyIdentity foo='bar' />