From 7be9552290f80d9dd68d03642be2618335a51cde Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 5 May 2008 03:11:29 +0000
Subject: (Hopefully) fix for Windows Vista asking for security elevation when
 running chocolate-setup.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1141
---
 setup/setup-manifest.xml | 16 ++++++++++++++++
 setup/setup-res.rc.in    |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 setup/setup-manifest.xml

diff --git a/setup/setup-manifest.xml b/setup/setup-manifest.xml
new file mode 100644
index 00000000..dacaa311
--- /dev/null
+++ b/setup/setup-manifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<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.0.0.0" processorArchitecture="*"
+                    name="chocolate-setup" type="win32"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <!-- Hi Vista! We don't require elevated privileges. Thanks! -->
+        <requestedExecutionLevel level="asInvoker"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
+
diff --git a/setup/setup-res.rc.in b/setup/setup-res.rc.in
index 4ae01348..2b7d203b 100644
--- a/setup/setup-res.rc.in
+++ b/setup/setup-res.rc.in
@@ -1,5 +1,7 @@
 1 ICON "..\\data\\setup.ico"
 
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml"
+
 1 VERSIONINFO
 PRODUCTVERSION @WINDOWS_RC_VERSION@
 FILEVERSION @WINDOWS_RC_VERSION@
-- 
cgit v1.2.3