From b00f3796559febf5f23336fa4a62503520accd70 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 19 Nov 2021 15:55:31 +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 <simon@rozman.si>
---
 EAPMethods/MSIBuild/Makefile              | Bin 6500 -> 6330 bytes
 EAPMethods/MSIBuild/MakefileEAPMethod.mak | Bin 26796 -> 26626 bytes
 EventMonitor/MSIBuild/Makefile            | Bin 14364 -> 13880 bytes
 MSI/Base/Main/Makefile                    | Bin 23402 -> 22896 bytes
 MSI/MSIBuild                              |   2 +-
 WLANManager/MSIBuild/Makefile             | Bin 9412 -> 9242 bytes
 6 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile
index a8023da9c58d4cb11b660c828b074dfa8d3803a1..dea7d2e1ff23e80f6c2228cee6bd22979155ea33 100644
GIT binary patch
delta 89
zcmV-f0H*)sGP*IaE(nwS5F8UB06hR803rZo0B!(Z0961}03ws|2NwlU08aotlcf?d
vlcW=@v&sk-2a}Wz9+L<V^pi>nFq2#nYylvX;R_i9PXH;C(Gt_Mv=guebZHw1

delta 159
zcmdmG_{3;~9>-)c@j08rIK|jG4H=9WOo5nlvOK^1<Sv0Pll3@c#BCXD859_l7*ZMX
z7~&a18G?aqUIwno=LOv-pAZbP2C^AA8Il?D844IGfhzUEqzZ!;5GpXJFgO57J0SK0
w>h%HXWKd*q1+sz}Tqj@TG@ZOoFmG}dhrwhUp>vZTv5QRJ$1!8`GGP%`0DS5qw*UYD

diff --git a/EAPMethods/MSIBuild/MakefileEAPMethod.mak b/EAPMethods/MSIBuild/MakefileEAPMethod.mak
index 98cc22536ca541d2439eba1d9082471733d2b4d8..e5042323fad11e0cbe5bca548527cc23e79134b7 100644
GIT binary patch
delta 76
zcmV-S0JHzB(E)<c0kDt?llCthlORhNladD%15W@wlb<m$lST;?lUP)kvn&gUBeT9P
iI02LDGd`0*F<_H24j2PZ04bBpG1HS&RGhO)Gh#I@yBk{o

delta 134
zcmZp=z_{ij<Aw=blhu6YY~I1$q0DK>V8mbw#GIS$^(`4EM{)8^76{^Fw4FRrQ+)C%
z1GmYC41%P28MqiY8Il?D844IG859`w!K4a<7K7GgeLrztMFv*}ABJEc2~;`RP{43<
hfid6YZ3YRG?{FDRHZwdo*^N_VvI6&v%?pf@OaXPtBTfJS

diff --git a/EventMonitor/MSIBuild/Makefile b/EventMonitor/MSIBuild/Makefile
index 00f2a5a67b92b2565fcaff741fe2ab1b1fb1c198..25cd4946751c11401de28f8f706059742667ebfe 100644
GIT binary patch
delta 120
zcmbPJup?)~B+kifq9&6kv5PSKGuTdkFJm~_jZ<WDjoFONdR)KwHycTbFiy6Tx0^gc
zCSmd;Q3;?b&B@ZTmnVM_TQylgUS#tgxpzX7r|AoAK4$odadMWR!Q?l3GLz@Xm;h-d
NG#zs`i<omT0stxFD_j5o

delta 239
zcmdmyGpAs~B+khpvU4`?;`+tUX~<y2U<$;XlhY;TCts5KHhB`K45RJj^_=39#q@M0
z7f8rV7Lf^%=4Iew;ABW<$Y&^EsAN!J&<B$$3|b6YlLIBiITaaP8GIOm8C)lS6f}kE
z3YvV6(_nI&%(=;KoFbbeWLF3ytlRwGfRzcwE|19p#vvry^Fdb*=sKgxA9Q6VFED09
Kv2TXS0!9F)l0Pf}

diff --git a/MSI/Base/Main/Makefile b/MSI/Base/Main/Makefile
index 8e4e7c650a168812eba073cc6d61ccacfa003476..73a93c209a5dc2adf009cb42c88ae6a7e9f4fc29 100644
GIT binary patch
delta 109
zcmaF0jq$@K#tn5`lf$fJCbNi0Om^cEVhv#MXRw{@=xI3F%y!LYDQ+A6$+Nf(CJWeT
zO@3gN#HcViP(hN}pFwkSuIK5^ZnhsdCYw0xY|e30VFatY;88R=NI?RoVzQg<oXt<X
G+5`Z;JS8mv

delta 185
zcmeyciSgAo#tn5`likGTY+lA~qd$3?9N**~E<Q%v$rDAyC%d@lOfIn2nrvg8G`Y^m
zh*OclmBEK0n89_jB9AFlCS~#|E`!MjtdC8e!6z_z0w>F4KJFQtm25*e*bNzs7)%+A
qCeP;;-Q3}7$B1FN2he1b$ptP7Xr>=@TaL}t$p(IGn?HCo2mk>3E<5}H

diff --git a/MSI/MSIBuild b/MSI/MSIBuild
index 538cea0..a53c4e2 160000
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
@@ -1 +1 @@
-Subproject commit 538cea09453a2ee52f918036f7b2e7b51347d7cc
+Subproject commit a53c4e2b8786023fd3afdb89932d84129521710d
diff --git a/WLANManager/MSIBuild/Makefile b/WLANManager/MSIBuild/Makefile
index f863cc3452ac3030e2dc669898d4b31fb8b90394..3705cec84632e62eabbc1005999fe83009fb22ca 100644
GIT binary patch
delta 96
zcmX@&Im=_i0}fV222TdJ$qPA!Cksfjh$}MKGAJ-8F{Co&F~l>3G6VzJybN5EC$ft&
z`!m>1UMOWac?yTf<|iB*_$FVI<=ebQ+=p>8i`2Zyi?}6#Dl{jbmAbrngR}@I0G){%
AW&i*H

delta 127
zcmbQ`al~`O1CGhtc;;;8;F93uG-NPhFa=`H&GHh_jFTU5$S~SY{>vdgNz85X5y>EF
zUIs1(PKIQLe1-ysN(Kc6eK4uQpv9myc_E)Try_$ZgAYS6gX?5l8RyBbMENEklMI@y
d!)Y+tLh9V)DI6k`3pi&??hxhMyg@pP0{~keA`bun