From 150d088b7d483822481e8e2715dbdbe1155e114a Mon Sep 17 00:00:00 2001
From: Exalm <exalm7659@gmail.com>
Date: Sun, 15 Apr 2018 13:07:16 +0000
Subject: [PATCH] Differentiate Neo Geo Pocket Color ROMs from non-Color ones

Add an 'application/x-neo-geo-pocket-color-rom' MIME type, as opposed to
'application-x-neo-geo-pocket-rom'.

Neo Geo Pocket Color ROMs usually have '.ngc' extension instead of
'.ngp', and their 0x23rd byte in the header is different from NGP ones.

The first 9 characters in the header can either be "COPYRIGHT" or
" LICENSED" with a leading space.

Also update application/x-neo-geo-pocket-rom test to use an actual NGP
game instead of a Neo-Geo Pocket Color one.

http://bugzilla.freedesktop.org/show_bug.cgi?id=106055
---
 freedesktop.org.xml.in              |  16 +++++++++++++++-
 tests/list                          |   4 +++-
 tests/neo-geo-pocket-color-test.ngc | Bin 0 -> 1024 bytes
 tests/neo-geo-pocket-test.ngp       | Bin 1024 -> 1024 bytes
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 tests/neo-geo-pocket-color-test.ngc

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 72c41d6..2a819f9 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -3024,7 +3024,21 @@ command to generate the output files.
     <generic-icon name="application-x-executable"/>
     <glob pattern="*.ngp"/>
     <magic>
-      <match offset="0" type="string" value="COPYRIGHT BY SNK CORPORATION"/>
+      <match offset="35" type="byte" value="0x0">
+        <match offset="0" type="string" value="COPYRIGHT BY SNK CORPORATION"/>
+        <match offset="0" type="string" value=" LICENSED BY SNK CORPORATION"/>
+      </match>
+    </magic>
+  </mime-type>
+  <mime-type type="application/x-neo-geo-pocket-color-rom">
+    <_comment>Neo-Geo Pocket Color ROM</_comment>
+    <generic-icon name="application-x-executable"/>
+    <glob pattern="*.ngc"/>
+    <magic>
+      <match offset="35" type="byte" value="0x10">
+        <match offset="0" type="string" value="COPYRIGHT BY SNK CORPORATION"/>
+        <match offset="0" type="string" value=" LICENSED BY SNK CORPORATION"/>
+      </match>
     </magic>
   </mime-type>
   <mime-type type="application/x-nes-rom">
diff --git a/tests/list b/tests/list
index 269c50a..ff757a7 100644
--- a/tests/list
+++ b/tests/list
@@ -528,8 +528,10 @@ m64p_test_rom.z64 application/x-n64-rom
 wii.wad application/x-wii-wad x
 # Mariobros from Atari 7800 truncated to 1Ko
 atari-7800-test.A78 application/x-atari-7800-rom
-# Sonic the Hedgehog - Pocket Adventure truncated to 1Ko
+# Samurai Shodown truncated to 1Ko
 neo-geo-pocket-test.ngp application/x-neo-geo-pocket-rom
+# Sonic the Hedgehog - Pocket Adventure truncated to 1Ko
+neo-geo-pocket-color-test.ngc application/x-neo-geo-pocket-color-rom
 # Pac-Man from Atari 2600 truncated to 1Ko
 atari-2600-test.A26 application/x-atari-2600-rom ox
 # Metroid truncated to 1Ko
diff --git a/tests/neo-geo-pocket-color-test.ngc b/tests/neo-geo-pocket-color-test.ngc
new file mode 100644
index 0000000000000000000000000000000000000000..f0795631f37326003583f197d03a3c0fc00d835f
GIT binary patch
literal 1024
zcmZXSOH30{6oyX+m_mWl`oI!6FwI4w5``)#?-^(aG)P;4h4n!oL0b)>glKT1E(n@v
zBr$A_frSZfl#PfOg%JoeZZvUka8*JiPK4Nz(0aJUE^w0b-GA<!=e^_d`uy$g=9W&W
z(Jys)S|yja-REs@=yZEM3P|9G6ibKK<910tudB7G6ZSnH3qX?N{ibH<1JFi70L#u7
z%N3K$<&!%8w#zP10M;LFMF5=fl3}YRC;^v8kf3pfe4T|bW>uerWJ~y-mZ>x-g$4;w
z9Adfh5QAK>#cS*8E32w&aM53l!%GaeZL(@oWauwd*WFaO7;i+F2>5-D;ajT%@2oN$
z7^}sJHMTafDk_pDDm{_;sSOb*u17VKWpI;Cp`_H12M3qfrHlRxT~{s})pSK7uV~<p
zW}>!vp=-KX8GOm0>8Tq4pARvtTwvI{$Z&;9R#Lg3#eu#E!<)AlzM?kIQ~BAS3}@ak
zJZF=!&n8F4sf}(86dxsS&@#x<6%e%hbOs_Qk7?@Z?qGI3YBWOKJj3I(&Qk8)97k7v
zAin3FvD?!~h=y;Z$TwuK@!JdwtNkMB>0mPP172NV`9*-C_bjl4QI%m9<@!PW71<o<
z++=}QUqI<GFFPmoU`$oo?9#xBx}r_RMB}_vJBo98^6p8m3QEy!DW*OM*~4o1Zurrs
z4Z%!P^qNPl*Qa)#9guL?Cg=VdV#Q^jjd(0iZZR6$=wkQVIQ>N~+W+dW{_op<-+%80
z0MK;<7&ryaB+g{c6i$)T$eGHS#%bbAhizSe3}Pn4Vgi_9XFH4X3Xl%*s0HGr;&B12
z5Zf~FJp&x%k%u@Bb7pfM;j|I=Vsb#=+Ecj+g$Y%VQ1*mk33W7~iW16^P$i@caDvx6
z$yv%-#_8ld#d(^uoU?-S4Ch&55>$dguYxqa8mziVb0$FzL^pTWdVozM-)Vs8)?bkv
BR%rkL

literal 0
HcmV?d00001

diff --git a/tests/neo-geo-pocket-test.ngp b/tests/neo-geo-pocket-test.ngp
index 31dad2688eb001a28770ff018bee12fb2715999a..be111317d6c0366b91f47ffbf2828ccd1fb950b3 100644
GIT binary patch
literal 1024
zcmchVPiWIn9LIlY()3@bFxaft2QQrk4_Y$qPAgk#S4ye2(ke{0ODRN8D_+E76j2#<
z2L<scc=0ZH>cRG6VlzbrD+)R%=!T*uc-dw3_Yx*k)~kW<H^031dGF<Y`Oy=_T)te(
z&(h;(X{}tMxk~j^rJ6lmtd#RWAqZipWlx@|W{dQqGNHh~PaI+c@<B<60f$p@GB?jr
zu&ri;q~@py_O&K}9lH$r*H;dxP;-1}_K04vK?mKYSjecOsAH%!Y7(XBxXgzIj}lOR
zz2F>Dq2U~6rZ7u0JE8&voD@2Bk|o?<RG~n|L^`zwdUE{X`h4eVQ+{Kug1N!xw(v@y
z_;0H?9>2iRr3DJhDE4N$wWDU=-F+&|47AB$v)osNep+}k!H*F`N#FqasU)V>B=3wa
z-o1{KqinLD_V*QkU{@x<NST?fZMwB-?J?ihf9(Y?zn7R#okV#`N^_K5#?VsTs0y?*
zqGv9ltz#^h4bM!_;T|RfcfGY;#4}sWWz!P1%-<xqB<?^B>$-zms-`7qKC`jC^M<>A
zlle5qj_zp!S(e<tu(VM&@=S}8+kQ&o0qVjt<o->WJQ66mvw(@myfpAG$XX62{F+tI
zS@oX02vJh-7EV8A@f*U9rYQW6rZD`5bzr*-K4KUA=@Qni(OK*;Xo1`ovYjhU+Qx{M
z%$0%BX>-|k4~*_O*YY21iOHuwxN~AV2ylLXD_CC?u+&>Y*}P$O7Ja=hD|X%2``r7^
sd0fclLW~O`7aGQeT`tVHFmmBxT*T!fjEf)_8OBL2CoxV!PTGz84Z5sv%m4rY

literal 1024
zcmZ8fUr1A76hGVUHvi;R6Elfp=Uya)f}DSrE^~K|($L&o25Kn!vNXa4{h?lJ5N7lc
zNZC^q5`-0j^dKrKcwg2)Dh7%VJ*OF%_kvOnxz2Yjq6Yh&edqgj&hPg-Cm0HMMou?2
zwNpbUoo#KVU?>s}MFQ=oL#-MR3_xKXr>|cL2ExJ684vvTNqAl+s>c&m<39|09Kwbp
z4lRZh2QZurLC^rc-rrgS@T3pl$v5qMwwVrr!CZ-;VJgN~rSLFcd&b@Hu|&pQPT}&L
z@4z>Sv;jM39Zu3@uL>uhH1buqlkigpVap4`OBE^(Z4w?y5cXy$cxXn!_7cKV(>{z&
z`_{&BV#bGga|%AKRuNpZ^3lxEAZ+Ff$Q4i^z$qY8gMjH4kinp&7lvbgh}sn}v-n(c
z+s3Jpm_IKjQhUU^Yz7yYHrA7N0dsp>K?#pzFJ6^IEEG|@Xd{@1UY%e0Veq>yS#i_k
z2sRweB%D7=_@$h1jG50Oe>qo{Mfk`~$%SZfna<4oV7^+S&rKL#BEb~W{cnEfoy)Xg
zr9fxm3jak;4p<tJi;ltJ{(U-&66qXH3w_B-xD`v|2)B6PChVD2QfvjS^!;^2XK9Kh
z64#w%@*D%WP(-*~M6z(p4v-ORHHKmz1`lHL7+rAk+$Lp)`Gq02ZDO16-kbL-X(Qno
zzp-HxT$#gQX+1vYA^n_EaFmC4%_Kbcj&Plamv~J*yI#t|aY!o~N?vth+d6^FN4r<m
z`HJiB@Cm%CECc~qYOUYa@BrlGVs5fe>{~z<`xcOOMn&fNTLTxPmv>7Q$gAbjYL&EF
zBdyj+btmd;YJJC3tkK_L7om@ZrV81gR1sH56>Fdx74fi96>l>r9!c>&3G1wl61(LB
zG+m?sj`4zSP5X2v!Gpi~$AQbcn-J}{7+Dlk-Yza*)5YcMyFfL$TiE1oZ6<e%{L{@R
zUe@tTEOnETwwmm(RB@6GZDeC>4Z>zN)RwJSUP6D)E`g|1#DNlR$J#tN-__aC)BOw7
C#yCU(

-- 
2.14.3