Add weird XML manifest resources, to enable WinXP skins to work

within PuTTY's dialog boxen.

git-svn-id: svn://svn.tartarus.org/sgt/putty@1530 cda61777-01e9-0310-a592-d414129be87e

diff --git a/pageant.mft b/pageant.mft
new file mode 100644 (file)
index 0000000..aa4818a
--- /dev/null
+++ b/pageant.mft
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+   version="1.0.0.0"
+   processorArchitecture="x86"
+   name="Pageant"
+   type="win32" />
+   <description>SSH authentication agent for PuTTY.</description>
+   <dependency>
+   <dependentAssembly>
+        <assemblyIdentity type="win32"
+             name="Microsoft.Windows.Common-Controls"
+             version="6.0.0.0" 
+             publicKeyToken="6595b64144ccf1df"
+             language="*" 
+             processorArchitecture="x86"/> 
+   </dependentAssembly>
+   </dependency>
+</assembly>

diff --git a/pageant.rc b/pageant.rc
index 217b110..21fa13d 100644 (file)
--- a/pageant.rc
+++ b/pageant.rc
@@ -3,6 +3,11 @@
 #include <winresrc.h>
 #endif
 
+/* Some systems don't define this, so I do it myself if necessary */
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif
+
 200 ICON "pageant.ico"
 201 ICON "pageants.ico"
 
@@ -82,3 +87,5 @@ BEGIN
     LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8
 
 END
+
+1 RT_MANIFEST "pageant.mft"

diff --git a/putty.mft b/putty.mft
new file mode 100644 (file)
index 0000000..0970a31
--- /dev/null
+++ b/putty.mft
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+   version="1.0.0.0"
+   processorArchitecture="x86"
+   name="PuTTY"
+   type="win32" />
+   <description>A free SSH and Telnet client.</description>
+   <dependency>
+   <dependentAssembly>
+        <assemblyIdentity type="win32"
+             name="Microsoft.Windows.Common-Controls"
+             version="6.0.0.0" 
+             publicKeyToken="6595b64144ccf1df"
+             language="*" 
+             processorArchitecture="x86"/> 
+   </dependentAssembly>
+   </dependency>
+</assembly>

diff --git a/puttygen.mft b/puttygen.mft
new file mode 100644 (file)
index 0000000..00d5101
--- /dev/null
+++ b/puttygen.mft
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+   version="1.0.0.0"
+   processorArchitecture="x86"
+   name="PuTTYgen"
+   type="win32" />
+   <description>SSH key generator for PuTTY.</description>
+   <dependency>
+   <dependentAssembly>
+        <assemblyIdentity type="win32"
+             name="Microsoft.Windows.Common-Controls"
+             version="6.0.0.0" 
+             publicKeyToken="6595b64144ccf1df"
+             language="*" 
+             processorArchitecture="x86"/> 
+   </dependentAssembly>
+   </dependency>
+</assembly>

diff --git a/puttygen.rc b/puttygen.rc
index a6d07ec..5efb155 100644 (file)
--- a/puttygen.rc
+++ b/puttygen.rc
@@ -3,6 +3,11 @@
 #include <winresrc.h>
 #endif
 
+/* Some systems don't define this, so I do it myself if necessary */
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif
+
 200 ICON "puttygen.ico"
 
 201 DIALOG DISCARDABLE 0, 0, 318, 270
@@ -75,3 +80,5 @@ BEGIN
     LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8
 
 END
+
+1 RT_MANIFEST "puttygen.mft"

diff --git a/win_res.rc b/win_res.rc
index 07dd93b..e251961 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -8,6 +8,11 @@
 #define TCS_MULTILINE 0x0200
 #endif
 
+/* Likewise */
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif
+
 #ifdef MINGW32_FIX
 #define EDITTEXT     EDITTEXT "",
 #endif
@@ -103,3 +108,5 @@ BEGIN
     LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8
 
 END
+
+1 RT_MANIFEST "putty.mft"