From 05858a6c0e72d9d2e50eb345060f931009aba34d Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Thu, 29 May 2014 22:54:25 -0400
Subject: [PATCH] Bug 1017945 - Make the XPConnect shell Vista aware to avoid
 registry virtualization. r=rstrong

---
 js/xpconnect/shell/moz.build             |  3 +++
 js/xpconnect/shell/xpcshell.exe.manifest | 30 ++++++++++++++++++++++++
 js/xpconnect/shell/xpcshell.rc           |  6 +++++
 3 files changed, 39 insertions(+)
 create mode 100644 js/xpconnect/shell/xpcshell.exe.manifest
 create mode 100644 js/xpconnect/shell/xpcshell.rc

diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build
index b85a13d42e0..04a4ad6c1c5 100644
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -34,3 +34,6 @@ if CONFIG['_MSC_VER']:
     # Always enter a Windows program through wmain, whether or not we're
     # a console application.
     WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    RCINCLUDE = 'xpcshell.rc'
diff --git a/js/xpconnect/shell/xpcshell.exe.manifest b/js/xpconnect/shell/xpcshell.exe.manifest
new file mode 100644
index 00000000000..9e105b516c1
--- /dev/null
+++ b/js/xpconnect/shell/xpcshell.exe.manifest
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+        version="1.0.0.0"
+        processorArchitecture="*"
+        name="Mozilla.xpcshell"
+        type="win32"
+/>
+<description>XPConnect Shell</description>
+<ms_asmv3:trustInfo xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
+  <ms_asmv3:security>
+    <ms_asmv3:requestedPrivileges>
+      <ms_asmv3:requestedExecutionLevel level="asInvoker" uiAccess="false" />
+    </ms_asmv3:requestedPrivileges>
+  </ms_asmv3:security>
+</ms_asmv3:trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+    </application>
+  </compatibility>
+</assembly>
diff --git a/js/xpconnect/shell/xpcshell.rc b/js/xpconnect/shell/xpcshell.rc
new file mode 100644
index 00000000000..1b6bec6d434
--- /dev/null
+++ b/js/xpconnect/shell/xpcshell.rc
@@ -0,0 +1,6 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+1 RT_MANIFEST "xpcshell.exe.manifest"