6223 2005-12-23 18:01:53 -0800 replace QPtrDict for Accessors structs with HashMap 2005-12-25 22:55:42 -0800 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 26453 0 mjs 2005-12-23 18:01:53 -0800 The Accessors struct in kjs_html.cpp is mapped via a QPtrDict, it should use HashMap. 26454 1 5254 mjs 2005-12-23 18:04:48 -0800 Created attachment 5254 patch to do the conversion 26462 2 5254 eric 2005-12-24 02:37:21 -0800 Comment on attachment 5254 patch to do the conversion Looks great. r=me. 5254 2005-12-23 18:04:48 -0800 2005-12-24 02:37:21 -0800 patch to do the conversion accessor-HashMap-convert.patch.txt text/plain 14038 mjs SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViQ29yZS9D aGFuZ2VMb2csdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzYKZGlmZiAtdSAtcCAtcjEuMzYgQ2hh bmdlTG9nCi0tLSBDaGFuZ2VMb2cJMjMgRGVjIDIwMDUgMjM6MDQ6MDYgLTAwMDAJMS4zNgorKysg Q2hhbmdlTG9nCTI0IERlYyAyMDA1IDAyOjA0OjE3IC0wMDAwCkBAIC0xLDMgKzEsMTcgQEAKKzIw MDUtMTItMjMgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIHJlcGxhY2VkIFFQdHJEaWN0 IGZvciBBY2Nlc3NvcnMgc3RydWN0cyB3aXRoIEhhc2hNYXAgKGFsc28gcmVuYW1lZCBzb21lCisJ c3RyYXkgZ2V0U2V0SW5mbyBtZXRob2RzKQorCWh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjIyMworCisgICAgICAgICoga2h0bWwvZWNtYS9ranNfaHRtbC5j cHA6CisgICAgICAgIChLSlM6OkhUTUxFbGVtZW50OjphY2Nlc3NvcnMpOgorICAgICAgICAoS0pT OjpIVE1MRWxlbWVudDo6Z2V0VmFsdWVQcm9wZXJ0eSk6CisgICAgICAgIChLSlM6OkhUTUxFbGVt ZW50OjpwdXRWYWx1ZVByb3BlcnR5KToKKyAgICAgICAgKiBraHRtbC9lY21hL2tqc19odG1sLmg6 CisKIDIwMDUtMTItMjIgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KICAgICAK ICAgICAgICAgUmV2aWV3ZWQgYnkgdmlja2kgKHlheSEpLCBlcmljLgpJbmRleDoga2h0bWwvZWNt YS9ranNfaHRtbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0 bWwvZWNtYS9ranNfaHRtbC5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTU5CmRpZmYgLXUg LXAgLXIxLjE1OSBraHRtbC9lY21hL2tqc19odG1sLmNwcAotLS0ga2h0bWwvZWNtYS9ranNfaHRt bC5jcHAJMjMgRGVjIDIwMDUgMTg6NDQ6MDkgLTAwMDAJMS4xNTkKKysrIGtodG1sL2VjbWEva2pz X2h0bWwuY3BwCTI0IERlYyAyMDA1IDAyOjA0OjMxIC0wMDAwCkBAIC02OTMsODMgKzY5Myw4MCBA QCBjb25zdCBIVE1MRWxlbWVudDo6QWNjZXNzb3JzIEhUTUxFbGVtZW50CiBjb25zdCBIVE1MRWxl bWVudDo6QWNjZXNzb3JzIEhUTUxFbGVtZW50OjppRnJhbWVfYWNjZXNzb3JzID0geyAmSFRNTEVs ZW1lbnQ6OmlGcmFtZUdldHRlciwgJkhUTUxFbGVtZW50OjppRnJhbWVTZXR0ZXIgfTsKIGNvbnN0 IEhUTUxFbGVtZW50OjpBY2Nlc3NvcnMgSFRNTEVsZW1lbnQ6Om1hcnF1ZWVfYWNjZXNzb3JzID0g eyAmSFRNTEVsZW1lbnQ6Om1hcnF1ZWVHZXR0ZXIsICZIVE1MRWxlbWVudDo6bWFycXVlZVNldHRl ciB9OwogCi1jb25zdCBIVE1MRWxlbWVudDo6QWNjZXNzb3JzKiBIVE1MRWxlbWVudDo6Z2V0U2V0 SW5mbygpIGNvbnN0Citjb25zdCBIVE1MRWxlbWVudDo6QWNjZXNzb3JzKiBIVE1MRWxlbWVudDo6 YWNjZXNzb3JzKCkgY29uc3QKIHsKICAgICAvLyBGSVhNRTogV2Ugd2FudCB0byB1c2UgSGFzaE1h cCBoZXJlLCBidXQgdGhlcmUgYXJlIGNvbXBpbGVyIGlzc3VlcyB0byBkZWFsIHdpdGguCi0gICAg c3RhdGljIFFQdHJEaWN0PGNvbnN0IEhUTUxFbGVtZW50OjpBY2Nlc3NvcnM+IGdldFNldEluZm9E aWN0OwotICAgIGlmIChnZXRTZXRJbmZvRGljdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgZ2V0U2V0 SW5mb0RpY3QuaW5zZXJ0KGFUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmYV9hY2Nlc3NvcnMpOwot ICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQoYXBwbGV0VGFnLmxvY2FsTmFtZSgpLmltcGwo KSwgJmFwcGxldF9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQoYXJl YVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZhcmVhX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNl dEluZm9EaWN0Lmluc2VydChiYXNlVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmJhc2VfYWNjZXNz b3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KGJhc2Vmb250VGFnLmxvY2FsTmFt ZSgpLmltcGwoKSwgJmJhc2VGb250X2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0 Lmluc2VydChibG9ja3F1b3RlVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmJsb2NrUXVvdGVfYWNj ZXNzb3JzKTsgCi0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChib2R5VGFnLmxvY2FsTmFt ZSgpLmltcGwoKSwgJmJvZHlfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5z ZXJ0KGJyVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmJyX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdl dFNldEluZm9EaWN0Lmluc2VydChidXR0b25UYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmYnV0dG9u X2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChjYW52YXNUYWcubG9j YWxOYW1lKCkuaW1wbCgpLCAmY2FudmFzX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9E aWN0Lmluc2VydChjYXB0aW9uVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmNhcHRpb25fYWNjZXNz b3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KGNvbFRhZy5sb2NhbE5hbWUoKS5p bXBsKCksICZjb2xfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KGNv bGdyb3VwVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmNvbF9hY2Nlc3NvcnMpOwotICAgICAgICBn ZXRTZXRJbmZvRGljdC5pbnNlcnQoZGVsVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJm1vZF9hY2Nl c3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQoZGlyVGFnLmxvY2FsTmFtZSgp LmltcGwoKSwgJmRpcl9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQo ZGl2VGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmRpdl9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRT ZXRJbmZvRGljdC5pbnNlcnQoZGxUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmZGxfYWNjZXNzb3Jz KTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KGZpZWxkc2V0VGFnLmxvY2FsTmFtZSgp LmltcGwoKSwgJmZpZWxkU2V0X2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmlu c2VydChmb250VGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmZvbnRfYWNjZXNzb3JzKTsKLSAgICAg ICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KGZvcm1UYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmZm9y bV9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQoZnJhbWVUYWcubG9j YWxOYW1lKCkuaW1wbCgpLCAmZnJhbWVfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0Rp Y3QuaW5zZXJ0KGZyYW1lc2V0VGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmZyYW1lU2V0X2FjY2Vz c29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChoMVRhZy5sb2NhbE5hbWUoKS5p bXBsKCksICZoZWFkaW5nX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2Vy dChoMlRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZoZWFkaW5nX2FjY2Vzc29ycyk7Ci0gICAgICAg IGdldFNldEluZm9EaWN0Lmluc2VydChoM1RhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZoZWFkaW5n X2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChoNFRhZy5sb2NhbE5h bWUoKS5pbXBsKCksICZoZWFkaW5nX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0 Lmluc2VydChoNVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZoZWFkaW5nX2FjY2Vzc29ycyk7Ci0g ICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChoNlRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZo ZWFkaW5nX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChoZWFkVGFn LmxvY2FsTmFtZSgpLmltcGwoKSwgJmhlYWRfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5m b0RpY3QuaW5zZXJ0KGhyVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmhyX2FjY2Vzc29ycyk7IAot ICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQoaHRtbFRhZy5sb2NhbE5hbWUoKS5pbXBsKCks ICZodG1sX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChpZnJhbWVU YWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmaUZyYW1lX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNl dEluZm9EaWN0Lmluc2VydChpbWdUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmaW1nX2FjY2Vzc29y cyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChpbnB1dFRhZy5sb2NhbE5hbWUoKS5p bXBsKCksICZpbnB1dF9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQo aW5zVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJm1vZF9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRT ZXRJbmZvRGljdC5pbnNlcnQoaXNpbmRleFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZpc0luZGV4 X2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChsYWJlbFRhZy5sb2Nh bE5hbWUoKS5pbXBsKCksICZsYWJlbF9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGlj dC5pbnNlcnQobGVnZW5kVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmxlZ2VuZF9hY2Nlc3NvcnMp OwotICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQobGlUYWcubG9jYWxOYW1lKCkuaW1wbCgp LCAmbGlfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KGxpbmtUYWcu bG9jYWxOYW1lKCkuaW1wbCgpLCAmbGlua19hY2Nlc3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZv RGljdC5pbnNlcnQobWFwVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJm1hcF9hY2Nlc3NvcnMpOwot ICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQobWFycXVlZVRhZy5sb2NhbE5hbWUoKS5pbXBs KCksICZtYXJxdWVlX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydCht ZW51VGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJm1lbnVfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0 U2V0SW5mb0RpY3QuaW5zZXJ0KG1ldGFUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmbWV0YV9hY2Nl c3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGljdC5pbnNlcnQob2JqZWN0VGFnLmxvY2FsTmFt ZSgpLmltcGwoKSwgJm9iamVjdF9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGljdC5p bnNlcnQob2xUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmb2xfYWNjZXNzb3JzKTsKLSAgICAgICAg Z2V0U2V0SW5mb0RpY3QuaW5zZXJ0KG9wdGlvblRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZvcHRp b25fYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KG9wdGdyb3VwVGFn LmxvY2FsTmFtZSgpLmltcGwoKSwgJm9wdEdyb3VwX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNl dEluZm9EaWN0Lmluc2VydChwVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJnBfYWNjZXNzb3JzKTsK LSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KHBhcmFtVGFnLmxvY2FsTmFtZSgpLmltcGwo KSwgJnBhcmFtX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydChwcmVU YWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmcHJlX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldElu Zm9EaWN0Lmluc2VydChxVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJnFfYWNjZXNzb3JzKTsKLSAg ICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KHNjcmlwdFRhZy5sb2NhbE5hbWUoKS5pbXBsKCks ICZzY3JpcHRfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KHNlbGVj dFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZzZWxlY3RfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0 U2V0SW5mb0RpY3QuaW5zZXJ0KHN0eWxlVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJnN0eWxlX2Fj Y2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydCh0YWJsZVRhZy5sb2NhbE5h bWUoKS5pbXBsKCksICZ0YWJsZV9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRTZXRJbmZvRGljdC5p bnNlcnQodGJvZHlUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmdGFibGVzZWN0aW9uX2FjY2Vzc29y cyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydCh0ZFRhZy5sb2NhbE5hbWUoKS5pbXBs KCksICZ0YWJsZWNlbGxfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0 KHRleHRhcmVhVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJnRleHRBcmVhX2FjY2Vzc29ycyk7Ci0g ICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydCh0aFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZ0 YWJsZWNlbGxfYWNjZXNzb3JzKTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KHRoZWFk VGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJnRhYmxlc2VjdGlvbl9hY2Nlc3NvcnMpOwotICAgICAg ICBnZXRTZXRJbmZvRGljdC5pbnNlcnQodGZvb3RUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmdGFi bGVzZWN0aW9uX2FjY2Vzc29ycyk7Ci0gICAgICAgIGdldFNldEluZm9EaWN0Lmluc2VydCh0aXRs ZVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZ0aXRsZV9hY2Nlc3NvcnMpOwotICAgICAgICBnZXRT ZXRJbmZvRGljdC5pbnNlcnQodHJUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmdHJfYWNjZXNzb3Jz KTsKLSAgICAgICAgZ2V0U2V0SW5mb0RpY3QuaW5zZXJ0KHVsVGFnLmxvY2FsTmFtZSgpLmltcGwo KSwgJnVsX2FjY2Vzc29ycyk7CisgICAgc3RhdGljIEhhc2hNYXA8RE9NOjpET01TdHJpbmdJbXBs ICosIGNvbnN0IEFjY2Vzc29ycyAqLCBQb2ludGVySGFzaDxET006OkRPTVN0cmluZ0ltcGwgKj4g PiBhY2Nlc3Nvck1hcDsKKyAgICBpZiAoYWNjZXNzb3JNYXAuaXNFbXB0eSgpKSB7CisgICAgICAg IGFjY2Vzc29yTWFwLmFkZChhVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmFfYWNjZXNzb3JzKTsK KyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKGFwcGxldFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZh cHBsZXRfYWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKGFyZWFUYWcubG9jYWxO YW1lKCkuaW1wbCgpLCAmYXJlYV9hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQo YmFzZVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZiYXNlX2FjY2Vzc29ycyk7CisgICAgICAgIGFj Y2Vzc29yTWFwLmFkZChiYXNlZm9udFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZiYXNlRm9udF9h Y2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoYmxvY2txdW90ZVRhZy5sb2NhbE5h bWUoKS5pbXBsKCksICZibG9ja1F1b3RlX2FjY2Vzc29ycyk7IAorICAgICAgICBhY2Nlc3Nvck1h cC5hZGQoYm9keVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZib2R5X2FjY2Vzc29ycyk7CisgICAg ICAgIGFjY2Vzc29yTWFwLmFkZChiclRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZicl9hY2Nlc3Nv cnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoYnV0dG9uVGFnLmxvY2FsTmFtZSgpLmltcGwo KSwgJmJ1dHRvbl9hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoY2FudmFzVGFn LmxvY2FsTmFtZSgpLmltcGwoKSwgJmNhbnZhc19hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nv ck1hcC5hZGQoY2FwdGlvblRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZjYXB0aW9uX2FjY2Vzc29y cyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChjb2xUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAm Y29sX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChjb2xncm91cFRhZy5sb2Nh bE5hbWUoKS5pbXBsKCksICZjb2xfYWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRk KGRlbFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZtb2RfYWNjZXNzb3JzKTsKKyAgICAgICAgYWNj ZXNzb3JNYXAuYWRkKGRpclRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZkaXJfYWNjZXNzb3JzKTsK KyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKGRpdlRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZkaXZf YWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKGRsVGFnLmxvY2FsTmFtZSgpLmlt cGwoKSwgJmRsX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChmaWVsZHNldFRh Zy5sb2NhbE5hbWUoKS5pbXBsKCksICZmaWVsZFNldF9hY2Nlc3NvcnMpOworICAgICAgICBhY2Nl c3Nvck1hcC5hZGQoZm9udFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZmb250X2FjY2Vzc29ycyk7 CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChmb3JtVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmZv cm1fYWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKGZyYW1lVGFnLmxvY2FsTmFt ZSgpLmltcGwoKSwgJmZyYW1lX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChm cmFtZXNldFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZmcmFtZVNldF9hY2Nlc3NvcnMpOworICAg ICAgICBhY2Nlc3Nvck1hcC5hZGQoaDFUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmaGVhZGluZ19h Y2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoaDJUYWcubG9jYWxOYW1lKCkuaW1w bCgpLCAmaGVhZGluZ19hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoaDNUYWcu bG9jYWxOYW1lKCkuaW1wbCgpLCAmaGVhZGluZ19hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nv ck1hcC5hZGQoaDRUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmaGVhZGluZ19hY2Nlc3NvcnMpOwor ICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoaDVUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmaGVhZGlu Z19hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoaDZUYWcubG9jYWxOYW1lKCku aW1wbCgpLCAmaGVhZGluZ19hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoaGVh ZFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZoZWFkX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vz c29yTWFwLmFkZChoclRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZocl9hY2Nlc3NvcnMpOyAKKyAg ICAgICAgYWNjZXNzb3JNYXAuYWRkKGh0bWxUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmaHRtbF9h Y2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoaWZyYW1lVGFnLmxvY2FsTmFtZSgp LmltcGwoKSwgJmlGcmFtZV9hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQoaW1n VGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJmltZ19hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nv ck1hcC5hZGQoaW5wdXRUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmaW5wdXRfYWNjZXNzb3JzKTsK KyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKGluc1RhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZtb2Rf YWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKGlzaW5kZXhUYWcubG9jYWxOYW1l KCkuaW1wbCgpLCAmaXNJbmRleF9hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQo bGFiZWxUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmbGFiZWxfYWNjZXNzb3JzKTsKKyAgICAgICAg YWNjZXNzb3JNYXAuYWRkKGxlZ2VuZFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZsZWdlbmRfYWNj ZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKGxpVGFnLmxvY2FsTmFtZSgpLmltcGwo KSwgJmxpX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChsaW5rVGFnLmxvY2Fs TmFtZSgpLmltcGwoKSwgJmxpbmtfYWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRk KG1hcFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZtYXBfYWNjZXNzb3JzKTsKKyAgICAgICAgYWNj ZXNzb3JNYXAuYWRkKG1hcnF1ZWVUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmbWFycXVlZV9hY2Nl c3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQobWVudVRhZy5sb2NhbE5hbWUoKS5pbXBs KCksICZtZW51X2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChtZXRhVGFnLmxv Y2FsTmFtZSgpLmltcGwoKSwgJm1ldGFfYWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAu YWRkKG9iamVjdFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZvYmplY3RfYWNjZXNzb3JzKTsKKyAg ICAgICAgYWNjZXNzb3JNYXAuYWRkKG9sVGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJm9sX2FjY2Vz c29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChvcHRpb25UYWcubG9jYWxOYW1lKCkuaW1w bCgpLCAmb3B0aW9uX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChvcHRncm91 cFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZvcHRHcm91cF9hY2Nlc3NvcnMpOworICAgICAgICBh Y2Nlc3Nvck1hcC5hZGQocFRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZwX2FjY2Vzc29ycyk7Cisg ICAgICAgIGFjY2Vzc29yTWFwLmFkZChwYXJhbVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZwYXJh bV9hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQocHJlVGFnLmxvY2FsTmFtZSgp LmltcGwoKSwgJnByZV9hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQocVRhZy5s b2NhbE5hbWUoKS5pbXBsKCksICZxX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFk ZChzY3JpcHRUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmc2NyaXB0X2FjY2Vzc29ycyk7CisgICAg ICAgIGFjY2Vzc29yTWFwLmFkZChzZWxlY3RUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmc2VsZWN0 X2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZChzdHlsZVRhZy5sb2NhbE5hbWUo KS5pbXBsKCksICZzdHlsZV9hY2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQodGFi bGVUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmdGFibGVfYWNjZXNzb3JzKTsKKyAgICAgICAgYWNj ZXNzb3JNYXAuYWRkKHRib2R5VGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJnRhYmxlc2VjdGlvbl9h Y2Nlc3NvcnMpOworICAgICAgICBhY2Nlc3Nvck1hcC5hZGQodGRUYWcubG9jYWxOYW1lKCkuaW1w bCgpLCAmdGFibGVjZWxsX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZCh0ZXh0 YXJlYVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksICZ0ZXh0QXJlYV9hY2Nlc3NvcnMpOworICAgICAg ICBhY2Nlc3Nvck1hcC5hZGQodGhUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmdGFibGVjZWxsX2Fj Y2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZCh0aGVhZFRhZy5sb2NhbE5hbWUoKS5p bXBsKCksICZ0YWJsZXNlY3Rpb25fYWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRk KHRmb290VGFnLmxvY2FsTmFtZSgpLmltcGwoKSwgJnRhYmxlc2VjdGlvbl9hY2Nlc3NvcnMpOwor ICAgICAgICBhY2Nlc3Nvck1hcC5hZGQodGl0bGVUYWcubG9jYWxOYW1lKCkuaW1wbCgpLCAmdGl0 bGVfYWNjZXNzb3JzKTsKKyAgICAgICAgYWNjZXNzb3JNYXAuYWRkKHRyVGFnLmxvY2FsTmFtZSgp LmltcGwoKSwgJnRyX2FjY2Vzc29ycyk7CisgICAgICAgIGFjY2Vzc29yTWFwLmFkZCh1bFRhZy5s b2NhbE5hbWUoKS5pbXBsKCksICZ1bF9hY2Nlc3NvcnMpOwogICAgIH0KICAgICAKICAgICBIVE1M RWxlbWVudEltcGwqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MRWxlbWVudEltcGwqPihpbXBs KCkpOwotICAgIGNvbnN0IEhUTUxFbGVtZW50OjpBY2Nlc3NvcnMqIHJlc3VsdCA9IGdldFNldElu Zm9EaWN0LmZpbmQoZWxlbWVudC0+bG9jYWxOYW1lKCkuaW1wbCgpKTsKLSAgICBpZiAocmVzdWx0 KQotICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgIHJldHVybiAwOworICAgIHJldHVybiBhY2Nl c3Nvck1hcC5nZXQoZWxlbWVudC0+bG9jYWxOYW1lKCkuaW1wbCgpKTsKIH0KIAogLyoKQEAgLTIy NjEsOSArMjI1OCw5IEBAIEpTVmFsdWUgKkhUTUxFbGVtZW50OjpnZXRWYWx1ZVByb3BlcnR5KEUK ICAgICB9CiAKICAgICAvLyBOb3cgY2hlY2sgdGhlIHByb3BlcnRpZXMgc3BlY2lmaWMgdG8gb3Vy IGVsZW1lbnQgdHlwZS4KLSAgICBjb25zdCBBY2Nlc3NvcnMqIGluZm8gPSBnZXRTZXRJbmZvKCk7 Ci0gICAgaWYgKGluZm8gJiYgaW5mby0+bV9nZXR0ZXIpCi0gICAgICAgIHJldHVybiAodGhpcy0+ KihpbmZvLT5tX2dldHRlcikpKGV4ZWMsIHRva2VuKTsKKyAgICBjb25zdCBBY2Nlc3NvcnMqIGFj Y2VzcyA9IGFjY2Vzc29ycygpOworICAgIGlmIChhY2Nlc3MgJiYgYWNjZXNzLT5tX2dldHRlcikK KyAgICAgICAgcmV0dXJuICh0aGlzLT4qKGFjY2Vzcy0+bV9nZXR0ZXIpKShleGVjLCB0b2tlbik7 CiAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiB9CiAKQEAgLTMyNDksOSArMzI0Niw5IEBAIHZv aWQgSFRNTEVsZW1lbnQ6OnB1dFZhbHVlUHJvcGVydHkoRXhlY1MKICAgICB9CiAKICAgICAvLyBO b3cgY2hlY2sgZm9yIHByb3BlcnRpZXMgdGhhdCBhcHBseSB0byBhIHNwZWNpZmljIGVsZW1lbnQg dHlwZS4KLSAgICBjb25zdCBBY2Nlc3NvcnMqIGluZm8gPSBnZXRTZXRJbmZvKCk7Ci0gICAgaWYg KGluZm8gJiYgaW5mby0+bV9zZXR0ZXIpCi0gICAgICAgIHJldHVybiAodGhpcy0+KihpbmZvLT5t X3NldHRlcikpKGV4ZWMsIHRva2VuLCB2YWx1ZSwgc3RyKTsgIAorICAgIGNvbnN0IEFjY2Vzc29y cyogYWNjZXNzID0gYWNjZXNzb3JzKCk7CisgICAgaWYgKGFjY2VzcyAmJiBhY2Nlc3MtPm1fc2V0 dGVyKQorICAgICAgICByZXR1cm4gKHRoaXMtPiooYWNjZXNzLT5tX3NldHRlcikpKGV4ZWMsIHRv a2VuLCB2YWx1ZSwgc3RyKTsgIAogfQogCiBIVE1MRWxlbWVudEltcGwgKnRvSFRNTEVsZW1lbnQo SlNWYWx1ZSAqdmFsKQpJbmRleDoga2h0bWwvZWNtYS9ranNfaHRtbC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT IGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL2VjbWEva2pzX2h0bWwuaCx2CnJldHJpZXZp bmcgcmV2aXNpb24gMS42NApkaWZmIC11IC1wIC1yMS42NCBraHRtbC9lY21hL2tqc19odG1sLmgK LS0tIGtodG1sL2VjbWEva2pzX2h0bWwuaAkxMyBEZWMgMjAwNSAyMToyOToyOSAtMDAwMAkxLjY0 CisrKyBraHRtbC9lY21hL2tqc19odG1sLmgJMjQgRGVjIDIwMDUgMDI6MDQ6MzQgLTAwMDAKQEAg LTg4LDcgKzg4LDcgQEAgbmFtZXNwYWNlIEtKUyB7CiAgICAgdHlwZWRlZiBKU1ZhbHVlICooSFRN TEVsZW1lbnQ6OipHZXR0ZXJGdW5jdGlvbikoRXhlY1N0YXRlICpleGVjLCBpbnQgdG9rZW4pIGNv bnN0OwogICAgIHR5cGVkZWYgdm9pZCAoSFRNTEVsZW1lbnQ6OipTZXR0ZXJGdW5jdGlvbikoRXhl Y1N0YXRlICpleGVjLCBpbnQgdG9rZW4sIEpTVmFsdWUgKnZhbHVlLCBjb25zdCBET006OkRPTVN0 cmluZyYgc3RyKTsKICAgICBzdHJ1Y3QgQWNjZXNzb3JzIHsgR2V0dGVyRnVuY3Rpb24gbV9nZXR0 ZXI7IFNldHRlckZ1bmN0aW9uIG1fc2V0dGVyOyB9OwotICAgIGNvbnN0IEFjY2Vzc29ycyogZ2V0 U2V0SW5mbygpIGNvbnN0OworICAgIGNvbnN0IEFjY2Vzc29ycyogYWNjZXNzb3JzKCkgY29uc3Q7 CiAgICAgc3RhdGljIGNvbnN0IEFjY2Vzc29ycyBodG1sX2FjY2Vzc29ycywgaGVhZF9hY2Nlc3Nv cnMsIGxpbmtfYWNjZXNzb3JzLCB0aXRsZV9hY2Nlc3NvcnMsCiAgICAgICBtZXRhX2FjY2Vzc29y cywgYmFzZV9hY2Nlc3NvcnMsIGlzSW5kZXhfYWNjZXNzb3JzLCBzdHlsZV9hY2Nlc3NvcnMsIGJv ZHlfYWNjZXNzb3JzLCBmb3JtX2FjY2Vzc29ycywKICAgICAgIHNlbGVjdF9hY2Nlc3NvcnMsIG9w dEdyb3VwX2FjY2Vzc29ycywgb3B0aW9uX2FjY2Vzc29ycywgaW5wdXRfYWNjZXNzb3JzLCB0ZXh0 QXJlYV9hY2Nlc3NvcnMsCg==