From 9fe7377bad6985bb50faa6476cb7f5c658c2dbbd Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Fri, 26 Dec 2008 05:50:01 +0000 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=87=BA=E7=A2=BA=E8=AA=8D=E6=9B=B8?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AB:=E5=BC=95=E6=95=B0?= =?UTF-8?q?=E3=82=92=E6=8F=90=E5=87=BA=E7=A2=BA=E8=AA=8D=E6=9B=B8=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E3=81=AB=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB?= =?UTF-8?q?=E3=82=82=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E5=8B=95?= =?UTF-8?q?=E4=BD=9C=E3=82=92=E5=8F=AF=E8=83=BD=E3=81=AB=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@101 7061adef-622a-194b-ae81-725974e89856 --- .../SheetCheckerTWL/SheetCheckerTWL.ncb | Bin 10603520 -> 10603520 bytes .../SheetCheckerTWL/SheetCheckerTWL.suo | Bin 18432 -> 25088 bytes .../SheetCheckerTWL/Debug/BuildLog.htm | Bin 13496 -> 9578 bytes .../SheetCheckerTWL/SheetCheckerTWL/Form1.h | 72 ++++++++-------- .../SheetCheckerTWL/SheetCheckerTWL.cpp | 80 +++++++----------- .../SheetCheckerTWL/SheetCheckerTWL.h | 2 + 6 files changed, 72 insertions(+), 82 deletions(-) diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb index 1bc28b9cf2b9fb90f2ae9621a6dc164bb5055ce9..1dfe8324892437b125679e7e822621ab1616ca3b 100644 GIT binary patch delta 16969 zcmeHv34B#WvUl}evXgxeAqnJUIhRFp*#npmw!lS#AP7nzA#9R_En*zegzY9^SYkq& z-2^dijDkQ8ih?W(D5D|@j)3Bz4(d1%Mdb;a?_cMh3;AZ|eeccpe((Lh_dU|Tx_wS{ zpX#dWs_N=K_ojSZg|!^8rlZemb4mYuFL7t)0dsYZ@5`2s!h1cQ+Zr<1hGya6}}IFu|0`zt-H4}h`9WkP@wVy(et ztu`n?`9XxQ@gb@PJOS7Zcmq%qqkZG0^f$@AK}x0kVrIia?MRSPn;_@dl`3T|o*oZi zN$&&P510tZ1+dNJqn@JmexhMtqITn(Eq*5H^-4ppb`JynJHS-HG{AH~Fa`?&g!;%& z{FMRGRlrpPo&a1+Bq~5X12EHDdv&7nfrn_8D+`n^;(P7&a#b^xO@RKxpNOF>3~MFR zq7JB2DOcnIzjHP4UOK)!NykqTCBPr8y@gNJ@ugxd@E2O)JL>rL;w9kYThX~g$L|sv z@Ykwi%5DzOO>fvI4xnLVD?+_={9$n%_=Z;azB>Md_#^N|Yi}`>q2ter&w=0A3O`WC zUldn>7qA@@`2)0hGnD6r*d}A0YJ#~y6v#}c8XHt4o)ZNtV~9;{A04K5;QYDe8ERK$rC(N**j{ZKMQrWho) z%FGHiv&(GyJ-tou&oAS=^^>zq_`y7 z*SWMcjSkWwIkQqtovmT~S4r*RLBSY6h$ztx0_2KGDEXpPtQUL4>ln->G>bjvV6-lF z34I9lumTcG7x{JXRVC|xK=WvAHx}EyLB3RZkIxNLSUV zQ>=&;cZ+f2QQ;I-VzbzWsa<~9UymSrDN%G1Jw&$5TdpQ_8Y;3y+f1`gI$t<32#1*V z)PWMIh>B@8^}@XHa0Oz9d~>5kmmU~vH$s$OeU!g{{ zNf-S^mKY+K$q}*zV+F7k3_uwtP92G+K-uMSHEM{v-v}|f$~D{9Xf$Te6T`nshhQa! z%pwF+Zw0pT7RC^-mUhXNkE_!|bZydKC{Gl_I&|er&nh*c>?DM|NDn+8p{wI4jOESH zNZo|DLS#$6X(6uljM?xWY}b=q{( z4f?|B5alSHhSNOylMe>}0xJ88{w!arQX|Y`#W;DqN{z7>!x0X_V~^0AGzbE+?w_Tp z2B89>Al5N1UsyM|t_I17m1_4PF8k;Vow3uufNA^_6<52QFA8=W57$eD^QFQ4(xLeN zP<)o~2RYVZE-X4<%nXmAQCmZ#bnBm{ARFy6n;vx852zr%@-$D8+xcqvtQEY`J z?h#G!f&Fm%lj00K;F9>O6sy#bpaSs_Oq*5YwiacTs+1Lqa>L?T=iZoh7G|DU4pEu! z*CF;F=xf}u>9+Qn?3*f>38}Cm5c^|1VpXcR15)*dR9~Zo&3g;&6L*3z)1F8RlFd5p zd7|nLuzWXM(;p4-)DtCGBnVa5MUE&Fm7-d3OnF`e7rAuXTYkF=hMFVBwr-X&tASi1 z(hs`=CfjkQ9KKqeQuYrFPAo+?)-ey3gCU+57Vyc^`iNTbqWEYj7B1Yev_*!L4~Pz6 zp8E`_?0Wrgv`!^9jn(;W+W_lEiRMSS^ad}zMDyty zHSY{;ZQ-H{)5;d#L39+|!O~h|5m+T=;gP>J==}%@+&h7Kk)K#29+NJ$xx(AX7p!{7 zgXBIC-5@DFYt)|N1$k$U8rJ)S;G~8%Js&aW8ogpTTq%6=6uj|Y3{93|(t8`r+jOY! zZMm{WjR6;S&p3Tc-?;<63|gxyVGDbi_5M6P_Zn25)uunJtoNuZP^xZcj8OOO zjFB_OPXCUKQ9QHDl{bylS}K%LqU@(PqIKVGX`wmnY(&ur<@ki>uun6dGf?as=_h+(kJjU;!9^lzsVO4J+r(Nv?s{XnXW zU7RjypGM)=zFUc8?sIctUTblFRBKC~#1Xf9m*I^^I?JP_2QDUOoKM*WbEIA|6< zhy=8p_94!5EEq={=p9JG(dn#FzQsMe?Kz5pv-8z?;`NUi*-1@EBL9rS$+CNl5DF>7 zK<*(p{XC9R079(BAykT`h$9Ebi5(!alU~+$04L}Y3a^^Xz@5mbo`uU_HKNUX^efnG zi1ig1t0?ufe$8RXs2s)qA>mbUj-f$2Z z2Qs-JQw&{fpa!x|vFdV0-CTU%Ben&WJ(`jXF+w2HdFp{X)?6k@S^&nQaQ!eXE2Gu4 z8L|0gDCku>KxgP<ZHn#fZW3>n)(d$S-3FThNG zBqZcr8k^B4MmdKxeKt&mb=5(i)J}9SSYREOCDH|)9 z)dt9Z?50Lo{e_09y0fP42GiZkh*JQbxm-3VBe8!VTD z^2}SH1lB`$dd8qLidNCjxMp4LfG*GBgvX_;t~42JF#SY&k*badpidc5S17SN9Y-gA zgst@yeT_SgSRwFzm;2yYnjA1ZO=Cch&O>jE}}menDz*h2c$f~ybFK+l@h|u^K@V;`#}I-ge1%UoSvQ{d8HDLLgHQGyH=ex(J?R;I zvU9uf5jsAVR-)!;47_|YTeZf<=nekxaMB-Q!eA($;~>?DppXu+d<7h^w2(u7f-fxu zR0HY(O$om8vurgXB-Z3hpJH985Amh%P=6KcD_gSFRMSkeREMeUGhd`VaPHTj*|%U} zr%+Do%&;Z;>*1fRY#L_3y#Xr3rlCZS*xYBETr^CzwfPjWhT|fmev~f_Q^U%Ru62df zW8bJidudoI#_n_dKYL{dhu|1{(l( z#?p-9nou{M*Dz$eD5S4cZhU|&Dpw++T=PANCZU<<+ua-?H>0`CHM*g`8!%rU^ezGUd3w%>3#H=zU_ZzntIi5MURs~83- zXLI#K{OON+UMsw!-aPN;`GaU6MgHRay zbH?M3xRH%|Pb)lYz@LVp5WNfm+;mt2fe3qJQ6C1L8I5cULM&+@-G%)x4(i|E+yc-Ks99_LaBqWsHz8XQhBCxhWhmLnGIPJ-_ zxQ~txC0^I2w!)|DcwVz{z}pJnSH}l~5iCIyX5S*zPj7Igs4uj7fTuVXDn#g^Gp+D< z>i7VC$xtTTqLZQH{V_{KYu|*BH@diPNU*jAZIUAaPlf&S*FC8C*ywKG9^mC_;#6+nam3a_neFpid4*f z&3P=x6Hd4QGTo{4j^hyN?!f6FuMClx+kDrjT;f!en1EJPIM-t;ZLu~0>|!w+ykA>lIKcS(8LCB zLN|VdZJDzQexw~zAqF|Owy?97RHu9*V&-CP;ePicOX0;`;JQZFYDZZ#TuqOw!SePZ z(lpoR<|Oh1E*FqLG^6|=Uk|X24%?;g42~daI!zrgGE=Ev8)NHP)*kPm%(&};Fu6$2 zXLz(}7~?UF%q^2}S3;~4HWMCdCyq)$n*Iz*yvTIK>2(H9*j8ZA;nE`a*uq&SdLgyFh!v6AN6YZ{YZ9Kh6BY6%SYj-i_()GTCg44dLha zz-oS?&kd0;$a~DTxDo86+;{~|*XRw*5p%*5ACG0hea-I6)Lzt`m$`ot2aWsj?!mQZ z;(n=ABX^o@AqjubH$~iuQze%IZa^9yrW2O^Zfi%`qSlt$;;FXJr2ttVe23r!WJL)3c24Abf)JFDOYIygiQ$HBkwfX z!o+Dg8u|@$&)Vsmvvvk=_#QIZ9%|!OHV|}ORG-TE zW?On=tzv1)QCC^C{dd^rnH%p_Q<|PtZ}@9B{-jt$<6bqg=|k1Oef5AeEu&r18=~o& zy1@jh8P%ClTGR8kVWMfB;xO$Tv|H3|QXD%ocbg;HV^9r|u?zG%5Z5_~EMx8;BO~gS z{;9$z3?SVQJ_nt=W zWz^oN!+`fOYG0%FLmdu$8>99&>HyRczy}(2kWmMtjs!l0YlJ+HPy-Q$ItusUMjc_) zyk15FA7#`6qIl^0eY{|b^Tpu2R^ZDOXm~Dn4Cju>Xhi~a<}VYrDG4&?C8d2(C=Ld^ zsK_G>bxTW;2gxPrNsrd;P~O(w?wi!hjM0g z)NB?@HE~3lZ#G@ssLea7YzY?!wV+RxsxZ0v5!)NqmaocQ`Blrms>F1WkG^0#AU_|m zIbvtd4)fo`bs@Z}Gh?-Ly^{KROTUi&z1r~WAa{ug(9c!epV~rGctdYWwHB#8I|6~gLvA34`0$$|*ZC)S3IOXB*hNpxb}9b+Q)2)Bh6!>`imd(1!6 zFIpR`ZMjMOBHtUJ&g89-mY$_X39apN^$XMAq^&Ew8rP|T+Ku;=Q2&1=f!$z!=Ei|! zi+1B@Ws!|@*)kd5BRNzHJd%9H%t@tHTDRMJ{=)>fI_K-gP@C7z0sE2nTK-e>+%xYv z-|ysnzjNdJUAi@8%=fBi)JDFflfdmZ{kEx%{ca!JmB@s4Xe^Adzseie4X)daX#2YERzHaUlpK|f_Nyc9rB=~K zE4s&S7T7G#9c!O2tRd*oK~|5oM>O4QFBBq7D;jUN3lXk0Ot3#LM1m zWPeJCXl>DK`_Eoh-tQcc4YSdqw$z?u@{9$-@{L7TN7G9SI(k~$0TVBqm!Qkg#rAkl zYa9?$@SRj3mM*v7>nA#B=hxaFG06+37g)pqIkyfiCF|^yP2LK+)_u{2JY-OMQiyhC zgFVuO8T8(4A8i&X+QfSM5|c>MKHqA8$0Sm<-#=}C$|O2!qn@>oOSN{w!;59YaZo#Q z(jJ;G16OqpZSx)Wn!MXI(PWQda#WXY5t?7OZhlAVW_Av>>J1g0u65HoUF)7cTj4#v z35EYG`pF~C0OKsw3lM|79Je~<&b%HGTK)7MZCA?r;9h>(v8z4$&XGB_&Tvl?Iweq* zJek)sM(Z`TXQ(BX=`h70G+05!^|pdL#!zS3Ft2BXRz9=mvn#DZKunjJSAiJ#bI;xW z)_5QW$OdyS%#=s3FT7>_1iMwvweWpluPT!)?32Z&^s5VZB)C_lDTNPWSPWqlKELPT z{V|{i2(lO^8tb9mk^RUvVa9opoV`6MOwQ?@Wsz6Hd$l#=G{%LxP~^1A=3$SFHsc7V zRjBTUNMkp(iW%n61IM_LBV`aGnxATF@-#MFEFOAWyAp@2qsb zHc_B9w@;Sc6y*VZ^V!Ef{S^qyl|X!AQXm_8WJPG3<~S{;NVX2{#7E+6879IOHzyTPci7R)t+}Bw7#3rX>q|=e(bc}L3?shsxI~`-3 zj(ePru};T0r{i9yW4zNb!Rffq>A2tNnCNumIvtaoj>%3(p3{-~yEKRYL{fP7P2WMp&1@UUq26CLAS z58vvo%^XpCafKOQ4$ww^T$|vbJv^YOppO|}7|<>(EIM9p#@7Y3?Y|by4L9S91l5@d zTCW{z-{@|}Hwm=sU#?YxP1Dk~hWpo!HT#X#d)IdEDt7-h zCObg$F5L1)fINPtsAnI3S^6LUeU)i~xBP9AvLJXK40S%B1n?lh^*gG%nE%9|P^C&7 z%B}-!0Bi(o0&E7<0~!EN0k#32mgfr_Y_fEsk`i-v3*bq>Tqvm3Z>e^Exps(2`}JtDxg1GR z)BBxo^psg~4UxB^T&294o`f9EtIL(^&W!oajFP5|2fMAkof+NEjBaN}|6?*EWJQao zM*ZDJDKTrYmYB69W9r}JOBKkM0GY^}2HgA7?X2j(O;#lH$_K~F3ttTml#dM>>?5xf z4ffZH77niYXELP_{_!}kAk{h5vTO0M6j>BD%tu}xn(d|av5b6ch_mvErplVaH)Y|@ zLht{V5}t;!a?P7tO0-#**6s=L&P&&m%N}7`T3}tU2!1b-=zYLRzy|=QqW@sq)EHW4 z(H5O5N>TsKbjdOeG-XakVNZEvV4+>c4=jw-I%gJsVDf8~Kap%0SlB`9GO+NZ+2^;* zzg^~iQ@c%?Ph{Qqo}Ef&meBmEC9b4!%w5n3TiHv%?kqI7f1587MbZs=2@`T1=Lz2EfUB`v4#lRIu@ zi};@agq3{@fuxTnX;vA-KE6Pq<{WL_&1Zp_meSifDZtt0RII^;(z7@5U63E&q5E6C*p_kCfrfD#A0*0PILJ>q{gW?V#2%%&^0tA78 ziie&Bh!jCUK&iGP3JAwuz;;l<+~=LW)=or@_nzafIl$7!Ui(Uz{5zPacHCz2f2jB^K0p0-RuLt<5o<4p{?<`;H9=6OQl;1+3!Mt5r z$0*~qni}<2lmB{D7zS#nIAQWnMLx69ogFFt&BGrE00My^AQ%V%LV++K9EboSfhZsv zhym&Yu|OOU4>SN8s=s+8cwQBzzU%$#hqsAmIc|(C^keKv6Jw2+N3w*oJ`A_)Zm_W0 zmantVQy6;&Z~&#id|&~v5O@|?1S|%g1C{_wfihqjupC$ctOUvd0jvU61J46%fC^wO zunt%cR02lSZwAmbcU&kaO6}ca!%M!^cM`t#R}cCtZ4Bb(xDB(^Xm4ecLFD@?na$28 zGIjyD2wVa#1MdK%JQ*7ej0MI4IuF9+gB+HFRMeq|OS+BOkY<(DRuCcSy;v`#OP;Hx zM@o8c)*I=DI`k+>@5A~ay@HNWN9@#tX!)Q&>yPwXdZ6{VzN8OfKO;?{9&7YCN&k&8 zNF@*(zo($p!ca$P76uj!K-;Uu&B<1HuAxKegZEP)#-5u zNk7F&9@f;Mcb4??{3CVLSViT0qKKKP#2fqZexl<{CC2zTFBc<@mM;?@J)uN|SMsfV2j9i_@csN%eu|&w zXZd*)EPQ7vN&J+^nx(Wh_u+^5J7W4QB`qq4+i>;aqqu{=z+b{U&W4~V;^-_TCf-@# zeiU_{pE(vL+g8Qef`JCK?Qyn4)XY+z_G`~O^YMHNf1EGmW#B;BlgjjZsD(#&G|G4S zh>+PzBG}Ylw4bdkcHf1HPV3y1&8&)@Vehby z*r%*F9}E^bdo&KLrha^it9qF)g9c$!*laeREo1B0R<@HJV8___m%?POJz(Y=!Qpbe zDzx&h9F1hqH7tfTVVSHQMk<`g^Krb`j-hU|*g3d*<_dgwN9G1>JR0;iJIBtm3#`I5 zuoLVg`<(3podkoihmaVN=CMxT`VU*fWP|kXZr19sH)Ipo z7WOWCkG;=6U|paU==B%aD6P7FT)~7TS|47$14;pR&#_hP?k?vjZ)AUaHj4Rz+JlW` zlfjp%Y#MuvO=ncqcg#85O`x@?F`Le7-e!as#_T!PVlHq&- zSWhgvfMK}KzQ8w_Wmb1$^>8&~92iIv5(F`dgdjEKDd681pi*B~v8}v4T2776V~-^o zWx2!A<8uBG_(6je$C~2u;r1w=z*Bi!UdX5M*&G^z3m&NTd^1~yBH^^i>^|I=>$yAq zF+T=}n*KYh!PQ^!l~u1}uR`jn5yiaqF{d^o%>=!qN!bQ=n{25S_}BCHzF7+)dz2NZ zH9?KI(P*phr5eK;wdV~Db2^}uWOf2feUK)8n}6uk#A@_R<)*oOg_2+I0y;-hR#U@@ z&0_5eB`ku3h)E^E*j2P%e_T(zg~xXC02mvJi?JW@xGVFgxBC&@hoykqa7Qo%^xcE; zN+-Pre~jJEb=o}-*wsLpKb55-&FNoDC+YNoifDrLZO{XmzX$T~B2U7HrP~?Vv&ctk zACN2IBZm^rszWDN!Uv2c)-1DaZgPL4(>)HwCuyrwokjbtdRZ-*Vm3#fn^ zj0)zY$p>)^E)Ao}*A;UK;*d-981R-xu=_yg#EoNyr)Y#@STHUqsyg(hk{%=#*n&EA z8sQiS3W*dSG^w^A8sZp8BFW&(bzUIXCk8C^NBUkJdNWD)lha)pR9g&zZ$6ClnVO{-&e`g+f^c10eue&Tz)X z+ObN6m^?5kGBC#A%|4FxVwFMO>>H$?#)#inDJP7_ITM#wD?NC)hKf;bOq^ zN(aAtn2@BKhp~KuIQ+cQ(r>*+3lQPZ#^wC>i45 z8YNw=QaxYk%kA_6nE`OKm~;_iZ^F_r_VbZQ7af9zzbHn&Ya|+@ z=cj>Z>;`j#LL|Db%P0zfuuBO$4H4G!$4Yu3+zG~rj{Lo4#WWY0CSoID;`A42PBEyA z(fA~~UIA$@(t*@~<=~V~w~B8TC}BK9EMA=w7E5wS9YfdHp9kApBra4o+p9wv>u}q^ zjzR+3#(S~tNasRwSAdJZfd?dM{-`Jr{f~q3Z;a-U!&e9oWDc7vEf6uhFI&UTXgoN} ze$cM3w4poCeq>P?I?8#O{lv&xQKNTRn94q5zu-z~?pCKVnx0XvswRmi=cP2W|H^)4 z^RzcRu!-zN_IJ1|qrjdqY%CnL@$j??UCzm0`I~wvWT4x^DhqCc92n6e6Q9f1@OS1p z{V;M4iZrJn&kirZ>G8E^9U*I`7o8rT?!;alfeD5pHnYbtCUo~1YYqlbv6+lQj-PKk zSwN0SHO7;e+Y{FINw~Up$TQW4LPl|Avoke z&W8i{99;Yr@Te--TDbajt!I^N0~};$xUiLNL*Mrx062(=^9J1gv+{b2IWGz({(-RJ zGxk0E4dOulYY-2^6^>vnhS%p7p2*X9I&W@A7))VSZ|U?RQbYtY93j`^a8t{9rMzCi zh|~2FViUUd%gY YXX)*Liu7TTFgz)w}iNIILrlnyYz_jlSe3X=|CSb-3gx@xxvx zHewAS$TWPZ{PAmYfe7xu(}SdN?e!yWa!8BNtJ^#MrH<2G;zgRM#-L|ud?h4|%6WoM zfDDl4sO!-lTItk}@fapIJAabT*8J)EU`jgg^RijKa#k|aS>Q>?012H9Giw=Jj=@>U z%9+3rea%WWS($<1JE;||VEo5Dpwc zAn=Qpbu#9FAKoT0PGLh>&l_f$Z#~AE#`!5tk&qK@&^VXCNxe{&@w^dOPlBrlje5v9 zL7M=Z*vm_!?9!!=h0OZGou9y`BJOVlW|F?{1uasTbXh)T9W{=dQigdhYU zL24*Psj(EMOoUOHnl7T1fGh-7EqEs86?wS5AzS@1w+8TmQpWQ6R6Ma$TL*A2t)G$b zW@EJWRkA&&$XwH_z4>U3x{(!fa`B1Yk)4ui(;fG-Fl(N}9I>DqO}MViCSkbNv%g`U z%mX)w=@C2*&r`uAvJ^q_Fwjx3zs`&J(2}*nT2yBlz&{LEP!xZVv`+Q7m~@9%4@t4P z*=dFnikdjB(i9nbIzL~@jgmf23PvmqS0=8OxbFX61c9P4pRHX>%RFU|N>~Z2Kfznx zFF-Iyx{`YO5H8KDu%pG)>UbF|(8Kw-{Irbp()J9e?xU9uqd_DD-Pyy44@cFeTK+Z& zUCA?{aws$ychd|CS@vk~q`q9#P+;Sz1C8)JjoH(rf}@@_V_C9yt>Ag*VFXBHm!dKM z`sM%qySmp?3Jw!=PiG&qEwX zOc)~#V3Z>~<_;2>6yS4(<3k=VNMSKLD(Q38-Th)Gv&XS0b zf~1Q=Khi;+v8*%@&0ARKjua=2Ah|y`@E+ysg{sN4%yiw^XEIt6qC$1<&eFsq3Ik08 ztfz}KdNiC<8Z$lpT5Hr}D3-7bWl_cSM{7S+c029r65w2LDFDyM;hJa%!(Cr+zf!9t z28-S#OnSN(bTX{nSU*VcVDvrz5BFxomQ?91Tzhd(3ckLax6V(uXU+2c9vA@UP%p%w zco@OPjgKy2t5w|lfef=r8@?vY;!jab0tZ`HO zHM4xrjXRh05M8rSM?Ri-LL=w9g&{Q|4Ml238iLdfX(ZB`ntb(@2`L_)evKg>6wloS zT6N1&k55fm%5)0)>{e+jd43X znA;_%2hr0Rk4N8qMSKfOyy)A>(jY7l3g3g3y9FVwsVOI!r$4bkRi>ABwwzW^?^Bu^ zDeS_at8NFCUyao^%WRW6`?&IyQD*<~d-2>UrGdD0N->EeCl!;Leo8rSx@lvTJ(yRTAbFq_uZhd&}TJd(NrObVN@x4#e zR$oy^&$mRSc^cRpRLl|UE>ta%qK|4xDeK!r+*K`|#K1@!H)Cz7U~4WgNzizv{g$66f|*6Fw1x zLCtO}8_^xjphlF*JqeoG{+KnPP#VL)9}}veT9VjwyoC)_GRU1_zUU<~c0^f^wqIs9 z5g@&X{u0Y6YGddzy_(=!n_3I@8o{}1XfWk!g_VIyyg?54Gl&o!d_FeS7V<@W(VKp< zs|gseBt}M(>IuwX7a`T;k&~??>k$ZRI2Jya9Z#-+^?kX%ezg&m-9a>6y%dX3ZOIH$ z-)Iqvyb6Z>rnC55j&gK5@dV2<2*;fZ=Q`a-yjG@!#n56SnX88Q+#>H}aU#N66k7b0q(lK)KY@P*G7&B`!vZsN1$N<=^jUZXJ_0w3%o z(nJwesk9DRfmW5vU{*k=kIUPE}8x)(}|=yZ{KqT#5IaVF4=q9vOY=tEip z>I5Oo|Km4NTA^f^SbcSQ!kIfQrJ&S z*U5L7u9NLjCzE6SXPrC-QQ$P6jNHA{_3_6{*T)|- zecQRS)W;-<0)x|)_jGCFj~QuWr=*ZcaBAau$Vs$XO`Lz9CazV)t#nOH#ZQD1U%?u= z^zhUCnfvsxQx0~sY0$#e+mz=_>T}za$;PTZN>X`&vWS1;IPYfSZ{gQ#qK(OLlHqTQ(=1_blT-G ztjdE9yPP6B^nk-I@9~d7|MOv&tNd%wIhb#N9x^a>@>u01&Yu-A<8ksOpXZB?Ghhp6h#bBj-FZw~c#Rx~@Fb10LXH>CEd^8>hXJ%k|Tt7Io0LJiH*TI?7{0zU&KXDzL8DHn%OfweDV|fy9ibb=Q zybTO%N4`#UnV@vEPsSSCO>F^pFY2Y*Hlk+Io790=1VU~2upDQL7VwYZ2vXaou=-j* z%v{%d&+`rZ7M9K^pxe$>ewZKS$FN>|8s~pLz+m)R9XiO<8Sesyg|8>ougskuZW^TCAsMZH1e|CwIIXF;eXXf9|vK% zZ!jN*rNxzeCzg&+<08I*GvZ{S665V`*D18^+cXrjCz-SQhE zwn&Lmn=eQ?ZE!z~e$YF=Oj6?QDmwzTq92DjhOX(yVYD~p+6Tq4F>w7_Vde&-b%}fi zw`2VD(=dA8+S4$_P|}wnGjv!*KMgaU>!)E_!?Bu#Rme9Ru+wrG{w?W6|cpRSme6F8qd6^wXwREP1 zBFPA_IS#^<3~{nToLcdAIEjzejqTmluaLi;y zv5$3~L7~C%gf~K+o9H@%@*cYi*H=G+Qb#7Zegq|->qk&Xu;MUy$yl$qx{jc%gSOF+ zpbT{#L79jyY~~L&z+@&zB~Au_fv^B6I2K~Vd7OECF}&>!yh_}jti=1-U?=JlH*0~0|HqrDl^-Z*wU7Kj%kfR~mPF39PqaU_RQlhjtVqpzonQiH4NH``Haw;27L_xrc^9f&2;YY0BD|1DM6HOZR|u30;@8 z3#=AzOj8mEw!uDM7fq=Qm6Dy0J-+df?x`5*mFV7fdF=#;>DrI6q06~XWXmf zo>L2KuP$LbcR1^B73yO|f>m5*Fa(BQ0r=F@boCH>N9zW~nsA?deLC_e}mYEEjG4 z)E8khl#HBKm`iksuM6+NztY0>F0TC@GFWY)W!ky+cZOmV3NY?t_*gj_ljQym&G9ip z%uteowGEsq*S5}3K2&@(L&=JuU|Jvdi&)$EhB^7tMWjBiDCl&E+VZ+`(onT3#lQNB za@SYA`>A5$RbMMO&?v4qO$}3{(^Ee;R+}uo4OHI-SZJ(HvOI4PyCNIq@<8#`F6AR6 zZ|+ty{=E|p9L_(TaA*m0M2z!e<_#3Yax6j6B1GMj57Oj4;N$}x^5F<1$Zyq7K8%-9 zZJd1YhocXYu1LD`a82El4=IxV=aUa~sE5NPzW?L{oyFne_5vlyOuiTwWvf$y%yi;L zyQSq+?KZ3SmintvTh`vTa@}UMrdza>&QO@)@jl=j1=EjEq#uBa_hTY&p^_|yEL4gI z>reE<6*-8~tw1zj1b)QHzfXXFb?9QMJmfip9e@FGLrYe(N^DTR#J018;-g9>OVPZ1 z>>c#S(!K8F2eJl@o%5$T&Xvs-Yd67X&{tTnehk-&M0GTqjdE$44afadxxzy96^yop zX}(jmOp!7zrO=b%>@!4qWJnvsujl{;2R}&*wP}5iwtz`==q(CV>75suTu>42o0S;P z9a@Fu>cGtk=ONA|_GA>-1kS|_REVHllvF8-*jA-HCepVkkGNBbYtZ8*Tfo;7Ta;F4 zaHP`sSHtA~e&|J~>a@lFQS!Jm zu}Eub^019JF6DhsHMzZI5&!>dPtMBteS31@&ONzYZBH(j%#r*PhXz}^%1ybqhghQq8EJLHjF4fYL zHq#ynR#ly2_ppoSOSjZlj7N#Z?q%i_$T*d_(wa3xQW=~ zi6Lq(w;u9Er+yakp4Kq6vA^{qH`LTr2U@*|1v^GEXTF3G>-QeUnwl3xNg(p2*SB75 zh}Wiw+wJf*I@=oPhS${e?$!gI$ks+QeFSvVL)MubR!yDru=N1(?vNqWj zdWnvssI)=Ww>@!Mx8_mnbX3}VxThHY+2l~QtiT%JhSGdRze(0Gad5nKn9++Z5F19~ zrOXM|YL2g)oL@~v)`z^ntEr!IXN!x2rXDcx2({5n>&|A}OZ{lObvbsK)RMhcY&X%q z)G9G|7YbThZ5_bP0U$IK`~V21ebz$GgVd7!)(mc@^P3+ya~?ThE#{(lztyB>9<<)! z+(%74WIbmR#e1!$>SNZMMl*I7SW8iI%o2j0c*QpU7S{u9bXtn7l*4FMkMlJfnI>m>_tJiWKV?g=Pr#E3xgUHOzyl^Zj*8+f9+ z)10xz1}%}5(55>{sfdwzqpmKaERPtkD=as;o)@Hs9_ z12V($FD$onGs8-A2V|XbrSccg$#eU(jGDS8JHrq~C+*3$CGsqJzi|b+0Fj z@fUOdhW-rMlzrL24Wj9m>@A{jceWRT<`|eOvzWU*JFI+b_K&sHfBK&hMccAtMZ$~O zUxH6e4R|SgBd^U+k6Gnw>XnzX4{+&Gj}6UnlJ>lk-PIspy0<<1q`PRmF+0%s6&o)4 z?IgCU*|!2j=M&k%;@bXf6K^d_-Ud1Nbhb|@Pb!VSmJM`Lzl>c@EnEhi#z4HppQ^wjmDNP={@p!#3Pu%XipDIBX*wwnrVd0*7ss!#3Js z8{@Ezb=byL*~V8??dV-mb!(}qYW@V1=yl>^dnNf74naX=ktl?h2fA{-$H1aps zs9rahf9hU(H?~~88!N(h2-~4m9%Q-hxU0eE#hub}pAP$S` z|Lsi&Q-LO`>0p{i_y3rh|CpNpVN)ajIq1J`YKpt6asDt9e51JS15;A`%8X)e^j{O= zw9&yqSuHqkEXo4#Y))|2`}Me=C`rzW;@^s{4b21IS`6DNZmg9VuhZLA#{4T2xM=o&+2Hl^t~G0PM*P3stdSKB_>Wn0 znzf!@qRH88FLmtY?0w#UvT#XDJ74BwVX_`*(qP7NYOadOKdp%*+4$7mk!f>e_HtzQ zuFC8a?zpwI`c_$C@*fROyqh#Lzf~2EpoJ}_{-x>J0@Gtq=j?@b z3^;DIC(xU{3aAa-i+(aX^LUP+z?gmmMa6HR1oFT+3JzWZPXSK@+V7DVs`@TBIl{{w z;i4*h)xJ`nS!-0ESrxbbu15c`eyp!rFlue3Z&_cHniO7{;H@^cuf4XYDu0b>i;vH` zV8@I#ju{nIGuHm-xuQu^zUSMh9^R_wsiGr(BJKUPS>=7#2U`-fA80v%)lT|>mIC}h zORDw*EzNOsWD$I%Xiv43ZMhc@T$6}k9#{*k0~`wdXi9mM{eS9bTQ-0*F8~{XO~7WL zO2J`@Ex6eVya>DmybNpuUIG3FYzKA#JAqxmZeS0v7pMkQU>~p_H~_o~90Xni4grUO zBfwGMb>J9q9C!mbq1bVH0XL_BH-Xc@8Q?7N7VtK34mb~704@TTfXl!;z`MYE!27@l zz~6xnfh)jAz{kK<;2Llp_yo8C+ywpsd`ds+@)__s@CEQC@D=bi@D1=S@EvdqxD9*{ z`~dt2`~>_A{1dnX`~v(6{07_w?g768H30o9FKq!C03%=m%z)huAMSt$;0bsE-hdBK z5AX&20Dm9=2n2$FU?2nt1;T)EAOeU4qJU^12B;6j0&ze*&;V!%Bmjy9<8Q%DB9H_m z11UfwpfQjNGy&3pbf76<1u}q-fvdnZ;5zULa09pr`~&zD_zd_Q_yYJ6_zL(M_y+hE z_|AgyzlEFI!1urpz>mOBz|X)xfjhu2z^}k>z+K=T@Hqr2lxVhc6|5)0YD%S1Ox*iKqwFfgaZ*kBoGBe12I5-AQp%N;(-Q0Lm&ZA z01J=^Bmv1l3eX5>45R{00DBrf(t)Oc703WGfo4E+APZ;#v;J%Jp+2J`}YCu02j;HEFo4|oW87{~?s1CIcCzyM$%FbEh7 z3;~7$!+_yHJ}?3p2|NlE0Hc7>z!+dGFb)_GOaKajB4A=7#(xrSih&YfGB5?03QPkY z1EvErfX9KEz!ShM;7MRMKtnhOmniw4V(ea0&fB5feUKC--^yyMD&;q^V{8TndU(e zTtucyU<2?1uo2hM+uy!0WCbq8g<57=*_M>sN)o3HsZ>Ip7(TbqwioFEzU7 zx}FAczMe8w{kv^l*CY%d1HfsY%cK6yp9*s_g*pt|0h|D6B;+WlEq^PzA-O&;g@)s=I6M+7?sb3a Qs}w)=g`fMXH2w6y0R8#B<^TWy diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo index b90ed74a601ba23dc24acbffc01848ca6292cb51..f6c13790d1be03963c858a275fd55d6640e05b88 100644 GIT binary patch delta 2013 zcmdUvZA@EL7{~9q++NFgS)rw)&=v{>N>^N45XV4h)olb{5MSov%j8X&+nBI{!){8) zro;F_#uLrHXow-vL}SEjqKO(S%;=UWGy28Epe~s)O2$U;1G-TEPuok_m&Ff$@!b6K zobx}=xzBld&WVnR=xOoZklgH+B&ismKw~0x#GIe4q;42sVKdFx3_k zJ`e6@%gWwr32%ZLq zzz|>`<}m6);%))RBokM z{s>KPXr!nuN)zER8na&>FIZAJRmNoctKcjzmpbhY^ogUE7M)Ib_$gErqR%QnB44>h z%M5%VC|a~6s&_f+d3Hg0(bXpRe6r8f_-qsSlqdwf_AmC;jSwZKxYrKv}|ElkvKcYQ0F;{n7xE?-6MSQbLq8IgY}M z&-NJL#Csn01#p7fC)++2D^qP1f@<#csi*`U&6As8=OgL%dm;vq0j4^^7I8=v!68UuM}Y|zQru)-a4!G_wHB-PM z{%z86}{0LJbN;u!(u?vgd@zSd%|=-uJK^ z2-1SLOrM8XOnBi2S?D|8PWr=Jsds5NSh8@Pw}z;{B&_vU{U~yeNZatH9!R{efnasb zO|{hLAH`rRb$AZx18Ko?k)kfA@YA=7i$aA);nF9nMleAuuC>ceZxlK4lqwW6*Qmpg zO@i8tEk@1_E;O;dnA(jyuN8h)@@VAN7`@`%MYB0BmG?}NwStX#GVh^22l-b)S1R}Z q`_0z}{ukS}jBP9T>3`H_%Jbya#)3zYuQze6r)plTT?xIkDg7VlR}>-u delta 1908 zcmYk+dr(wW90%}wE_c@jR@hxImdC;_yWk27yC5}bflF8tBcqg~7*kD3Rz{|^q^;H7 zq^D2ZpZ3mP_L2he*4V?65@)oL24-yft8r?kra#E|gPO4t`u>)484vT}ocq1!+{f8- zu0AaEUU77r>YSRMp7tt=;)7C{8f@Dtl3G`m_v&A={@rj^q#+y%8*%NT=qyCL2s}^> zCC~z!fd~5`0A)}P^C1WepaS@2A=Fi}9Y!628mNVZK)*)ICop3j7 zfP3IxxDPhM{m=yuz$SPQ4gp`~A=D2;47%YF*b3X=QHaBKcnltgCm;bj9M&d@N+YJK zNm+#dH>LiXl!de;uZPas8M(^G<`lsMK3lGjVpE{E#0s$9lw6__f?uek# zV2HBv9dv!sHRKBZN1KXDX;*rLhKi!3mrRO!qubjfED?S!BYS~UP?q1OrH%^x6~e-c zA>X_O#R4lWyc{xTlgWT?-HD`MrFdC9b03<;JQ~k17ObLB`6?Q352azE$fxBR;kEPB z*@KP_O{MFW`euVQtq4k5eKYf_8sFY|S!g@8wlum>?=gFc35wnji`sCDk-j?DpHmm7 z`A2ETF)s(6lPhyC&fN^WBF&t~9P{WZjaGKic=`FnlQ_8pdf+K|8lHh?;W>C7-i2MT z8}`6n=!ag|4@n^4pWz_t7vM#BNoKF0eidGW*Jbtw>Nj~QzJ{v!PhX;cW|{TsIhsuVGq`+yiDw8 z4vq0dDwsHhY_-=KfeMGvsy_|xG0ulWf})FDSj~Jk2)y&LB~m+{Gav9W<&1Z{Fh)Fi zBDDD29lYsMyNc_p_#a9>@G!IFqCwvj7m_32P6N@k$%bZ|`9i!C#R2MWxK+5#MQC{$ z14`*qLkpeKYACj3g;nqeEXV9%KaQi{V9PW3E)w4f!~KqJ+;+_6MTkOoC9tHd2Qu(w4HESW`3^a$vLRG$*-3ovo$i~Z(@hc zw#bZUH72v9%=i;>P^7+HSO_v~K{y~gej>Bw$d1eGgv|K0PNK~Ze_Cei&^{xxA7sW~ z;2&l7lgv7iU69$hXq74TP1X})n{2^)WD+0Gi>d|nA`k~0>Q zj5oKb*f0TgVM^-qNpJq3rU!C^3%btDh8i!iOXzBuGfkeQBgd}CkjzlPP_UWbU?mFx DBSJPo delta 1135 zcmZ`&O=uHA6n;t577bftvZW>|aa=D7Hco4s>Os&ZDO72cijATW+fC92Y7#f8)`JON z1b;wqPF@OvS5a6G6%;)Qg1zafQ1oa7MFbI);x|c~F3rlYvor5|?|X0NeN#KJlzSHG z@D0!r>Ze0=7-N7U7+kD$4VjgWO1lVjd)sv?Qc?7)d&R1IP#jZLaYmkJ$%-Q5edI_|WDNpZu<3MQ^c-n) zfHZN_(>OhorI48uN;s(_7U6! z$2Ua7c*=wI9S%^fhZgBNoO2M_?0NywdI5ID$y5epC};U*8VSNk!SIadFqnl)mfd(T WvYe|ZD!ty48vn_ka`Qb~bo~PjB=9o; diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Form1.h b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Form1.h index c1be512..26d0c05 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Form1.h +++ b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Form1.h @@ -107,12 +107,12 @@ namespace SheetCheckerTWL { this->butSrl = (gcnew System::Windows::Forms::Button()); this->butSheet = (gcnew System::Windows::Forms::Button()); this->gridCompare = (gcnew System::Windows::Forms::DataGridView()); - this->tboxResult = (gcnew System::Windows::Forms::TextBox()); - this->labResult = (gcnew System::Windows::Forms::Label()); - this->labVersion = (gcnew System::Windows::Forms::Label()); this->colTitle = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); this->colSrl = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); this->colSheet = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn()); + this->tboxResult = (gcnew System::Windows::Forms::TextBox()); + this->labResult = (gcnew System::Windows::Forms::Label()); + this->labVersion = (gcnew System::Windows::Forms::Label()); (cli::safe_cast(this->gridCompare))->BeginInit(); this->SuspendLayout(); // @@ -176,35 +176,9 @@ namespace SheetCheckerTWL { this->gridCompare->Name = L"gridCompare"; this->gridCompare->RowHeadersVisible = false; this->gridCompare->RowTemplate->Height = 21; - this->gridCompare->Size = System::Drawing::Size(363, 170); + this->gridCompare->Size = System::Drawing::Size(363, 191); this->gridCompare->TabIndex = 6; // - // tboxResult - // - this->tboxResult->Location = System::Drawing::Point(294, 289); - this->tboxResult->Name = L"tboxResult"; - this->tboxResult->ReadOnly = true; - this->tboxResult->Size = System::Drawing::Size(100, 19); - this->tboxResult->TabIndex = 7; - // - // labResult - // - this->labResult->AutoSize = true; - this->labResult->Location = System::Drawing::Point(235, 292); - this->labResult->Name = L"labResult"; - this->labResult->Size = System::Drawing::Size(53, 12); - this->labResult->TabIndex = 8; - this->labResult->Text = L"判定結果"; - // - // labVersion - // - this->labVersion->AutoSize = true; - this->labVersion->Location = System::Drawing::Point(353, 9); - this->labVersion->Name = L"labVersion"; - this->labVersion->Size = System::Drawing::Size(41, 12); - this->labVersion->TabIndex = 9; - this->labVersion->Text = L"ver. 0.0"; - // // colTitle // dataGridViewCellStyle6->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleCenter; @@ -231,11 +205,37 @@ namespace SheetCheckerTWL { this->colSheet->Name = L"colSheet"; this->colSheet->Width = 120; // + // tboxResult + // + this->tboxResult->Location = System::Drawing::Point(294, 315); + this->tboxResult->Name = L"tboxResult"; + this->tboxResult->ReadOnly = true; + this->tboxResult->Size = System::Drawing::Size(100, 19); + this->tboxResult->TabIndex = 7; + // + // labResult + // + this->labResult->AutoSize = true; + this->labResult->Location = System::Drawing::Point(235, 318); + this->labResult->Name = L"labResult"; + this->labResult->Size = System::Drawing::Size(53, 12); + this->labResult->TabIndex = 8; + this->labResult->Text = L"判定結果"; + // + // labVersion + // + this->labVersion->AutoSize = true; + this->labVersion->Location = System::Drawing::Point(353, 9); + this->labVersion->Name = L"labVersion"; + this->labVersion->Size = System::Drawing::Size(41, 12); + this->labVersion->TabIndex = 9; + this->labVersion->Text = L"ver. 0.0"; + // // Form1 // this->AutoScaleDimensions = System::Drawing::SizeF(6, 12); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; - this->ClientSize = System::Drawing::Size(429, 321); + this->ClientSize = System::Drawing::Size(429, 347); this->Controls->Add(this->labVersion); this->Controls->Add(this->labResult); this->Controls->Add(this->tboxResult); @@ -311,23 +311,27 @@ private: this->gridCompare->Rows[ last ]->DefaultCellStyle->ForeColor = System::Drawing::Color::Red; } + tmp1 = (this->rh->s.titleID_Hi & TITLE_ID_HI_MEDIA_MASK)?"NAND":"Game Card"; + tmp2 = this->sheet->Media; + this->gridCompare->Rows->Add( "メディア", tmp1, tmp2 ); + tmp2 = this->sheet->SubmitVersion.ToString() + " (" + this->sheet->SubmitVersion.ToString( "X1" ) + ")"; this->gridCompare->Rows->Add( "提出バージョン", "-", tmp2 ); System::UInt16 tadver = sheet->RomVersion; tadver = (tadver << 8) | sheet->SubmitVersion; tmp2 = tadver.ToString() + " (" + tadver.ToString( "X04" ) + ")"; - this->gridCompare->Rows->Add( "TADバージョン", "-", tmp2); + this->gridCompare->Rows->Add( "TADバージョン", "-", tmp2 ); if( this->sheet->IsUnnecessaryRating ) { - this->gridCompare->Rows->Add( "TITLE_TYPE", "-", "TWL_APP"); + this->gridCompare->Rows->Add( "TITLE_TYPE", "-", "TWL_APP" ); System::Int32 last = this->gridCompare->Rows->Count - 2; this->gridCompare->Rows[ last ]->DefaultCellStyle->ForeColor = System::Drawing::Color::Blue; // 青色で強調 } else { - this->gridCompare->Rows->Add( "TITLE_TYPE", "-", "TWL_GAME"); + this->gridCompare->Rows->Add( "TITLE_TYPE", "-", "TWL_GAME" ); } if( *this->error == SheetCheckerError::NOERROR ) diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp index 73478b8..885ecc4 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp +++ b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp @@ -14,7 +14,6 @@ using namespace SheetCheckerTWL; // 宣言 // ------------------------------------------------------------------ -System::Int32 parseOption( array ^args, SheetCheckerContext ^context ); int consoleRun( array ^args, int argc, SheetCheckerContext ^context ); int consoleOptionRun( array ^args, int argc, SheetCheckerContext ^context ); int printResult( SheetCheckerContext ^context, ROM_Header *rh, SheetItem ^item, @@ -77,6 +76,14 @@ int consoleRun( array ^args, int argc, SheetCheckerContext ^co System::String ^romfile = args[0]; System::String ^sheetfile = args[1]; + // 提出確認書の読み込み + if( !readSheet( sheetfile, item ) ) + { + error = SheetCheckerError::ERROR_READ_SHEET; + printResult( context, &rh, item, romfile, sheetfile, 0, error ); + return ((int)error); + } + // ROMヘッダの読み込み if( !readRomHeader( romfile, &rh ) ) { @@ -87,14 +94,6 @@ int consoleRun( array ^args, int argc, SheetCheckerContext ^co System::UInt16 crc; getWholeCRCInFile( romfile, &crc ); - // 提出確認書の読み込み - if( !readSheet( sheetfile, item ) ) - { - error = SheetCheckerError::ERROR_READ_SHEET; - printResult( context, &rh, item, romfile, sheetfile, crc, error ); - return ((int)error); - } - // 一致判定 error = checkSheet( &rh, crc, item ); printResult( context, &rh, item, romfile, sheetfile, crc, error ); // 結果を表形式で表示 @@ -155,7 +154,7 @@ int consoleOptionRun( array ^args, const int argc, SheetChecke // ROMヘッダの読み込み if( !readRomHeader( romfile, &rh ) ) { - error = SheetCheckerError::ERROR_READ_SHEET; + error = SheetCheckerError::ERROR_READ_SRL; printf( "%d", (int)error ); return ((int)error); } @@ -167,7 +166,7 @@ int consoleOptionRun( array ^args, const int argc, SheetChecke }//if( argc == 2 ) // 結果出力はオプションによって異なる(エラーのときには共通) - if( error != SheetCheckerError::NOERROR ) + if( error == SheetCheckerError::NOERROR ) { if( context->bResult ) { @@ -195,32 +194,6 @@ int consoleOptionRun( array ^args, const int argc, SheetChecke return ((int)error); } -// ------------------------------------------------------------------ -// 一致判定 -// ------------------------------------------------------------------ - -SheetCheckerError checkSheet( ROM_Header *rh, System::UInt16 crc, SheetItem ^item ) -{ - SheetCheckerError error; - if( memcmp( rh->s.game_code, item->GameCode, 4 ) != 0 ) - { - error = SheetCheckerError::ERROR_VERIFY_GAME_CODE; - } - else if( rh->s.rom_version != item->RomVersion ) - { - error = SheetCheckerError::ERROR_VERIFY_ROM_VERSION; - } - else if( crc != item->FileCRC ) - { - error = SheetCheckerError::ERROR_VERIFY_CRC; - } - else - { - error = SheetCheckerError::NOERROR; - } - return error; -} - // ------------------------------------------------------------------ // 結果表示 // ------------------------------------------------------------------ @@ -231,25 +204,36 @@ int printResult( SheetCheckerContext ^context, ROM_Header *rh, SheetItem ^item, System::UInt16 tadver = item->RomVersion; tadver = (tadver << 8) | item->SubmitVersion; + char media[255]; + setStringToChars( media, item->Media, 255, 0 ); + // 通常の表示 Console::WriteLine( "" ); Console::WriteLine( "SRL: " + srlfile ); Console::WriteLine( "Sheet: " + sheetfile ); Console::WriteLine( "" ); - printf( " SRL Sheet\n" ); - printf( "---------------------------------------\n" ); - printf( "InitialCode: %c%c%c%c %c%c%c%c\n", + printf( " SRL Sheet\n" ); + printf( "-----------------------------------------\n" ); + printf( "InitialCode: %c%c%c%c %c%c%c%c\n", rh->s.game_code[0], rh->s.game_code[1], rh->s.game_code[2], rh->s.game_code[3], item->GameCode[0], item->GameCode[1], item->GameCode[2], item->GameCode[3] ); - printf( "RemasterVersion: %02X %02X\n", rh->s.rom_version, item->RomVersion ); - printf( "File CRC: %04X %04X\n", srlcrc, item->FileCRC ); - printf( "---------------------------------------\n" ); - printf( "Rating Display: %s\n", (item->IsUnnecessaryRating)?"Unnecessary":"Necessary" ); - printf( "---------------------------------------\n" ); - printf( "SubmitVersion: - %d (%02X)\n", item->SubmitVersion, item->SubmitVersion ); - printf( "TAD Version: %d (%04X)\n", tadver, tadver ); - printf( "---------------------------------------\n" ); + printf( "RemasterVersion: %02X %02X\n", rh->s.rom_version, item->RomVersion ); + printf( "File CRC: %04X %04X\n", srlcrc, item->FileCRC ); + if( rh->s.titleID_Hi & TITLE_ID_HI_MEDIA_MASK ) + { + printf( "Media: NAND %s\n", media ); + } + else + { + printf( "Media: Game Card %s\n", media ); + } + printf( "-----------------------------------------\n" ); + printf( "SubmitVersion: - %d (%02X)\n", item->SubmitVersion, item->SubmitVersion ); + printf( "TAD Version: - %d (%04X)\n", tadver, tadver ); + printf( "-----------------------------------------\n" ); + printf( "TITLE_TYPE: - %s\n", (item->IsUnnecessaryRating)?"TWL_APP":"TWL_GAME" ); + printf( "-----------------------------------------\n" ); printf( "Result: " ); if( error == SheetCheckerError::NOERROR ) { diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.h b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.h index 5d4a5cf..d7cc234 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.h +++ b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.h @@ -94,6 +94,8 @@ public: System::Boolean readRomHeader( System::String ^srlfile, ROM_Header *rh ); System::Boolean readSheet( System::String ^sheetfile, SheetItem ^item ); System::String^ getXPathText( System::Xml::XmlElement ^root, System::String ^xpath ); +void setStringToChars( char *pDst, System::String ^hSrc, const System::Int32 nMax, const System::SByte pad ); SheetCheckerError checkSheet( ROM_Header *rh, System::UInt16 crc, SheetItem ^item ); +System::Int32 parseOption( array ^args, SheetCheckerContext ^context ); // eof \ No newline at end of file