* freedesktop.org.xml.in: Add magic from gdk-pixbuf for

ICO and CUR files, spotted by Matthias Clasen <mclasen@redhat.com>
(Closes: #16413)
* tests/aero_alt.cur:
* tests/list: Add a test windows cursor file

4 files changed, 21 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a9e11d2..0f89a0e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-06-19  Bastien Nocera  <hadess@hadess.net>
 
+	* freedesktop.org.xml.in: Add magic from gdk-pixbuf for
+	ICO and CUR files, spotted by Matthias Clasen <mclasen@redhat.com>
+	(Closes: #16413)
+	* tests/aero_alt.cur:
+	* tests/list: Add a test windows cursor file
+
+2008-06-19  Bastien Nocera  <hadess@hadess.net>
+
 	* freedesktop.org.xml.in: Better magic for GIF files,
 	from gdk-pixbuf, spotted by Matthias Clasen <mclasen@redhat.com>
 	(Closes: #16411)
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 67946a9b..b5381b88 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -3479,6 +3479,11 @@ command to generate the output files.
     <_comment>ICO icon</_comment>
     <acronym>ICO</acronym>
     <expanded-acronym>Windows Icon</expanded-acronym>
+    <magic priority="50">
+      <match type="string" value="\0\0\1\0" offset="0">
+        <match type="string" value="\0" offset="5"/>
+      </match>
+    </magic>
     <glob pattern="*.ico"/>
   </mime-type>
   <mime-type type="image/x-icns">
@@ -3645,6 +3650,11 @@ command to generate the output files.
   </mime-type>
   <mime-type type="image/x-win-bitmap">
     <_comment>Windows cursor</_comment>
+    <magic priority="50">
+      <match type="string" value="\0\0\2\0" offset="0">
+        <match type="string" value="\0" offset="5"/>
+      </match>
+    </magic>
     <glob pattern="*.cur"/>
   </mime-type>
   <mime-type type="application/x-navi-animation">
diff --git a/tests/aero_alt.cur b/tests/aero_alt.cur
new file mode 100644
index 00000000..5b1165c2
--- /dev/null
+++ b/tests/aero_alt.cur
diff --git a/tests/list b/tests/list
index 58f0eee2..a662de29 100644
--- a/tests/list
+++ b/tests/list
@@ -7,7 +7,7 @@ GammaChart.exr image/x-exr
 test.fit image/x-fits x
 test.fli video/x-flic ox
 test.gif image/gif
-test.ico image/x-ico ox
+test.ico image/x-ico
 test.im1 image/x-sun-raster x
 test.jp2 image/jp2
 test.jpg image/jpeg
@@ -37,6 +37,8 @@ test.kdc image/x-kodak-kdc
 bathead.sk image/x-skencil
 # Copied from http://www.geocities.com/CapeCanaveral/1939/256cur95.zip
 jc-win.ani application/x-navi-animation
+# Copied from http://blogs.vertigosoftware.com/alanl/archive/2006/06/28/Vista_Cursors_on_Windows_XP.aspx
+aero_alt.cur image/x-win-bitmap
 
 # Documents
 ooo-6.0.doc application/msword