From b9dbb7f904f8dc2db2a7ca11ea8eed71fccdbf3a Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 19 Nov 2021 14:19:48 +0100 Subject: [PATCH] Resolve charset .idtx/.idt confusion NMake inline files are always created using ACP. The "1252" in the .idtx header has no effect on this. However, we must encode the .idt files using correct charset/codepage regardless the ACP being used on the building machine. Signed-off-by: Simon Rozman --- MSICA/MSIBuild/Makefile | Bin 15664 -> 31722 bytes lib/MSICALib | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/MSICA/MSIBuild/Makefile b/MSICA/MSIBuild/Makefile index 9f6bf57d5366d87f2b648e34b584766256fb8e36..e475fadd2898bd060f346bb6d325f248b110dc97 100644 GIT binary patch literal 31722 zcmd^|`*IXVmd5K}ZN$Dqdzgs98*7=1!Pp)q220?<<`$?u9`AaC5J=bxgJ9LdhIylX z$=&^a`Sl?)tE);~s2f8#I@Fh{%#$b2{hZ7!{ontdY5ukOm*z|}nZLH0XU+5GRdduF zG(R>!HOIRCKl(f0e5Tj==A-69b54Kfb?sX7wApVSs^x4BrG_4qZo#tkhAFzAF!a+Uh}bf9qHFoebV}|;M6lZNI1Vpt@l&gW6hCy0qsaVnXTs( zcfM-wG~ep#S88#XTJ4G!ljfdqc&Kj&!gA8wN}sftC3w3D((~7CW@(%~wS2gMRg82) z7?>tI35QIRNpnM2jQ6f^J*ztZQE)Y6o!$6i(ry0{9J4m1K>F?W7S7?@8#&9O5te^tvTi60LW z-Crd7KNhW?h(7haEH#tnJIU&_`CD^We4T2PYvS?@IgnY{1?waA~J=-16AzwhY&CB3*x%bj_Td_BGauUpnOD%?w~>9Zy5 zh}VdTh*vxdDA#@cj+Vrh;NuYMM+SIJ6ZFAo)IW=%h6{;9jz z^kdzl<)Nf^2(z8k67K>>1DA~y2N9<+130m#d$*IXzAwnw=`TcyBgw!leaE`>%@bb) zKK5aUf=N6~v}^wx)VV8;f^o*_tTdB$L}ZTy!||BoRb&s(JDtZat*S3X=qvd_cII@Heg(T%( ztD*gnTwPBbbAEvDucd1U&vTNj^ZL7-boHV>^Y>2&WDLn6iXqZU=RS&|d(KC!)wbzqHa0CryODIBxE0Deo(;&|_{_v(_=ks#Y#plE zdSJP*2pI-4&3!Cq&c-62Hof^pFXnzM?i{H-cZj{on`Yw7t{`74tm$^rjNKC?6WWu1 zK}*YBDW8jXhoy9}eV%DQAE0?%5wSe&B(CD4h)DQE;^48pwZE0#txtPa<7n`c6vg59j@P%m z;i;#jM5xqhctU8f=DSJb6BAUnZf0E*X3(XaM62B7KGp9lg|?dt z_y8n6#_p#@;7jJ{8QT)%zGLV8t!VAI>ts2{8YAIExzxTwzXM;QY&_U;;^EKw1~2h5 z9t9tSZFUumIG7n*0`1B1c*MMDAAWkb8gUseT6!$s40vz=gCy-&Q-^aNR&4dx8P`wb50%`4~H*wPF|0BGs#(*8BpoWSqq$r z>My84Z;CRXw7vN5p}=u_C~y*9>M={8G!`Q?)@F9jRc~-Jhrjtcgi;mSub# z_rNnW0Bd4d#uhQQwPbn9z#U?t@FlCIQN(S`?WM3~#%LbYAtP~C>NSI!Y9;jpN|wO3 zt!339M}y?HP$p|iKnTiyq`P1PHQ}r+BGIL*qr)xAsB7KX&q>&h$$Fw~)NEL*a%2_sK({|m+W$j($0j^Y`fTk)7tvZ` z9;}}0arRg_*LECx66QP7Zu%d~n!HN(YU4&Rl`&k_0_bs7 zwgl_&C*7g$iC-qNbDn=r_aEwhteerk^t9N-3%cgG1>KNpQLM8$EeHi z%_IAhC}L?O;$&^0rp8TSiZzT1By-R6{z9?*7mD0BQniRRc-wTZMfO$gpbN96_6;v{ zRhW4&|Lg-@pFvZog0LPM^dR;yA7l1hVFh$KIq?tY6(RW1Lf7d5-E2xX=7_h!>i zlGh!{}6wEHfEujjU_s2#rVrddAv2@Exx?7LG`R-8HdO=SVtByNHU*%44+0 zN_F!LFAz4$66_rpR1t}I99>7mHdR~dTdX6%|IoGe@3&|F`!M=a*t>%1isQKGG5T~x z$LKON;9g0EY#*@mSR!caRRKq_j?^4kvZCyDp}d_dT-HE_*x9}*j5FH#w44@x@5h!BRRt+ z-X?Og&B#*kb)Tuc1>9XG%kR>DdNabJt@trrw|2&y;6L)pZ+kVbf0;uu>zeK%A7l$| zjVFp-9m95I7}Baah>avFWG5K&w8z9M+6Q|78r%!(UwTMOm8+z1#hHK27heNz=?${= z4+>^!Xrdz&W)Se74TKsH^N#0yALx(hP9{87|+S#k^Arpos8IRLn9JXuq$D4 zT=4i_I}xs{4Vpo;iq)`fz(SYvw=599wxy}0c4VEI%BB6Qsmo|NJ~n-keaBK*O2!0# zXR^`Ty!W;4aTal8HrXa3FShAVll`^Cl+iUg(7vqMUXrC+VruSXDzc~Yj(Bia@7)-L z90cw)1+s5&R2Q`Hyh}PFWdXxurC@v4E$L;oH&;pRb;1%3%ONoyac)Rm zc!Jt~$K5QGI|KFGE^Fq<2`Ot^^1w4{_OX+Bny9gu%X}xE?km0@kMo_R9gLqXh&>9> z7BPdUcP;lZ-)!T$=wH^y zOZ$=SC%c4>QJhr*>?V&nOZ#A{;=@uGbzy?}8#E6rfnTHutWC0jaM9xNO?y?}d8e{lauFYK~+ z3fT_V@hCR>NG<49OKP4yoU*);bAt;xM_}X_5K5WnA&1mpVhxD4!~6}69O7@=3R1zX zE11LUT3Pq{X4-A>BchEQ)4n94*sLp5nBX9hug@!xV|r(IP{l2v79P09gY~jn6REGF zdsETR9y@SpbAQo#27gKp2Nv)Qyh6H9lK;^9)8N4w7iZVjCtIuYvH)O8MbB$~HBD+M zq*{I&9L}rC?a_h~oC&n_FEhSv-JA2`g5=fn&f{O1V>C4HOQ)PS``bLr%=w^r_NY(> zDa$k;*4f*VS4+@L@!Dg>!Bn1N7YAPT6Ir6qMDsqsI%JbG7GVR4E!)vp=)+I>9PO3|Q_i9a^a! z+6(QIC2gBmSH`_lEPR}$@4NX4EcSq*BR+?-p(w*Av)b3+UTwV}gXQ;;*4XFWX4F>u z;FtTkOU{(nPue4CO-CLxO()GiB(b+7OF`xEbXWx<0QSPYt$pczv)@Wq=eJtzYg6p^ zwW2q~lee=&W0C&&FYh6W7}j=!Q*?J^4Zl%s=DI30XjJ^Yi>E2CCA;lP=~TA)rL1`1 zdo9IUH?z zna1<_^G4AlviG5?H+%gT;gZcck|N{yPel^{m2lqCb@pKpW#k=A<>=AkdGZdNY$3ud z+qU;Z)gzSi?Y1uEXt{OFHTqx!N?*o2`|kB)u$6FU6$}sPx)b^H5VcuBTs&pU_}$Rz z(aC9v%vt?;($k|HziuB?SS1cYwRgARDnY7kxJ#Iy&MJ<)H@^Oa$kIld7#r-YCA)oj75TA4lpNmute3thx*MkDoBF+<0pzEGgca#} zE=Wl2yJRKe8Et1I=iQMISVybcZj6=XZuqt3C`Vfd{E&q8>bYkzMoZ81P~SV{9VK^HDnefvtxq-14|BAoTGwH%?KE?adQLkhUKfq~##=Q_`^H%Z4NJL=sz|$!+-!}A(y-qs!jkyjwW1nZTG1&J08s)kuz1--lruA~8uAka(+kVvZ z?i+o*)b1N~9n{9p_1B!&CDX&Bu9~{TqpgRkQMG@YafB=N?GaZ`&Az#Pq?p~I&ZPP7wexmf zI<6iNxxJsW4A;j{vCjItDt|ycsS-dffc=Ty2~p+?<189*$Z^NP30+_ps{8vn@5|y* zTbF=wA=PI3^2$YP9Q`g1_FKgDlfm}gxLrzp%K7!hRQ-5fUK++C&Yv#bw;TT}3;p}@ zoqqg3TN*|i|H~cn)i-_@{+A_Xi+a`vp=$;}2q~|%wGT=;2lpO>Lwgp6U?RcOaSTAV?bYz^VkJtNE5`x5WPis>1xtM<3Vm!=h&CeDdpL8{HA^V zbWT>eU#hxVKYtSaYDcivx%ye~K7gKXnanCNJE6N>_cKEQxXRGepXGA!{-Cbw6_?PT_Yw+ar2$(${COqqX;c z0+D<9R4^wn{H&1n_1va?ayVq-!Cb$`*$wY~2|ta^@b{Z(51HRfixPJiTjnccFtFCe z9NH36|9*e%PInDpb#|v4{_5<`GVtGByVH$*>AB0D%j@2)nLYIwJ;CaQFCWv-GS)|d z?(6TDo*7%7;D5I CS3~*$ literal 15664 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 diff --git a/lib/MSICALib b/lib/MSICALib index c27435b..c9cf295 160000 --- a/lib/MSICALib +++ b/lib/MSICALib @@ -1 +1 @@ -Subproject commit c27435b037abf89daba08d9a6d57c745e5769a2d +Subproject commit c9cf29551dc26e7540664e702dea8970ad5c3f0f