diff options
| author | Simon Howard | 2009-12-09 02:40:39 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-12-09 02:40:39 +0000 |
| commit | c09be2cdb7668f9f5246eaa3e7de060db94b432b (patch) | |
| tree | c0326e9a714a5dc8b4c9463a88ccf8c62b6a299f | |
| parent | d27d3bb8b68f1e0f066a0749601ff32431325983 (diff) | |
| download | chocolate-doom-c09be2cdb7668f9f5246eaa3e7de060db94b432b.tar.gz chocolate-doom-c09be2cdb7668f9f5246eaa3e7de060db94b432b.tar.bz2 chocolate-doom-c09be2cdb7668f9f5246eaa3e7de060db94b432b.zip | |
Fix the setup tool on Windows Vista/7 to not prompt for elevated
permissions and to disable the "Program Compatibility Assistant" (thanks
hobbs and MikeRS).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1744
| -rw-r--r-- | setup/setup-manifest.xml | 25 | ||||
| -rw-r--r-- | setup/setup-res.rc.in | 2 |
2 files changed, 22 insertions, 5 deletions
diff --git a/setup/setup-manifest.xml b/setup/setup-manifest.xml index 409a142b..c2788306 100644 --- a/setup/setup-manifest.xml +++ b/setup/setup-manifest.xml @@ -1,16 +1,33 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<!-- Magic manifest file that should make Windows Vista/7 not + attempt to gain elevated privileges for chocolate-setup. + + Based on: + + http://www.cygwin.com/ml/cygwin/2006-12/msg00580.html + --> + <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <!-- The "name" field in this tag should be the same as the executable's name --> - <assemblyIdentity version="1.2.1.0" processorArchitecture="*" - name="chocolate-setup" type="win32"/> + <assemblyIdentity version="0.0.0.0" processorArchitecture="X86" + name="chocolate-setup.exe" type="win32"/> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <security> <requestedPrivileges> - <!-- Hi Vista! We don't require elevated privileges. Thanks! --> - <requestedExecutionLevel level="asInvoker"/> + <requestedExecutionLevel level="asInvoker" uiAccess="false" /> </requestedPrivileges> </security> </trustInfo> + + <!-- Stop the Program Compatibility Assistant appearing: --> + + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- 7 --> + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!-- Vista --> + </application> + </compatibility> </assembly> diff --git a/setup/setup-res.rc.in b/setup/setup-res.rc.in index dc25135a..2bc3106c 100644 --- a/setup/setup-res.rc.in +++ b/setup/setup-res.rc.in @@ -1,6 +1,6 @@ 1 ICON "../data/setup.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml" +1 24 MOVEABLE PURE "setup-manifest.xml" 1 VERSIONINFO PRODUCTVERSION @WINDOWS_RC_VERSION@ |