`xp-wont-run': Apparently my application-manifest trims of r5534 aren't

acceptable on all versions of XP. Bah. Revert to pre-r5534 format (but
keep version number as 0.0.0.0). People who've had this problem have
reported putty.mft to make it go away.

NB, putting these updated manifests alongside the executable (e.g. as
`putty.exe.manifest') is also reported to work.

[originally from svn r5604]
[r5534 == deadab0900aec14efa94a116b4cb4f1f4536757c]
[this svn revision also touched putty-wishlist]

diff --git a/windows/pageant.mft b/windows/pageant.mft
index 8bc4431c583f489f5f9ac03ccbb8fd2e6e43b178..94458ab4f0868e05e0f8bdcf8c761ef1ab7ff541 100644 (file)
--- a/windows/pageant.mft
+++ b/windows/pageant.mft
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- This is present purely to make Visual Styles in XP work better.
-     See 20020104174954.A12067@imsa.edu. -->
+     See 20020104174954.A12067@imsa.edu.
+     Do not attempt to do anything clever with it, as some versions of
+     Windows are very sensitive to the exact format.
+     Hence, some facts below are fibs. -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-   type="win32"
+   version="0.0.0.0"
+   processorArchitecture="x86"
    name="Pageant"
-   version="0.0.0.0"/>
+   type="win32" />
+   <description>PuTTY SSH authentication agent</description>
    <dependency>
    <dependentAssembly>
         <!-- Load Common Controls 6 instead of 5 to get WinXP native-

diff --git a/windows/putty.mft b/windows/putty.mft
index 9b34d641c3b0574a30742760c76258ed92387d65..fa05ab802a03fb3cca7d9bfd328abcb9300d5258 100644 (file)
--- a/windows/putty.mft
+++ b/windows/putty.mft
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- This is present purely to make Visual Styles in XP work better.
-     See 20020104174954.A12067@imsa.edu. -->
+     See 20020104174954.A12067@imsa.edu.
+     Do not attempt to do anything clever with it, as some versions of
+     Windows are very sensitive to the exact format.
+     Hence, some facts below are fibs. -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-   type="win32"
+   version="0.0.0.0"
+   processorArchitecture="x86"
    name="PuTTY"
-   version="0.0.0.0"/>
+   type="win32" />
+   <description>A network client and terminal emulator</description>
    <dependency>
    <dependentAssembly>
         <!-- Load Common Controls 6 instead of 5 to get WinXP native-

diff --git a/windows/puttygen.mft b/windows/puttygen.mft
index 45ec531e2810a41000197b7d1e92761e3721d066..10a394ca5cf801ad88586e6a84391c1c480800fa 100644 (file)
--- a/windows/puttygen.mft
+++ b/windows/puttygen.mft
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- This is present purely to make Visual Styles in XP work better.
-     See 20020104174954.A12067@imsa.edu. -->
+     See 20020104174954.A12067@imsa.edu.
+     Do not attempt to do anything clever with it, as some versions of
+     Windows are very sensitive to the exact format.
+     Hence, some facts below are fibs. -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-   type="win32"
+   version="0.0.0.0"
+   processorArchitecture="x86"
    name="PuTTYgen"
-   version="0.0.0.0"/>
+   type="win32" />
+   <description>SSH key generator for PuTTY</description>
    <dependency>
    <dependentAssembly>
         <!-- Load Common Controls 6 instead of 5 to get WinXP native-