13994 2007-06-04 14:46:45 -0700 [S60] Remove circular dependency between UI RSS file and engine 2011-03-21 11:53:30 -0700 1 1 1 Unclassified WebKit Tools / Tests 417.x S60 Hardware S60 3rd edition CLOSED INVALID P2 Major --- 1 sriram.yadavalli webkit-unassigned oldest_to_newest 8401 0 sriram.yadavalli 2007-06-04 14:46:45 -0700 Engine should not depend on the compiled RSS file of the UI 8402 1 sriram.yadavalli 2007-06-04 14:47:21 -0700 SYAI-73USWF 8403 2 14855 sriram.yadavalli 2007-06-04 14:50:11 -0700 Created attachment 14855 Fixes circular dependency issue 8404 3 14855 yongjun.zhang 2007-06-04 14:59:43 -0700 Comment on attachment 14855 Fixes circular dependency issue r = me 8405 4 yongjun.zhang 2007-06-04 14:59:58 -0700 landed on r21970. 76755 5 bradley.morrison 2008-04-09 11:31:48 -0700 Bulk update of s60 bugs - tagging and closing. 76867 6 bradley.morrison 2008-04-09 11:39:26 -0700 Bulk closing of all s60 platform bugs. Sorry for the noise! 370755 7 joel.parks 2011-03-21 11:53:30 -0700 re-purposing InTSW keyword for use by QtWebkit team 14855 2007-06-04 14:50:11 -0700 2007-06-04 14:59:43 -0700 Fixes circular dependency issue WidgetExtFix.patch text/plain 17411 sriram.yadavalli SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMTk2OSkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDMxIEBADQoreWFkYXZhbGwsIHJldmlld2VkIGJ5IDx5b25nanVuLnpoYW5nQG5v a2lhLmNvbT4NCisgREVTQzogUmVtb3ZlIGNpcmN1bGFyIGRlcGVuZGVuY3kgYmV0d2VlbiBVSSBS U1MgZmlsZSBhbmQgZW5naW5lDQorIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzOTk0DQorDQorICAgICAgICAqIEJyb3dzZXJWaWV3L3NyYy9XaWRnZXRFeHRlbnNpb24u Y3BwOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246Ok5ld0wpOg0KKyAgICAgICAgKENXaWRn ZXRFeHRlbnNpb246On5DV2lkZ2V0RXh0ZW5zaW9uKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5z aW9uOjpMYXVuY2hBcHBsaWNhdGlvbkwpOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246Ok9w ZW5BcHBsaWNhdGlvbik6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6U2V0UHJlZmVyZW5j ZUZvcktleSk6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6QWRkT3B0aW9uTWVudUl0ZW1z TCk6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6TWVudUl0ZW1TZWxlY3RlZCk6DQorICAg ICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6U2V0UGFyYW1MKToNCisgICAgICAgIChDV2lkZ2V0RXh0 ZW5zaW9uOjpBZGRPcHRpb25zTWVudUl0ZW0pOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246 OlNldFJpZ2h0U29mdEtleUxhYmVsKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpBcHBl bmQpOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246OkRlbGV0ZU1lbnVJdGVtKToNCisgICAg ICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpSZXBsYWNlTWVudUl0ZW0pOg0KKyAgICAgICAgKENXaWRn ZXRFeHRlbnNpb246Ok1lbnVJdGVtKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpHZXRG cm9tTWVudUl0ZW1Db2xsZWN0aW9uKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRE aW1tZWQpOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246OlNldE1lbnVJdGVtT2JzZXJ2ZXIp Og0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246Ok1lbnVJdGVtT2JzZXJ2ZXIpOg0KKyAgICAg ICAgKENXaWRnZXRFeHRlbnNpb246Ok1lbnVPYnNlcnZlcik6DQorICAgICAgICAoQ1dpZGdldEV4 dGVuc2lvbjo6UmlnaHRLZXlPYnNlcnZlcik6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6 RmluZE5vZGVCeUlkKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpGaW5kTm9kZUJ5VGV4 dCk6DQorDQogc3BhZG1hLCByZXZpZXdlZCBieSB6YWxhbg0KICBERVNDOiBCcm93c2VyIGNvbnRy b2wgQVBJLCBDQnJDdGxJbnRlcmZhY2U6OiBDb250ZW50U2l6ZSgpIGRvZXMgbm90IHJldHVybiBj b3JyZWN0IGNvbnRlbnQgc2l6ZS4NCiAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM5NTQNCkluZGV4OiBXZWJLaXQvQnJvd3NlclZpZXcvc3JjL1dpZGdldEV4dGVuc2lv bi5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQnJvd3NlclZpZXcvc3JjL1dpZGdldEV4dGVu c2lvbi5jcHAJKHJldmlzaW9uIDIxMjI5KQ0KKysrIFdlYktpdC9Ccm93c2VyVmlldy9zcmMvV2lk Z2V0RXh0ZW5zaW9uLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTQ1LDkgKzQ1LDkgQEANCiAjaW5j bHVkZSA8YXBnY2xpLmg+DQogI2luY2x1ZGUgPGFwZ3Rhc2suaD4NCiAjaW5jbHVkZSA8YnJvd3Nl cmxhdW5jaGVyLmg+DQotI2luY2x1ZGUgPHdpZGdldHVpLnJzZz4NCiAjaW5jbHVkZSA8d2lkZ2V0 bWVudS5yc2c+DQogI2luY2x1ZGUgPGVpa2J0Z3BjLmg+DQorI2luY2x1ZGUgPGF2a29uLmhyaD4N CiANCiAjaW5jbHVkZSAiV2lkZ2V0RXh0ZW5zaW9uLmgiDQogI2luY2x1ZGUgIldpZGdldFByZWZl cmVuY2VzLmgiDQpAQCAtOTIsNyArOTIsNyBAQCBDV2lkZ2V0RXh0ZW5zaW9uKiBDV2lkZ2V0RXh0 ZW5zaW9uOjpOZXdMDQogICAgIENXZWJLaXRWaWV3JiBhV2ViS2l0VmlldywNCiAgICAgTVdpZGdl dENhbGxiYWNrJiBhV2lkZ2V0Q2FsbGJhY2sgKQ0KICAgICB7DQotICAgIENXaWRnZXRFeHRlbnNp b24qIHNlbGYgPSBuZXcgKCBFTGVhdmUgKSBDV2lkZ2V0RXh0ZW5zaW9uKCANCisgICAgQ1dpZGdl dEV4dGVuc2lvbiogc2VsZiA9IG5ldyAoIEVMZWF2ZSApIENXaWRnZXRFeHRlbnNpb24oDQogICAg ICAgICBhV2ViS2l0VmlldywgYVdpZGdldENhbGxiYWNrICk7DQogICAgIENsZWFudXBTdGFjazo6 UHVzaEwoIHNlbGYgKTsNCiAgICAgc2VsZi0+Q29uc3RydWN0TCgpOw0KQEAgLTEzOCw3ICsxMzgs NyBAQCBDV2lkZ2V0RXh0ZW5zaW9uOjp+Q1dpZGdldEV4dGVuc2lvbigpDQogICAgIGRlbGV0ZSBp V2lkZ2V0QmFzZVBhdGg7DQogICAgIGRlbGV0ZSBpV2lkZ2V0QnVuZGxlSWQ7DQogICAgIC8vIGRl bGV0ZSB0cmVlDQotICAgIERlbGV0ZVRyZWUoIGlNZW51Um9vdCApOyAgIA0KKyAgICBEZWxldGVU cmVlKCBpTWVudVJvb3QgKTsNCiAgICAgaUxpYnJhcnkuQ2xvc2UoKTsNCiAgICAgfQ0KIA0KQEAg LTE4OSw3ICsxODksNyBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OkNvbnN0cnVjdEwoKQ0KIC8v DQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vDQotdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpM YXVuY2hBcHBsaWNhdGlvbkwoIA0KK3ZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6TGF1bmNoQXBwbGlj YXRpb25MKA0KICAgICBjb25zdCBUVWlkJiBhVWlkLCBjb25zdCBURGVzQyYgYVBhcmFtICkNCiAg ICAgew0KICAgICBSQXBhTHNTZXNzaW9uIGFwYUxzU2Vzc2lvbjsNCkBAIC0yMzEsNyArMjMxLDcg QEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpMYXVuY2hBcHBsaWNhdGlvbg0KIC8vDQogLy8gLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQ0KIC8vDQotdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpPcGVuQXBwbGlj YXRpb24oIA0KK3ZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6T3BlbkFwcGxpY2F0aW9uKA0KICAgICBj b25zdCBUVWlkJiBhQXBwVWlkLCBjb25zdCBURGVzQyYgYVBhcmFtICkNCiAgICAgew0KICAgICBM YXVuY2hBcHBsaWNhdGlvbkwoIGFBcHBVaWQsIGFQYXJhbSApOw0KQEAgLTI5Niw3ICsyOTYsNyBA QCB2b2lkIENXaWRnZXRFeHRlbnNpb246OlBlcmZvcm1UcmFuc2l0aW9uDQogLy8NCiAvLyAtLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tDQogLy8NCi12b2lkIENXaWRnZXRFeHRlbnNpb246OlNldFByZWZlcmVu Y2VGb3JLZXkoIA0KK3ZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0UHJlZmVyZW5jZUZvcktleSgN CiAgICAgY29uc3QgVERlc0MmIGFLZXksIGNvbnN0IFREZXNDJiBhVmFsdWUgKQ0KICAgICB7DQog ICAgIGlQcmVmZXJlbmNlcy0+U2V0UHJlZmVyZW5jZUwoIGFLZXksIGFWYWx1ZSApOw0KQEAgLTMz MCwxNSArMzMwLDE1IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0TmF2aWdhdGlvbkVuYWIN CiAgICAgICAgIH0NCiAgICAgfQ0KIA0KLS8vIFRoZSBiaW5hcnkgdHJlZSByZXByZXNlbnRhdGlv biBvZiBhIG11bHRpd2F5IHRyZWUgaXMgYmFzZWQgb24gDQotLy8gZmlyc3QgY2hpbGQtbmV4dCBz aWJsaW5nIHJlcHJlc2VudGF0aW9uIG9mIHRoZSB0cmVlLiBJbiB0aGlzIHJlcHJlc2VudGF0aW9u IA0KKy8vIFRoZSBiaW5hcnkgdHJlZSByZXByZXNlbnRhdGlvbiBvZiBhIG11bHRpd2F5IHRyZWUg aXMgYmFzZWQgb24NCisvLyBmaXJzdCBjaGlsZC1uZXh0IHNpYmxpbmcgcmVwcmVzZW50YXRpb24g b2YgdGhlIHRyZWUuIEluIHRoaXMgcmVwcmVzZW50YXRpb24NCiAvLyBldmVyeSBub2RlIGlzIGxp bmtlZCB3aXRoIGl0cyBsZWZ0bW9zdCBjaGlsZCBhbmQgaXRzIG5leHQgKHJpZ2h0IG5lYXJlc3Qp DQotLy8gc2libGluZy4gDQorLy8gc2libGluZy4NCiANCi0vKiANCi1FeGFtcGxlOiBDb25zaWRl ciB0aGUgZm9sbG93aW5nIG11bHRpd2F5IHRyZWUgDQorLyoNCitFeGFtcGxlOiBDb25zaWRlciB0 aGUgZm9sbG93aW5nIG11bHRpd2F5IHRyZWUNCiANCi0gICAgICAgICAgICAgICAgICAgICAgICAx ICAgICAgICAgICAgICAgICAgDQorICAgICAgICAgICAgICAgICAgICAgICAgMQ0KICAgICAgICAg ICAgICAgICAgICAgICAvIHwgXA0KICAgICAgICAgICAgICAgICAgICAgIC8gIHwgIFwNCiAgICAg ICAgICAgICAgICAgICAgIC8gICB8ICAgXA0KQEAgLTM2Miw4ICszNjIsOCBAQCBUaGlzIHRyZWUg Y2FuIGJlIHJlcHJlc2VudGVkIGluIGZpcnN0IGNoDQogICAgICAgICAgICAgICAgICAgICAgICAg OC0tLTkNCiANCiANCi1JZiB3ZSBsb29rIGF0IHRoZSBmaXJzdCBjaGlsZC1uZXh0IHNpYmxpbmcg cmVwcmVzZW50YXRpb24gb2YgdGhlIHRyZWUgY2xvc2VseSwgDQotd2Ugd2lsbCBzZWUgdGhhdCBp dCBmb3JtcyBhIGJpbmFyeSB0cmVlLiBUbyBzZWUgdGhpcyBiZXR0ZXIsIHJvdGF0ZSBldmVyeSAN CitJZiB3ZSBsb29rIGF0IHRoZSBmaXJzdCBjaGlsZC1uZXh0IHNpYmxpbmcgcmVwcmVzZW50YXRp b24gb2YgdGhlIHRyZWUgY2xvc2VseSwNCit3ZSB3aWxsIHNlZSB0aGF0IGl0IGZvcm1zIGEgYmlu YXJ5IHRyZWUuIFRvIHNlZSB0aGlzIGJldHRlciwgcm90YXRlIGV2ZXJ5DQogbmV4dC1zaWJsaW5n IGVkZ2UgNDUgZGVncmVlcyBjbG9ja3dpc2UuIEFmdGVyIHRoYXQsIHRoZSBmb2xsb3dpbmcgYmlu YXJ5IHRyZWUgaXMgZ290Og0KIA0KICAgICAgICAgICAgICAgICAgICAgICAgIDENCkBAIC0zODks MzEgKzM4OSwxNSBAQCBuZXh0LXNpYmxpbmcgZWRnZSA0NSBkZWdyZWVzIGNsb2Nrd2lzZS4gDQog Ly8NCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8NCi12b2lkIENXaWRnZXRFeHRlbnNpb246 OkFkZE9wdGlvbk1lbnVJdGVtc0woIA0KK3ZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6QWRkT3B0aW9u TWVudUl0ZW1zTCgNCiAgICAgQ0Vpa01lbnVQYW5lJiBhTWVudVBhbmUsIFRJbnQgYVJlc291cmNl SWQgKQ0KICAgICB7DQogICAgIENNZW51SXRlbSogbm9kZSA9IE5VTEw7DQogICAgIENNZW51SXRl bSogcGFyZW50Tm9kZSA9IE5VTEw7DQogICAgIFRJbnQgcGFyZW50Q21kSWQgPSAtMTsNCiANCi0g ICAgaWYgKCBhUmVzb3VyY2VJZCA9PSBSX1dJREdFVFVJX01FTlUgKQ0KKyAgICBpZiAoIGFSZXNv dXJjZUlkID49IFJfQ0FTQ0FERV9NRU5VXzEgKSAvL29uZSBvZiB0aGUgY2FzY2FkZSBtZW51IHBh bmUNCiAgICAgICAgIHsNCi0gICAgICAgIC8vaW52b2tlIG1lbnUgb25zaG93IGNhbGxiYWNrDQot ICAgICAgICBpZiAoIGlXaWRnZXRFbmdpbmVCcmlkZ2UgKQ0KLSAgICAgICAgICAgIHsNCi0gICAg ICAgICAgICBpV2lkZ2V0RW5naW5lQnJpZGdlLT5NZW51U2hvd2VkKCk7DQotICAgICAgICAgICAg fQ0KLQ0KLSAgICAgICAgaWYgKCBhTWVudVBhbmUuTnVtYmVyT2ZJdGVtc0luUGFuZSgpID4gMSAp DQotICAgICAgICAgICAgew0KLSAgICAgICAgICAgIGFNZW51UGFuZS5EZWxldGVCZXR3ZWVuTWVu dUl0ZW1zKCANCi0gICAgICAgICAgICAgICAgMCwgYU1lbnVQYW5lLk51bWJlck9mSXRlbXNJblBh bmUoKSAtIDIgKTsNCi0gICAgICAgICAgICB9DQotICAgICAgICBpZiAoIGlNZW51Um9vdCApDQot ICAgICAgICAgICAgbm9kZSA9IGlNZW51Um9vdC0+Rmlyc3RDaGlsZCgpOw0KLSAgICAgICAgfSAg ICAgICANCi0gICAgZWxzZSBpZiAoIGFSZXNvdXJjZUlkID49IFJfQ0FTQ0FERV9NRU5VXzEgKSAv L29uZSBvZiB0aGUgY2FzY2FkZSBtZW51IHBhbmUNCi0gICAgICAgIHsgICANCiAgICAgICAgIGZv ciAoIFRJbnQgaSA9IDA7IGkgPCBpQ2FzY2FkZUFyci5Db3VudCgpOyBpKysgKQ0KICAgICAgICAg ICAgIHsNCiAgICAgICAgICAgICBpZiAoIGlDYXNjYWRlQXJyW2ldLmlSZXNvdXJjZUlkID09IGFS ZXNvdXJjZUlkICkNCkBAIC00MjMsMTkgKzQwNywzNSBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246 OkFkZE9wdGlvbk1lbnVJdGVtDQogICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICB9DQog ICAgICAgICBpZiAoIHBhcmVudENtZElkICE9IC0xICkNCi0gICAgICAgICAgICB7ICAgDQorICAg ICAgICAgICAgew0KICAgICAgICAgICAgIE1lbnVJdGVtU2VsZWN0ZWQoIHBhcmVudENtZElkICsg S01lbnVJdGVtQ29tbWFuZElkQmFzZSk7DQogICAgICAgICAgICAgcGFyZW50Tm9kZSA9IEZpbmRO b2RlQnlJZCggaU1lbnVSb290LCBwYXJlbnRDbWRJZCApOw0KICAgICAgICAgICAgIH0NCiAgICAg ICAgIGlmICggcGFyZW50Tm9kZSApDQogICAgICAgICAgICAgbm9kZSA9IHBhcmVudE5vZGUtPkZp cnN0Q2hpbGQoKTsNCiAgICAgICAgIH0NCisgICAgZWxzZQ0KKyAgICAgICAgIHsNCisgICAgICAg ICAvL2ludm9rZSBtZW51IG9uc2hvdyBjYWxsYmFjaw0KKyAgICAgICAgIGlmICggaVdpZGdldEVu Z2luZUJyaWRnZSApDQorICAgICAgICAgICAgIHsNCisgICAgICAgICAgICAgaVdpZGdldEVuZ2lu ZUJyaWRnZS0+TWVudVNob3dlZCgpOw0KKyAgICAgICAgICAgICB9DQorDQorICAgICAgICAgaWYg KCBhTWVudVBhbmUuTnVtYmVyT2ZJdGVtc0luUGFuZSgpID4gMSApDQorICAgICAgICAgICAgIHsN CisgICAgICAgICAgICAgYU1lbnVQYW5lLkRlbGV0ZUJldHdlZW5NZW51SXRlbXMoDQorICAgICAg ICAgICAgICAgICAwLCBhTWVudVBhbmUuTnVtYmVyT2ZJdGVtc0luUGFuZSgpIC0gMiApOw0KKyAg ICAgICAgICAgICB9DQorICAgICAgICAgaWYgKCBpTWVudVJvb3QgKQ0KKyAgICAgICAgICAgICBu b2RlID0gaU1lbnVSb290LT5GaXJzdENoaWxkKCk7DQorICAgICAgICB9DQogDQogICAgIGlmICgg bm9kZSApDQogICAgICAgICB7DQogICAgICAgICAvL2FkZCBmaXJzdCBjaGlsZA0KICAgICAgICAg QWRkTWVudUl0ZW0oIGFNZW51UGFuZSwgbm9kZSApOw0KLSAgICAgICAgDQorDQogICAgICAgICAv L2FkZCBhbGwgb3RoZXIgY2hpbGRyZW4gKHNpYmxpbmdzIG9mIGZpcnN0IGNoaWxkKQ0KICAgICAg ICAgQ01lbnVJdGVtKiBzaWJsaW5nID0gbm9kZS0+TmV4dFNpYmxpbmcoKTsNCiAgICAgICAgIHdo aWxlKCBzaWJsaW5nICkNCkBAIC00ODgsMTMgKzQ4OCwxMyBAQCB2b2lkIENXaWRnZXRFeHRlbnNp b246OkFkZE1lbnVJdGVtKCBDRWlrDQogLy8NCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogdm9p ZCBDV2lkZ2V0RXh0ZW5zaW9uOjpNZW51SXRlbVNlbGVjdGVkKCBUSW50IGFDbWRJZCApDQotICAg IHsgICAgDQorICAgIHsNCiAgICAgaWYgKCBpV2lkZ2V0RW5naW5lQnJpZGdlICkNCiAgICAgICAg IHsNCiAgICAgICAgIGlXaWRnZXRFbmdpbmVCcmlkZ2UtPk1lbnVJdGVtU2VsZWN0ZWQoIGFDbWRJ ZCAtIEtNZW51SXRlbUNvbW1hbmRJZEJhc2UgKTsNCiAgICAgICAgIH0NCiANCi0gICAgT25TaG93 U2VsZWN0ZWQoKTsgICAgDQorICAgIE9uU2hvd1NlbGVjdGVkKCk7DQogICAgIH0NCiANCiAvLyAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tDQpAQCAtNjA2LDcgKzYwNiw3IEBAIHZvaWQgQ1dpZGdldEV4dGVu c2lvbjo6TG9hZFdpZGdldEVuZ2luZUQNCiAvLw0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQog Ly8NCi12b2lkIENXaWRnZXRFeHRlbnNpb246OlNldFBhcmFtTCggDQordm9pZCBDV2lkZ2V0RXh0 ZW5zaW9uOjpTZXRQYXJhbUwoDQogICAgIFRCckN0bERlZnM6OlRCckN0bFdpZGdldFBhcmFtcyBh UGFyYW0sIGNvbnN0IFREZXNDJiBhVmFsdWUgKQ0KICAgICB7DQogICAgIHN3aXRjaCggYVBhcmFt ICkNCkBAIC02MzQsNyArNjM0LDcgQEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRQYXJhbUwo IA0KIC8vDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAvLw0KLXZvaWQgQ1dpZGdldEV4dGVu c2lvbjo6U2V0UGFyYW1MKCANCit2b2lkIENXaWRnZXRFeHRlbnNpb246OlNldFBhcmFtTCgNCiAg ICAgVEJyQ3RsRGVmczo6VEJyQ3RsV2lkZ2V0UGFyYW1zIGFQYXJhbSwgVFVpbnQgYVZhbHVlICkN CiAgICAgew0KICAgICBzd2l0Y2goIGFQYXJhbSApDQpAQCAtNjU2LDIwICs2NTYsMjAgQEAgdm9p ZCBDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRQYXJhbUwoIA0KIC8vDQogLy8gLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0NCiAvLw0KLXZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6QWRkT3B0aW9uc01lbnVJdGVtKCAN Cit2b2lkIENXaWRnZXRFeHRlbnNpb246OkFkZE9wdGlvbnNNZW51SXRlbSgNCiAgICAgY29uc3Qg VERlc0MmIGFUZXh0LCBUSW50IGFDbWRJZCwgVEludCBhUGFyZW50SWQsIHZvaWQqIGFPYmogKQ0K LSAgICB7ICAgDQotICAgIGlmICggIWlNZW51Um9vdCApIA0KLSAgICAgICAgeyANCisgICAgew0K KyAgICBpZiAoICFpTWVudVJvb3QgKQ0KKyAgICAgICAgew0KICAgICAgICAgaU1lbnVSb290ID0g Q01lbnVJdGVtOjpOZXdMKCBfTCgiIiksIC0xICk7DQotICAgICAgICB9ICAgIA0KKyAgICAgICAg fQ0KICAgICBpZiAoIGFUZXh0Lkxlbmd0aCgpID4gMCApDQogICAgICAgICB7DQogICAgICAgICBD TWVudUl0ZW0qIHBhcmVudCA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290LCBhUGFyZW50SWQgKTsN CiAgICAgICAgIGlmICggIXBhcmVudCApDQogICAgICAgICAgICAgcmV0dXJuOw0KLSAgICAgICAg Q01lbnVJdGVtKiBpdGVtID0gQ01lbnVJdGVtOjpOZXdMKCBhVGV4dCwgYUNtZElkLCBwYXJlbnQs IGFPYmogKTsgDQotICAgICAgICBBcHBlbmQoIHBhcmVudCwgaXRlbSApOyAgICANCisgICAgICAg IENNZW51SXRlbSogaXRlbSA9IENNZW51SXRlbTo6TmV3TCggYVRleHQsIGFDbWRJZCwgcGFyZW50 LCBhT2JqICk7DQorICAgICAgICBBcHBlbmQoIHBhcmVudCwgaXRlbSApOw0KICAgICAgICAgfQ0K ICAgICB9DQogDQpAQCAtNjgyLDcgKzY4Miw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6QWRk T3B0aW9uc01lbnVJdGUNCiAvLw0KIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0UmlnaHRTb2Z0 S2V5TGFiZWwoIGNvbnN0IFREZXNDJiBhVGV4dCApDQogICAgIHsNCi0gICAgQ0Vpa0J1dHRvbkdy b3VwQ29udGFpbmVyICogcENiYUdyb3VwID0gQ0Vpa0J1dHRvbkdyb3VwQ29udGFpbmVyOjpDdXJy ZW50KCk7ICAgICANCisgICAgQ0Vpa0J1dHRvbkdyb3VwQ29udGFpbmVyICogcENiYUdyb3VwID0g Q0Vpa0J1dHRvbkdyb3VwQ29udGFpbmVyOjpDdXJyZW50KCk7DQogICAgIHBDYmFHcm91cC0+U2V0 Q29tbWFuZEwoIEVBa25Tb2Z0a2V5RXhpdCwgYVRleHQgKTsNCiAgICAgcENiYUdyb3VwLT5EcmF3 Tm93KCk7DQogICAgIH0NCkBAIC02OTQsMjIgKzY5NCwyMiBAQCB2b2lkIENXaWRnZXRFeHRlbnNp b246OlNldFJpZ2h0U29mdEtleUxhDQogLy8NCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8v DQotVEJvb2wgQ1dpZGdldEV4dGVuc2lvbjo6QXBwZW5kKCANCitUQm9vbCBDV2lkZ2V0RXh0ZW5z aW9uOjpBcHBlbmQoDQogICAgIENNZW51SXRlbSogYVBhcmVudCwgQ01lbnVJdGVtKiBhSXRlbSAp DQotICAgIHsgIA0KKyAgICB7DQogICAgIGlmICggIWFQYXJlbnQgKQ0KICAgICAgICAgcmV0dXJu IEVGYWxzZTsNCiANCi0gICAgaWYgKCBhUGFyZW50LT5GaXJzdENoaWxkKCkgPT0gTlVMTCApIC8v Zmlyc3QgY2hpbGQgIA0KLSAgICAgICAgeyANCi0gICAgICAgIGFQYXJlbnQtPlNldEZpcnN0Q2hp bGQoIGFJdGVtICk7IA0KLSAgICAgICAgfSANCisgICAgaWYgKCBhUGFyZW50LT5GaXJzdENoaWxk KCkgPT0gTlVMTCApIC8vZmlyc3QgY2hpbGQNCisgICAgICAgIHsNCisgICAgICAgIGFQYXJlbnQt PlNldEZpcnN0Q2hpbGQoIGFJdGVtICk7DQorICAgICAgICB9DQogICAgIGVsc2UgLy9pbnNlcnQg YXMgc2libGluZyBvZiBmaXJzdCBjaGlsZA0KLSAgICAgICAgeyANCisgICAgICAgIHsNCiAgICAg ICAgIEFwcGVuZFNpYmxpbmcoIGFQYXJlbnQtPkZpcnN0Q2hpbGQoKSwgYUl0ZW0gKTsNCiAgICAg ICAgIH0NCi0gICAgcmV0dXJuIEVUcnVlOyAgICAgICAgICAgIA0KLSAgICB9IA0KKyAgICByZXR1 cm4gRVRydWU7DQorICAgIH0NCiANCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vIENXaWRn ZXRFeHRlbnNpb246OkFwcGVuZFNpYmxpbmcNCkBAIC03NDEsNyArNzQxLDcgQEAgdm9pZCBDV2lk Z2V0RXh0ZW5zaW9uOjpBcHBlbmRTaWJsaW5nKCBDTQ0KIC8vDQogdm9pZCBDV2lkZ2V0RXh0ZW5z aW9uOjpEZWxldGVNZW51SXRlbSggVEludCBhQ21kSWQgKQ0KICAgICB7DQotICAgIENNZW51SXRl bSogbm9kZSA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290LCBhQ21kSWQgKTsgDQorICAgIENNZW51 SXRlbSogbm9kZSA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290LCBhQ21kSWQgKTsNCiANCiAgICAg aWYgKCAhbm9kZSApDQogICAgICAgICByZXR1cm47DQpAQCAtNzYxLDcgKzc2MSw3IEBAIHZvaWQg Q1dpZGdldEV4dGVuc2lvbjo6RGVsZXRlTWVudUl0ZW0oIFQNCiAgICAgICAgICAgICByZXR1cm47 DQogICAgICAgICAgICAgfQ0KICAgICAgICAgLy9vciBvbmUgb2YgdGhlIHNpYmxpbmcgb2YgZmly c3RjaGlsZA0KLSAgICAgICAgZWxzZSANCisgICAgICAgIGVsc2UNCiAgICAgICAgICAgICB7DQog ICAgICAgICAgICAgQ01lbnVJdGVtKiBwcmV2ID0gcGFyZW50LT5GaXJzdENoaWxkKCk7DQogICAg ICAgICAgICAgQ01lbnVJdGVtKiBpdGVtID0gTlVMTDsNCkBAIC03NzYsNyArNzc2LDcgQEAgdm9p ZCBDV2lkZ2V0RXh0ZW5zaW9uOjpEZWxldGVNZW51SXRlbSggVA0KICAgICAgICAgICAgICAgICAg ICAgaXRlbSA9IE5VTEw7DQogICAgICAgICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgICAg ICAgICAgICAgIH0NCi0gICAgICAgICAgICAgICAgaXRlbSA9IGl0ZW0tPk5leHRTaWJsaW5nKCk7 ICAgIA0KKyAgICAgICAgICAgICAgICBpdGVtID0gaXRlbS0+TmV4dFNpYmxpbmcoKTsNCiAgICAg ICAgICAgICAgICAgfQ0KICAgICAgICAgICAgIH0NCiAgICAgICAgIH0NCkBAIC04MDIsMTkgKzgw MiwxOSBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OkNsZWFyTWVudUl0ZW1zKCkNCiAvLw0KIC8v IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAvLw0KLXZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6UmVwbGFj ZU1lbnVJdGVtKCANCi0gICAgVEludCBvbGRJdGVtQ21kSWQsIA0KLSAgICBjb25zdCBURGVzQyYg bmV3SXRlbVRleHQsIA0KLSAgICBUSW50IG5ld0l0ZW1DbWRJZCwgDQordm9pZCBDV2lkZ2V0RXh0 ZW5zaW9uOjpSZXBsYWNlTWVudUl0ZW0oDQorICAgIFRJbnQgb2xkSXRlbUNtZElkLA0KKyAgICBj b25zdCBURGVzQyYgbmV3SXRlbVRleHQsDQorICAgIFRJbnQgbmV3SXRlbUNtZElkLA0KICAgICBU SW50IG5ld0l0ZW1EaW1tZWQgKQ0KICAgICB7DQogICAgIENNZW51SXRlbSogbm9kZSA9IE5VTEw7 DQogDQotICAgIG5vZGUgPSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9vdCwgb2xkSXRlbUNtZElkICk7 ICAgIA0KKyAgICBub2RlID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIG9sZEl0ZW1DbWRJZCAp Ow0KICAgICBpZiAoIG5vZGUgKQ0KICAgICAgICAgew0KLSAgICAgICAgbm9kZS0+U2V0VGV4dCgg bmV3SXRlbVRleHQgKTsgICAgDQotICAgICAgICBub2RlLT5TZXRDbWRJZCggbmV3SXRlbUNtZElk ICk7ICAgDQorICAgICAgICBub2RlLT5TZXRUZXh0KCBuZXdJdGVtVGV4dCApOw0KKyAgICAgICAg bm9kZS0+U2V0Q21kSWQoIG5ld0l0ZW1DbWRJZCApOw0KICAgICAgICAgbm9kZS0+U2V0RGltbWVk KCBuZXdJdGVtRGltbWVkICk7DQogICAgICAgICB9DQogICAgIH0NCkBAIC04MjYsMTQgKzgyNiwx NCBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OlJlcGxhY2VNZW51SXRlbSggDQogLy8NCiAvLyAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tDQogLy8NCi12b2lkIENXaWRnZXRFeHRlbnNpb246Ok1lbnVJdGVt KCANCit2b2lkIENXaWRnZXRFeHRlbnNpb246Ok1lbnVJdGVtKA0KICAgICBURGVzJiB0ZXh0VmFs LCBUSW50JiBjbWRJZCwgVEJvb2wmIGRpbVN0YXQgKQ0KICAgICB7DQogICAgIENNZW51SXRlbSog bm9kZSA9IE5VTEw7DQogDQogICAgIGlmICggY21kSWQgPT0gLTEgKQ0KICAgICAgICAgew0KLSAg ICAgICAgbm9kZSA9IEZpbmROb2RlQnlUZXh0KCBpTWVudVJvb3QsIHRleHRWYWwgKTsgDQorICAg ICAgICBub2RlID0gRmluZE5vZGVCeVRleHQoIGlNZW51Um9vdCwgdGV4dFZhbCApOw0KICAgICAg ICAgfQ0KICAgICBlbHNlDQogICAgICAgICB7DQpAQCAtODU4LDExICs4NTgsMTEgQEAgdm9pZCog Q1dpZGdldEV4dGVuc2lvbjo6R2V0RnJvbU1lbnVJdGVtQw0KICAgICB7DQogICAgIENNZW51SXRl bSogbm9kZSA9IE5VTEw7DQogDQotICAgIG5vZGUgPSBGaW5kTm9kZUJ5VGV4dCggaU1lbnVSb290 LCB0ZXh0VmFsICk7IA0KKyAgICBub2RlID0gRmluZE5vZGVCeVRleHQoIGlNZW51Um9vdCwgdGV4 dFZhbCApOw0KICAgICBpZiAoIG5vZGUgKQ0KICAgICAgICAgcmV0dXJuIG5vZGUtPk9iaigpOw0K ICAgICBlbHNlDQotICAgICAgICByZXR1cm4gTlVMTDsgICANCisgICAgICAgIHJldHVybiBOVUxM Ow0KICAgICB9DQogDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KQEAgLTg3NiwxMSArODc2LDEx IEBAIHZvaWQqIENXaWRnZXRFeHRlbnNpb246OkdldEZyb21NZW51SXRlbUMNCiAgICAgew0KICAg ICBDTWVudUl0ZW0qIG5vZGUgPSBOVUxMOw0KIA0KLSAgICBub2RlID0gRmluZE5vZGVCeUlkKCBp TWVudVJvb3QsIGNtZElkICk7IA0KKyAgICBub2RlID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3Qs IGNtZElkICk7DQogICAgIGlmICggbm9kZSApDQogICAgICAgICByZXR1cm4gbm9kZS0+T2JqKCk7 DQogICAgIGVsc2UNCi0gICAgICAgIHJldHVybiBOVUxMOyAgIA0KKyAgICAgICAgcmV0dXJuIE5V TEw7DQogICAgIH0NCiANCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQpAQCAtODkzLDggKzg5Myw4 IEBAIHZvaWQqIENXaWRnZXRFeHRlbnNpb246OkdldEZyb21NZW51SXRlbUMNCiB2b2lkIENXaWRn ZXRFeHRlbnNpb246OlNldERpbW1lZCggVEludCBhQ21kSWQsIFRCb29sIGFWYWx1ZSApDQogICAg IHsNCiAgICAgQ01lbnVJdGVtKiBub2RlID0gTlVMTDsNCi0gICAgbm9kZSA9IEZpbmROb2RlQnlJ ZCggaU1lbnVSb290LCBhQ21kSWQgKTsgICAgICAgDQotICAgIGlmICggbm9kZSApIA0KKyAgICBu b2RlID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGFDbWRJZCApOw0KKyAgICBpZiAoIG5vZGUg KQ0KICAgICAgICAgbm9kZS0+U2V0RGltbWVkKCBhVmFsdWUgKTsNCiAgICAgfQ0KIA0KQEAgLTkw NSwxMSArOTA1LDExIEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0RGltbWVkKCBUSW50IGEN CiAvLw0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAvLw0KLXZvaWQgQ1dpZGdldEV4dGVuc2lv bjo6U2V0TWVudUl0ZW1PYnNlcnZlciggDQordm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRNZW51 SXRlbU9ic2VydmVyKA0KICAgICBUSW50IGFDbWRJZCwgV2lkZ2V0RXZlbnRIYW5kbGVyKiBhT25T ZWxlY3RDYWxsYmFjayApDQogICAgIHsNCiAgICAgQ01lbnVJdGVtKiBub2RlID0gTlVMTDsNCi0g ICAgbm9kZSA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290LCBhQ21kSWQgKTsgDQorICAgIG5vZGUg PSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9vdCwgYUNtZElkICk7DQogICAgIGlmICggbm9kZSApDQog ICAgICAgICBub2RlLT5TZXRDYWxsYmFjayggYU9uU2VsZWN0Q2FsbGJhY2sgKTsNCiAgICAgfQ0K QEAgLTkyNCw3ICs5MjQsNyBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OlNldE1lbnVJdGVtT2Jz ZXJ2DQogV2lkZ2V0RXZlbnRIYW5kbGVyKiBDV2lkZ2V0RXh0ZW5zaW9uOjpNZW51SXRlbU9ic2Vy dmVyKCBUSW50IGFDbWRJZCApDQogICAgIHsNCiAgICAgQ01lbnVJdGVtKiBub2RlID0gTlVMTDsN Ci0gICAgbm9kZSA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290LCBhQ21kSWQgKTsgDQorICAgIG5v ZGUgPSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9vdCwgYUNtZElkICk7DQogICAgIGlmICggbm9kZSAp DQogICAgICAgICByZXR1cm4gbm9kZS0+Q2FsbGJhY2soKTsNCiAgICAgZWxzZQ0KQEAgLTk1Miw3 ICs5NTIsNyBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OlNldE1lbnVPYnNlcnZlciggDQogLy8g LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vDQogV2lkZ2V0RXZlbnRIYW5kbGVyKiBDV2lkZ2V0RXh0 ZW5zaW9uOjpNZW51T2JzZXJ2ZXIoKQ0KLSAgICB7ICANCisgICAgew0KICAgICByZXR1cm4gaU1l bnVDYWxsYmFjazsNCiAgICAgfQ0KIA0KQEAgLTk3Niw3ICs5NzYsNyBAQCB2b2lkIENXaWRnZXRF eHRlbnNpb246OlNldFJpZ2h0S2V5T2JzZXJ2DQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8v DQogV2lkZ2V0RXZlbnRIYW5kbGVyKiBDV2lkZ2V0RXh0ZW5zaW9uOjpSaWdodEtleU9ic2VydmVy KCkNCi0gICAgeyAgDQorICAgIHsNCiAgICAgcmV0dXJuIGlSaWdodEtleUNhbGxiYWNrOw0KICAg ICB9DQogDQpAQCAtMTAwNyw3ICsxMDA3LDcgQEAgQ01lbnVJdGVtKiBDV2lkZ2V0RXh0ZW5zaW9u OjpGaW5kTm9kZUJ5SQ0KICAgICB7DQogICAgIENNZW51SXRlbSogaXRlbSA9IE5VTEw7DQogDQot ICAgIGlmICggIW5vZGUgKSANCisgICAgaWYgKCAhbm9kZSApDQogICAgICAgICByZXR1cm4gaXRl bTsNCiANCiAgICAgaWYgKCBub2RlLT5DbWRJZCgpID09IGFDbWRJZCApDQpAQCAtMTAxNiwxNSAr MTAxNiwxNSBAQCBDTWVudUl0ZW0qIENXaWRnZXRFeHRlbnNpb246OkZpbmROb2RlQnlJDQogICAg ICAgICB9DQogICAgIGVsc2UNCiAgICAgICAgIHsNCi0gICAgICAgIGlmICggbm9kZS0+Rmlyc3RD aGlsZCgpICkgDQotICAgICAgICAgICAgeyANCi0gICAgICAgICAgICBpdGVtID0gRmluZE5vZGVC eUlkKCBub2RlLT5GaXJzdENoaWxkKCksIGFDbWRJZCApOyANCi0gICAgICAgICAgICBpZiAoIGl0 ZW0gKSANCisgICAgICAgIGlmICggbm9kZS0+Rmlyc3RDaGlsZCgpICkNCisgICAgICAgICAgICB7 DQorICAgICAgICAgICAgaXRlbSA9IEZpbmROb2RlQnlJZCggbm9kZS0+Rmlyc3RDaGlsZCgpLCBh Q21kSWQgKTsNCisgICAgICAgICAgICBpZiAoIGl0ZW0gKQ0KICAgICAgICAgICAgICAgICByZXR1 cm4gaXRlbTsNCi0gICAgICAgICAgICB9IA0KKyAgICAgICAgICAgIH0NCiAgICAgICAgIGlmICgg bm9kZS0+TmV4dFNpYmxpbmcoKSApDQotICAgICAgICAgICAgeyANCi0gICAgICAgICAgICBpdGVt ID0gRmluZE5vZGVCeUlkKCBub2RlLT5OZXh0U2libGluZygpLCBhQ21kSWQgKTsgDQorICAgICAg ICAgICAgew0KKyAgICAgICAgICAgIGl0ZW0gPSBGaW5kTm9kZUJ5SWQoIG5vZGUtPk5leHRTaWJs aW5nKCksIGFDbWRJZCApOw0KICAgICAgICAgICAgIH0NCiAgICAgICAgIH0NCiAgICAgcmV0dXJu IGl0ZW07DQpAQCAtMTA0MSw3ICsxMDQxLDcgQEAgQ01lbnVJdGVtKiBDV2lkZ2V0RXh0ZW5zaW9u OjpGaW5kTm9kZUJ5VA0KICAgICB7DQogICAgIENNZW51SXRlbSogaXRlbSA9IE5VTEw7DQogDQot ICAgIGlmICggIW5vZGUgKSANCisgICAgaWYgKCAhbm9kZSApDQogICAgICAgICByZXR1cm4gaXRl bTsNCiANCiAgICAgaWYgKCBub2RlLT5UZXh0KCkuQ29tcGFyZSggYVRleHQgKSA9PSAwICkNCkBA IC0xMDUwLDE2ICsxMDUwLDE2IEBAIENNZW51SXRlbSogQ1dpZGdldEV4dGVuc2lvbjo6RmluZE5v ZGVCeVQNCiAgICAgICAgIH0NCiAgICAgZWxzZQ0KICAgICAgICAgew0KLSAgICAgICAgaWYgKCBu b2RlLT5GaXJzdENoaWxkKCkgKSANCi0gICAgICAgICAgICB7IA0KLSAgICAgICAgICAgIGl0ZW0g PSBGaW5kTm9kZUJ5VGV4dCggbm9kZS0+Rmlyc3RDaGlsZCgpLCBhVGV4dCApOyANCisgICAgICAg IGlmICggbm9kZS0+Rmlyc3RDaGlsZCgpICkNCisgICAgICAgICAgICB7DQorICAgICAgICAgICAg aXRlbSA9IEZpbmROb2RlQnlUZXh0KCBub2RlLT5GaXJzdENoaWxkKCksIGFUZXh0ICk7DQogDQot ICAgICAgICAgICAgaWYgKCBpdGVtICkgDQorICAgICAgICAgICAgaWYgKCBpdGVtICkNCiAgICAg ICAgICAgICAgICAgcmV0dXJuIGl0ZW07DQotICAgICAgICAgICAgfSANCisgICAgICAgICAgICB9 DQogICAgICAgICBpZiAoIG5vZGUtPk5leHRTaWJsaW5nKCkgKQ0KLSAgICAgICAgICAgIHsgDQot ICAgICAgICAgICAgaXRlbSA9IEZpbmROb2RlQnlUZXh0KCBub2RlLT5OZXh0U2libGluZygpLCBh VGV4dCApOyANCisgICAgICAgICAgICB7DQorICAgICAgICAgICAgaXRlbSA9IEZpbmROb2RlQnlU ZXh0KCBub2RlLT5OZXh0U2libGluZygpLCBhVGV4dCApOw0KICAgICAgICAgICAgIH0NCiAgICAg ICAgIH0NCiAgICAgcmV0dXJuIGl0ZW07DQo=