From cfc2b4ff44ece1d901421f26f04765f13f63a2c7 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 24 Jun 2019 23:56:24 +0000
Subject: [PATCH] Move the Icon MS Window data to OS/2 Bitmap array and expand
 on it (Joerg Jenderek)

---
 magic/Magdir/images | 35 ++++++++++++++++++++++++++++++++++-
 magic/Magdir/msdos  |  6 +-----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/magic/Magdir/images b/magic/Magdir/images
index c65069fc..2e53cc80 100644
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.163 2019/06/24 23:50:11 christos Exp $
+# $File: images,v 1.164 2019/06/24 23:56:24 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -704,7 +704,40 @@
 # dib header size: 12~Ch~OS/2 1.x 64~40h~OS/2 2.x
 #>>14	ulelong		x		\b, dib header size %u
 # Conflicts with other entries [BABYL]
+# URL:	http://fileformats.archiveteam.org/wiki/BMP#OS.2F2_Bitmap_Array
+# Note:	container for OS/2 icon "IC", color icon "CI", color pointer "CP" or bitmap "BM"
 #0	string		BA		PC bitmap array data
+0	string		BA
+# skip old Emacs RMAIL BABYL ./mail.news by checking for low header size
+>2	ulelong		<0x004c5942	OS/2 graphic array
+!:mime	image/x-os2-graphics
+#!:apple	????BMPf
+# cbSize; size of header like 28h 5Ch
+>>2	ulelong			x	\b, cbSize %u
+#>>2	ulelong			x	\b, cbSize 0x%x
+# offNext; offset to data like 0 48h F2h 4Eh 64h C6h D2h D6h DAh E6h EAh 348h
+>>6	ulelong			>0	\b, data offset %u
+#>>6	ulelong			>0	\b, data offset 0x%x
+#>>(6.l) ubequad		!0	\b, data 0x%16.16llx
+# dimensions of the intended device like 640 x 480 for VGA or 1024 x 768
+>>10	uleshort	>0		\b, display %u
+>>>12	uleshort	>0		x %u
+# usType of first array element
+#>>14	string		x		\b, usType %2.2s
+# 1 space char after "1st"
+# no *.bga examples found https://www.openwith.org/file-extensions/bga/1342
+>>14	string		BM	\b; 1st 
+!:ext	bmp/bga
+>>14	string		CI	\b; 1st 
+!:ext	ico
+>>14	string		CP	\b; 1st 
+!:ext	ico
+>>14	string		IC	\b; 1st 
+!:ext	ico
+# no white-black pointer found
+#>>14	string		PT	\b; 1st 
+#!:ext	
+>>14	indirect	x	
 
 # XPM icons (Greg Roelofs, newt@uchicago.edu)
 0	search/1	/*\ XPM\ */	X pixmap image text
diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 472f6821..d09605ff 100644
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: msdos,v 1.129 2019/06/02 15:25:40 christos Exp $
+# $File: msdos,v 1.130 2019/06/24 23:56:24 christos Exp $
 # msdos:  file(1) magic for MS-DOS files
 #
 
@@ -976,10 +976,6 @@
 # windows zips files .dmf
 0	string/b	MDIF\032\000\010\000\000\000\372\046\100\175\001\000\001\036\001\000 MS Windows special zipped file
 
-
-#ico files
-0	string/b	\102\101\050\000\000\000\056\000\000\000\000\000\000\000	Icon for MS Windows
-
 # Windows icons
 # Update: Joerg Jenderek
 # URL: https://en.wikipedia.org/wiki/CUR_(file_format)
-- 
2.50.1