From 16b27ad924168718a7216f42dde71e6322731ddb Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Fri, 1 Nov 2013 17:02:39 +0000
Subject: Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9298 : Update
 manifest file so as to identify Windows 8.1 properly (see
 http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx for
 details) Use manifest file to build tshark, rawshark and dumpcap

svn path=/trunk/; revision=53024
---
 image/Makefile.nmake            |  6 +++---
 image/dumpcap.rc.in             |  5 +++++
 image/rawshark.rc.in            |  5 +++++
 image/tshark.rc.in              |  5 +++++
 image/wireshark.exe.manifest.in | 22 ++++++++++++++++++++++
 5 files changed, 40 insertions(+), 3 deletions(-)

(limited to 'image')

diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index 1746edc404..59af328960 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -26,12 +26,12 @@ libwireshark.rc: libwireshark.rc.in ..\config.nmake
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
 		< libwireshark.rc.in > $@
 
-tshark.rc  : tshark.rc.in ..\config.nmake
+tshark.rc  : tshark.rc.in wireshark.exe.manifest ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
 		< tshark.rc.in > $@
 
-rawshark.rc  : rawshark.rc.in ..\config.nmake
+rawshark.rc  : rawshark.rc.in wireshark.exe.manifest ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
 		< rawshark.rc.in > $@
@@ -71,7 +71,7 @@ libwsutil.rc  : libwsutil.rc.in ..\config.nmake
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
 		< libwsutil.rc.in > $@
 
-dumpcap.rc   : dumpcap.rc.in ..\config.nmake
+dumpcap.rc   : dumpcap.rc.in wireshark.exe.manifest ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
 		< dumpcap.rc.in > $@
diff --git a/image/dumpcap.rc.in b/image/dumpcap.rc.in
index a395dcc669..d3a7e71e5f 100644
--- a/image/dumpcap.rc.in
+++ b/image/dumpcap.rc.in
@@ -34,3 +34,8 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
+
+#define MANIFEST_RESOURCE_ID 1
+#define RT_MANIFEST 24
+
+MANIFEST_RESOURCE_ID RT_MANIFEST "wireshark.exe.manifest"
diff --git a/image/rawshark.rc.in b/image/rawshark.rc.in
index 0d5c21ed4f..47afa8517a 100644
--- a/image/rawshark.rc.in
+++ b/image/rawshark.rc.in
@@ -34,3 +34,8 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
+
+#define MANIFEST_RESOURCE_ID 1
+#define RT_MANIFEST 24
+
+MANIFEST_RESOURCE_ID RT_MANIFEST "wireshark.exe.manifest"
diff --git a/image/tshark.rc.in b/image/tshark.rc.in
index ed3b162ee3..7e61e6fd06 100644
--- a/image/tshark.rc.in
+++ b/image/tshark.rc.in
@@ -34,3 +34,8 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
+
+#define MANIFEST_RESOURCE_ID 1
+#define RT_MANIFEST 24
+
+MANIFEST_RESOURCE_ID RT_MANIFEST "wireshark.exe.manifest"
diff --git a/image/wireshark.exe.manifest.in b/image/wireshark.exe.manifest.in
index 357dc47b97..3b80f8c699 100644
--- a/image/wireshark.exe.manifest.in
+++ b/image/wireshark.exe.manifest.in
@@ -19,4 +19,26 @@
       />
     </dependentAssembly>
   </dependency>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"
+        />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
+    <application> 
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+    </application> 
+  </compatibility>
 </assembly> 
-- 
cgit v1.2.3