notepad: Allow files in different encodings to be opened.

[Alexander Scott-Johns]

---
 programs/notepad/En.rc         |   10 +++
 programs/notepad/dialog.c      |  144 ++++++++++++++++++++++++++++++++++++----
 programs/notepad/dialog.h      |    2 +-
 programs/notepad/main.c        |    6 +-
 programs/notepad/main.h        |   14 ++++
 programs/notepad/notepad_res.h |    7 ++
 6 files changed, 167 insertions(+), 16 deletions(-)

--001636c5a9fff0b651046d34e169
Content-Type: text/plain; charset=US-ASCII; name="0001-notepad-opening-2009-06-25.txt"
Content-Disposition: attachment; 
	filename="0001-notepad-opening-2009-06-25.txt"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fwe2n0ad0

RnJvbSA3MGExZGY3M2I4YzZhMTk3NDZhMjU4YzgxZTExNWJlOGExOTBjY2NkIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgU2NvdHQtSm9obnMgPGFsZXhhbmRlci5zY290
dC5qb2huc0Bnb29nbGVtYWlsLmNvbT4KRGF0ZTogV2VkLCAxNyBKdW4gMjAwOSAwMzozNDowMSAr
MDEwMApTdWJqZWN0OiBub3RlcGFkOiBBbGxvdyBmaWxlcyBpbiBkaWZmZXJlbnQgZW5jb2Rpbmdz
IHRvIGJlIG9wZW5lZC4KCi0tLQogcHJvZ3JhbXMvbm90ZXBhZC9Fbi5yYyAgICAgICAgIHwgICAx
MCArKysKIHByb2dyYW1zL25vdGVwYWQvZGlhbG9nLmMgICAgICB8ICAxNDQgKysrKysrKysrKysr
KysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogcHJvZ3JhbXMvbm90ZXBhZC9kaWFsb2cuaCAg
ICAgIHwgICAgMiArLQogcHJvZ3JhbXMvbm90ZXBhZC9tYWluLmMgICAgICAgIHwgICAgNiArLQog
cHJvZ3JhbXMvbm90ZXBhZC9tYWluLmggICAgICAgIHwgICAxNCArKysrCiBwcm9ncmFtcy9ub3Rl
cGFkL25vdGVwYWRfcmVzLmggfCAgICA3ICsrCiA2IGZpbGVzIGNoYW5nZWQsIDE2NyBpbnNlcnRp
b25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9wcm9ncmFtcy9ub3RlcGFkL0Vu
LnJjIGIvcHJvZ3JhbXMvbm90ZXBhZC9Fbi5yYwppbmRleCBjNGE0YmFmLi44YTJjZWI4IDEwMDY0
NAotLS0gYS9wcm9ncmFtcy9ub3RlcGFkL0VuLnJjCisrKyBiL3Byb2dyYW1zL25vdGVwYWQvRW4u
cmMKQEAgLTkxLDYgKzkxLDE0IEBAIFBVU0hCVVRUT04gICAgIkNhbmNlbCIsICAgICBJRENBTkNF
TCwgICAgICAgICAgICAgICAxODAsIDIxLCA0MCwgMTUsIFdTX1RBQlNUT1AKIFBVU0hCVVRUT04g
ICAgIiZIZWxwIiwgICAgICAgSURIRUxQLCAgICAgICAgICAgICAgICAxODAsIDM5LCA0MCwgMTUs
IFdTX1RBQlNUT1AKIH0KIAorSUREX09GTl9URU1QTEFURSAgRElBTE9HICBESVNDQVJEQUJMRSA1
MCw1MCwzMDAsMTUKK1NUWUxFIERTXzNETE9PSyB8IERTX0NPTlRST0wgfCBXU19DSElMRCB8IFdT
X1ZJU0lCTEUgfCBXU19DTElQU0lCTElOR1MgfCBXU19CT1JERVIKK0ZPTlQgOCwgIk1TIFNoZWxs
IERsZyIKK0JFR0lOCisgIExURVhUICJFbmNvZGluZzoiLCAtMSwgNSwwLCA1MCwxMgorICBDT01C
T0JPWCBJRENfT0ZOX0VOQ0NPTUJPLCA1MywwLCAxNTYsNDgsIFdTX0NISUxEIHwgV1NfVlNDUk9M
TCB8IENCU19EUk9QRE9XTkxJU1QKK0VORAorCiBTVFJJTkdUQUJMRSBESVNDQVJEQUJMRQogewog
U1RSSU5HX1BBR0VTRVRVUF9IRUFERVJWQUxVRSwgICAiJmYiCkBAIC0xMTksNCArMTI3LDYgQEAg
U1RSSU5HX09VVF9PRl9NRU1PUlksICAgICAgICAgICAgICAgICAgICJOb3QgZW5vdWdoIG1lbW9y
eSB0byBjb21wbGV0ZSB0aGlzIFwKIHRhc2suXG5DbG9zZSBvbmUgb3IgbW9yZSBhcHBsaWNhdGlv
bnMgdG8gaW5jcmVhc2UgdGhlIGFtb3VudCBvZlxuZnJlZSBcCiBtZW1vcnkuIgogCitTVFJJTkdf
VU5JQ09ERV9MRSwgICAgICJVbmljb2RlIChVVEYtMTYpIgorU1RSSU5HX1VOSUNPREVfQkUsICAg
ICAiVW5pY29kZSAoVVRGLTE2IGJpZy1lbmRpYW4pIgogfQpkaWZmIC0tZ2l0IGEvcHJvZ3JhbXMv
bm90ZXBhZC9kaWFsb2cuYyBiL3Byb2dyYW1zL25vdGVwYWQvZGlhbG9nLmMKaW5kZXggZDczNTRl
Ny4uMjQ2NzMwNSAxMDA2NDQKLS0tIGEvcHJvZ3JhbXMvbm90ZXBhZC9kaWFsb2cuYworKysgYi9w
cm9ncmFtcy9ub3RlcGFkL2RpYWxvZy5jCkBAIC0zNyw2ICszNywzNiBAQCBzdGF0aWMgY29uc3Qg
V0NIQVIgaGVscGZpbGVXW10gPSB7ICduJywnbycsJ3QnLCdlJywncCcsJ2EnLCdkJywnLicsJ2gn
LCdsJywncCcsMAogCiBzdGF0aWMgSU5UX1BUUiBXSU5BUEkgRElBTE9HX1BBR0VTRVRVUF9EbGdQ
cm9jKEhXTkQgaERsZywgVUlOVCBtc2csIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pOwog
CisvKiBTd2FwIGJ5dGVzIG9mIFdDSEFSIGJ1ZmZlciAoYmlnLWVuZGlhbiA8LT4gbGl0dGxlLWVu
ZGlhbikuICovCitzdGF0aWMgaW5saW5lIHZvaWQgYnl0ZXN3YXBfd2lkZV9zdHJpbmcoTFBXU1RS
IHN0ciwgVUlOVCBudW0pCit7CisgICAgVUlOVCBpOworICAgIGZvciAoaSA9IDA7IGkgPCBudW07
IGkrKykKKyAgICAgICAgc3RyW2ldID0gKFdDSEFSKSBNQUtFV09SRChISUJZVEUoKFdPUkQpIHN0
cltpXSksIExPQllURSgoV09SRCkgc3RyW2ldKSk7Cit9CisKK3N0YXRpYyB2b2lkIGxvYWRfZW5j
b2RpbmdfbmFtZShFTkNPRElORyBlbmMsIFdDSEFSKiBidWZmZXIsIGludCBsZW5ndGgpCit7Cisg
ICAgc3dpdGNoIChlbmMpCisgICAgeworICAgICAgICBjYXNlIEVOQ09ESU5HX1VURjE2TEU6Cisg
ICAgICAgICAgICBMb2FkU3RyaW5nVyhHbG9iYWxzLmhJbnN0YW5jZSwgU1RSSU5HX1VOSUNPREVf
TEUsIGJ1ZmZlciwgbGVuZ3RoKTsKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGNhc2Ug
RU5DT0RJTkdfVVRGMTZCRToKKyAgICAgICAgICAgIExvYWRTdHJpbmdXKEdsb2JhbHMuaEluc3Rh
bmNlLCBTVFJJTkdfVU5JQ09ERV9CRSwgYnVmZmVyLCBsZW5ndGgpOworICAgICAgICAgICAgYnJl
YWs7CisKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgeworICAgICAgICAgICAgQ1BJTkZPRVhX
IGNwaTsKKyAgICAgICAgICAgIEdldENQSW5mb0V4VygoZW5jPT1FTkNPRElOR19VVEY4KSA/IENQ
X1VURjggOiBDUF9BQ1AsIDAsICZjcGkpOworICAgICAgICAgICAgbHN0cmNweW5XKGJ1ZmZlciwg
Y3BpLkNvZGVQYWdlTmFtZSwgbGVuZ3RoKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9
CisgICAgfQorfQorCiBWT0lEIFNob3dMYXN0RXJyb3Iodm9pZCkKIHsKICAgICBEV09SRCBlcnJv
ciA9IEdldExhc3RFcnJvcigpOwpAQCAtMTk1LDE0ICsyMjUsMzIgQEAgQk9PTCBEb0Nsb3NlRmls
ZSh2b2lkKQogICAgIHJldHVybihUUlVFKTsKIH0KIAorLyogU2ltaWxhciB0byBTZXRXaW5kb3dU
ZXh0QSwgYnV0IHVzZXMgYSBDUF9VVEY4IGVuY29kZWQgaW5wdXQsIG5vdCBDUF9BQ1AuCisgKiBs
cFRleHRJblV0Zjggc2hvdWxkIGJlIE5VTC10ZXJtaW5hdGVkIGFuZCBub3QgaW5jbHVkZSB0aGUg
Qk9NLgorICoKKyAqIFJldHVybnMgRkFMU0Ugb24gZmFpbHVyZSwgVFJVRSBvbiBzdWNjZXNzLCBs
aWtlIFNldFdpbmRvd1RleHRBL1cuCisgKi8KK3N0YXRpYyBCT09MIFNldFdpbmRvd1RleHRVdGY4
KEhXTkQgaHduZCwgTFBDU1RSIGxwVGV4dEluVXRmOCkKK3sKKyAgICBCT09MIHJldDsKKyAgICBp
bnQgbGVuVyA9IE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfVVRGOCwgMCwgbHBUZXh0SW5VdGY4LCAt
MSwgTlVMTCwgMCk7CisgICAgTFBXU1RSIHRleHRXID0gSGVhcEFsbG9jKEdldFByb2Nlc3NIZWFw
KCksIDAsIGxlblcgKiBzaXplb2YoV0NIQVIpKTsKKyAgICBpZiAoIXRleHRXKQorICAgICAgICBy
ZXR1cm4gRkFMU0U7CisgICAgTXVsdGlCeXRlVG9XaWRlQ2hhcihDUF9VVEY4LCAwLCBscFRleHRJ
blV0ZjgsIC0xLCB0ZXh0VywgbGVuVyk7CisgICAgcmV0ID0gU2V0V2luZG93VGV4dFcoaHduZCwg
dGV4dFcpOworICAgIEhlYXBGcmVlKEdldFByb2Nlc3NIZWFwKCksIDAsIHRleHRXKTsKKyAgICBy
ZXR1cm4gcmV0OworfQogCi12b2lkIERvT3BlbkZpbGUoTFBDV1NUUiBzekZpbGVOYW1lKQordm9p
ZCBEb09wZW5GaWxlKExQQ1dTVFIgc3pGaWxlTmFtZSwgRU5DT0RJTkcgZW5jKQogewogICAgIHN0
YXRpYyBjb25zdCBXQ0hBUiBkb3Rsb2dbXSA9IHsgJy4nLCdMJywnTycsJ0cnLDAgfTsKICAgICBI
QU5ETEUgaEZpbGU7CiAgICAgTFBTVFIgcFRlbXA7CiAgICAgRFdPUkQgc2l6ZTsKICAgICBEV09S
RCBkd051bVJlYWQ7CisgICAgQk9PTCBzdWNjZWVkZWQ7CiAgICAgV0NIQVIgbG9nWzVdOwogCiAg
ICAgLyogQ2xvc2UgYW55IGZpbGVzIGFuZCBwcm9tcHQgdG8gc2F2ZSBjaGFuZ2VzICovCkBAIC0y
MjQsOSArMjcyLDkgQEAgdm9pZCBEb09wZW5GaWxlKExQQ1dTVFIgc3pGaWxlTmFtZSkKIAlTaG93
TGFzdEVycm9yKCk7CiAJcmV0dXJuOwogICAgIH0KLSAgICBzaXplKys7CiAKLSAgICBwVGVtcCA9
IEhlYXBBbGxvYyhHZXRQcm9jZXNzSGVhcCgpLCAwLCBzaXplKTsKKyAgICAvKiBFeHRyYSBtZW1v
cnkgZm9yIChXQ0hBUiknXDAnLXRlcm1pbmF0aW9uLiAqLworICAgIHBUZW1wID0gSGVhcEFsbG9j
KEdldFByb2Nlc3NIZWFwKCksIDAsIHNpemUrMik7CiAgICAgaWYgKCFwVGVtcCkKICAgICB7CiAJ
Q2xvc2VIYW5kbGUoaEZpbGUpOwpAQCAtMjM0LDcgKzI4Miw3IEBAIHZvaWQgRG9PcGVuRmlsZShM
UENXU1RSIHN6RmlsZU5hbWUpCiAJcmV0dXJuOwogICAgIH0KIAotICAgIGlmICghUmVhZEZpbGUo
aEZpbGUsIHBUZW1wLCBzaXplLCAmZHdOdW1SZWFkLCBOVUxMKSkKKyAgICBpZiAoIVJlYWRGaWxl
KGhGaWxlLCBwVGVtcCwgc2l6ZSsyLCAmZHdOdW1SZWFkLCBOVUxMKSkKICAgICB7CiAJQ2xvc2VI
YW5kbGUoaEZpbGUpOwogCUhlYXBGcmVlKEdldFByb2Nlc3NIZWFwKCksIDAsIHBUZW1wKTsKQEAg
LTI0MywxMiArMjkxLDQ1IEBAIHZvaWQgRG9PcGVuRmlsZShMUENXU1RSIHN6RmlsZU5hbWUpCiAg
ICAgfQogCiAgICAgQ2xvc2VIYW5kbGUoaEZpbGUpOwotICAgIHBUZW1wW2R3TnVtUmVhZF0gPSAw
OwogCi0gICAgaWYoKHNpemUgLTEpID49IDIgJiYgKEJZVEUpcFRlbXBbMF0gPT0gMHhmZiAmJiAo
QllURSlwVGVtcFsxXSA9PSAweGZlKQotCVNldFdpbmRvd1RleHRXKEdsb2JhbHMuaEVkaXQsIChM
UFdTVFIpcFRlbXAgKyAxKTsKLSAgICBlbHNlCi0JU2V0V2luZG93VGV4dEEoR2xvYmFscy5oRWRp
dCwgcFRlbXApOworICAgIHBUZW1wW3NpemVdID0gMDsgICAgLyogbWFrZSBzdXJlIGl0J3MgIChj
aGFyKSdcMCctdGVybWluYXRlZCAqLworICAgIHBUZW1wW3NpemUrMV0gPSAwOyAgLyogbWFrZSBz
dXJlIGl0J3MgKFdDSEFSKSdcMCctdGVybWluYXRlZCAqLworCisgICAgLyogU2V0V2luZG93VGV4
dFV0ZjggYW5kIFNldFdpbmRvd1RleHRBIHRyeSB0byBhbGxvY2F0ZSBtZW1vcnksIHNvIHdlCisg
ICAgICogY2hlY2sgaWYgdGhleSBzdWNjZWVkLgorICAgICAqLworICAgIHN3aXRjaCAoZW5jKQor
ICAgIHsKKyAgICBjYXNlIEVOQ09ESU5HX1VURjE2QkU6CisgICAgICAgIGJ5dGVzd2FwX3dpZGVf
c3RyaW5nKChXQ0hBUiopIHBUZW1wLCBzaXplL3NpemVvZihXQ0hBUikpOworICAgICAgICAvKiBm
YWxsIHRocm91Z2ggKi8KKworICAgIGNhc2UgRU5DT0RJTkdfVVRGMTZMRToKKyAgICAgICAgaWYg
KHNpemUgPj0gMiAmJiAoQllURSlwVGVtcFswXSA9PSAweGZmICYmIChCWVRFKXBUZW1wWzFdID09
IDB4ZmUpCisgICAgICAgICAgICBzdWNjZWVkZWQgPSBTZXRXaW5kb3dUZXh0VyhHbG9iYWxzLmhF
ZGl0LCAoTFBXU1RSKShwVGVtcCsyKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHN1Y2Nl
ZWRlZCA9IFNldFdpbmRvd1RleHRXKEdsb2JhbHMuaEVkaXQsIChMUFdTVFIpcFRlbXApOworICAg
ICAgICBicmVhazsKKworICAgIGNhc2UgRU5DT0RJTkdfVVRGODoKKyAgICAgICAgaWYgKHNpemUg
Pj0gMyAmJiAoQllURSlwVGVtcFswXSA9PSAweGVmICYmIChCWVRFKXBUZW1wWzFdID09IDB4YmIg
JiYKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChC
WVRFKXBUZW1wWzJdID09IDB4YmYpCisgICAgICAgICAgICBzdWNjZWVkZWQgPSBTZXRXaW5kb3dU
ZXh0VXRmOChHbG9iYWxzLmhFZGl0LCBwVGVtcCszKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg
ICAgc3VjY2VlZGVkID0gU2V0V2luZG93VGV4dFV0ZjgoR2xvYmFscy5oRWRpdCwgcFRlbXApOwor
ICAgICAgICBicmVhazsKKworICAgIGRlZmF1bHQ6CisgICAgICAgIHN1Y2NlZWRlZCA9IFNldFdp
bmRvd1RleHRBKEdsb2JhbHMuaEVkaXQsIHBUZW1wKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQor
CisgICAgaWYgKCFzdWNjZWVkZWQpCisgICAgeworICAgICAgICBTaG93TGFzdEVycm9yKCk7Cisg
ICAgICAgIEhlYXBGcmVlKEdldFByb2Nlc3NIZWFwKCksIDAsIHBUZW1wKTsKKyAgICAgICAgcmV0
dXJuOworICAgIH0KIAogICAgIEhlYXBGcmVlKEdldFByb2Nlc3NIZWFwKCksIDAsIHBUZW1wKTsK
IApAQCAtMjgyLDYgKzM2Myw0MSBAQCBWT0lEIERJQUxPR19GaWxlTmV3KFZPSUQpCiAgICAgfQog
fQogCitzdGF0aWMgVUlOVF9QVFIgQ0FMTEJBQ0sgT2ZuSG9va1Byb2MoSFdORCBoZGxnLCBVSU5U
IHVNc2csIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCit7CisgICAgc3RhdGljIEhXTkQg
aEVuY0NvbWJvOworCisgICAgc3dpdGNoICh1TXNnKQorICAgIHsKKyAgICBjYXNlIFdNX0lOSVRE
SUFMT0c6CisgICAgICAgIHsKKyAgICAgICAgICAgIEVOQ09ESU5HIGVuYzsKKyAgICAgICAgICAg
IGhFbmNDb21ibyA9IEdldERsZ0l0ZW0oaGRsZywgSURDX09GTl9FTkNDT01CTyk7CisgICAgICAg
ICAgICBmb3IgKGVuYyA9IE1JTl9FTkNPRElORzsgZW5jIDw9IE1BWF9FTkNPRElORzsgZW5jKysp
CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgV0NIQVIgc3pFbmNbTUFYX1NUUklOR19M
RU5dOworICAgICAgICAgICAgICAgIGxvYWRfZW5jb2RpbmdfbmFtZShlbmMsIHN6RW5jLCBBUlJB
WV9TSVpFKHN6RW5jKSk7CisgICAgICAgICAgICAgICAgU2VuZE1lc3NhZ2VXKGhFbmNDb21ibywg
Q0JfQUREU1RSSU5HLCAwLCAoTFBBUkFNKXN6RW5jKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg
ICAgIFNlbmRNZXNzYWdlVyhoRW5jQ29tYm8sIENCX1NFVENVUlNFTCwgKFdQQVJBTSlHbG9iYWxz
LmVuY09mbkNvbWJvLCAwKTsKKyAgICAgICAgfQorICAgICAgICBicmVhazsKKworICAgIGNhc2Ug
V01fQ09NTUFORDoKKyAgICAgICAgaWYgKExPV09SRCh3UGFyYW0pID09IElEQ19PRk5fRU5DQ09N
Qk8gJiYKKyAgICAgICAgICAgIEhJV09SRCh3UGFyYW0pID09IENCTl9TRUxDSEFOR0UpCisgICAg
ICAgIHsKKyAgICAgICAgICAgIGludCBpbmRleCA9IFNlbmRNZXNzYWdlVyhoRW5jQ29tYm8sIENC
X0dFVENVUlNFTCwgMCwgMCk7CisgICAgICAgICAgICBHbG9iYWxzLmVuY09mbkNvbWJvID0gaW5k
ZXg9PUNCX0VSUiA/IEVOQ09ESU5HX0FOU0kgOiAoRU5DT0RJTkcpaW5kZXg7CisgICAgICAgIH0K
KyAgICAgICAgYnJlYWs7CisKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9Cisg
ICAgcmV0dXJuIDA7Cit9CisKIFZPSUQgRElBTE9HX0ZpbGVPcGVuKFZPSUQpCiB7CiAgICAgT1BF
TkZJTEVOQU1FVyBvcGVuZmlsZW5hbWU7CkBAIC0zMDIsMTMgKzQxOCwxNyBAQCBWT0lEIERJQUxP
R19GaWxlT3BlbihWT0lEKQogICAgIG9wZW5maWxlbmFtZS5scHN0ckZpbGUgICAgICAgICA9IHN6
UGF0aDsKICAgICBvcGVuZmlsZW5hbWUubk1heEZpbGUgICAgICAgICAgPSBBUlJBWV9TSVpFKHN6
UGF0aCk7CiAgICAgb3BlbmZpbGVuYW1lLmxwc3RySW5pdGlhbERpciAgID0gc3pEaXI7Ci0gICAg
b3BlbmZpbGVuYW1lLkZsYWdzICAgICAgICAgICAgID0gT0ZOX0ZJTEVNVVNURVhJU1QgfCBPRk5f
UEFUSE1VU1RFWElTVCB8Ci0gICAgICAgIE9GTl9ISURFUkVBRE9OTFkgfCBPRk5fRU5BQkxFU0la
SU5HOworICAgIG9wZW5maWxlbmFtZS5GbGFncyA9IE9GTl9FTkFCTEVURU1QTEFURSB8IE9GTl9F
TkFCTEVIT09LIHwgT0ZOX0VYUExPUkVSIHwKKyAgICAgICAgICAgICAgICAgICAgICAgICBPRk5f
RklMRU1VU1RFWElTVCB8IE9GTl9QQVRITVVTVEVYSVNUIHwKKyAgICAgICAgICAgICAgICAgICAg
ICAgICBPRk5fSElERVJFQURPTkxZIHwgT0ZOX0VOQUJMRVNJWklORzsKKyAgICBvcGVuZmlsZW5h
bWUubHBmbkhvb2sgICAgICAgPSBPZm5Ib29rUHJvYzsKKyAgICBvcGVuZmlsZW5hbWUubHBUZW1w
bGF0ZU5hbWUgPSBNQUtFSU5UUkVTT1VSQ0VXKElERF9PRk5fVEVNUExBVEUpOwogICAgIG9wZW5m
aWxlbmFtZS5scHN0ckRlZkV4dCAgICAgICA9IHN6RGVmYXVsdEV4dDsKIAorICAgIEdsb2JhbHMu
ZW5jT2ZuQ29tYm8gPSBFTkNPRElOR19BTlNJOwogCiAgICAgaWYgKEdldE9wZW5GaWxlTmFtZVco
Jm9wZW5maWxlbmFtZSkpCi0gICAgICAgIERvT3BlbkZpbGUob3BlbmZpbGVuYW1lLmxwc3RyRmls
ZSk7CisgICAgICAgIERvT3BlbkZpbGUob3BlbmZpbGVuYW1lLmxwc3RyRmlsZSwgR2xvYmFscy5l
bmNPZm5Db21ibyk7CiB9CiAKIApkaWZmIC0tZ2l0IGEvcHJvZ3JhbXMvbm90ZXBhZC9kaWFsb2cu
aCBiL3Byb2dyYW1zL25vdGVwYWQvZGlhbG9nLmgKaW5kZXggZDkyNzE0My4uN2FhYmI2ZSAxMDA2
NDQKLS0tIGEvcHJvZ3JhbXMvbm90ZXBhZC9kaWFsb2cuaAorKysgYi9wcm9ncmFtcy9ub3RlcGFk
L2RpYWxvZy5oCkBAIC01NCw0ICs1NCw0IEBAIGludCBESUFMT0dfU3RyaW5nTXNnQm94KEhXTkQg
aFBhcmVudCwgaW50IGZvcm1hdElkLCBMUENXU1RSIHN6U3RyaW5nLCBEV09SRCBkd0ZsCiBWT0lE
IFNob3dMYXN0RXJyb3Iodm9pZCk7CiBCT09MIEZpbGVFeGlzdHMoTFBDV1NUUiBzekZpbGVuYW1l
KTsKIEJPT0wgRG9DbG9zZUZpbGUodm9pZCk7Ci12b2lkIERvT3BlbkZpbGUoTFBDV1NUUiBzekZp
bGVOYW1lKTsKK3ZvaWQgRG9PcGVuRmlsZShMUENXU1RSIHN6RmlsZU5hbWUsIEVOQ09ESU5HIGVu
Yyk7CmRpZmYgLS1naXQgYS9wcm9ncmFtcy9ub3RlcGFkL21haW4uYyBiL3Byb2dyYW1zL25vdGVw
YWQvbWFpbi5jCmluZGV4IGMxOTU2NjguLmE5YjVmODMgMTAwNjQ0Ci0tLSBhL3Byb2dyYW1zL25v
dGVwYWQvbWFpbi5jCisrKyBiL3Byb2dyYW1zL25vdGVwYWQvbWFpbi5jCkBAIC01NzgsNyArNTc4
LDcgQEAgc3RhdGljIExSRVNVTFQgV0lOQVBJIE5PVEVQQURfV25kUHJvYyhIV05EIGhXbmQsIFVJ
TlQgbXNnLCBXUEFSQU0gd1BhcmFtLAogCiAgICAgICAgIERyYWdRdWVyeUZpbGVXKGhEcm9wLCAw
LCBzekZpbGVOYW1lLCBBUlJBWV9TSVpFKHN6RmlsZU5hbWUpKTsKICAgICAgICAgRHJhZ0Zpbmlz
aChoRHJvcCk7Ci0gICAgICAgIERvT3BlbkZpbGUoc3pGaWxlTmFtZSk7CisgICAgICAgIERvT3Bl
bkZpbGUoc3pGaWxlTmFtZSwgRU5DT0RJTkdfQU5TSSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0K
ICAgICAKQEAgLTY4OSw3ICs2ODksNyBAQCBzdGF0aWMgdm9pZCBIYW5kbGVDb21tYW5kTGluZShM
UFdTVFIgY21kbGluZSkKIAogICAgICAgICBpZiAoZmlsZV9leGlzdHMpCiAgICAgICAgIHsKLSAg
ICAgICAgICAgIERvT3BlbkZpbGUoZmlsZV9uYW1lKTsKKyAgICAgICAgICAgIERvT3BlbkZpbGUo
ZmlsZV9uYW1lLCBFTkNPRElOR19BTlNJKTsKICAgICAgICAgICAgIEludmFsaWRhdGVSZWN0KEds
b2JhbHMuaE1haW5XbmQsIE5VTEwsIEZBTFNFKTsKICAgICAgICAgICAgIGlmIChvcHRfcHJpbnQp
CiAgICAgICAgICAgICAgICAgRElBTE9HX0ZpbGVQcmludCgpOwpAQCAtNjk4LDcgKzY5OCw3IEBA
IHN0YXRpYyB2b2lkIEhhbmRsZUNvbW1hbmRMaW5lKExQV1NUUiBjbWRsaW5lKQogICAgICAgICB7
CiAgICAgICAgICAgICBzd2l0Y2ggKEFsZXJ0RmlsZURvZXNOb3RFeGlzdChmaWxlX25hbWUpKSB7
CiAgICAgICAgICAgICBjYXNlIElEWUVTOgotICAgICAgICAgICAgICAgIERvT3BlbkZpbGUoZmls
ZV9uYW1lKTsKKyAgICAgICAgICAgICAgICBEb09wZW5GaWxlKGZpbGVfbmFtZSwgRU5DT0RJTkdf
QU5TSSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgSUROTzoK
ZGlmZiAtLWdpdCBhL3Byb2dyYW1zL25vdGVwYWQvbWFpbi5oIGIvcHJvZ3JhbXMvbm90ZXBhZC9t
YWluLmgKaW5kZXggZjgxYzQzNy4uYzQ4NWU3YiAxMDA2NDQKLS0tIGEvcHJvZ3JhbXMvbm90ZXBh
ZC9tYWluLmgKKysrIGIvcHJvZ3JhbXMvbm90ZXBhZC9tYWluLmgKQEAgLTI1LDYgKzI1LDE5IEBA
CiAKICNkZWZpbmUgTUFYX1NUUklOR19MRU4gICAgICAyNTUKIAorLyogVmFsdWVzIGFyZSBpbmRl
eGVzIG9mIHRoZSBpdGVtcyBpbiB0aGUgRW5jb2RpbmcgY29tYm9ib3guICovCit0eXBlZGVmIGVu
dW0KK3sKKyAgICBFTkNPRElOR19JTlZBTElEID0gLTEsCisgICAgRU5DT0RJTkdfQU5TSSAgICA9
ICAwLAorICAgIEVOQ09ESU5HX1VURjE2TEUgPSAgMSwKKyAgICBFTkNPRElOR19VVEYxNkJFID0g
IDIsCisgICAgRU5DT0RJTkdfVVRGOCAgICA9ICAzCit9IEVOQ09ESU5HOworCisjZGVmaW5lIE1J
Tl9FTkNPRElORyAgIDAKKyNkZWZpbmUgTUFYX0VOQ09ESU5HICAgMworCiB0eXBlZGVmIHN0cnVj
dAogewogICBIQU5ETEUgICBoSW5zdGFuY2U7CkBAIC0zOSw2ICs1Miw3IEBAIHR5cGVkZWYgc3Ry
dWN0CiAgIFdDSEFSICAgIHN6RmlsZU5hbWVbTUFYX1BBVEhdOwogICBXQ0hBUiAgICBzekZpbGVU
aXRsZVtNQVhfUEFUSF07CiAgIFdDSEFSICAgIHN6RmlsdGVyWzIgKiBNQVhfU1RSSU5HX0xFTiAr
IDEwMF07CisgIEVOQ09ESU5HIGVuY09mbkNvbWJvOyAgLyogRW5jb2Rpbmcgc2VsZWN0ZWQgaW4g
SURDX09GTl9FTkNDT01CTyAqLwogICBJTlQgICAgICBpTWFyZ2luVG9wOwogICBJTlQgICAgICBp
TWFyZ2luQm90dG9tOwogICBJTlQgICAgICBpTWFyZ2luTGVmdDsKZGlmZiAtLWdpdCBhL3Byb2dy
YW1zL25vdGVwYWQvbm90ZXBhZF9yZXMuaCBiL3Byb2dyYW1zL25vdGVwYWQvbm90ZXBhZF9yZXMu
aAppbmRleCA4MTc2Yjg1Li4zMTIyZDk4IDEwMDY0NAotLS0gYS9wcm9ncmFtcy9ub3RlcGFkL25v
dGVwYWRfcmVzLmgKKysrIGIvcHJvZ3JhbXMvbm90ZXBhZC9ub3RlcGFkX3Jlcy5oCkBAIC04MSwz
ICs4MSwxMCBAQAogCiAjZGVmaW5lIFNUUklOR19OT1RGT1VORCAweDE3QgogI2RlZmluZSBTVFJJ
TkdfT1VUX09GX01FTU9SWSAweDE3QworCisjZGVmaW5lIFNUUklOR19VTklDT0RFX0xFICAgICAg
MHgxODAKKyNkZWZpbmUgU1RSSU5HX1VOSUNPREVfQkUgICAgICAweDE4MQorCisvKiBPcGVuL1Nh
dmUgQXMgZGlhbG9nIHRlbXBsYXRlICovCisjZGVmaW5lIElERF9PRk5fVEVNUExBVEUgICAgICAg
MHgxOTAKKyNkZWZpbmUgSURDX09GTl9FTkNDT01CTyAgICAgICAweDE5MQotLSAKMS41LjYuMwoK
--001636c5a9fff0b651046d34e169--