11759 2006-12-05 11:26:26 -0800 Windows build bustage 2006-12-08 13:34:19 -0800 1 1 1 Unclassified WebKit WebCore Misc. 420+ PC Windows XP RESOLVED FIXED P2 Normal --- 1 dgibson77 dgibson77 oldest_to_newest 43165 0 dgibson77 2006-12-05 11:26:26 -0800 Patch coming shortly 43166 1 11741 dgibson77 2006-12-05 11:29:29 -0800 Created attachment 11741 patch for r18020 Gets windows compiling again, but the resource loader is pretty screwed up. Trying to load a page results in a crash due to the ResourceHandle's client() (a SubresourceLoader) being garbage. Someone isn't holding a reference long enough. Since that stuff is all highly in flux right now, I don't care enough to fix it. 42748 2 11777 dgibson77 2006-12-08 13:20:28 -0800 Created attachment 11777 patch for r18084 Updated to newest trunk 42749 3 11777 ap 2006-12-08 13:30:09 -0800 Comment on attachment 11777 patch for r18084 Looks sane, r=me. + virtual void downloadURL(const KURL& url); This doesn't need a variable name in the header. 42750 4 ap 2006-12-08 13:34:19 -0800 Committed revision 18086. 11741 2006-12-05 11:29:29 -0800 2006-12-08 13:20:28 -0800 patch for r18020 patch text/plain 9393 dgibson77 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxODAyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDYtMTItMDUgIERvbiBHaWJzb24gIDxkZ2lic29uNzdAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzU5OgorCVdpbmRvd3MgYnVp bGQgYnVzdGFnZQorCisgICAgICAgICogV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS9XZWJDb3JlLnZj cHJvajoKKyAgICAgICAgKiBsb2FkZXIvd2luL0ZyYW1lTG9hZGVyV2luLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpzdWJtaXRGb3JtKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZUhhbmRsZTo6b25SZXF1ZXN0Q29tcGxldGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VIYW5kbGU6OmZpbGVMb2FkVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5k bGU6OmNhbmNlbCk6CisgICAgICAgICogcGxhdGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQp OgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Y29weUN1cnNvcik6CisKIDIwMDYtMTItMDUgIEFuZGVycyBDYXJsc3NvbiAg PGFjYXJsc3NvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQnJhZHksIERhcmlu LgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlL1dlYkNvcmUudmNwcm9qCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS9XZWJDb3JlLnZjcHJv agkocmV2aXNpb24gMTgwMjApCisrKyBXZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUvV2Vi Q29yZS52Y3Byb2oJKHdvcmtpbmcgY29weSkKQEAgLTExOTEsNiArMTE5MSwzMCBAQAogCQkJCT4K IAkJCTwvRmlsZT4KIAkJCTxGaWxlCisJCQkJUmVsYXRpdmVQYXRoPSIuLlwuLlxsb2FkZXJcTWFp blJlc291cmNlTG9hZGVyLmNwcCIKKwkJCQk+CisJCQk8L0ZpbGU+CisJCQk8RmlsZQorCQkJCVJl bGF0aXZlUGF0aD0iLi5cLi5cbG9hZGVyXE1haW5SZXNvdXJjZUxvYWRlci5oIgorCQkJCT4KKwkJ CTwvRmlsZT4KKwkJCTxGaWxlCisJCQkJUmVsYXRpdmVQYXRoPSIuLlwuLlxsb2FkZXJcTmF2aWdh dGlvbkFjdGlvbi5jcHAiCisJCQkJPgorCQkJPC9GaWxlPgorCQkJPEZpbGUKKwkJCQlSZWxhdGl2 ZVBhdGg9Ii4uXC4uXGxvYWRlclxOYXZpZ2F0aW9uQWN0aW9uLmgiCisJCQkJPgorCQkJPC9GaWxl PgorCQkJPEZpbGUKKwkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4uXGxvYWRlclxOZXRzY2FwZVBsdWdp blN0cmVhbUxvYWRlci5jcHAiCisJCQkJPgorCQkJPC9GaWxlPgorCQkJPEZpbGUKKwkJCQlSZWxh dGl2ZVBhdGg9Ii4uXC4uXGxvYWRlclxOZXRzY2FwZVBsdWdpblN0cmVhbUxvYWRlci5oIgorCQkJ CT4KKwkJCTwvRmlsZT4KKwkJCTxGaWxlCiAJCQkJUmVsYXRpdmVQYXRoPSIuLlwuLlxsb2FkZXJc UGx1Z2luRG9jdW1lbnQuY3BwIgogCQkJCT4KIAkJCTwvRmlsZT4KQEAgLTEyMTUsNiArMTIzOSwx OCBAQAogCQkJCT4KIAkJCTwvRmlsZT4KIAkJCTxGaWxlCisJCQkJUmVsYXRpdmVQYXRoPSIuLlwu Llxsb2FkZXJcU3VicmVzb3VyY2VMb2FkZXIuY3BwIgorCQkJCT4KKwkJCTwvRmlsZT4KKwkJCTxG aWxlCisJCQkJUmVsYXRpdmVQYXRoPSIuLlwuLlxsb2FkZXJcU3VicmVzb3VyY2VMb2FkZXIuaCIK KwkJCQk+CisJCQk8L0ZpbGU+CisJCQk8RmlsZQorCQkJCVJlbGF0aXZlUGF0aD0iLi5cLi5cbG9h ZGVyXFN1YnJlc291cmNlTG9hZGVyQ2xpZW50LmgiCisJCQkJPgorCQkJPC9GaWxlPgorCQkJPEZp bGUKIAkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4uXGxvYWRlclxUZXh0RG9jdW1lbnQuY3BwIgogCQkJ CT4KIAkJCTwvRmlsZT4KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL3dpbi9GcmFtZUxvYWRlcldpbi5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvd2luL0ZyYW1lTG9hZGVyV2luLmNwcAko cmV2aXNpb24gMTgwMjApCisrKyBXZWJDb3JlL2xvYWRlci93aW4vRnJhbWVMb2FkZXJXaW4uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00NCwxMSArNDQsMTQgQEAgdm9pZCBGcmFtZUxvYWRlcjo6dXJs U2VsZWN0ZWQoY29uc3QgRnJhbQogCiB2b2lkIEZyYW1lTG9hZGVyOjpzdWJtaXRGb3JtKGNvbnN0 IEZyYW1lTG9hZFJlcXVlc3QmIHJlcXVlc3QsIEV2ZW50KikKIHsKLSAgICAvLyBGSVhNRTogdGhp cyBpcyBhIGhhY2sgaW5oZXJpdGVkIGZyb20gRnJhbWVNYWMsIGFuZCBzaG91bGQgYmUgcHVzaGVk IGludG8gRnJhbWUKICAgICBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCA9 IHJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCk7CisKKyNpZmRlZiBNVUxUSVBMRV9GT1JNX1NVQk1J U1NJT05fUFJPVEVDVElPTgorICAgIC8vIEZJWE1FOiB0aGlzIGlzIGEgaGFjayBpbmhlcml0ZWQg ZnJvbSBGcmFtZU1hYywgYW5kIHNob3VsZCBiZSBwdXNoZWQgaW50byBGcmFtZQogICAgIGlmICht X3N1Ym1pdHRlZEZvcm1VUkwgPT0gcmVzb3VyY2VSZXF1ZXN0LnVybCgpKQogICAgICAgICByZXR1 cm47CiAgICAgbV9zdWJtaXR0ZWRGb3JtVVJMID0gcmVzb3VyY2VSZXF1ZXN0LnVybCgpOworI2Vu ZGlmCiAKICAgICBGcmFtZVdpbiogZnJhbWVXaW4gPSBzdGF0aWNfY2FzdDxGcmFtZVdpbio+KG1f ZnJhbWUpOwogICAgIGlmIChmcmFtZVdpbi0+Y2xpZW50KCkpCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFuZGxlV2luLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFuZGxlV2luLmNwcAkocmV2aXNpb24g MTgwMjApCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFuZGxlV2lu LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM2LDcgKzIzNiw4IEBAIHZvaWQgUmVzb3VyY2VIYW5k bGU6Om9uUmVxdWVzdENvbXBsZXRlKEwKICAgICB3aGlsZSAoKG9rID0gSW50ZXJuZXRSZWFkRmls ZUV4QShoYW5kbGUsICZidWZmZXJzLCBJUkZfTk9fV0FJVCwgKERXT1JEX1BUUil0aGlzKSkgJiYg YnVmZmVycy5kd0J1ZmZlckxlbmd0aCkgewogICAgICAgICBpZiAoIWhhc1JlY2VpdmVkUmVzcG9u c2UoKSkgewogICAgICAgICAgICAgc2V0SGFzUmVjZWl2ZWRSZXNwb25zZSgpOwotICAgICAgICAg ICAgY2xpZW50KCktPnJlY2VpdmVkUmVzcG9uc2UodGhpcywgMCk7CisgICAgICAgICAgICBSZXNv dXJjZVJlc3BvbnNlIHJlc3BvbnNlOworICAgICAgICAgICAgY2xpZW50KCktPmRpZFJlY2VpdmVS ZXNwb25zZSh0aGlzLCByZXNwb25zZSk7CiAgICAgICAgIH0KICAgICAgICAgY2xpZW50KCktPmRp ZFJlY2VpdmVEYXRhKHRoaXMsIGJ1ZmZlciwgYnVmZmVycy5kd0J1ZmZlckxlbmd0aCk7CiAgICAg ICAgIGJ1ZmZlcnMuZHdCdWZmZXJMZW5ndGggPSBidWZmZXJTaXplOwpAQCAtMjY1LDcgKzI2Niw2 IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6Om9uUmVxdWVzdENvbXBsZXRlKEwKICAgICAgICAgSW50 ZXJuZXRDbG9zZUhhbmRsZShkLT5tX3NlY29uZGFyeUhhbmRsZSk7CiAgICAgSW50ZXJuZXRDbG9z ZUhhbmRsZShkLT5tX3Jlc291cmNlSGFuZGxlKTsKIAotICAgIGNsaWVudCgpLT5yZWNlaXZlZEFs bERhdGEodGhpcywgJnBsYXRmb3JtRGF0YSk7CiAgICAgY2xpZW50KCktPmRpZEZpbmlzaExvYWRp bmcodGhpcyk7CiAgICAgZGVsZXRlIHRoaXM7CiB9CkBAIC00MDUsNyArNDA1LDggQEAgYm9vbCBS ZXNvdXJjZUhhbmRsZTo6c3RhcnQoRG9jTG9hZGVyKiBkbwogCiB2b2lkIFJlc291cmNlSGFuZGxl OjpmaWxlTG9hZFRpbWVyKFRpbWVyPFJlc291cmNlSGFuZGxlPiogdGltZXIpCiB7Ci0gICAgY2xp ZW50KCktPnJlY2VpdmVkUmVzcG9uc2UodGhpcywgMCk7CisgICAgUmVzb3VyY2VSZXNwb25zZSBy ZXNwb25zZTsKKyAgICBjbGllbnQoKS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKHRoaXMsIHJlc3BvbnNl KTsKIAogICAgIGJvb2wgcmVzdWx0ID0gZmFsc2U7CiAgICAgRFdPUkQgYnl0ZXNSZWFkID0gMDsK QEAgLTQyNCwxMiArNDI1LDYgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6ZmlsZUxvYWRUaW1lcihU aW1lcgogICAgIENsb3NlSGFuZGxlKGQtPm1fZmlsZUhhbmRsZSk7CiAgICAgZC0+bV9maWxlSGFu ZGxlID0gSU5WQUxJRF9IQU5ETEVfVkFMVUU7CiAKLSAgICBQbGF0Zm9ybURhdGFTdHJ1Y3QgcGxh dGZvcm1EYXRhOwotICAgIHBsYXRmb3JtRGF0YS5lcnJvclN0cmluZyA9IDA7Ci0gICAgcGxhdGZv cm1EYXRhLmVycm9yID0gMDsKLSAgICBwbGF0Zm9ybURhdGEubG9hZGVkID0gVFJVRTsKLQotICAg IGNsaWVudCgpLT5yZWNlaXZlZEFsbERhdGEodGhpcywgJnBsYXRmb3JtRGF0YSk7CiAgICAgY2xp ZW50KCktPmRpZEZpbmlzaExvYWRpbmcodGhpcyk7CiB9CiAKQEAgLTQ0MCwxMiArNDM1LDYgQEAg dm9pZCBSZXNvdXJjZUhhbmRsZTo6Y2FuY2VsKCkKICAgICBlbHNlCiAgICAgICAgIGQtPm1fZmls ZUxvYWRUaW1lci5zdG9wKCk7CiAKLSAgICBQbGF0Zm9ybURhdGFTdHJ1Y3QgcGxhdGZvcm1EYXRh OwotICAgIHBsYXRmb3JtRGF0YS5lcnJvclN0cmluZyA9IDA7Ci0gICAgcGxhdGZvcm1EYXRhLmVy cm9yID0gMDsKLSAgICBwbGF0Zm9ybURhdGEubG9hZGVkID0gRkFMU0U7Ci0KLSAgICBjbGllbnQo KS0+cmVjZWl2ZWRBbGxEYXRhKHRoaXMsICZwbGF0Zm9ybURhdGEpOwogICAgIGNsaWVudCgpLT5k aWRGaW5pc2hMb2FkaW5nKHRoaXMpOyAKIAogICAgIGlmICghZC0+bV9yZXNvdXJjZUhhbmRsZSkK SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwCShyZXZpc2lvbiAxODAy MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01MSwxMyArNTEsMTQgQEAgc3RhdGljIEludFBvaW50IGdsb2JhbFBvc2l0aW9uRm9y RXZlbnQoSAogICAgIHJldHVybiBwb2ludDsKIH0KIAotUGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0 Zm9ybU1vdXNlRXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQ QVJBTSBsUGFyYW0pCitQbGF0Zm9ybU1vdXNlRXZlbnQ6OlBsYXRmb3JtTW91c2VFdmVudChIV05E IGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSwgYm9vbCBh Y3RpdmF0ZWRXZWJWaWV3KQogICAgIDogbV9wb3NpdGlvbihwb3NpdGlvbkZvckV2ZW50KGhXbmQs IGxQYXJhbSkpCiAgICAgLCBtX2dsb2JhbFBvc2l0aW9uKGdsb2JhbFBvc2l0aW9uRm9yRXZlbnQo aFduZCwgbFBhcmFtKSkKICAgICAsIG1fc2hpZnRLZXkod1BhcmFtICYgTUtfU0hJRlQpCiAgICAg LCBtX2N0cmxLZXkod1BhcmFtICYgTUtfQ09OVFJPTCkKICAgICAsIG1fYWx0S2V5KEdldEtleVN0 YXRlKFZLX01FTlUpICYgSElHSF9CSVRfTUFTS19TSE9SVCkKICAgICAsIG1fbWV0YUtleShtX2Fs dEtleSkgLy8gRklYTUU6IFdlJ2xsIGhhdmUgdG8gdGVzdCBvdGhlciBicm93c2VycworICAgICwg bV9hY3RpdmF0ZWRXZWJWaWV3KGFjdGl2YXRlZFdlYlZpZXcpCiB7CiAgICAgc3dpdGNoIChtZXNz YWdlKSB7CiAgICAgICAgIGNhc2UgV01fTEJVVFRPTkRPV046CkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL3dpbi9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vd2luL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAJKHJldmlzaW9uIDE4MDIwKQorKysgV2Vi Q29yZS9wbGF0Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0dWJzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzIsNiArNzIsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtU2Nyb2xsQmFyLmgiCiAjaW5jbHVk ZSAiUGx1Z0luSW5mb1N0b3JlLmgiCiAjaW5jbHVkZSAiUG9wdXBNZW51LmgiCisjaW5jbHVkZSAi UmFuZ2UuaCIKICNpbmNsdWRlICJSZW5kZXJUaGVtZS5oIgogI2luY2x1ZGUgIlJlc291cmNlTG9h ZGVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWVXaW4uaCIKQEAgLTEwOSw2ICsxMTAsNyBAQCBi b29sIElzUmVzcG9uc2VVUkxFcXVhbFRvVVJMKFBsYXRmb3JtUmVzCiBjb25zdCBDdXJzb3ImIGFs aWFzQ3Vyc29yKCkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gbG9jYWxDdXJzb3I7IH0KIGNv bnN0IEN1cnNvciYgY2VsbEN1cnNvcigpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGxvY2Fs Q3Vyc29yOyB9CiBjb25zdCBDdXJzb3ImIGNvbnRleHRNZW51Q3Vyc29yKCkgeyBub3RJbXBsZW1l bnRlZCgpOyByZXR1cm4gbG9jYWxDdXJzb3I7IH0KK2NvbnN0IEN1cnNvciYgY29weUN1cnNvcigp IHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGxvY2FsQ3Vyc29yOyB9CiBjb25zdCBDdXJzb3Im IG1vdmVDdXJzb3IoKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBsb2NhbEN1cnNvcjsgfQog Y29uc3QgQ3Vyc29yJiBub0Ryb3BDdXJzb3IoKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBs b2NhbEN1cnNvcjsgfQogY29uc3QgQ3Vyc29yJiBwcm9ncmVzc0N1cnNvcigpIHsgbm90SW1wbGVt ZW50ZWQoKTsgcmV0dXJuIGxvY2FsQ3Vyc29yOyB9CkluZGV4OiBXZWJLaXQvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MDI1KQorKysgV2ViS2l0 L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDA2LTEyLTA1ICBE b24gR2lic29uICA8ZGdpYnNvbjc3QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTc1OToKKwlXaW5kb3dzIGJ1aWxkIGJ1c3RhZ2UKKworICAgICAgICAqIENPTS9X ZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJGcmFtZTo6bG9hZERhdGFTb3VyY2UpOgorICAgICAg ICAqIENPTS9XZWJGcmFtZS5oOgorCiAyMDA2LTEyLTA1ICBKb2huIFN1bGxpdmFuICA8c3VsbGl2 YW5AYXBwbGUuY29tPgogCiAgICAgICAgIGJ1aWxkIGZpeApJbmRleDogV2ViS2l0L0NPTS9XZWJG cmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NPTS9XZWJGcmFtZS5jcHAJKHJldmlzaW9u IDE4MDIwKQorKysgV2ViS2l0L0NPTS9XZWJGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUx LDYgKzUxLDcgQEAKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIlJlc291 cmNlSGFuZGxlV2luLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0LmgiCisjaW5jbHVkZSAi U3VicmVzb3VyY2VMb2FkZXIuaCIKICNwcmFnbWEgd2FybmluZyhwb3ApCiAKIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwpAQCAtMzg0LDcgKzM4NSw3IEBAIEhSRVNVTFQgV2ViRnJhbWU6OmxvYWRE YXRhU291cmNlKFdlYkRhdGEKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICBS ZXNvdXJjZVJlcXVlc3QgcmVzb3VyY2VSZXF1ZXN0KGt1cmwpOwotICAgICAgICAgICAgICAgIFJl ZlB0cjxSZXNvdXJjZUhhbmRsZT4gbG9hZGVyID0gUmVzb3VyY2VIYW5kbGU6OmNyZWF0ZShyZXNv dXJjZVJlcXVlc3QsIHRoaXMsIGQtPmZyYW1lLT5kb2N1bWVudCgpLT5kb2NMb2FkZXIoKSk7Cisg ICAgICAgICAgICAgICAgUmVmUHRyPFN1YnJlc291cmNlTG9hZGVyPiBsb2FkZXIgPSBTdWJyZXNv dXJjZUxvYWRlcjo6Y3JlYXRlKGQtPmZyYW1lLmdldCgpLCB0aGlzLCByZXNvdXJjZVJlcXVlc3Qp OwogCiAgICAgICAgICAgICAgICAgSVdlYkZyYW1lTG9hZERlbGVnYXRlKiBmcmFtZUxvYWREZWxl Z2F0ZTsKICAgICAgICAgICAgICAgICBpZiAoU1VDQ0VFREVEKGQtPndlYlZpZXctPmZyYW1lTG9h ZERlbGVnYXRlKCZmcmFtZUxvYWREZWxlZ2F0ZSkpKSB7CkluZGV4OiBXZWJLaXQvQ09NL1dlYkZy YW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NPTS9XZWJGcmFtZS5oCShyZXZpc2lvbiAxODAy MCkKKysrIFdlYktpdC9DT00vV2ViRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNyArMzEs NyBAQAogI2luY2x1ZGUgIldlYkRhdGFTb3VyY2UuaCIKIAogI3ByYWdtYSB3YXJuaW5nKHB1c2gs IDApCi0jaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGVDbGllbnQuaCIKKyNpbmNsdWRlICJTdWJyZXNv dXJjZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkZyYW1lV2luLmgiCiAjaW5jbHVkZSAiUGxh dGZvcm1TdHJpbmcuaCIKICNwcmFnbWEgd2FybmluZyhwb3ApCkBAIC01Myw3ICs1Myw3IEBAIHR5 cGVkZWYgZW51bSB7CiAgICAgV2ViRnJhbWVMb2FkVHlwZVJlcGxhY2UKIH0gV2ViRnJhbWVMb2Fk VHlwZTsKIAotY2xhc3MgV2ViRnJhbWUgOiBwdWJsaWMgSVdlYkZyYW1lLCBwdWJsaWMgV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGVDbGllbnQsIHB1YmxpYyBXZWJDb3JlOjpGcmFtZVdpbkNsaWVudAor Y2xhc3MgV2ViRnJhbWUgOiBwdWJsaWMgSVdlYkZyYW1lLCBwdWJsaWMgV2ViQ29yZTo6U3VicmVz b3VyY2VMb2FkZXJDbGllbnQsIHB1YmxpYyBXZWJDb3JlOjpGcmFtZVdpbkNsaWVudAogewogcHVi bGljOgogICAgIHN0YXRpYyBXZWJGcmFtZSogY3JlYXRlSW5zdGFuY2UoKTsK 11777 2006-12-08 13:20:28 -0800 2006-12-08 13:30:09 -0800 patch for r18084 patch text/plain 22345 dgibson77 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxODA4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDEgQEAKKzIwMDYtMTItMDggIERvbiBHaWJzb24gIDxkZ2lic29uNzdAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzU5OgorICAgICAgICBXaW5k b3dzIGJ1aWxkIGJ1c3RhZ2UKKworICAgICAgICAqIFdlYkNvcmUudmNwcm9qL1dlYkNvcmUvV2Vi Q29yZS52Y3Byb2o6CisgICAgICAgICogYnJpZGdlL3dpbi9Db250ZXh0TWVudUNsaWVudFdpbi5o OgorICAgICAgICAqIGJyaWRnZS93aW4vRnJhbWVXaW4uaDoKKyAgICAgICAgKiBsb2FkZXIvd2lu L0ZyYW1lTG9hZGVyV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpzdWJt aXRGb3JtKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdp bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6b25SZXF1ZXN0Q29tcGxl dGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmZpbGVMb2FkVGltZXIpOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmNhbmNlbCk6CisgICAgICAgICogcGxh dGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1N b3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQpOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9U ZW1wb3JhcnlMaW5rU3R1YnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmlsZUJ1dHRvbkNob29z ZUZpbGVMYWJlbCk6CisgICAgICAgIChXZWJDb3JlOjppbnB1dEVsZW1lbnRBbHRUZXh0KToKKyAg ICAgICAgKFdlYkNvcmU6OmNvcHlDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6cmVzZXRCdXR0 b25EZWZhdWx0TGFiZWwpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnVDbGllbnRXaW46 OmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51 Q2xpZW50V2luOjpjb3B5TGlua1RvQ2xpcGJvYXJkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl eHRNZW51Q2xpZW50V2luOjpkb3dubG9hZFVSTCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0 TWVudUNsaWVudFdpbjo6Y29weUltYWdlVG9DbGlwYm9hcmQpOgorICAgICAgICAoV2ViQ29yZTo6 RWRpdG9yOjppZ25vcmVTcGVsbGluZyk6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OmxlYXJu U3BlbGxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjppc1NlbGVjdGlvblVuZ3JhbW1h dGljYWwpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjppc1NlbGVjdGlvbk1pc3NwZWxsZWQp OgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpndWVzc2VzRm9yTWlzc3BlbGxlZFNlbGVjdGlv bik6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Omd1ZXNzZXNGb3JVbmdyYW1tYXRpY2FsU2Vs ZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6bWFya01pc3NwZWxsaW5nc0luQWRq YWNlbnRXb3Jkcyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZCk6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVdpbjo6c2NoZWR1bGVDbG9zZSk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVdpbjo6cmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbik6CisKIDIwMDYtMTItMDcgIEp1 c3RpbiBHYXJjaWEgIDxqdXN0aW4uZ2FyY2lhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBqb2huCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUvV2ViQ29yZS52 Y3Byb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlL1dlYkNv cmUudmNwcm9qCShyZXZpc2lvbiAxODA4NCkKKysrIFdlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2Vi Q29yZS9XZWJDb3JlLnZjcHJvagkod29ya2luZyBjb3B5KQpAQCAtMTE5MSw2ICsxMTkxLDMwIEBA CiAJCQkJPgogCQkJPC9GaWxlPgogCQkJPEZpbGUKKwkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4uXGxv YWRlclxNYWluUmVzb3VyY2VMb2FkZXIuY3BwIgorCQkJCT4KKwkJCTwvRmlsZT4KKwkJCTxGaWxl CisJCQkJUmVsYXRpdmVQYXRoPSIuLlwuLlxsb2FkZXJcTWFpblJlc291cmNlTG9hZGVyLmgiCisJ CQkJPgorCQkJPC9GaWxlPgorCQkJPEZpbGUKKwkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4uXGxvYWRl clxOYXZpZ2F0aW9uQWN0aW9uLmNwcCIKKwkJCQk+CisJCQk8L0ZpbGU+CisJCQk8RmlsZQorCQkJ CVJlbGF0aXZlUGF0aD0iLi5cLi5cbG9hZGVyXE5hdmlnYXRpb25BY3Rpb24uaCIKKwkJCQk+CisJ CQk8L0ZpbGU+CisJCQk8RmlsZQorCQkJCVJlbGF0aXZlUGF0aD0iLi5cLi5cbG9hZGVyXE5ldHNj YXBlUGx1Z2luU3RyZWFtTG9hZGVyLmNwcCIKKwkJCQk+CisJCQk8L0ZpbGU+CisJCQk8RmlsZQor CQkJCVJlbGF0aXZlUGF0aD0iLi5cLi5cbG9hZGVyXE5ldHNjYXBlUGx1Z2luU3RyZWFtTG9hZGVy LmgiCisJCQkJPgorCQkJPC9GaWxlPgorCQkJPEZpbGUKIAkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4u XGxvYWRlclxQbHVnaW5Eb2N1bWVudC5jcHAiCiAJCQkJPgogCQkJPC9GaWxlPgpAQCAtMTIxNSw2 ICsxMjM5LDE4IEBACiAJCQkJPgogCQkJPC9GaWxlPgogCQkJPEZpbGUKKwkJCQlSZWxhdGl2ZVBh dGg9Ii4uXC4uXGxvYWRlclxTdWJyZXNvdXJjZUxvYWRlci5jcHAiCisJCQkJPgorCQkJPC9GaWxl PgorCQkJPEZpbGUKKwkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4uXGxvYWRlclxTdWJyZXNvdXJjZUxv YWRlci5oIgorCQkJCT4KKwkJCTwvRmlsZT4KKwkJCTxGaWxlCisJCQkJUmVsYXRpdmVQYXRoPSIu LlwuLlxsb2FkZXJcU3VicmVzb3VyY2VMb2FkZXJDbGllbnQuaCIKKwkJCQk+CisJCQk8L0ZpbGU+ CisJCQk8RmlsZQogCQkJCVJlbGF0aXZlUGF0aD0iLi5cLi5cbG9hZGVyXFRleHREb2N1bWVudC5j cHAiCiAJCQkJPgogCQkJPC9GaWxlPgpAQCAtMjY0Miw2ICsyNjc4LDE0IEBACiAJCQkJCT4KIAkJ CQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlwuLlxwbGF0Zm9ybVxu ZXR3b3JrXEhUVFBQYXJzZXJzLmNwcCIKKwkJCQkJPgorCQkJCTwvRmlsZT4KKwkJCQk8RmlsZQor CQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4uXHBsYXRmb3JtXG5ldHdvcmtcSFRUUFBhcnNlcnMuaCIK KwkJCQkJPgorCQkJCTwvRmlsZT4KKwkJCQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4u XHBsYXRmb3JtXG5ldHdvcmtcUmVzb3VyY2VFcnJvci5jcHAiCiAJCQkJCT4KIAkJCQk8L0ZpbGU+ CkluZGV4OiBXZWJDb3JlL2JyaWRnZS93aW4vQ29udGV4dE1lbnVDbGllbnRXaW4uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS93aW4vQ29udGV4dE1lbnVDbGllbnRXaW4uaAkocmV2aXNp b24gMTgwODQpCisrKyBXZWJDb3JlL2JyaWRnZS93aW4vQ29udGV4dE1lbnVDbGllbnRXaW4uaAko d29ya2luZyBjb3B5KQpAQCAtMzgsMTEgKzM4LDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgdmlydHVhbCB2b2lkIGNvbnRleHRNZW51RGVzdHJveWVkKCk7CiAKICAgICAgICAgdmly dHVhbCB2b2lkIGFkZEN1c3RvbUNvbnRleHRNZW51SXRlbXMoQ29udGV4dE1lbnUqKTsKLSAgICAg ICAgdmlydHVhbCB2b2lkIGNvbnRleHRNZW51SXRlbVNlbGVjdGVkKENvbnRleHRNZW51SXRlbSop OworICAgICAgICB2aXJ0dWFsIHZvaWQgY29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoY29uc3QgQ29u dGV4dE1lbnVJdGVtKik7CiAKLSAgICAgICAgdmlydHVhbCB2b2lkIGNvcHlMaW5rVG9DbGlwYm9h cmQoSGl0VGVzdFJlc3VsdCk7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkb3dubG9hZFVSTChLVVJM KTsKLSAgICAgICAgdmlydHVhbCB2b2lkIGNvcHlJbWFnZVRvQ2xpcGJvYXJkKEhpdFRlc3RSZXN1 bHQpOworICAgICAgICB2aXJ0dWFsIHZvaWQgY29weUxpbmtUb0NsaXBib2FyZChjb25zdCBIaXRU ZXN0UmVzdWx0Jik7CisgICAgICAgIHZpcnR1YWwgdm9pZCBkb3dubG9hZFVSTChjb25zdCBLVVJM JiB1cmwpOworICAgICAgICB2aXJ0dWFsIHZvaWQgY29weUltYWdlVG9DbGlwYm9hcmQoY29uc3Qg SGl0VGVzdFJlc3VsdCYpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgbG9va1VwSW5EaWN0aW9uYXJ5 KEZyYW1lKik7CiAgICAgfTsKIApJbmRleDogV2ViQ29yZS9icmlkZ2Uvd2luL0ZyYW1lV2luLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvd2luL0ZyYW1lV2luLmgJKHJldmlzaW9uIDE4 MDg0KQorKysgV2ViQ29yZS9icmlkZ2Uvd2luL0ZyYW1lV2luLmgJKHdvcmtpbmcgY29weSkKQEAg LTY0LDEyICs2NCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCB2b2lk IHVuZm9jdXNXaW5kb3coKTsKICAgICAgICAgdmlydHVhbCB2b2lkIHByaW50KCk7CiAKLSAgICAg ICAgdmlydHVhbCB2b2lkIGlnbm9yZVNwZWxsaW5nKCk7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBs ZWFyblNwZWxsaW5nKCk7Ci0gICAgICAgIHZpcnR1YWwgYm9vbCBpc1NlbGVjdGlvbk1pc3NwZWxs ZWQoKTsKLSAgICAgICAgdmlydHVhbCBWZWN0b3I8U3RyaW5nPiBndWVzc2VzRm9yTWlzc3BlbGxl ZFNlbGVjdGlvbigpOwotICAgICAgICB2aXJ0dWFsIHZvaWQgbWFya01pc3NwZWxsaW5nc0luQWRq YWNlbnRXb3Jkcyhjb25zdCBWaXNpYmxlUG9zaXRpb24mKTsKLSAgICAgICAgdmlydHVhbCB2b2lk IG1hcmtNaXNzcGVsbGluZ3MoY29uc3QgU2VsZWN0aW9uJik7CiAgICAgICAgIHZpcnR1YWwgUmFu Z2UqIG1hcmtlZFRleHRSYW5nZSgpIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIHZvaWQgaXNzdWVD dXRDb21tYW5kKCk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBpc3N1ZUNvcHlDb21tYW5kKCk7Cklu ZGV4OiBXZWJDb3JlL2xvYWRlci93aW4vRnJhbWVMb2FkZXJXaW4uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvbG9hZGVyL3dpbi9GcmFtZUxvYWRlcldpbi5jcHAJKHJldmlzaW9uIDE4MDg0KQor KysgV2ViQ29yZS9sb2FkZXIvd2luL0ZyYW1lTG9hZGVyV2luLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDQsMTEgKzQ0LDE0IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnVybFNlbGVjdGVkKGNvbnN0IEZy YW0KIAogdm9pZCBGcmFtZUxvYWRlcjo6c3VibWl0Rm9ybShjb25zdCBGcmFtZUxvYWRSZXF1ZXN0 JiByZXF1ZXN0LCBFdmVudCopCiB7Ci0gICAgLy8gRklYTUU6IHRoaXMgaXMgYSBoYWNrIGluaGVy aXRlZCBmcm9tIEZyYW1lTWFjLCBhbmQgc2hvdWxkIGJlIHB1c2hlZCBpbnRvIEZyYW1lCiAgICAg Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QgPSByZXF1ZXN0LnJlc291cmNl UmVxdWVzdCgpOworCisjaWZkZWYgTVVMVElQTEVfRk9STV9TVUJNSVNTSU9OX1BST1RFQ1RJT04K KyAgICAvLyBGSVhNRTogdGhpcyBpcyBhIGhhY2sgaW5oZXJpdGVkIGZyb20gRnJhbWVNYWMsIGFu ZCBzaG91bGQgYmUgcHVzaGVkIGludG8gRnJhbWUKICAgICBpZiAobV9zdWJtaXR0ZWRGb3JtVVJM ID09IHJlc291cmNlUmVxdWVzdC51cmwoKSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fc3VibWl0 dGVkRm9ybVVSTCA9IHJlc291cmNlUmVxdWVzdC51cmwoKTsKKyNlbmRpZgogCiAgICAgRnJhbWVX aW4qIGZyYW1lV2luID0gc3RhdGljX2Nhc3Q8RnJhbWVXaW4qPihtX2ZyYW1lKTsKICAgICBpZiAo ZnJhbWVXaW4tPmNsaWVudCgpKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9S ZXNvdXJjZUhhbmRsZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHAJKHJldmlzaW9uIDE4MDg0KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTIzNiw5ICsyMzYsMTAgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6b25SZXF1ZXN0Q29t cGxldGUoTAogICAgIHdoaWxlICgob2sgPSBJbnRlcm5ldFJlYWRGaWxlRXhBKGhhbmRsZSwgJmJ1 ZmZlcnMsIElSRl9OT19XQUlULCAoRFdPUkRfUFRSKXRoaXMpKSAmJiBidWZmZXJzLmR3QnVmZmVy TGVuZ3RoKSB7CiAgICAgICAgIGlmICghaGFzUmVjZWl2ZWRSZXNwb25zZSgpKSB7CiAgICAgICAg ICAgICBzZXRIYXNSZWNlaXZlZFJlc3BvbnNlKCk7Ci0gICAgICAgICAgICBjbGllbnQoKS0+cmVj ZWl2ZWRSZXNwb25zZSh0aGlzLCAwKTsKKyAgICAgICAgICAgIFJlc291cmNlUmVzcG9uc2UgcmVz cG9uc2U7CisgICAgICAgICAgICBjbGllbnQoKS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKHRoaXMsIHJl c3BvbnNlKTsKICAgICAgICAgfQotICAgICAgICBjbGllbnQoKS0+ZGlkUmVjZWl2ZURhdGEodGhp cywgYnVmZmVyLCBidWZmZXJzLmR3QnVmZmVyTGVuZ3RoKTsKKyAgICAgICAgY2xpZW50KCktPmRp ZFJlY2VpdmVEYXRhKHRoaXMsIGJ1ZmZlciwgYnVmZmVycy5kd0J1ZmZlckxlbmd0aCwgMCk7CiAg ICAgICAgIGJ1ZmZlcnMuZHdCdWZmZXJMZW5ndGggPSBidWZmZXJTaXplOwogICAgIH0KIApAQCAt MjY1LDcgKzI2Niw2IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6Om9uUmVxdWVzdENvbXBsZXRlKEwK ICAgICAgICAgSW50ZXJuZXRDbG9zZUhhbmRsZShkLT5tX3NlY29uZGFyeUhhbmRsZSk7CiAgICAg SW50ZXJuZXRDbG9zZUhhbmRsZShkLT5tX3Jlc291cmNlSGFuZGxlKTsKIAotICAgIGNsaWVudCgp LT5yZWNlaXZlZEFsbERhdGEodGhpcywgJnBsYXRmb3JtRGF0YSk7CiAgICAgY2xpZW50KCktPmRp ZEZpbmlzaExvYWRpbmcodGhpcyk7CiAgICAgZGVsZXRlIHRoaXM7CiB9CkBAIC00MDUsNyArNDA1 LDggQEAgYm9vbCBSZXNvdXJjZUhhbmRsZTo6c3RhcnQoRG9jTG9hZGVyKiBkbwogCiB2b2lkIFJl c291cmNlSGFuZGxlOjpmaWxlTG9hZFRpbWVyKFRpbWVyPFJlc291cmNlSGFuZGxlPiogdGltZXIp CiB7Ci0gICAgY2xpZW50KCktPnJlY2VpdmVkUmVzcG9uc2UodGhpcywgMCk7CisgICAgUmVzb3Vy Y2VSZXNwb25zZSByZXNwb25zZTsKKyAgICBjbGllbnQoKS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKHRo aXMsIHJlc3BvbnNlKTsKIAogICAgIGJvb2wgcmVzdWx0ID0gZmFsc2U7CiAgICAgRFdPUkQgYnl0 ZXNSZWFkID0gMDsKQEAgLTQxNSw3ICs0MTYsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpmaWxl TG9hZFRpbWVyKFRpbWVyCiAgICAgICAgIGNoYXIgYnVmZmVyW2J1ZmZlclNpemVdOwogICAgICAg ICByZXN1bHQgPSBSZWFkRmlsZShkLT5tX2ZpbGVIYW5kbGUsICZidWZmZXIsIGJ1ZmZlclNpemUs ICZieXRlc1JlYWQsIE5VTEwpOyAKICAgICAgICAgaWYgKHJlc3VsdCAmJiBieXRlc1JlYWQpCi0g ICAgICAgICAgICBjbGllbnQoKS0+ZGlkUmVjZWl2ZURhdGEodGhpcywgYnVmZmVyLCBieXRlc1Jl YWQpOworICAgICAgICAgICAgY2xpZW50KCktPmRpZFJlY2VpdmVEYXRhKHRoaXMsIGJ1ZmZlciwg Ynl0ZXNSZWFkLCAwKTsKICAgICAgICAgLy8gQ2hlY2sgZm9yIGVuZCBvZiBmaWxlLiAKICAgICB9 IHdoaWxlIChyZXN1bHQgJiYgYnl0ZXNSZWFkKTsKIApAQCAtNDI0LDEyICs0MjUsNiBAQCB2b2lk IFJlc291cmNlSGFuZGxlOjpmaWxlTG9hZFRpbWVyKFRpbWVyCiAgICAgQ2xvc2VIYW5kbGUoZC0+ bV9maWxlSGFuZGxlKTsKICAgICBkLT5tX2ZpbGVIYW5kbGUgPSBJTlZBTElEX0hBTkRMRV9WQUxV RTsKIAotICAgIFBsYXRmb3JtRGF0YVN0cnVjdCBwbGF0Zm9ybURhdGE7Ci0gICAgcGxhdGZvcm1E YXRhLmVycm9yU3RyaW5nID0gMDsKLSAgICBwbGF0Zm9ybURhdGEuZXJyb3IgPSAwOwotICAgIHBs YXRmb3JtRGF0YS5sb2FkZWQgPSBUUlVFOwotCi0gICAgY2xpZW50KCktPnJlY2VpdmVkQWxsRGF0 YSh0aGlzLCAmcGxhdGZvcm1EYXRhKTsKICAgICBjbGllbnQoKS0+ZGlkRmluaXNoTG9hZGluZyh0 aGlzKTsKIH0KIApAQCAtNDQwLDE4ICs0MzUsMTIgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Y2Fu Y2VsKCkKICAgICBlbHNlCiAgICAgICAgIGQtPm1fZmlsZUxvYWRUaW1lci5zdG9wKCk7CiAKLSAg ICBQbGF0Zm9ybURhdGFTdHJ1Y3QgcGxhdGZvcm1EYXRhOwotICAgIHBsYXRmb3JtRGF0YS5lcnJv clN0cmluZyA9IDA7Ci0gICAgcGxhdGZvcm1EYXRhLmVycm9yID0gMDsKLSAgICBwbGF0Zm9ybURh dGEubG9hZGVkID0gRkFMU0U7Ci0KLSAgICBjbGllbnQoKS0+cmVjZWl2ZWRBbGxEYXRhKHRoaXMs ICZwbGF0Zm9ybURhdGEpOwogICAgIGNsaWVudCgpLT5kaWRGaW5pc2hMb2FkaW5nKHRoaXMpOyAK IAogICAgIGlmICghZC0+bV9yZXNvdXJjZUhhbmRsZSkKICAgICAgICAgLy8gQXN5bmMgbG9hZCBj YW5jZWxlZCBiZWZvcmUgd2UgaGF2ZSBhIGhhbmRsZSAtLSBtYXJrIG91cnNlbHZlcyBhcyBpbiBl cnJvciwgdG8gYmUgZGVsZXRlZCBsYXRlci4KICAgICAgICAgLy8gRklYTUU6IG5lZWQgcmVhbCBj YW5jZWwgZXJyb3IKLSAgICAgICAgY2xpZW50KCktPmRpZEZhaWxXaXRoRXJyb3IodGhpcywgUmVz b3VyY2VFcnJvcigpKTsKKyAgICAgICAgY2xpZW50KCktPmRpZEZhaWwodGhpcywgUmVzb3VyY2VF cnJvcigpKTsKIH0KIAogdm9pZCBSZXNvdXJjZUhhbmRsZTo6c2V0SGFzUmVjZWl2ZWRSZXNwb25z ZShib29sIGIpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3dpbi9Nb3VzZUV2ZW50V2luLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3dpbi9Nb3VzZUV2ZW50V2luLmNwcAkocmV2 aXNpb24gMTgwODQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3dpbi9Nb3VzZUV2ZW50V2luLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTEsMTMgKzUxLDE0IEBAIHN0YXRpYyBJbnRQb2ludCBnbG9iYWxQ b3NpdGlvbkZvckV2ZW50KEgKICAgICByZXR1cm4gcG9pbnQ7CiB9CiAKLVBsYXRmb3JtTW91c2VF dmVudDo6UGxhdGZvcm1Nb3VzZUV2ZW50KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0g d1BhcmFtLCBMUEFSQU0gbFBhcmFtKQorUGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNl RXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFy YW0sIGJvb2wgYWN0aXZhdGVkV2ViVmlldykKICAgICA6IG1fcG9zaXRpb24ocG9zaXRpb25Gb3JF dmVudChoV25kLCBsUGFyYW0pKQogICAgICwgbV9nbG9iYWxQb3NpdGlvbihnbG9iYWxQb3NpdGlv bkZvckV2ZW50KGhXbmQsIGxQYXJhbSkpCiAgICAgLCBtX3NoaWZ0S2V5KHdQYXJhbSAmIE1LX1NI SUZUKQogICAgICwgbV9jdHJsS2V5KHdQYXJhbSAmIE1LX0NPTlRST0wpCiAgICAgLCBtX2FsdEtl eShHZXRLZXlTdGF0ZShWS19NRU5VKSAmIEhJR0hfQklUX01BU0tfU0hPUlQpCiAgICAgLCBtX21l dGFLZXkobV9hbHRLZXkpIC8vIEZJWE1FOiBXZSdsbCBoYXZlIHRvIHRlc3Qgb3RoZXIgYnJvd3Nl cnMKKyAgICAsIG1fYWN0aXZhdGVkV2ViVmlldyhhY3RpdmF0ZWRXZWJWaWV3KQogewogICAgIHN3 aXRjaCAobWVzc2FnZSkgewogICAgICAgICBjYXNlIFdNX0xCVVRUT05ET1dOOgpJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0dWJzLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL3dpbi9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCShyZXZpc2lvbiAxODA4 NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vd2luL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTcyLDYgKzcyLDcgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVNjcm9sbEJhci5o IgogI2luY2x1ZGUgIlBsdWdJbkluZm9TdG9yZS5oIgogI2luY2x1ZGUgIlBvcHVwTWVudS5oIgor I2luY2x1ZGUgIlJhbmdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKICNpbmNsdWRlICJS ZXNvdXJjZUxvYWRlci5oIgogI2luY2x1ZGUgIlJlbmRlclRoZW1lV2luLmgiCkBAIC05MiwxMiAr OTMsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RhdGljIGludCBmcmFtZU51bWJlciA9IDA7 CiBzdGF0aWMgQ3Vyc29yIGxvY2FsQ3Vyc29yOwogCi10aW1lX3QgQ2FjaGVPYmplY3RFeHBpcmVz VGltZShEb2NMb2FkZXIqLCBQbGF0Zm9ybVJlc3BvbnNlKSB7IG5vdEltcGxlbWVudGVkKCk7IHJl dHVybiAwOyB9CiB2b2lkIENoZWNrQ2FjaGVPYmplY3RTdGF0dXMoRG9jTG9hZGVyKiwgQ2FjaGVk UmVzb3VyY2UqKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KIGJvb2wgQ2hlY2tJZlJlbG9hZGluZyhE b2NMb2FkZXIqKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBmYWxzZTsgfQogU3RyaW5nIGRl ZmF1bHRMYW5ndWFnZSgpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuICJlbiI7IH0KIFN0cmlu ZyBmaWxlQnV0dG9uQ2hvb3NlRmlsZUxhYmVsKCkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4g IkJyb3dzZS4uLiI7IH0KLVN0cmluZyBmaWxlQnV0dG9uTm9GaWxlU2VsZWN0ZWRMYWJlbCgpIHsg bm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIFN0cmluZygpOyB9CiBpbnQgZmluZE5leHRTZW50ZW5j ZUZyb21JbmRleChVQ2hhciBjb25zdCosIGludCwgaW50LCBib29sKSB7IG5vdEltcGxlbWVudGVk KCk7IHJldHVybiAwOyB9CiBpbnQgZmluZE5leHRXb3JkRnJvbUluZGV4KFVDaGFyIGNvbnN0Kiwg aW50LCBpbnQsIGJvb2wpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIDA7IH0KIHZvaWQgZmlu ZFNlbnRlbmNlQm91bmRhcnkoVUNoYXIgY29uc3QqLCBpbnQsIGludCwgaW50KiwgaW50KikgeyBu b3RJbXBsZW1lbnRlZCgpOyB9CkBAIC0xMDUsMTkgKzEwNCwxNiBAQCB2b2lkIGZpbmRXb3JkQm91 bmRhcnkoVUNoYXIgY29uc3QqIHN0ciwgCiBDb2xvciBmb2N1c1JpbmdDb2xvcigpIHsgbm90SW1w bGVtZW50ZWQoKTsgcmV0dXJuIDB4RkYwMDAwRkY7IH0KIGJvb2wgaGlzdG9yeUNvbnRhaW5zKERl cHJlY2F0ZWRTdHJpbmcgY29uc3QmKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBmYWxzZTsg fQogU3RyaW5nIGlucHV0RWxlbWVudEFsdFRleHQoKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVy biBEZXByZWNhdGVkU3RyaW5nKCk7IH0KLWJvb2wgSXNSZXNwb25zZVVSTEVxdWFsVG9VUkwoUGxh dGZvcm1SZXNwb25zZSAsIGNvbnN0IFN0cmluZyYpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJu IGZhbHNlOyB9CiBjb25zdCBDdXJzb3ImIGFsaWFzQ3Vyc29yKCkgeyBub3RJbXBsZW1lbnRlZCgp OyByZXR1cm4gbG9jYWxDdXJzb3I7IH0KIGNvbnN0IEN1cnNvciYgY2VsbEN1cnNvcigpIHsgbm90 SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGxvY2FsQ3Vyc29yOyB9CiBjb25zdCBDdXJzb3ImIGNvbnRl eHRNZW51Q3Vyc29yKCkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gbG9jYWxDdXJzb3I7IH0K K2NvbnN0IEN1cnNvciYgY29weUN1cnNvcigpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGxv Y2FsQ3Vyc29yOyB9CiBjb25zdCBDdXJzb3ImIG1vdmVDdXJzb3IoKSB7IG5vdEltcGxlbWVudGVk KCk7IHJldHVybiBsb2NhbEN1cnNvcjsgfQogY29uc3QgQ3Vyc29yJiBub0Ryb3BDdXJzb3IoKSB7 IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBsb2NhbEN1cnNvcjsgfQogY29uc3QgQ3Vyc29yJiBw cm9ncmVzc0N1cnNvcigpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGxvY2FsQ3Vyc29yOyB9 CiBjb25zdCBDdXJzb3ImIHZlcnRpY2FsVGV4dEN1cnNvcigpIHsgbm90SW1wbGVtZW50ZWQoKTsg cmV0dXJuIGxvY2FsQ3Vyc29yOyB9CiB2b2lkIHJlZnJlc2hQbHVnaW5zKGJvb2wpIHsgbm90SW1w bGVtZW50ZWQoKTsgfQogU3RyaW5nIHJlc2V0QnV0dG9uRGVmYXVsdExhYmVsKCkgeyBub3RJbXBs ZW1lbnRlZCgpOyByZXR1cm4gIlJlc2V0IjsgfQotYm9vbCBSZXNwb25zZUlzTXVsdGlwYXJ0KFBs YXRmb3JtUmVzcG9uc2UpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGZhbHNlOyB9Ci1EZXBy ZWNhdGVkU3RyaW5nIFJlc3BvbnNlTUlNRVR5cGUoUGxhdGZvcm1SZXNwb25zZSkgeyBub3RJbXBs ZW1lbnRlZCgpOyByZXR1cm4gRGVwcmVjYXRlZFN0cmluZygpOyB9Ci1EZXByZWNhdGVkU3RyaW5n IFJlc3BvbnNlVVJMKFBsYXRmb3JtUmVzcG9uc2UpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJu IERlcHJlY2F0ZWRTdHJpbmcoKTsgfQogaW50IHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50KFdpZGdl dCopIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIDg7IH0KIGJvb2wgc2NyZWVuSXNNb25vY2hy b21lKFdpZGdldCopIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGZhbHNlOyB9CiBTdHJpbmcg c2VhcmNoYWJsZUluZGV4SW50cm9kdWN0aW9uKCkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4g U3RyaW5nKCk7IH0KQEAgLTE1OSwxMCArMTU1LDEwIEBAIHZvaWQgQ29udGV4dE1lbnU6OnNob3co KSB7IG5vdEltcGxlbWVudGUKIAogdm9pZCBDb250ZXh0TWVudUNsaWVudFdpbjo6Y29udGV4dE1l bnVEZXN0cm95ZWQoKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KIHZvaWQgQ29udGV4dE1lbnVDbGll bnRXaW46OmFkZEN1c3RvbUNvbnRleHRNZW51SXRlbXMoQ29udGV4dE1lbnUqKSB7IG5vdEltcGxl bWVudGVkKCk7IH0KLXZvaWQgQ29udGV4dE1lbnVDbGllbnRXaW46OmNvbnRleHRNZW51SXRlbVNl bGVjdGVkKENvbnRleHRNZW51SXRlbSopIHsgbm90SW1wbGVtZW50ZWQoKTsgfQotdm9pZCBDb250 ZXh0TWVudUNsaWVudFdpbjo6Y29weUxpbmtUb0NsaXBib2FyZChIaXRUZXN0UmVzdWx0KSB7IG5v dEltcGxlbWVudGVkKCk7IH0KLXZvaWQgQ29udGV4dE1lbnVDbGllbnRXaW46OmRvd25sb2FkVVJM KEtVUkwpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQotdm9pZCBDb250ZXh0TWVudUNsaWVudFdpbjo6 Y29weUltYWdlVG9DbGlwYm9hcmQoSGl0VGVzdFJlc3VsdCkgeyBub3RJbXBsZW1lbnRlZCgpOyB9 Cit2b2lkIENvbnRleHRNZW51Q2xpZW50V2luOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb25z dCBDb250ZXh0TWVudUl0ZW0qKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KK3ZvaWQgQ29udGV4dE1l bnVDbGllbnRXaW46OmNvcHlMaW5rVG9DbGlwYm9hcmQoY29uc3QgSGl0VGVzdFJlc3VsdCYpIHsg bm90SW1wbGVtZW50ZWQoKTsgfQordm9pZCBDb250ZXh0TWVudUNsaWVudFdpbjo6ZG93bmxvYWRV UkwoY29uc3QgS1VSTCYgdXJsKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KK3ZvaWQgQ29udGV4dE1l bnVDbGllbnRXaW46OmNvcHlJbWFnZVRvQ2xpcGJvYXJkKGNvbnN0IEhpdFRlc3RSZXN1bHQmKSB7 IG5vdEltcGxlbWVudGVkKCk7IH0KIHZvaWQgQ29udGV4dE1lbnVDbGllbnRXaW46Omxvb2tVcElu RGljdGlvbmFyeShGcmFtZSopIHsgbm90SW1wbGVtZW50ZWQoKTsgfQogCiBDb250ZXh0TWVudUl0 ZW06OkNvbnRleHRNZW51SXRlbShQbGF0Zm9ybU1lbnVJdGVtRGVzY3JpcHRpb24sIENvbnRleHRN ZW51KikgeyBub3RJbXBsZW1lbnRlZCgpOyB9CkBAIC0xODgsNiArMTg0LDEzIEBAIHZvaWQgRG9j dW1lbnRMb2FkZXI6OnNldHVwRm9yUmVwbGFjZUJ5TUkKIGJvb2wgRG9jdW1lbnRMb2FkZXI6Omlz TG9hZGluZ0luQVBJU2Vuc2UoKSBjb25zdCB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBmYWxz ZTsgfQogdm9pZCBEb2N1bWVudExvYWRlcjo6c3RvcFJlY29yZGluZ1Jlc3BvbnNlcygpIHsgbm90 SW1wbGVtZW50ZWQoKTsgfQogCit2b2lkIEVkaXRvcjo6aWdub3JlU3BlbGxpbmcoKSB7IG5vdElt cGxlbWVudGVkKCk7IH0KK3ZvaWQgRWRpdG9yOjpsZWFyblNwZWxsaW5nKCkgeyBub3RJbXBsZW1l bnRlZCgpOyB9Citib29sIEVkaXRvcjo6aXNTZWxlY3Rpb25VbmdyYW1tYXRpY2FsKCkgeyBub3RJ bXBsZW1lbnRlZCgpOyByZXR1cm4gZmFsc2U7IH0KK2Jvb2wgRWRpdG9yOjppc1NlbGVjdGlvbk1p c3NwZWxsZWQoKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBmYWxzZTsgfQorVmVjdG9yPFN0 cmluZz4gRWRpdG9yOjpndWVzc2VzRm9yTWlzc3BlbGxlZFNlbGVjdGlvbigpIHsgbm90SW1wbGVt ZW50ZWQoKTsgcmV0dXJuIFZlY3RvcjxTdHJpbmc+KCk7IH0KK1ZlY3RvcjxTdHJpbmc+IEVkaXRv cjo6Z3Vlc3Nlc0ZvclVuZ3JhbW1hdGljYWxTZWxlY3Rpb24oKSB7IG5vdEltcGxlbWVudGVkKCk7 IHJldHVybiBWZWN0b3I8U3RyaW5nPigpOyB9Cit2b2lkIEVkaXRvcjo6bWFya01pc3NwZWxsaW5n c0luQWRqYWNlbnRXb3Jkcyhjb25zdCBWaXNpYmxlUG9zaXRpb24mKSB7IG5vdEltcGxlbWVudGVk KCk7IH0KIFBhc3NSZWZQdHI8Q2xpcGJvYXJkPiBFZGl0b3I6Om5ld0dlbmVyYWxDbGlwYm9hcmQo Q2xpcGJvYXJkQWNjZXNzUG9saWN5IHBvbGljeSkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4g MDsgfQogCiB2b2lkIEVkaXRvckNsaWVudFdpbjo6cGFnZURlc3Ryb3llZCgpIHsgbm90SW1wbGVt ZW50ZWQoKTsgfQpAQCAtMjM2LDYgKzIzOSw3IEBAIHZvaWQgRmlsZUNob29zZXI6OmNob29zZUZp bGUoY29uc3QgU3RyaW4KIAogdm9pZCBGcmFtZTo6c2V0TmVlZHNSZWFwcGx5U3R5bGVzKCkgeyBu b3RJbXBsZW1lbnRlZCgpOyB9CiAKK3ZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoY29uc3QgRnJhbWVM b2FkUmVxdWVzdCYsIGJvb2wgdXNlckdlc3R1cmUsIEV2ZW50KiwgRWxlbWVudCogZm9ybSwgY29u c3QgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4mIGZvcm1WYWx1ZXMpIHsgbm90SW1wbGVtZW50ZWQo KTsgfQogdm9pZCBGcmFtZUxvYWRlcjo6ZGlkRmlyc3RMYXlvdXQoKSB7IG5vdEltcGxlbWVudGVk KCk7IH0KIFN0cmluZyBGcmFtZUxvYWRlcjo6b3ZlcnJpZGVNZWRpYVR5cGUoKSBjb25zdCB7IG5v dEltcGxlbWVudGVkKCk7IHJldHVybiBTdHJpbmcoKTsgfQogV2lkZ2V0KiBGcmFtZUxvYWRlcjo6 Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiwgRWxlbWVudCosIGNvbnN0IEhh c2hNYXA8U3RyaW5nLCBTdHJpbmc+JikgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gMDsgfQpA QCAtMzQ1LDE4ICszNDksMTIgQEAgdm9pZCBGcmFtZVdpbjo6aXNzdWVDb3B5Q29tbWFuZCgpIHsg bm90SQogU3RyaW5nIEZyYW1lV2luOjptaW1lVHlwZUZvckZpbGVOYW1lKFN0cmluZyBjb25zdCYp IGNvbnN0IHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIFN0cmluZygpOyB9CiB2b2lkIEZyYW1l V2luOjppc3N1ZVBhc3RlQ29tbWFuZCgpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQogdm9pZCBGcmFt ZVdpbjo6c2NoZWR1bGVDbG9zZSgpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQotdm9pZCBGcmFtZVdp bjo6bWFya01pc3NwZWxsaW5ncyhjb25zdCBXZWJDb3JlOjpTZWxlY3Rpb24mKSB7IG5vdEltcGxl bWVudGVkKCk7IH0KIHZvaWQgRnJhbWVXaW46Omlzc3VlVHJhbnNwb3NlQ29tbWFuZCgpIHsgbm90 SW1wbGVtZW50ZWQoKTsgfQogdm9pZCBGcmFtZVdpbjo6aXNzdWVQYXN0ZUFuZE1hdGNoU3R5bGVD b21tYW5kKCkgeyBub3RJbXBsZW1lbnRlZCgpOyB9CiBib29sIEZyYW1lV2luOjppc0xvYWRUeXBl UmVsb2FkKCkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gZmFsc2U7IH0KIFJhbmdlKiBGcmFt ZVdpbjo6bWFya2VkVGV4dFJhbmdlKCkgY29uc3QgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4g MDsgfQogYm9vbCBGcmFtZVdpbjo6c2hvdWxkQ2hhbmdlU2VsZWN0aW9uKGNvbnN0IFNlbGVjdGlv biYsIGNvbnN0IFNlbGVjdGlvbiYsIEVBZmZpbml0eSwgYm9vbCkgY29uc3QgeyBub3RJbXBsZW1l bnRlZCgpOyByZXR1cm4gdHJ1ZTsgfQogdm9pZCBGcmFtZVdpbjo6cmVzcG9uZFRvQ2hhbmdlZFNl bGVjdGlvbihjb25zdCBTZWxlY3Rpb24mLCBib29sKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KLXZv aWQgRnJhbWVXaW46Om1hcmtNaXNzcGVsbGluZ3NJbkFkamFjZW50V29yZHMoVmlzaWJsZVBvc2l0 aW9uIGNvbnN0JikgeyBub3RJbXBsZW1lbnRlZCgpOyB9Ci12b2lkIEZyYW1lV2luOjppZ25vcmVT cGVsbGluZygpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQotdm9pZCBGcmFtZVdpbjo6bGVhcm5TcGVs bGluZygpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQotYm9vbCBGcmFtZVdpbjo6aXNTZWxlY3Rpb25N aXNzcGVsbGVkKCkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gZmFsc2U7IH0KLVZlY3RvcjxT dHJpbmc+IEZyYW1lV2luOjpndWVzc2VzRm9yTWlzc3BlbGxlZFNlbGVjdGlvbigpIHsgbm90SW1w bGVtZW50ZWQoKTsgcmV0dXJuIFZlY3RvcjxTdHJpbmc+KCk7IH0KIAogdm9pZCBHcmFwaGljc0Nv bnRleHQ6OmFkZFJvdW5kZWRSZWN0Q2xpcChjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJbnRT aXplJiB0b3BMZWZ0LCBjb25zdCBJbnRTaXplJiB0b3BSaWdodCwgY29uc3QgSW50U2l6ZSYgYm90 dG9tTGVmdCwgY29uc3QgSW50U2l6ZSYgYm90dG9tUmlnaHQpIHsgbm90SW1wbGVtZW50ZWQoKTsg fQogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmFkZElubmVyUm91bmRlZFJlY3RDbGlwKGNvbnN0IElu dFJlY3QmIHJlY3QsIGludCB0aGlja25lc3MpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQpJbmRleDog V2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lv biAxODA4NCkKKysrIFdlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NCBAQAorMjAwNi0xMi0wOCAgRG9uIEdpYnNvbiAgPGRnaWJzb243N0BnbWFpbC5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NTk6CisgICAgICAgIFdpbmRvd3MgYnVpbGQg YnVzdGFnZQorCisgICAgICAgICogQ09NL1dlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkZyYW1l Ojpsb2FkRGF0YVNvdXJjZSk6CisgICAgICAgICogQ09NL1dlYkZyYW1lLmg6CisKIDIwMDYtMTIt MDggIERhdmlkIEhhcnJpc29uICA8aGFycmlzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEJyYWR5LgpJbmRleDogV2ViS2l0L0NPTS9XZWJGcmFtZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L0NPTS9XZWJGcmFtZS5jcHAJKHJldmlzaW9uIDE4MDg0KQorKysgV2ViS2l0L0NP TS9XZWJGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAKICNpbmNsdWRl ICJSZXNvdXJjZUhhbmRsZS5oIgogI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlV2luLmgiCiAjaW5j bHVkZSAiUmVzb3VyY2VSZXF1ZXN0LmgiCisjaW5jbHVkZSAiU3VicmVzb3VyY2VMb2FkZXIuaCIK ICNwcmFnbWEgd2FybmluZyhwb3ApCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpAQCAtMzg0 LDcgKzM4NSw3IEBAIEhSRVNVTFQgV2ViRnJhbWU6OmxvYWREYXRhU291cmNlKFdlYkRhdGEKICAg ICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICBSZXNvdXJjZVJlcXVlc3QgcmVzb3Vy Y2VSZXF1ZXN0KGt1cmwpOwotICAgICAgICAgICAgICAgIFJlZlB0cjxSZXNvdXJjZUhhbmRsZT4g bG9hZGVyID0gUmVzb3VyY2VIYW5kbGU6OmNyZWF0ZShyZXNvdXJjZVJlcXVlc3QsIHRoaXMsIGQt PmZyYW1lLT5kb2N1bWVudCgpLT5kb2NMb2FkZXIoKSk7CisgICAgICAgICAgICAgICAgUmVmUHRy PFN1YnJlc291cmNlTG9hZGVyPiBsb2FkZXIgPSBTdWJyZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKGQt PmZyYW1lLmdldCgpLCB0aGlzLCByZXNvdXJjZVJlcXVlc3QpOwogCiAgICAgICAgICAgICAgICAg SVdlYkZyYW1lTG9hZERlbGVnYXRlKiBmcmFtZUxvYWREZWxlZ2F0ZTsKICAgICAgICAgICAgICAg ICBpZiAoU1VDQ0VFREVEKGQtPndlYlZpZXctPmZyYW1lTG9hZERlbGVnYXRlKCZmcmFtZUxvYWRE ZWxlZ2F0ZSkpKSB7CkBAIC00NzMsNzQgKzQ3NCw2IEBAIHZvaWQgV2ViRnJhbWU6OmRpZFJlY2Vp dmVEYXRhKFdlYkNvcmU6OlIKICAgICBkLT5mcmFtZS0+bG9hZGVyKCktPndyaXRlKGRhdGEsIGxl bmd0aCk7CiB9CiAKLXZvaWQgV2ViRnJhbWU6OnJlY2VpdmVkUmVzcG9uc2UoUmVzb3VyY2VIYW5k bGUqIGpvYiwgUGxhdGZvcm1SZXNwb25zZSkKLXsKLSAgICAvLyBDb21taXQgdGhlIHByb3Zpc2lv bmFsIGRhdGEgc291cmNlCi0KLSAgICBpZiAobV9wcm92aXNpb25hbERhdGFTb3VyY2UpIHsKLSAg ICAgICAgbV9kYXRhU291cmNlID0gbV9wcm92aXNpb25hbERhdGFTb3VyY2U7Ci0gICAgICAgIG1f cHJvdmlzaW9uYWxEYXRhU291cmNlID0gMDsKLSAgICB9Ci0KLSAgICAvLyBUZWxsIHRoZSBGcmFt ZSB0byBleHBlY3QgbmV3IGRhdGEuICBXZSB1c2UgdGhlIFVSTCBvZiB0aGUgZGF0YSBzb3VyY2Ug aW4KLSAgICAvLyBvcmRlciB0byBhY2NvdW50IGZvciByZWRpcmVjdHMuCi0KLSAgICBJV2ViTXV0 YWJsZVVSTFJlcXVlc3QqIHJlcXVlc3Q7Ci0gICAgbV9kYXRhU291cmNlLT5yZXF1ZXN0KCZyZXF1 ZXN0KTsKLQotICAgIEJTVFIgdXJsOwotICAgIHJlcXVlc3QtPlVSTCgmdXJsKTsKLSAgICByZXF1 ZXN0LT5SZWxlYXNlKCk7Ci0KLSAgICBLVVJMIGt1cmwoRGVwcmVjYXRlZFN0cmluZygoRGVwcmVj YXRlZENoYXIqKXVybCwgU3lzU3RyaW5nTGVuKHVybCkpKTsKLSAgICBTeXNGcmVlU3RyaW5nKHVy bCk7Ci0KLSAgICAvLyBVcGRhdGUgTUlNRSBpbmZvIChGSVhNRTogZ2V0IGZyb20gUGxhdGZvcm1S ZXNwb25zZSkKLSAgICBkLT5mcmFtZS0+bG9hZGVyKCktPnNldFJlc3BvbnNlTUlNRVR5cGUoU3Ry aW5nKEwidGV4dC9odG1sIikpOwotCi0gICAgZC0+ZnJhbWUtPmxvYWRlcigpLT5iZWdpbihrdXJs KTsKLQotICAgIGlmIChtX2xvYWRUeXBlICE9IFdlYkZyYW1lTG9hZFR5cGVCYWNrICYmIG1fbG9h ZFR5cGUgIT0gV2ViRnJhbWVMb2FkVHlwZUZvcndhcmQgJiYgbV9sb2FkVHlwZSAhPSBXZWJGcmFt ZUxvYWRUeXBlSW5kZXhlZEJhY2tGb3J3YXJkICYmICFtX3F1aWNrUmVkaXJlY3RDb21pbmcpIHsK LSAgICAgICAgRGVwcmVjYXRlZFN0cmluZyB1cmxTdHIgPSBqb2ItPnVybCgpLnVybCgpOwotICAg ICAgICBCU1RSIHVybEJTdHIgPSBTeXNBbGxvY1N0cmluZ0xlbigoTFBDT0xFU1RSKXVybFN0ci51 bmljb2RlKCksIHVybFN0ci5sZW5ndGgoKSk7Ci0gICAgICAgIFdlYkhpc3RvcnlJdGVtKiBoaXN0 b3J5SXRlbSA9IFdlYkhpc3RvcnlJdGVtOjpjcmVhdGVJbnN0YW5jZSgpOwotICAgICAgICBpZiAo U1VDQ0VFREVEKGhpc3RvcnlJdGVtLT5pbml0V2l0aFVSTFN0cmluZyh1cmxCU3RyLCAwLypGSVhN RSovKSkpIHsKLSAgICAgICAgICAgIElXZWJCYWNrRm9yd2FyZExpc3QqIGJhY2tGb3J3YXJkTGlz dDsKLSAgICAgICAgICAgIGlmIChTVUNDRUVERUQoZC0+d2ViVmlldy0+YmFja0ZvcndhcmRMaXN0 KCZiYWNrRm9yd2FyZExpc3QpKSkgewotICAgICAgICAgICAgICAgIGJhY2tGb3J3YXJkTGlzdC0+ YWRkSXRlbShoaXN0b3J5SXRlbSk7Ci0gICAgICAgICAgICAgICAgYmFja0ZvcndhcmRMaXN0LT5S ZWxlYXNlKCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBoaXN0b3J5SXRlbS0+UmVsZWFz ZSgpOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgSVdlYkZyYW1lTG9hZERlbGVnYXRlKiBmcmFt ZUxvYWREZWxlZ2F0ZTsKLSAgICBpZiAoU1VDQ0VFREVEKGQtPndlYlZpZXctPmZyYW1lTG9hZERl bGVnYXRlKCZmcmFtZUxvYWREZWxlZ2F0ZSkpKSB7Ci0gICAgICAgIGZyYW1lTG9hZERlbGVnYXRl LT5kaWRDb21taXRMb2FkRm9yRnJhbWUoZC0+d2ViVmlldywgdGhpcyk7Ci0gICAgICAgIGZyYW1l TG9hZERlbGVnYXRlLT5SZWxlYXNlKCk7Ci0gICAgfQotfQotCi12b2lkIFdlYkZyYW1lOjpyZWNl aXZlZEFsbERhdGEoUmVzb3VyY2VIYW5kbGUqLCBQbGF0Zm9ybURhdGEgZGF0YSkKLXsKLSAgICBJ V2ViRnJhbWVMb2FkRGVsZWdhdGUqIGZyYW1lTG9hZERlbGVnYXRlOwotICAgIGlmIChTVUNDRUVE RUQoZC0+d2ViVmlldy0+ZnJhbWVMb2FkRGVsZWdhdGUoJmZyYW1lTG9hZERlbGVnYXRlKSkpIHsK LQotICAgICAgICBpZiAoZGF0YS0+bG9hZGVkKSB7Ci0gICAgICAgICAgICBmcmFtZUxvYWREZWxl Z2F0ZS0+ZGlkRmluaXNoTG9hZEZvckZyYW1lKGQtPndlYlZpZXcsIHRoaXMpOwotICAgICAgICB9 Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgZnJhbWVMb2FkRGVsZWdhdGUtPmRpZEZhaWxM b2FkV2l0aEVycm9yKGQtPndlYlZpZXcsIDAvKkZJWE1FKi8sIHRoaXMpOwotICAgICAgICAgICAg bV9xdWlja1JlZGlyZWN0Q29taW5nID0gZmFsc2U7Ci0gICAgICAgICAgICBtX2xvYWRUeXBlID0g V2ViRnJhbWVMb2FkVHlwZVN0YW5kYXJkOwotICAgICAgICB9Ci0KLSAgICAgICAgZnJhbWVMb2Fk RGVsZWdhdGUtPlJlbGVhc2UoKTsKLSAgICB9Ci0KLSAgICBkLT5mcmFtZS0+bG9hZGVyKCktPmVu ZCgpOwotfQotCiAvLyBGcmFtZVdpbkNsaWVudAogCiB2b2lkIFdlYkZyYW1lOjpjcmVhdGVOZXdX aW5kb3coY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6V2lu ZG93RmVhdHVyZXMmLCBXZWJDb3JlOjpGcmFtZSomIG5ld0ZyYW1lKQpJbmRleDogV2ViS2l0L0NP TS9XZWJGcmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9DT00vV2ViRnJhbWUuaAkocmV2aXNp b24gMTgwODQpCisrKyBXZWJLaXQvQ09NL1dlYkZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTMx LDcgKzMxLDcgQEAKICNpbmNsdWRlICJXZWJEYXRhU291cmNlLmgiCiAKICNwcmFnbWEgd2Fybmlu ZyhwdXNoLCAwKQotI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlQ2xpZW50LmgiCisjaW5jbHVkZSAi U3VicmVzb3VyY2VMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJGcmFtZVdpbi5oIgogI2luY2x1 ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjcHJhZ21hIHdhcm5pbmcocG9wKQpAQCAtNTMsNyArNTMs NyBAQCB0eXBlZGVmIGVudW0gewogICAgIFdlYkZyYW1lTG9hZFR5cGVSZXBsYWNlCiB9IFdlYkZy YW1lTG9hZFR5cGU7CiAKLWNsYXNzIFdlYkZyYW1lIDogcHVibGljIElXZWJGcmFtZSwgcHVibGlj IFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ2xpZW50LCBwdWJsaWMgV2ViQ29yZTo6RnJhbWVXaW5D bGllbnQKK2NsYXNzIFdlYkZyYW1lIDogcHVibGljIElXZWJGcmFtZSwgcHVibGljIFdlYkNvcmU6 OlN1YnJlc291cmNlTG9hZGVyQ2xpZW50LCBwdWJsaWMgV2ViQ29yZTo6RnJhbWVXaW5DbGllbnQK IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgV2ViRnJhbWUqIGNyZWF0ZUluc3RhbmNlKCk7CkBAIC0x MzIsOCArMTMyLDYgQEAgcHVibGljOgogCiAgICAgLy8gUmVzb3VyY2VIYW5kbGVDbGllbnQKICAg ICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGEoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBj b25zdCBjaGFyKiwgaW50KTsKLSAgICB2aXJ0dWFsIHZvaWQgcmVjZWl2ZWRSZXNwb25zZShXZWJD b3JlOjpSZXNvdXJjZUhhbmRsZSosIFdlYkNvcmU6OlBsYXRmb3JtUmVzcG9uc2UpOwotICAgIHZp cnR1YWwgdm9pZCByZWNlaXZlZEFsbERhdGEoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBXZWJD b3JlOjpQbGF0Zm9ybURhdGEpOwogCiAgICAgLy8gRnJhbWVXaW5DbGllbnQKICAgICB2aXJ0dWFs IHZvaWQgY3JlYXRlTmV3V2luZG93KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNv bnN0IFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVzJiwgV2ViQ29yZTo6RnJhbWUqJiBuZXdGcmFtZSk7 Cg==