60839 2011-05-14 10:17:23 -0700 Consolidate plug-in creation parameters to a single struct 2011-05-14 11:06:34 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 404062 0 andersca 2011-05-14 10:17:23 -0700 Consolidate plug-in creation parameters to a single struct 404063 1 93556 andersca 2011-05-14 10:20:43 -0700 Created attachment 93556 Patch 404064 2 webkit.review.bot 2011-05-14 10:23:13 -0700 Attachment 93556 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/PluginProcess/PluginCreationParameters.h:34: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 404074 3 andersca 2011-05-14 11:06:34 -0700 Committed r86489: <http://trac.webkit.org/changeset/86489> 93556 2011-05-14 10:20:43 -0700 2011-05-14 10:57:27 -0700 Patch bug-60839-20110514102042.patch text/plain 21523 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NDg3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDUtMTQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDb25zb2xpZGF0ZSBwbHVnLWluIGNyZWF0aW9uIHBhcmFt ZXRlcnMgdG8gYSBzaW5nbGUgc3RydWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MDgzOQorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5D b250cm9sbGVyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJv eHk6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6UGx1 Z2luQ29udHJvbGxlclByb3h5KToKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRy b2xsZXJQcm94eS5oOgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvUGx1Z2luQ3JlYXRpb25QYXJh bWV0ZXJzLmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNyZWF0aW9uUGFyYW1l dGVyczo6UGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2lu Q3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5DcmVh dGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5D cmVhdGlvblBhcmFtZXRlcnMuaDogQWRkZWQuCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9XZWJQ cm9jZXNzQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDb25uZWN0 aW9uOjpjcmVhdGVQbHVnaW4pOgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nv bm5lY3Rpb24uaDoKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9u Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weToKKyAg ICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogV2Vi UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2lu UHJveHk6OmluaXRpYWxpemUpOgorCiAyMDExLTA1LTE0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2V2aW4gRGVja2VyLgpJbmRl eDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJv bGxlclByb3h5LmNwcAkocmV2aXNpb24gODY0ODcpCisrKyBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Q cm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYg KzM0LDcgQEAKICNpbmNsdWRlICJOUFJ1bnRpbWVVdGlsaXRpZXMuaCIKICNpbmNsdWRlICJOUFZh cmlhbnREYXRhLmgiCiAjaW5jbHVkZSAiTmV0c2NhcGVQbHVnaW4uaCIKKyNpbmNsdWRlICJQbHVn aW5DcmVhdGlvblBhcmFtZXRlcnMuaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzLmgiCiAjaW5j bHVkZSAiUGx1Z2luUHJveHlNZXNzYWdlcy5oIgogI2luY2x1ZGUgIlNoYXJlYWJsZUJpdG1hcC5o IgpAQCAtNDcsMTcgKzQ4LDE5IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAotUGFzc093blB0cjxQbHVnaW5Db250cm9sbGVyUHJveHk+IFBsdWdpbkNv bnRyb2xsZXJQcm94eTo6Y3JlYXRlKFdlYlByb2Nlc3NDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1 aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlELCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgYm9vbCBp c1ByaXZhdGVCcm93c2luZ0VuYWJsZWQsIGJvb2wgaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5h YmxlZCkKK1Bhc3NPd25QdHI8UGx1Z2luQ29udHJvbGxlclByb3h5PiBQbHVnaW5Db250cm9sbGVy UHJveHk6OmNyZWF0ZShXZWJQcm9jZXNzQ29ubmVjdGlvbiogY29ubmVjdGlvbiwgY29uc3QgUGx1 Z2luQ3JlYXRpb25QYXJhbWV0ZXJzJiBjcmVhdGlvblBhcmFtZXRlcnMpCiB7Ci0gICAgcmV0dXJu IGFkb3B0UHRyKG5ldyBQbHVnaW5Db250cm9sbGVyUHJveHkoY29ubmVjdGlvbiwgcGx1Z2luSW5z dGFuY2VJRCwgdXNlckFnZW50LCBpc1ByaXZhdGVCcm93c2luZ0VuYWJsZWQsIGlzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0VuYWJsZWQpKTsKKyAgICByZXR1cm4gYWRvcHRQdHIobmV3IFBsdWdpbkNv bnRyb2xsZXJQcm94eShjb25uZWN0aW9uLCBjcmVhdGlvblBhcmFtZXRlcnMpKTsKIH0KIAotUGx1 Z2luQ29udHJvbGxlclByb3h5OjpQbHVnaW5Db250cm9sbGVyUHJveHkoV2ViUHJvY2Vzc0Nvbm5l Y3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQsIGNvbnN0IFN0cmlu ZyYgdXNlckFnZW50LCBib29sIGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgYm9vbCBpc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKQorUGx1Z2luQ29udHJvbGxlclByb3h5OjpQbHVnaW5D b250cm9sbGVyUHJveHkoV2ViUHJvY2Vzc0Nvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIGNvbnN0IFBs dWdpbkNyZWF0aW9uUGFyYW1ldGVycyYgY3JlYXRpb25QYXJhbWV0ZXJzKQogICAgIDogbV9jb25u ZWN0aW9uKGNvbm5lY3Rpb24pCi0gICAgLCBtX3BsdWdpbkluc3RhbmNlSUQocGx1Z2luSW5zdGFu Y2VJRCkKLSAgICAsIG1fdXNlckFnZW50KHVzZXJBZ2VudCkKLSAgICAsIG1faXNQcml2YXRlQnJv d3NpbmdFbmFibGVkKGlzUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCkKLSAgICAsIG1faXNBY2NlbGVy YXRlZENvbXBvc2l0aW5nRW5hYmxlZChpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKQor ICAgICwgbV9wbHVnaW5JbnN0YW5jZUlEKGNyZWF0aW9uUGFyYW1ldGVycy5wbHVnaW5JbnN0YW5j ZUlEKQorICAgICwgbV91c2VyQWdlbnQoY3JlYXRpb25QYXJhbWV0ZXJzLnVzZXJBZ2VudCkKKyAg ICAsIG1faXNQcml2YXRlQnJvd3NpbmdFbmFibGVkKGNyZWF0aW9uUGFyYW1ldGVycy5pc1ByaXZh dGVCcm93c2luZ0VuYWJsZWQpCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAg ICwgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKGNyZWF0aW9uUGFyYW1ldGVycy5p c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKQorI2VuZGlmCiAgICAgLCBtX3BhaW50VGlt ZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmUGx1Z2luQ29udHJvbGxlclByb3h5OjpwYWludCkK ICAgICAsIG1fcGx1Z2luRGVzdHJ1Y3Rpb25Qcm90ZWN0Q291bnQoMCkKICAgICAsIG1fcGx1Z2lu RGVzdHJveVRpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJlBsdWdpbkNvbnRyb2xsZXJQcm94 eTo6ZGVzdHJveSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29u dHJvbGxlclByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vz cy9QbHVnaW5Db250cm9sbGVyUHJveHkuaAkocmV2aXNpb24gODY0ODcpCisrKyBTb3VyY2UvV2Vi S2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oCSh3b3JraW5nIGNvcHkp CkBAIC01MCwxMiArNTAsMTMgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFNoYXJlYWJs ZUJpdG1hcDsKIGNsYXNzIFdlYlByb2Nlc3NDb25uZWN0aW9uOworc3RydWN0IFBsdWdpbkNyZWF0 aW9uUGFyYW1ldGVyczsKIAogY2xhc3MgUGx1Z2luQ29udHJvbGxlclByb3h5IDogUGx1Z2luQ29u dHJvbGxlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoUGx1Z2luQ29udHJvbGxlclByb3h5 KTsKIAogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPFBsdWdpbkNvbnRyb2xsZXJQcm94 eT4gY3JlYXRlKFdlYlByb2Nlc3NDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBwbHVn aW5JbnN0YW5jZUlELCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgYm9vbCBpc1ByaXZhdGVCcm93 c2luZ0VuYWJsZWQsIGJvb2wgaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCk7CisgICAg c3RhdGljIFBhc3NPd25QdHI8UGx1Z2luQ29udHJvbGxlclByb3h5PiBjcmVhdGUoV2ViUHJvY2Vz c0Nvbm5lY3Rpb24qLCBjb25zdCBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMmKTsKICAgICB+UGx1 Z2luQ29udHJvbGxlclByb3h5KCk7CiAKICAgICB1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlEKCkg Y29uc3QgeyByZXR1cm4gbV9wbHVnaW5JbnN0YW5jZUlEOyB9CkBAIC03Myw3ICs3NCw3IEBAIHB1 YmxpYzoKICAgICBQbHVnaW5Db250cm9sbGVyKiBhc1BsdWdpbkNvbnRyb2xsZXIoKSB7IHJldHVy biB0aGlzOyB9CiAKIHByaXZhdGU6Ci0gICAgUGx1Z2luQ29udHJvbGxlclByb3h5KFdlYlByb2Nl c3NDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlELCBjb25z dCBTdHJpbmcmIHVzZXJBZ2VudCwgYm9vbCBpc1ByaXZhdGVCcm93c2luZ0VuYWJsZWQsIGJvb2wg aXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCk7CisgICAgUGx1Z2luQ29udHJvbGxlclBy b3h5KFdlYlByb2Nlc3NDb25uZWN0aW9uKiwgY29uc3QgUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJz Jik7CiAKICAgICB2b2lkIHN0YXJ0UGFpbnRUaW1lcigpOwogICAgIHZvaWQgcGFpbnQoKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNy ZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViS2l0Mi9QbHVn aW5Qcm9jZXNzL1BsdWdpbkNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsODEgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0 OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g dGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks IE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAi UGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCisKKyNpZiBFTkFCTEUoUExVR0lOX1BST0NFU1Mp CisKKyNpbmNsdWRlICJBcmd1bWVudENvZGVycy5oIgorCituYW1lc3BhY2UgV2ViS2l0IHsKKwor UGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzOjpQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMoKQorICAg IDogcGx1Z2luSW5zdGFuY2VJRCgwKQorICAgICwgaXNQcml2YXRlQnJvd3NpbmdFbmFibGVkKGZh bHNlKQorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICAsIGlzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0VuYWJsZWQoZmFsc2UpCisjZW5kaWYKK3sKK30KKwordm9pZCBQbHVnaW5D cmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29k ZXIpIGNvbnN0Cit7CisgICAgZW5jb2Rlci0+ZW5jb2RlKHBsdWdpbkluc3RhbmNlSUQpOworICAg IGVuY29kZXItPmVuY29kZShwYXJhbWV0ZXJzKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUodXNlckFn ZW50KTsKKyAgICBlbmNvZGVyLT5lbmNvZGUoaXNQcml2YXRlQnJvd3NpbmdFbmFibGVkKTsKKwor I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICBlbmNvZGVyLT5lbmNvZGUoaXNB Y2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCk7CisjZW5kaWYKK30KKworYm9vbCBQbHVnaW5D cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGRlY29k ZXIsIFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVycyYgcmVzdWx0KQoreworICAgIGlmICghZGVjb2Rl ci0+ZGVjb2RlKHJlc3VsdC5wbHVnaW5JbnN0YW5jZUlEKSB8fCAhcmVzdWx0LnBsdWdpbkluc3Rh bmNlSUQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghZGVjb2Rlci0+ZGVjb2Rl KHJlc3VsdC5wYXJhbWV0ZXJzKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFk ZWNvZGVyLT5kZWNvZGUocmVzdWx0LnVzZXJBZ2VudCkpCisgICAgICAgIHJldHVybiBmYWxzZTsK KworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHJlc3VsdC5pc1ByaXZhdGVCcm93c2luZ0VuYWJs ZWQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LmlzQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0VuYWJsZWQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKKworICAgIHJl dHVybiB0cnVlOworfQorCisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5kaWYgLy8gRU5B QkxFKFBMVUdJTl9QUk9DRVNTKQpJbmRleDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9Q bHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9Q bHVnaW5Qcm9jZXNzL1BsdWdpbkNyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAwKQorKysg U291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuaAko cmV2aXNpb24gMCkKQEAgLTAsMCArMSw2OCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUg bXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0 cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1h dGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMg SVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNI QU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRP UlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MK KyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgor ICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgUGx1Z2lu Q3JlYXRpb25QYXJhbWV0ZXJzX2gKKyNkZWZpbmUgUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzX2gK KworI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKKworI2luY2x1ZGUgIlBsdWdpbi5oIgorCitu YW1lc3BhY2UgQ29yZUlQQyB7CisgICAgY2xhc3MgQXJndW1lbnREZWNvZGVyOworICAgIGNsYXNz IEFyZ3VtZW50RW5jb2RlcjsKK30KKworbmFtZXNwYWNlIFdlYktpdCB7CisKK3N0cnVjdCBQbHVn aW5DcmVhdGlvblBhcmFtZXRlcnMgeworICAgIFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVycygpOwor CisgICAgdm9pZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKikgY29uc3Q7CisgICAg c3RhdGljIGJvb2wgZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIFBsdWdpbkNyZWF0 aW9uUGFyYW1ldGVycyYpOworCisgICAgLy8gVGhlIHVuaXF1ZSBJRCBvZiB0aGlzIHBsdWctaW4g aW5zdGFuY2UuCisgICAgdWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRDsKKworICAgIC8vIFRoZSBw YXJhbWV0ZXJzIHBhc3NlZCB0byB0aGUgcGx1Zy1pbi4KKyAgICBQbHVnaW46OlBhcmFtZXRlcnMg cGFyYW1ldGVyczsKKworICAgIC8vIFRoZSBicm93c2VyIHVzZXIgYWdlbnQuCisgICAgU3RyaW5n IHVzZXJBZ2VudDsKKworICAgIC8vIFdoZXRoZXIgcHJpdmF0ZSBicm93c2luZyBpcyBlbmFibGVk IGF0IHRoZSB0aW1lIG9mIGluc3RhbnRpYXRpb24uCisgICAgYm9vbCBpc1ByaXZhdGVCcm93c2lu Z0VuYWJsZWQ7CisKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgLy8gV2hl dGhlciBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVkLgorICAgIGJvb2wgaXNBY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZDsKKyNlbmRpZgorfTsKKworfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CisKKyNlbmRpZiAvLyBFTkFCTEUoUExVR0lOX1BST0NFU1MpCisKKyNlbmRpZiAvLyBQ bHVnaW5DcmVhdGlvblBhcmFtZXRlcnNfaApJbmRleDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJv Y2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAJKHJldmlzaW9uIDg2NDg3 KQorKysgU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2luY2x1ZGUgIk5QUmVtb3Rl T2JqZWN0TWFwLmgiCiAjaW5jbHVkZSAiUGx1Z2luQ29udHJvbGxlclByb3h5LmgiCisjaW5jbHVk ZSAiUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzcy5o IgogI2luY2x1ZGUgIlJ1bkxvb3AuaCIKIApAQCAtMTYxLDkgKzE2Miw5IEBAIHZvaWQgV2ViUHJv Y2Vzc0Nvbm5lY3Rpb246OnN5bmNNZXNzYWdlU2UKIHsKIH0KIAotdm9pZCBXZWJQcm9jZXNzQ29u bmVjdGlvbjo6Y3JlYXRlUGx1Z2luKHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQsIGNvbnN0IFBs dWdpbjo6UGFyYW1ldGVycyYgcGFyYW1ldGVycywgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQsIGJv b2wgaXNQcml2YXRlQnJvd3NpbmdFbmFibGVkLCBib29sIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0VuYWJsZWQsIGJvb2wmIHJlc3VsdCwgdWludDMyX3QmIHJlbW90ZUxheWVyQ2xpZW50SUQpCit2 b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpjcmVhdGVQbHVnaW4oY29uc3QgUGx1Z2luQ3JlYXRp b25QYXJhbWV0ZXJzJiBjcmVhdGlvblBhcmFtZXRlcnMsIGJvb2wmIHJlc3VsdCwgdWludDMyX3Qm IHJlbW90ZUxheWVyQ2xpZW50SUQpCiB7Ci0gICAgT3duUHRyPFBsdWdpbkNvbnRyb2xsZXJQcm94 eT4gcGx1Z2luQ29udHJvbGxlclByb3h5ID0gUGx1Z2luQ29udHJvbGxlclByb3h5OjpjcmVhdGUo dGhpcywgcGx1Z2luSW5zdGFuY2VJRCwgdXNlckFnZW50LCBpc1ByaXZhdGVCcm93c2luZ0VuYWJs ZWQsIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpOworICAgIE93blB0cjxQbHVnaW5D b250cm9sbGVyUHJveHk+IHBsdWdpbkNvbnRyb2xsZXJQcm94eSA9IFBsdWdpbkNvbnRyb2xsZXJQ cm94eTo6Y3JlYXRlKHRoaXMsIGNyZWF0aW9uUGFyYW1ldGVycyk7CiAKICAgICBQbHVnaW5Db250 cm9sbGVyUHJveHkqIHBsdWdpbkNvbnRyb2xsZXJQcm94eVB0ciA9IHBsdWdpbkNvbnRyb2xsZXJQ cm94eS5nZXQoKTsKIApAQCAtMTcyLDcgKzE3Myw3IEBAIHZvaWQgV2ViUHJvY2Vzc0Nvbm5lY3Rp b246OmNyZWF0ZVBsdWdpbigKICAgICBhZGRQbHVnaW5Db250cm9sbGVyUHJveHkocGx1Z2luQ29u dHJvbGxlclByb3h5LnJlbGVhc2UoKSk7CiAKICAgICAvLyBOb3cgdHJ5IHRvIGluaXRpYWxpemUg dGhlIHBsdWctaW4uCi0gICAgcmVzdWx0ID0gcGx1Z2luQ29udHJvbGxlclByb3h5UHRyLT5pbml0 aWFsaXplKHBhcmFtZXRlcnMpOworICAgIHJlc3VsdCA9IHBsdWdpbkNvbnRyb2xsZXJQcm94eVB0 ci0+aW5pdGlhbGl6ZShjcmVhdGlvblBhcmFtZXRlcnMucGFyYW1ldGVycyk7CiAKICAgICBpZiAo IXJlc3VsdCkKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJv Y2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uaAkocmV2aXNpb24gODY0ODcpCisr KyBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmgJKHdv cmtpbmcgY29weSkKQEAgLTM2LDYgKzM2LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNz IE5QUmVtb3RlT2JqZWN0TWFwOwogY2xhc3MgUGx1Z2luQ29udHJvbGxlclByb3h5Oworc3RydWN0 IFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVyczsKICAgICAKIC8vIEEgY29ubmVjdGlvbiBmcm9tIGEg cGx1Zy1pbiBwcm9jZXNzIHRvIGEgd2ViIHByb2Nlc3MuCiAKQEAgLTY1LDcgKzY2LDcgQEAgcHJp dmF0ZToKIAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCiAgICAgQ29yZUlQQzo6U3luY1JlcGx5 TW9kZSBkaWRSZWNlaXZlU3luY1dlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZShDb3JlSVBDOjpD b25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIq LCBDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqKTsKLSAgICB2b2lkIGNyZWF0ZVBsdWdpbih1aW50 NjRfdCBwbHVnaW5JbnN0YW5jZUlELCBjb25zdCBQbHVnaW46OlBhcmFtZXRlcnMmLCBjb25zdCBT dHJpbmcmIHVzZXJBZ2VudCwgYm9vbCBpc1ByaXZhdGVCcm93c2luZ0VuYWJsZWQsIGJvb2wgaXNB Y2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCwgYm9vbCYgcmVzdWx0LCB1aW50MzJfdCYgcmVt b3RlTGF5ZXJDbGllbnRJRCk7CisgICAgdm9pZCBjcmVhdGVQbHVnaW4oY29uc3QgUGx1Z2luQ3Jl YXRpb25QYXJhbWV0ZXJzJiwgYm9vbCYgcmVzdWx0LCB1aW50MzJfdCYgcmVtb3RlTGF5ZXJDbGll bnRJRCk7CiAgICAgdm9pZCBkZXN0cm95UGx1Z2luKHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQp OwogCiAgICAgUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24ubWVzc2Fn ZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9j ZXNzQ29ubmVjdGlvbi5tZXNzYWdlcy5pbgkocmV2aXNpb24gODY0ODcpCisrKyBTb3VyY2UvV2Vi S2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmluCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMyw4ICsyMyw4IEBACiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQog CiBtZXNzYWdlcyAtPiBXZWJQcm9jZXNzQ29ubmVjdGlvbiB7Ci0gICAgIyBDcmVhdGVzIGEgcGx1 Zy1pbiBpbnN0YW5jZSB3aXRoIHRoZSBnaXZlbiBpbnN0YW5jZSBJRC4KLSAgICBDcmVhdGVQbHVn aW4odWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRCwgV2ViS2l0OjpQbHVnaW46OlBhcmFtZXRlcnMg cGFyYW1ldGVycywgV1RGOjpTdHJpbmcgdXNlckFnZW50LCBib29sIGlzUHJpdmF0ZUJyb3dzaW5n RW5hYmxlZCwgYm9vbCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKSAtPiAoYm9vbCBy ZXN1bHQsIHVpbnQzMl90IHJlbW90ZUxheWVyQ2xpZW50SUQpCisgICAgIyBDcmVhdGVzIGEgcGx1 Zy1pbiBpbnN0YW5jZSB1c2luZyB0aGUgZ2l2ZW4gY3JlYXRpb24gcGFyYW1ldGVycy4KKyAgICBD cmVhdGVQbHVnaW4oV2ViS2l0OjpQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMgcGx1Z2luQ3JlYXRp b25QYXJhbWV0ZXJzKSAtPiAoYm9vbCByZXN1bHQsIHVpbnQzMl90IHJlbW90ZUxheWVyQ2xpZW50 SUQpCiAKICAgICAjIERlc3Ryb3lzIHRoZSBwbHVnLWluIGluc3RhbmNlIHdpdGggdGhlIGdpdmVu IGluc3RhbmNlIElELgogICAgIERlc3Ryb3lQbHVnaW4odWludDY0X3QgcGx1Z2luSW5zdGFuY2VJ RCkgLT4gKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMu cHkJKHJldmlzaW9uIDg2NDg3KQorKysgU291cmNlL1dlYktpdDIvU2NyaXB0cy93ZWJraXQyL21l c3NhZ2VzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNjUsNiArMjY1LDcgQEAgZGVmIHN0cnVjdF9v cl9jbGFzcyhuYW1lc3BhY2UsIHR5cGUpOgogICAgICAgICAnV2ViS2l0OjpEcmF3aW5nQXJlYUlu Zm8nLAogICAgICAgICAnV2ViS2l0OjpFZGl0b3JTdGF0ZScsCiAgICAgICAgICdXZWJLaXQ6OlBs YXRmb3JtUG9wdXBNZW51RGF0YScsCisgICAgICAgICdXZWJLaXQ6OlBsdWdpbkNyZWF0aW9uUGFy YW1ldGVycycsCiAgICAgICAgICdXZWJLaXQ6OlBsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMnLAogICAgICAgICAnV2ViS2l0OjpQcmludEluZm8nLAogICAgICAgICAnV2ViS2l0OjpTZWN1 cml0eU9yaWdpbkRhdGEnLApJbmRleDogU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gODY0ODcpCisrKyBTb3VyY2UvV2ViS2l0 Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTYy LDYgKzYyLDggQEAKIAkJMUEwRjI5RTMxMjBCNDQ0MjAwNTNEMUI5IC8qIFZpc2l0ZWRMaW5rUHJv dmlkZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MUEwRjI5RTExMjBCNDQ0MjAwNTNEMUI5IC8qIFZpc2l0ZWRMaW5rUHJvdmlkZXIuY3BwICovOyB9 OwogCQkxQTBGMjlFNDEyMEI0NDQyMDA1M0QxQjkgLyogVmlzaXRlZExpbmtQcm92aWRlci5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwRjI5RTIxMjBC NDQ0MjAwNTNEMUI5IC8qIFZpc2l0ZWRMaW5rUHJvdmlkZXIuaCAqLzsgfTsKIAkJMUExMTlBOTUx MjdCNzk2MjAwQTlFQ0IxIC8qIE1lc3NhZ2VTZW5kZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMTE5QTk0MTI3Qjc5NjIwMEE5RUNCMSAvKiBNZXNz YWdlU2VuZGVyLmggKi87IH07CisJCTFBMTc5NzdGMTM3RUU4MkMwMEY5N0Q0NSAvKiBQbHVnaW5D cmVhdGlvblBhcmFtZXRlcnMuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMUExNzk3N0QxMzdFRTgyQzAwRjk3RDQ1IC8qIFBsdWdpbkNyZWF0aW9uUGFy YW1ldGVycy5jcHAgKi87IH07CisJCTFBMTc5NzgwMTM3RUU4MkMwMEY5N0Q0NSAvKiBQbHVnaW5D cmVhdGlvblBhcmFtZXRlcnMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFBMTc5NzdFMTM3RUU4MkMwMEY5N0Q0NSAvKiBQbHVnaW5DcmVhdGlvblBhcmFt ZXRlcnMuaCAqLzsgfTsKIAkJMUExODZFRUExMkVGNzYxODAwOEU1RjM3IC8qIExheWVyVHJlZUhv c3QuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMTg2 RUU4MTJFRjc2MTgwMDhFNUYzNyAvKiBMYXllclRyZWVIb3N0LmggKi87IH07CiAJCTFBMTg2RUVC MTJFRjc2MTgwMDhFNUYzNyAvKiBMYXllclRyZWVIb3N0LmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMTg2RUU5MTJFRjc2MTgwMDhFNUYzNyAvKiBM YXllclRyZWVIb3N0LmNwcCAqLzsgfTsKIAkJMUExQzRFQzgxMEQwNjA5OTAwNUU2N0U3IC8qIFdl YkNvcmUuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMUFBMUM3OUExMDBFN0ZDNTAwNzhERUJDIC8qIFdlYkNvcmUuZnJhbWV3b3JrICov OyB9OwpAQCAtOTMyLDYgKzkzNCw4IEBACiAJCTFBMEYyOUUxMTIwQjQ0NDIwMDUzRDFCOSAvKiBW aXNpdGVkTGlua1Byb3ZpZGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IFZpc2l0ZWRMaW5rUHJvdmlkZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQkxQTBGMjlFMjEyMEI0NDQyMDA1M0QxQjkgLyogVmlzaXRlZExpbmtQcm92aWRlci5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBWaXNpdGVkTGlua1Byb3ZpZGVyLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMTE5QTk0MTI3Qjc5NjIwMEE5RUNCMSAvKiBNZXNz YWdlU2VuZGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IE1lc3NhZ2VTZW5k ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUExNzk3N0QxMzdFRTgyQzAwRjk3 RDQ1IC8qIFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVycy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OworCQkxQTE3OTc3RTEzN0VFODJDMDBGOTdENDUgLyogUGx1Z2luQ3Jl YXRpb25QYXJhbWV0ZXJzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdp bkNyZWF0aW9uUGFyYW1ldGVycy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTE4 NkVFODEyRUY3NjE4MDA4RTVGMzcgLyogTGF5ZXJUcmVlSG9zdC5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBMYXllclRyZWVIb3N0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTFBMTg2RUU5MTJFRjc2MTgwMDhFNUYzNyAvKiBMYXllclRyZWVIb3N0LmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IExheWVyVHJlZUhvc3QuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTFDNjQ4NjExRjQxNUI3MDA1NTNDMTkgLyogV2Vi Q29udGV4dE1hYy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdl YkNvbnRleHRNYWMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xODgxLDYgKzE4 ODUsOCBAQAogCQkJCTFBOEVGNENBMTI1MjQwMzcwMEY3MDY3RiAvKiBQbHVnaW5Db250cm9sbGVy UHJveHkuY3BwICovLAogCQkJCTFBOEVGNEM5MTI1MjQwMzcwMEY3MDY3RiAvKiBQbHVnaW5Db250 cm9sbGVyUHJveHkuaCAqLywKIAkJCQkxQThFRjk0MTEyNTJBRTg0MDBGNzA2N0YgLyogUGx1Z2lu Q29udHJvbGxlclByb3h5Lm1lc3NhZ2VzLmluICovLAorCQkJCTFBMTc5NzdEMTM3RUU4MkMwMEY5 N0Q0NSAvKiBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuY3BwICovLAorCQkJCTFBMTc5NzdFMTM3 RUU4MkMwMEY5N0Q0NSAvKiBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuaCAqLywKIAkJCQkxQTA0 Mzk3NTEyNEQwMzQ4MDBGRkJGQjUgLyogUGx1Z2luUHJvY2Vzcy5jcHAgKi8sCiAJCQkJMUEwNDM5 NzQxMjREMDM0ODAwRkZCRkI1IC8qIFBsdWdpblByb2Nlc3MuaCAqLywKIAkJCQkxQTBFQzZCMTEy NEJCRDM2MDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzcy5tZXNzYWdlcy5pbiAqLywKQEAgLTM3MTks NiArMzcyNSw3IEBACiAJCQkJNkVFODQ5QzgxMzY4RDkzOTAwMzhENDgxIC8qIFdLSW5zcGVjdG9y TWFjLmggaW4gSGVhZGVycyAqLywKIAkJCQkzN0Y5MERFMzEzNzY1NjBFMDA1MUNGNjggLyogSFRU UENvb2tpZUFjY2VwdFBvbGljeS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUE3QzZDREIxMzc4OTUw ODAwQjlDMDREIC8qIEVudmlyb25tZW50VmFyaWFibGVzLmggaW4gSGVhZGVycyAqLywKKwkJCQkx QTE3OTc4MDEzN0VFODJDMDBGOTdENDUgLyogUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmggaW4g SGVhZGVycyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5n ID0gMDsKIAkJfTsKQEAgLTQzNTEsNiArNDM1OCw3IEBACiAJCQkJNTFDNDAzMkMxMzY3NDlEODAw REM5NzJEIC8qIEF1dGhlbnRpY2F0aW9uTWFuYWdlci5tYWMubW0gaW4gU291cmNlcyAqLywKIAkJ CQlERjU4QzYzNjEzNzFBQ0EwMDBGOUEzN0MgLyogTmF0aXZlV2ViV2hlZWxFdmVudE1hYy5tbSBp biBTb3VyY2VzICovLAogCQkJCTFBN0M2Q0RBMTM3ODk1MDgwMEI5QzA0RCAvKiBFbnZpcm9ubWVu dFZhcmlhYmxlcy5jcHAgaW4gU291cmNlcyAqLywKKwkJCQkxQTE3OTc3RjEzN0VFODJDMDBGOTdE NDUgLyogUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBpbiBTb3VyY2VzICovLAogCQkJKTsK IAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3Bw CShyZXZpc2lvbiA4NjQ4NykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5Qcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRl ICJOUFZhcmlhbnREYXRhLmgiCiAjaW5jbHVkZSAiUGx1Z2luQ29udHJvbGxlci5oIgogI2luY2x1 ZGUgIlBsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2VzLmgiCisjaW5jbHVkZSAiUGx1Z2luQ3Jl YXRpb25QYXJhbWV0ZXJzLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb24uaCIK ICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbk1hbmFnZXIuaCIKICNpbmNsdWRlICJT aGFyZWFibGVCaXRtYXAuaCIKQEAgLTk4LDE0ICs5OSwxOSBAQCBib29sIFBsdWdpblByb3h5Ojpp bml0aWFsaXplKFBsdWdpbkNvbnRyCiAgICAgbV9jb25uZWN0aW9uLT5hZGRQbHVnaW5Qcm94eSh0 aGlzKTsKIAogICAgIC8vIEFzayB0aGUgcGx1Zy1pbiBwcm9jZXNzIHRvIGNyZWF0ZSBhIHBsdWct aW4uCi0gICAgYm9vbCByZXN1bHQgPSBmYWxzZTsKLSAgICBib29sIGlzQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0VuYWJsZWQgPSBmYWxzZTsKKyAgICBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMgY3Jl YXRpb25QYXJhbWV0ZXJzOworICAgIGNyZWF0aW9uUGFyYW1ldGVycy5wbHVnaW5JbnN0YW5jZUlE ID0gbV9wbHVnaW5JbnN0YW5jZUlEOworICAgIGNyZWF0aW9uUGFyYW1ldGVycy5wYXJhbWV0ZXJz ID0gcGFyYW1ldGVyczsKKyAgICBjcmVhdGlvblBhcmFtZXRlcnMudXNlckFnZW50ID0gcGx1Z2lu Q29udHJvbGxlci0+dXNlckFnZW50KCk7CisgICAgY3JlYXRpb25QYXJhbWV0ZXJzLmlzUHJpdmF0 ZUJyb3dzaW5nRW5hYmxlZCA9IHBsdWdpbkNvbnRyb2xsZXItPmlzUHJpdmF0ZUJyb3dzaW5nRW5h YmxlZCgpOwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICBpc0FjY2VsZXJh dGVkQ29tcG9zaXRpbmdFbmFibGVkID0gcGx1Z2luQ29udHJvbGxlci0+aXNBY2NlbGVyYXRlZENv bXBvc2l0aW5nRW5hYmxlZCgpOworICAgIGNyZWF0aW9uUGFyYW1ldGVycy5pc0FjY2VsZXJhdGVk Q29tcG9zaXRpbmdFbmFibGVkID0gcGx1Z2luQ29udHJvbGxlci0+aXNBY2NlbGVyYXRlZENvbXBv c2l0aW5nRW5hYmxlZCgpOwogI2VuZGlmCiAKKyAgICBib29sIHJlc3VsdCA9IGZhbHNlOwogICAg IHVpbnQzMl90IHJlbW90ZUxheWVyQ2xpZW50SUQgPSAwOwotICAgIGlmICghbV9jb25uZWN0aW9u LT5jb25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6 Q3JlYXRlUGx1Z2luKG1fcGx1Z2luSW5zdGFuY2VJRCwgcGFyYW1ldGVycywgcGx1Z2luQ29udHJv bGxlci0+dXNlckFnZW50KCksIHBsdWdpbkNvbnRyb2xsZXItPmlzUHJpdmF0ZUJyb3dzaW5nRW5h YmxlZCgpLCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKSwgTWVzc2FnZXM6OldlYlBy b2Nlc3NDb25uZWN0aW9uOjpDcmVhdGVQbHVnaW46OlJlcGx5KHJlc3VsdCwgcmVtb3RlTGF5ZXJD bGllbnRJRCksIDApIHx8ICFyZXN1bHQpIHsKKworICAgIGlmICghbV9jb25uZWN0aW9uLT5jb25u ZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6Q3JlYXRl UGx1Z2luKGNyZWF0aW9uUGFyYW1ldGVycyksIE1lc3NhZ2VzOjpXZWJQcm9jZXNzQ29ubmVjdGlv bjo6Q3JlYXRlUGx1Z2luOjpSZXBseShyZXN1bHQsIHJlbW90ZUxheWVyQ2xpZW50SUQpLCAwKSB8 fCAhcmVzdWx0KSB7CiAgICAgICAgIG1fY29ubmVjdGlvbi0+cmVtb3ZlUGx1Z2luUHJveHkodGhp cyk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Cg==