20758 2008-09-09 19:13:58 -0700 refactor CSSStyleSelector transform code 2008-09-11 15:40:06 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.5 RESOLVED WONTFIX P2 Normal --- 20770 20771 1 dino dino simon.fraser oldest_to_newest 90720 0 dino 2008-09-09 19:13:58 -0700 CSSStyleSelector has a huge ugly chunk of code in the switch statement. Move that to a new function. 90722 1 23311 dino 2008-09-09 19:20:15 -0700 Created attachment 23311 refactoring patch needs tests for transforms!! 90804 2 dino 2008-09-10 15:27:58 -0700 Adding dependency to 20771 which has transform tests 90805 3 23332 dino 2008-09-10 15:48:33 -0700 Created attachment 23332 updated with changelog 90806 4 dino 2008-09-10 15:51:03 -0700 Tested with the new tests in 20771 90808 5 dino 2008-09-10 16:03:27 -0700 Looks like 20770 does this as well. 90903 6 dino 2008-09-11 15:39:51 -0700 This is fixed in 20770 23311 2008-09-09 19:20:15 -0700 2008-09-10 15:48:33 -0700 refactoring patch refactor.patch text/plain 14447 dino ZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwIGIvV2ViQ29yZS9j c3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5kZXggNTUwYjljMi4uNmQ1MWFhMCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NT U3R5bGVTZWxlY3Rvci5jcHAKQEAgLTQ3NjAsMTEyICs0NzYwLDcgQEAgdm9pZCBDU1NTdHlsZVNl bGVjdG9yOjphcHBseVByb3BlcnR5KGludCBpZCwgQ1NTVmFsdWUgKnZhbHVlKQogICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm06IHsKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5E X0lOSVRJQUwodHJhbnNmb3JtLCBUcmFuc2Zvcm0pOwogICAgICAgICBUcmFuc2Zvcm1PcGVyYXRp b25zIG9wZXJhdGlvbnM7Ci0gICAgICAgIGlmICghdmFsdWUtPmlzUHJpbWl0aXZlVmFsdWUoKSkg ewotICAgICAgICAgICAgQ1NTVmFsdWVMaXN0KiBsaXN0ID0gc3RhdGljX2Nhc3Q8Q1NTVmFsdWVM aXN0Kj4odmFsdWUpOwotICAgICAgICAgICAgdW5zaWduZWQgc2l6ZSA9IGxpc3QtPmxlbmd0aCgp OwotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHNpemU7IGkrKykgewotICAg ICAgICAgICAgICAgIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlKiB2YWwgPSBzdGF0aWNfY2FzdDxX ZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZSo+KGxpc3QtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaSkp OwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBm aXJzdFZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRo b3V0Qm91bmRzQ2hlY2soMCkpOwotICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBz d2l0Y2ggKHZhbC0+b3BlcmF0aW9uVHlwZSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2Ug V2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlNjYWxlVHJhbnNmb3JtT3BlcmF0aW9uOgotICAgICAg ICAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTY2FsZVhUcmFuc2Zv cm1PcGVyYXRpb246Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3Jt VmFsdWU6OlNjYWxlWVRyYW5zZm9ybU9wZXJhdGlvbjogewotICAgICAgICAgICAgICAgICAgICAg ICAgZG91YmxlIHN4ID0gMS4wOwotICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIHN5ID0g MS4wOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+b3BlcmF0aW9uVHlwZSgpID09 IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTY2FsZVlUcmFuc2Zvcm1PcGVyYXRpb24pCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3kgPSBmaXJzdFZhbHVlLT5nZXREb3VibGVWYWx1ZSgp OwotICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSB7IAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHN4ID0gZmlyc3RWYWx1ZS0+Z2V0RG91YmxlVmFsdWUoKTsKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAodmFsLT5vcGVyYXRpb25UeXBlKCkgPT0gV2ViS2l0Q1NTVHJhbnNm b3JtVmFsdWU6OlNjYWxlVHJhbnNmb3JtT3BlcmF0aW9uKSB7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlmICh2YWwtPmxlbmd0aCgpID4gMSkgewotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHNlY29uZFZhbHVlID0gc3RhdGlj X2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMSkp OwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3kgPSBzZWNvbmRWYWx1ZS0+ Z2V0RG91YmxlVmFsdWUoKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNl IAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3kgPSBzeDsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgICAgICAgICBvcGVyYXRpb25zLmFwcGVuZChTY2FsZVRyYW5zZm9ybU9wZXJhdGlv bjo6Y3JlYXRlKHN4LCBzeSkpOwotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFu c2Zvcm1WYWx1ZTo6VHJhbnNsYXRlVHJhbnNmb3JtT3BlcmF0aW9uOgotICAgICAgICAgICAgICAg ICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVYVHJhbnNmb3JtT3Bl cmF0aW9uOgotICAgICAgICAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVl OjpUcmFuc2xhdGVZVHJhbnNmb3JtT3BlcmF0aW9uOiB7Ci0gICAgICAgICAgICAgICAgICAgICAg ICBib29sIG9rID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIExlbmd0aCB0eCA9IExl bmd0aCgwLCBGaXhlZCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBMZW5ndGggdHkgPSBMZW5n dGgoMCwgRml4ZWQpOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+b3BlcmF0aW9u VHlwZSgpID09IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVZVHJhbnNmb3JtT3Bl cmF0aW9uKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHR5ID0gY29udmVydFRvTGVuZ3Ro KGZpcnN0VmFsdWUsIG1fc3R5bGUsICZvayk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBlbHNl IHsgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdHggPSBjb252ZXJ0VG9MZW5ndGgoZmly c3RWYWx1ZSwgbV9zdHlsZSwgJm9rKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo dmFsLT5vcGVyYXRpb25UeXBlKCkgPT0gV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlRyYW5zbGF0 ZVRyYW5zZm9ybU9wZXJhdGlvbikgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAodmFsLT5sZW5ndGgoKSA+IDEpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBzZWNvbmRWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1p dGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDEpKTsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHR5ID0gY29udmVydFRvTGVuZ3RoKHNlY29uZFZhbHVl LCBtX3N0eWxlLCAmb2spOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoIW9rKQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICAgICAg ICAgIAotICAgICAgICAgICAgICAgICAgICAgICAgb3BlcmF0aW9ucy5hcHBlbmQoVHJhbnNsYXRl VHJhbnNmb3JtT3BlcmF0aW9uOjpjcmVhdGUodHgsIHR5KSk7Ci0gICAgICAgICAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICBj YXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpSb3RhdGVUcmFuc2Zvcm1PcGVyYXRpb246IHsK LSAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBhbmdsZSA9IGZpcnN0VmFsdWUtPmdldERv dWJsZVZhbHVlKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoZmlyc3RWYWx1ZS0+cHJp bWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUkFEKQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFuZ2xlID0gcmFkMmRlZyhhbmdsZSk7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBlbHNlIGlmIChmaXJzdFZhbHVlLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0 aXZlVmFsdWU6OkNTU19HUkFEKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFuZ2xlID0g Z3JhZDJkZWcoYW5nbGUpOwotICAgICAgICAgICAgICAgICAgICAgICAgb3BlcmF0aW9ucy5hcHBl bmQoUm90YXRlVHJhbnNmb3JtT3BlcmF0aW9uOjpjcmVhdGUoYW5nbGUpKTsKLSAgICAgICAgICAg ICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlNrZXdUcmFuc2Zvcm1PcGVyYXRp b246Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlNr ZXdYVHJhbnNmb3JtT3BlcmF0aW9uOgotICAgICAgICAgICAgICAgICAgICBjYXNlIFdlYktpdENT U1RyYW5zZm9ybVZhbHVlOjpTa2V3WVRyYW5zZm9ybU9wZXJhdGlvbjogewotICAgICAgICAgICAg ICAgICAgICAgICAgZG91YmxlIGFuZ2xlWCA9IDA7Ci0gICAgICAgICAgICAgICAgICAgICAgICBk b3VibGUgYW5nbGVZID0gMDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBhbmdsZSA9 IGZpcnN0VmFsdWUtPmdldERvdWJsZVZhbHVlKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBp ZiAoZmlyc3RWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1Nf UkFEKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFuZ2xlID0gcmFkMmRlZyhhbmdsZSk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChmaXJzdFZhbHVlLT5wcmltaXRpdmVU eXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19HUkFEKQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGFuZ2xlID0gZ3JhZDJkZWcoYW5nbGUpOwotICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKHZhbC0+b3BlcmF0aW9uVHlwZSgpID09IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpT a2V3WVRyYW5zZm9ybU9wZXJhdGlvbikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmds ZVkgPSBhbmdsZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFuZ2xlWCA9IGFuZ2xlOwotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlmICh2YWwtPm9wZXJhdGlvblR5cGUoKSA9PSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6 U2tld1RyYW5zZm9ybU9wZXJhdGlvbikgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAodmFsLT5sZW5ndGgoKSA+IDEpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBzZWNvbmRWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1By aW1pdGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDEpKTsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFuZ2xlWSA9IHNlY29uZFZhbHVlLT5nZXREb3Vi bGVWYWx1ZSgpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHNlY29u ZFZhbHVlLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19SQUQpCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5nbGVZID0gcmFkMmRlZyhh bmdsZSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChzZWNv bmRWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfR1JBRCkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZVkgPSBncmFkMmRl ZyhhbmdsZSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgICAgICAgICBvcGVyYXRpb25zLmFwcGVuZChTa2V3VHJhbnNmb3JtT3BlcmF0aW9uOjpj cmVhdGUoYW5nbGVYLCBhbmdsZVkpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NT VHJhbnNmb3JtVmFsdWU6Ok1hdHJpeFRyYW5zZm9ybU9wZXJhdGlvbjogewotICAgICAgICAgICAg ICAgICAgICAgICAgZG91YmxlIGEgPSBmaXJzdFZhbHVlLT5nZXREb3VibGVWYWx1ZSgpOwotICAg ICAgICAgICAgICAgICAgICAgICAgZG91YmxlIGIgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVW YWx1ZSo+KHZhbC0+aXRlbVdpdGhvdXRCb3VuZHNDaGVjaygxKSktPmdldERvdWJsZVZhbHVlKCk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBkb3VibGUgYyA9IHN0YXRpY19jYXN0PENTU1ByaW1p dGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDIpKS0+Z2V0RG91YmxlVmFs dWUoKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBkID0gc3RhdGljX2Nhc3Q8Q1NT UHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMykpLT5nZXREb3Vi bGVWYWx1ZSgpOwotICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIGUgPSBzdGF0aWNfY2Fz dDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZhbC0+aXRlbVdpdGhvdXRCb3VuZHNDaGVjayg0KSktPmdl dERvdWJsZVZhbHVlKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBkb3VibGUgZiA9IHN0YXRp Y19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDUp KS0+Z2V0RG91YmxlVmFsdWUoKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIG9wZXJhdGlvbnMu YXBwZW5kKE1hdHJpeFRyYW5zZm9ybU9wZXJhdGlvbjo6Y3JlYXRlKGEsIGIsIGMsIGQsIGUsIGYp KTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICB9 ICAgCi0gICAgICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlVu a25vd25UcmFuc2Zvcm1PcGVyYXRpb246Ci0gICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIH0KLSAgICAgICAgfQorICAgICAgICBjcmVhdGVUcmFuc2Zv cm1PcGVyYXRpb25zKHZhbHVlLCBtX3N0eWxlLCBvcGVyYXRpb25zKTsKICAgICAgICAgbV9zdHls ZS0+c2V0VHJhbnNmb3JtKG9wZXJhdGlvbnMpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAt NTY3OCw0ICs1NTczLDExNSBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OlNlbGVjdG9yQ2hlY2tl cjo6dmlzaXRlZFN0YXRlQ2hhbmdlZCh1bnNpZ25lZCB2aXNpdGVkSGFzaAogICAgIH0KIH0KIAor Ym9vbCBDU1NTdHlsZVNlbGVjdG9yOjpjcmVhdGVUcmFuc2Zvcm1PcGVyYXRpb25zKENTU1ZhbHVl KiB2YWx1ZSwgUmVuZGVyU3R5bGUqIHN0eWxlLCBUcmFuc2Zvcm1PcGVyYXRpb25zJiBvcGVyYXRp b25zKQoreworICAgIGlmICh2YWx1ZSAmJiAhdmFsdWUtPmlzUHJpbWl0aXZlVmFsdWUoKSkgewor ICAgICAgICBDU1NWYWx1ZUxpc3QqIGxpc3QgPSBzdGF0aWNfY2FzdDxDU1NWYWx1ZUxpc3QqPih2 YWx1ZSk7CisgICAgICAgIHVuc2lnbmVkIHNpemUgPSBsaXN0LT5sZW5ndGgoKTsKKyAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHNpemU7IGkrKykgeworICAgICAgICAgICAgV2ViS2l0 Q1NTVHJhbnNmb3JtVmFsdWUqIHZhbCA9IHN0YXRpY19jYXN0PFdlYktpdENTU1RyYW5zZm9ybVZh bHVlKj4obGlzdC0+aXRlbVdpdGhvdXRCb3VuZHNDaGVjayhpKSk7CisgICAgICAgICAgICAKKyAg ICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBmaXJzdFZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NT UHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMCkpOworICAgICAg ICAgICAgCisgICAgICAgICAgICBzd2l0Y2ggKHZhbC0+b3BlcmF0aW9uVHlwZSgpKSB7CisgICAg ICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6U2NhbGVUcmFuc2Zvcm1P cGVyYXRpb246CisgICAgICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6 U2NhbGVYVHJhbnNmb3JtT3BlcmF0aW9uOgorICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NT VHJhbnNmb3JtVmFsdWU6OlNjYWxlWVRyYW5zZm9ybU9wZXJhdGlvbjogeworICAgICAgICAgICAg ICAgICAgICBkb3VibGUgc3ggPSAxLjA7CisgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBzeSA9 IDEuMDsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+b3BlcmF0aW9uVHlwZSgpID09IFdl YktpdENTU1RyYW5zZm9ybVZhbHVlOjpTY2FsZVlUcmFuc2Zvcm1PcGVyYXRpb24pCisgICAgICAg ICAgICAgICAgICAgICAgICBzeSA9IGZpcnN0VmFsdWUtPmdldERvdWJsZVZhbHVlKCk7CisgICAg ICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgc3ggPSBmaXJz dFZhbHVlLT5nZXREb3VibGVWYWx1ZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHZh bC0+b3BlcmF0aW9uVHlwZSgpID09IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTY2FsZVRyYW5z Zm9ybU9wZXJhdGlvbikgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh2YWwtPmxl bmd0aCgpID4gMSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQcmltaXRp dmVWYWx1ZSogc2Vjb25kVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZh bC0+aXRlbVdpdGhvdXRCb3VuZHNDaGVjaygxKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHN5ID0gc2Vjb25kVmFsdWUtPmdldERvdWJsZVZhbHVlKCk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN5 ID0gc3g7CisgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAgICAgICAgb3BlcmF0aW9ucy5hcHBlbmQoU2NhbGVUcmFuc2Zvcm1PcGVy YXRpb246OmNyZWF0ZShzeCwgc3kpKTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3JtVmFs dWU6OlRyYW5zbGF0ZVRyYW5zZm9ybU9wZXJhdGlvbjoKKyAgICAgICAgICAgICAgICBjYXNlIFdl YktpdENTU1RyYW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVYVHJhbnNmb3JtT3BlcmF0aW9uOgorICAg ICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlRyYW5zbGF0ZVlUcmFu c2Zvcm1PcGVyYXRpb246IHsKKyAgICAgICAgICAgICAgICAgICAgYm9vbCBvayA9IHRydWU7Cisg ICAgICAgICAgICAgICAgICAgIExlbmd0aCB0eCA9IExlbmd0aCgwLCBGaXhlZCk7CisgICAgICAg ICAgICAgICAgICAgIExlbmd0aCB0eSA9IExlbmd0aCgwLCBGaXhlZCk7CisgICAgICAgICAgICAg ICAgICAgIGlmICh2YWwtPm9wZXJhdGlvblR5cGUoKSA9PSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1 ZTo6VHJhbnNsYXRlWVRyYW5zZm9ybU9wZXJhdGlvbikKKyAgICAgICAgICAgICAgICAgICAgICAg IHR5ID0gY29udmVydFRvTGVuZ3RoKGZpcnN0VmFsdWUsIHN0eWxlLCAmb2spOworICAgICAgICAg ICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHR4ID0gY29udmVydFRv TGVuZ3RoKGZpcnN0VmFsdWUsIHN0eWxlLCAmb2spOworICAgICAgICAgICAgICAgICAgICAgICAg aWYgKHZhbC0+b3BlcmF0aW9uVHlwZSgpID09IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpUcmFu c2xhdGVUcmFuc2Zvcm1PcGVyYXRpb24pIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAodmFsLT5sZW5ndGgoKSA+IDEpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Q1NTUHJpbWl0aXZlVmFsdWUqIHNlY29uZFZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZl VmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMSkpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0eSA9IGNvbnZlcnRUb0xlbmd0aChzZWNvbmRWYWx1ZSwgc3R5bGUs ICZvayk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIAorICAg ICAgICAgICAgICAgICAgICBpZiAoIW9rKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgb3BlcmF0 aW9ucy5hcHBlbmQoVHJhbnNsYXRlVHJhbnNmb3JtT3BlcmF0aW9uOjpjcmVhdGUodHgsIHR5KSk7 CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpSb3RhdGVUcmFuc2Zvcm1PcGVy YXRpb246IHsKKyAgICAgICAgICAgICAgICAgICAgZG91YmxlIGFuZ2xlID0gZmlyc3RWYWx1ZS0+ Z2V0RG91YmxlVmFsdWUoKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGZpcnN0VmFsdWUtPnBy aW1pdGl2ZVR5cGUoKSA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1JBRCkKKyAgICAgICAgICAg ICAgICAgICAgICAgIGFuZ2xlID0gcmFkMmRlZyhhbmdsZSk7CisgICAgICAgICAgICAgICAgICAg IGVsc2UgaWYgKGZpcnN0VmFsdWUtPnByaW1pdGl2ZVR5cGUoKSA9PSBDU1NQcmltaXRpdmVWYWx1 ZTo6Q1NTX0dSQUQpCisgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZSA9IGdyYWQyZGVnKGFu Z2xlKTsKKyAgICAgICAgICAgICAgICAgICAgb3BlcmF0aW9ucy5hcHBlbmQoUm90YXRlVHJhbnNm b3JtT3BlcmF0aW9uOjpjcmVhdGUoYW5nbGUpKTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNm b3JtVmFsdWU6OlNrZXdUcmFuc2Zvcm1PcGVyYXRpb246CisgICAgICAgICAgICAgICAgY2FzZSBX ZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6U2tld1hUcmFuc2Zvcm1PcGVyYXRpb246CisgICAgICAg ICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6U2tld1lUcmFuc2Zvcm1PcGVy YXRpb246IHsKKyAgICAgICAgICAgICAgICAgICAgZG91YmxlIGFuZ2xlWCA9IDA7CisgICAgICAg ICAgICAgICAgICAgIGRvdWJsZSBhbmdsZVkgPSAwOworICAgICAgICAgICAgICAgICAgICBkb3Vi bGUgYW5nbGUgPSBmaXJzdFZhbHVlLT5nZXREb3VibGVWYWx1ZSgpOworICAgICAgICAgICAgICAg ICAgICBpZiAoZmlyc3RWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVl OjpDU1NfUkFEKQorICAgICAgICAgICAgICAgICAgICAgICAgYW5nbGUgPSByYWQyZGVnKGFuZ2xl KTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAoZmlyc3RWYWx1ZS0+cHJpbWl0aXZlVHlw ZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfR1JBRCkKKyAgICAgICAgICAgICAgICAgICAg ICAgIGFuZ2xlID0gZ3JhZDJkZWcoYW5nbGUpOworICAgICAgICAgICAgICAgICAgICBpZiAodmFs LT5vcGVyYXRpb25UeXBlKCkgPT0gV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlNrZXdZVHJhbnNm b3JtT3BlcmF0aW9uKQorICAgICAgICAgICAgICAgICAgICAgICAgYW5nbGVZID0gYW5nbGU7Cisg ICAgICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgYW5nbGVY ID0gYW5nbGU7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAodmFsLT5vcGVyYXRpb25UeXBl KCkgPT0gV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlNrZXdUcmFuc2Zvcm1PcGVyYXRpb24pIHsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAodmFsLT5sZW5ndGgoKSA+IDEpIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHNlY29uZFZh bHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91 bmRzQ2hlY2soMSkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZVkgPSBz ZWNvbmRWYWx1ZS0+Z2V0RG91YmxlVmFsdWUoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKHNlY29uZFZhbHVlLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFs dWU6OkNTU19SQUQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZVkg PSByYWQyZGVnKGFuZ2xlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSBp ZiAoc2Vjb25kVmFsdWUtPnByaW1pdGl2ZVR5cGUoKSA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NT X0dSQUQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZVkgPSBncmFk MmRlZyhhbmdsZSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAg IG9wZXJhdGlvbnMuYXBwZW5kKFNrZXdUcmFuc2Zvcm1PcGVyYXRpb246OmNyZWF0ZShhbmdsZVgs IGFuZ2xlWSkpOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6TWF0cml4VHJh bnNmb3JtT3BlcmF0aW9uOiB7CisgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBhID0gZmlyc3RW YWx1ZS0+Z2V0RG91YmxlVmFsdWUoKTsKKyAgICAgICAgICAgICAgICAgICAgZG91YmxlIGIgPSBz dGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZhbC0+aXRlbVdpdGhvdXRCb3VuZHNDaGVj aygxKSktPmdldERvdWJsZVZhbHVlKCk7CisgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBjID0g c3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hl Y2soMikpLT5nZXREb3VibGVWYWx1ZSgpOworICAgICAgICAgICAgICAgICAgICBkb3VibGUgZCA9 IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0No ZWNrKDMpKS0+Z2V0RG91YmxlVmFsdWUoKTsKKyAgICAgICAgICAgICAgICAgICAgZG91YmxlIGUg PSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZhbC0+aXRlbVdpdGhvdXRCb3VuZHND aGVjayg0KSktPmdldERvdWJsZVZhbHVlKCk7CisgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBm ID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRz Q2hlY2soNSkpLT5nZXREb3VibGVWYWx1ZSgpOworICAgICAgICAgICAgICAgICAgICBvcGVyYXRp b25zLmFwcGVuZChNYXRyaXhUcmFuc2Zvcm1PcGVyYXRpb246OmNyZWF0ZShhLCBiLCBjLCBkLCBl LCBmKSk7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpVbmtub3duVHJhbnNm b3JtT3BlcmF0aW9uOgorICAgICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK KyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAg ICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaCBiL1dlYkNvcmUvY3NzL0NTU1N0 eWxlU2VsZWN0b3IuaAppbmRleCBlMmZkMWUwLi4xMTE0YjFjIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKKysrIGIvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5oCkBAIC0xNTAsNiArMTUwLDggQEAgcHVibGljOgogICAgICAgICB9CiAKICAgICAgICAgdm9p ZCBhZGRLZXlmcmFtZVN0eWxlKERvY3VtZW50KiBkb2MsIGNvbnN0IFdlYktpdENTU0tleWZyYW1l c1J1bGUqIHJ1bGUpOworICAgICAgICAKKyAgICAgICAgc3RhdGljIGJvb2wgY3JlYXRlVHJhbnNm b3JtT3BlcmF0aW9ucyhDU1NWYWx1ZSogdmFsdWUsIFJlbmRlclN0eWxlKiBzdHlsZSwgVHJhbnNm b3JtT3BlcmF0aW9ucyYgb3BlcmF0aW9ucyk7CiAKICAgICBwcml2YXRlOgogICAgICAgICBlbnVt IFNlbGVjdG9yTWF0Y2ggeyBTZWxlY3Rvck1hdGNoZXMsIFNlbGVjdG9yRmFpbHNMb2NhbGx5LCBT ZWxlY3RvckZhaWxzQ29tcGxldGVseSB9Owo= 23332 2008-09-10 15:48:33 -0700 2008-09-11 15:40:06 -0700 updated with changelog refactor.patch text/plain 14937 dino ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTgyN2NmZC4uYTBhNjY4ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOC0wOS0xMCAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZCisKKyAgICAg ICAgUmVmYWN0b3IgQ1NTU3R5bGVTZWxlY3RvciB0cmFuc2Zvcm0gcGFyc2luZyBjb2RlLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3NTgKKworICAg ICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmgKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAKKwogMjAwOC0wOS0xMCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CmluZGV4IDU1MGI5YzIuLjZkNTFhYTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC00 NzYwLDExMiArNDc2MCw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShp bnQgaWQsIENTU1ZhbHVlICp2YWx1ZSkKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VHJhbnNm b3JtOiB7CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKHRyYW5zZm9ybSwgVHJh bnNmb3JtKTsKICAgICAgICAgVHJhbnNmb3JtT3BlcmF0aW9ucyBvcGVyYXRpb25zOwotICAgICAg ICBpZiAoIXZhbHVlLT5pc1ByaW1pdGl2ZVZhbHVlKCkpIHsKLSAgICAgICAgICAgIENTU1ZhbHVl TGlzdCogbGlzdCA9IHN0YXRpY19jYXN0PENTU1ZhbHVlTGlzdCo+KHZhbHVlKTsKLSAgICAgICAg ICAgIHVuc2lnbmVkIHNpemUgPSBsaXN0LT5sZW5ndGgoKTsKLSAgICAgICAgICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBzaXplOyBpKyspIHsKLSAgICAgICAgICAgICAgICBXZWJLaXRDU1NU cmFuc2Zvcm1WYWx1ZSogdmFsID0gc3RhdGljX2Nhc3Q8V2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWUq PihsaXN0LT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKGkpKTsKLSAgICAgICAgICAgICAgICAKLSAg ICAgICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSogZmlyc3RWYWx1ZSA9IHN0YXRpY19jYXN0 PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDApKTsKLSAg ICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgc3dpdGNoICh2YWwtPm9wZXJhdGlvblR5 cGUoKSkgewotICAgICAgICAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVl OjpTY2FsZVRyYW5zZm9ybU9wZXJhdGlvbjoKLSAgICAgICAgICAgICAgICAgICAgY2FzZSBXZWJL aXRDU1NUcmFuc2Zvcm1WYWx1ZTo6U2NhbGVYVHJhbnNmb3JtT3BlcmF0aW9uOgotICAgICAgICAg ICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTY2FsZVlUcmFuc2Zvcm1P cGVyYXRpb246IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBzeCA9IDEuMDsKLSAg ICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBzeSA9IDEuMDsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGlmICh2YWwtPm9wZXJhdGlvblR5cGUoKSA9PSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1 ZTo6U2NhbGVZVHJhbnNmb3JtT3BlcmF0aW9uKQotICAgICAgICAgICAgICAgICAgICAgICAgICAg IHN5ID0gZmlyc3RWYWx1ZS0+Z2V0RG91YmxlVmFsdWUoKTsKLSAgICAgICAgICAgICAgICAgICAg ICAgIGVsc2UgeyAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeCA9IGZpcnN0VmFsdWUt PmdldERvdWJsZVZhbHVlKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+ b3BlcmF0aW9uVHlwZSgpID09IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTY2FsZVRyYW5zZm9y bU9wZXJhdGlvbikgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAodmFsLT5s ZW5ndGgoKSA+IDEpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1By aW1pdGl2ZVZhbHVlKiBzZWNvbmRWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVl Kj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDEpKTsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN5ID0gc2Vjb25kVmFsdWUtPmdldERvdWJsZVZhbHVlKCk7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSAKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN5ID0gc3g7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgb3BlcmF0 aW9ucy5hcHBlbmQoU2NhbGVUcmFuc2Zvcm1PcGVyYXRpb246OmNyZWF0ZShzeCwgc3kpKTsKLSAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlRyYW5zbGF0ZVRy YW5zZm9ybU9wZXJhdGlvbjoKLSAgICAgICAgICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFu c2Zvcm1WYWx1ZTo6VHJhbnNsYXRlWFRyYW5zZm9ybU9wZXJhdGlvbjoKLSAgICAgICAgICAgICAg ICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6VHJhbnNsYXRlWVRyYW5zZm9ybU9w ZXJhdGlvbjogewotICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBvayA9IHRydWU7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBMZW5ndGggdHggPSBMZW5ndGgoMCwgRml4ZWQpOwotICAgICAg ICAgICAgICAgICAgICAgICAgTGVuZ3RoIHR5ID0gTGVuZ3RoKDAsIEZpeGVkKTsKLSAgICAgICAg ICAgICAgICAgICAgICAgIGlmICh2YWwtPm9wZXJhdGlvblR5cGUoKSA9PSBXZWJLaXRDU1NUcmFu c2Zvcm1WYWx1ZTo6VHJhbnNsYXRlWVRyYW5zZm9ybU9wZXJhdGlvbikKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICB0eSA9IGNvbnZlcnRUb0xlbmd0aChmaXJzdFZhbHVlLCBtX3N0eWxlLCAm b2spOwotICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSB7IAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHR4ID0gY29udmVydFRvTGVuZ3RoKGZpcnN0VmFsdWUsIG1fc3R5bGUsICZvayk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+b3BlcmF0aW9uVHlwZSgpID09 IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVUcmFuc2Zvcm1PcGVyYXRpb24pIHsK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+bGVuZ3RoKCkgPiAxKSB7 Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSog c2Vjb25kVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZhbC0+aXRlbVdp dGhvdXRCb3VuZHNDaGVjaygxKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0eSA9IGNvbnZlcnRUb0xlbmd0aChzZWNvbmRWYWx1ZSwgbV9zdHlsZSwgJm9rKTsKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgICAg IH0KLSAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgICAgIAot ICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFvaykKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICAg ICAgICAgIG9wZXJhdGlvbnMuYXBwZW5kKFRyYW5zbGF0ZVRyYW5zZm9ybU9wZXJhdGlvbjo6Y3Jl YXRlKHR4LCB0eSkpOwotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1W YWx1ZTo6Um90YXRlVHJhbnNmb3JtT3BlcmF0aW9uOiB7Ci0gICAgICAgICAgICAgICAgICAgICAg ICBkb3VibGUgYW5nbGUgPSBmaXJzdFZhbHVlLT5nZXREb3VibGVWYWx1ZSgpOwotICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKGZpcnN0VmFsdWUtPnByaW1pdGl2ZVR5cGUoKSA9PSBDU1NQcmlt aXRpdmVWYWx1ZTo6Q1NTX1JBRCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZSA9 IHJhZDJkZWcoYW5nbGUpOwotICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAoZmlyc3RW YWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfR1JBRCkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZSA9IGdyYWQyZGVnKGFuZ2xlKTsKLSAgICAg ICAgICAgICAgICAgICAgICAgIG9wZXJhdGlvbnMuYXBwZW5kKFJvdGF0ZVRyYW5zZm9ybU9wZXJh dGlvbjo6Y3JlYXRlKGFuZ2xlKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1Ry YW5zZm9ybVZhbHVlOjpTa2V3VHJhbnNmb3JtT3BlcmF0aW9uOgotICAgICAgICAgICAgICAgICAg ICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTa2V3WFRyYW5zZm9ybU9wZXJhdGlvbjoK LSAgICAgICAgICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6U2tld1lU cmFuc2Zvcm1PcGVyYXRpb246IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBhbmds ZVggPSAwOwotICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIGFuZ2xlWSA9IDA7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBkb3VibGUgYW5nbGUgPSBmaXJzdFZhbHVlLT5nZXREb3VibGVW YWx1ZSgpOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGZpcnN0VmFsdWUtPnByaW1pdGl2 ZVR5cGUoKSA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1JBRCkKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICBhbmdsZSA9IHJhZDJkZWcoYW5nbGUpOwotICAgICAgICAgICAgICAgICAgICAg ICAgZWxzZSBpZiAoZmlyc3RWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfR1JBRCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZSA9IGdyYWQy ZGVnKGFuZ2xlKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmICh2YWwtPm9wZXJhdGlvblR5 cGUoKSA9PSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6U2tld1lUcmFuc2Zvcm1PcGVyYXRpb24p Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5nbGVZID0gYW5nbGU7Ci0gICAgICAgICAg ICAgICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZVgg PSBhbmdsZTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAodmFsLT5vcGVyYXRpb25U eXBlKCkgPT0gV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlNrZXdUcmFuc2Zvcm1PcGVyYXRpb24p IHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+bGVuZ3RoKCkgPiAx KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1 ZSogc2Vjb25kVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZhbC0+aXRl bVdpdGhvdXRCb3VuZHNDaGVjaygxKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBhbmdsZVkgPSBzZWNvbmRWYWx1ZS0+Z2V0RG91YmxlVmFsdWUoKTsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzZWNvbmRWYWx1ZS0+cHJpbWl0aXZlVHlwZSgp ID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUkFEKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFuZ2xlWSA9IHJhZDJkZWcoYW5nbGUpOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAoc2Vjb25kVmFsdWUtPnByaW1pdGl2ZVR5cGUo KSA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX0dSQUQpCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYW5nbGVZID0gZ3JhZDJkZWcoYW5nbGUpOwotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgb3BlcmF0aW9u cy5hcHBlbmQoU2tld1RyYW5zZm9ybU9wZXJhdGlvbjo6Y3JlYXRlKGFuZ2xlWCwgYW5nbGVZKSk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpNYXRyaXhU cmFuc2Zvcm1PcGVyYXRpb246IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBhID0g Zmlyc3RWYWx1ZS0+Z2V0RG91YmxlVmFsdWUoKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRv dWJsZSBiID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0 Qm91bmRzQ2hlY2soMSkpLT5nZXREb3VibGVWYWx1ZSgpOwotICAgICAgICAgICAgICAgICAgICAg ICAgZG91YmxlIGMgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHZhbC0+aXRlbVdp dGhvdXRCb3VuZHNDaGVjaygyKSktPmdldERvdWJsZVZhbHVlKCk7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBkb3VibGUgZCA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsLT5p dGVtV2l0aG91dEJvdW5kc0NoZWNrKDMpKS0+Z2V0RG91YmxlVmFsdWUoKTsKLSAgICAgICAgICAg ICAgICAgICAgICAgIGRvdWJsZSBlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2 YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soNCkpLT5nZXREb3VibGVWYWx1ZSgpOwotICAgICAg ICAgICAgICAgICAgICAgICAgZG91YmxlIGYgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1 ZSo+KHZhbC0+aXRlbVdpdGhvdXRCb3VuZHNDaGVjayg1KSktPmdldERvdWJsZVZhbHVlKCk7Ci0g ICAgICAgICAgICAgICAgICAgICAgICBvcGVyYXRpb25zLmFwcGVuZChNYXRyaXhUcmFuc2Zvcm1P cGVyYXRpb246OmNyZWF0ZShhLCBiLCBjLCBkLCBlLCBmKSk7Ci0gICAgICAgICAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgfSAgIAotICAgICAgICAgICAgICAgICAg ICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpVbmtub3duVHJhbnNmb3JtT3BlcmF0aW9u OgotICAgICAgICAgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9 Ci0gICAgICAgIH0KKyAgICAgICAgY3JlYXRlVHJhbnNmb3JtT3BlcmF0aW9ucyh2YWx1ZSwgbV9z dHlsZSwgb3BlcmF0aW9ucyk7CiAgICAgICAgIG1fc3R5bGUtPnNldFRyYW5zZm9ybShvcGVyYXRp b25zKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTU2NzgsNCArNTU3MywxMTUgQEAgdm9p ZCBDU1NTdHlsZVNlbGVjdG9yOjpTZWxlY3RvckNoZWNrZXI6OnZpc2l0ZWRTdGF0ZUNoYW5nZWQo dW5zaWduZWQgdmlzaXRlZEhhc2gKICAgICB9CiB9CiAKK2Jvb2wgQ1NTU3R5bGVTZWxlY3Rvcjo6 Y3JlYXRlVHJhbnNmb3JtT3BlcmF0aW9ucyhDU1NWYWx1ZSogdmFsdWUsIFJlbmRlclN0eWxlKiBz dHlsZSwgVHJhbnNmb3JtT3BlcmF0aW9ucyYgb3BlcmF0aW9ucykKK3sKKyAgICBpZiAodmFsdWUg JiYgIXZhbHVlLT5pc1ByaW1pdGl2ZVZhbHVlKCkpIHsKKyAgICAgICAgQ1NTVmFsdWVMaXN0KiBs aXN0ID0gc3RhdGljX2Nhc3Q8Q1NTVmFsdWVMaXN0Kj4odmFsdWUpOworICAgICAgICB1bnNpZ25l ZCBzaXplID0gbGlzdC0+bGVuZ3RoKCk7CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCBzaXplOyBpKyspIHsKKyAgICAgICAgICAgIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlKiB2YWwg PSBzdGF0aWNfY2FzdDxXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZSo+KGxpc3QtPml0ZW1XaXRob3V0 Qm91bmRzQ2hlY2soaSkpOworICAgICAgICAgICAgCisgICAgICAgICAgICBDU1NQcmltaXRpdmVW YWx1ZSogZmlyc3RWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsLT5p dGVtV2l0aG91dEJvdW5kc0NoZWNrKDApKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgc3dp dGNoICh2YWwtPm9wZXJhdGlvblR5cGUoKSkgeworICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0 Q1NTVHJhbnNmb3JtVmFsdWU6OlNjYWxlVHJhbnNmb3JtT3BlcmF0aW9uOgorICAgICAgICAgICAg ICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlNjYWxlWFRyYW5zZm9ybU9wZXJhdGlv bjoKKyAgICAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTY2FsZVlU cmFuc2Zvcm1PcGVyYXRpb246IHsKKyAgICAgICAgICAgICAgICAgICAgZG91YmxlIHN4ID0gMS4w OworICAgICAgICAgICAgICAgICAgICBkb3VibGUgc3kgPSAxLjA7CisgICAgICAgICAgICAgICAg ICAgIGlmICh2YWwtPm9wZXJhdGlvblR5cGUoKSA9PSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6 U2NhbGVZVHJhbnNmb3JtT3BlcmF0aW9uKQorICAgICAgICAgICAgICAgICAgICAgICAgc3kgPSBm aXJzdFZhbHVlLT5nZXREb3VibGVWYWx1ZSgpOworICAgICAgICAgICAgICAgICAgICBlbHNlIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIHN4ID0gZmlyc3RWYWx1ZS0+Z2V0RG91YmxlVmFsdWUo KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICh2YWwtPm9wZXJhdGlvblR5cGUoKSA9PSBX ZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6U2NhbGVUcmFuc2Zvcm1PcGVyYXRpb24pIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpZiAodmFsLT5sZW5ndGgoKSA+IDEpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHNlY29uZFZhbHVlID0g c3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hl Y2soMSkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeSA9IHNlY29uZFZhbHVl LT5nZXREb3VibGVWYWx1ZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeSA9IHN4OworICAgICAgICAgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIG9w ZXJhdGlvbnMuYXBwZW5kKFNjYWxlVHJhbnNmb3JtT3BlcmF0aW9uOjpjcmVhdGUoc3gsIHN5KSk7 CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVUcmFuc2Zvcm1P cGVyYXRpb246CisgICAgICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6 VHJhbnNsYXRlWFRyYW5zZm9ybU9wZXJhdGlvbjoKKyAgICAgICAgICAgICAgICBjYXNlIFdlYktp dENTU1RyYW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVZVHJhbnNmb3JtT3BlcmF0aW9uOiB7CisgICAg ICAgICAgICAgICAgICAgIGJvb2wgb2sgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBMZW5n dGggdHggPSBMZW5ndGgoMCwgRml4ZWQpOworICAgICAgICAgICAgICAgICAgICBMZW5ndGggdHkg PSBMZW5ndGgoMCwgRml4ZWQpOworICAgICAgICAgICAgICAgICAgICBpZiAodmFsLT5vcGVyYXRp b25UeXBlKCkgPT0gV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlRyYW5zbGF0ZVlUcmFuc2Zvcm1P cGVyYXRpb24pCisgICAgICAgICAgICAgICAgICAgICAgICB0eSA9IGNvbnZlcnRUb0xlbmd0aChm aXJzdFZhbHVlLCBzdHlsZSwgJm9rKTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZSB7CisgICAg ICAgICAgICAgICAgICAgICAgICB0eCA9IGNvbnZlcnRUb0xlbmd0aChmaXJzdFZhbHVlLCBzdHls ZSwgJm9rKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICh2YWwtPm9wZXJhdGlvblR5cGUo KSA9PSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6VHJhbnNsYXRlVHJhbnNmb3JtT3BlcmF0aW9u KSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+bGVuZ3RoKCkgPiAxKSB7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBzZWNv bmRWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91 dEJvdW5kc0NoZWNrKDEpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHkgPSBj b252ZXJ0VG9MZW5ndGgoc2Vjb25kVmFsdWUsIHN0eWxlLCAmb2spOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFv aykKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAg ICAgICAgCisgICAgICAgICAgICAgICAgICAgIG9wZXJhdGlvbnMuYXBwZW5kKFRyYW5zbGF0ZVRy YW5zZm9ybU9wZXJhdGlvbjo6Y3JlYXRlKHR4LCB0eSkpOworICAgICAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NU cmFuc2Zvcm1WYWx1ZTo6Um90YXRlVHJhbnNmb3JtT3BlcmF0aW9uOiB7CisgICAgICAgICAgICAg ICAgICAgIGRvdWJsZSBhbmdsZSA9IGZpcnN0VmFsdWUtPmdldERvdWJsZVZhbHVlKCk7CisgICAg ICAgICAgICAgICAgICAgIGlmIChmaXJzdFZhbHVlLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19SQUQpCisgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZSA9IHJh ZDJkZWcoYW5nbGUpOworICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChmaXJzdFZhbHVlLT5w cmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19HUkFEKQorICAgICAgICAg ICAgICAgICAgICAgICAgYW5nbGUgPSBncmFkMmRlZyhhbmdsZSk7CisgICAgICAgICAgICAgICAg ICAgIG9wZXJhdGlvbnMuYXBwZW5kKFJvdGF0ZVRyYW5zZm9ybU9wZXJhdGlvbjo6Y3JlYXRlKGFu Z2xlKSk7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTa2V3VHJhbnNmb3Jt T3BlcmF0aW9uOgorICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6 OlNrZXdYVHJhbnNmb3JtT3BlcmF0aW9uOgorICAgICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NT VHJhbnNmb3JtVmFsdWU6OlNrZXdZVHJhbnNmb3JtT3BlcmF0aW9uOiB7CisgICAgICAgICAgICAg ICAgICAgIGRvdWJsZSBhbmdsZVggPSAwOworICAgICAgICAgICAgICAgICAgICBkb3VibGUgYW5n bGVZID0gMDsKKyAgICAgICAgICAgICAgICAgICAgZG91YmxlIGFuZ2xlID0gZmlyc3RWYWx1ZS0+ Z2V0RG91YmxlVmFsdWUoKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGZpcnN0VmFsdWUtPnBy aW1pdGl2ZVR5cGUoKSA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1JBRCkKKyAgICAgICAgICAg ICAgICAgICAgICAgIGFuZ2xlID0gcmFkMmRlZyhhbmdsZSk7CisgICAgICAgICAgICAgICAgICAg IGVsc2UgaWYgKGZpcnN0VmFsdWUtPnByaW1pdGl2ZVR5cGUoKSA9PSBDU1NQcmltaXRpdmVWYWx1 ZTo6Q1NTX0dSQUQpCisgICAgICAgICAgICAgICAgICAgICAgICBhbmdsZSA9IGdyYWQyZGVnKGFu Z2xlKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZhbC0+b3BlcmF0aW9uVHlwZSgpID09IFdl YktpdENTU1RyYW5zZm9ybVZhbHVlOjpTa2V3WVRyYW5zZm9ybU9wZXJhdGlvbikKKyAgICAgICAg ICAgICAgICAgICAgICAgIGFuZ2xlWSA9IGFuZ2xlOworICAgICAgICAgICAgICAgICAgICBlbHNl IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGFuZ2xlWCA9IGFuZ2xlOworICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKHZhbC0+b3BlcmF0aW9uVHlwZSgpID09IFdlYktpdENTU1RyYW5zZm9y bVZhbHVlOjpTa2V3VHJhbnNmb3JtT3BlcmF0aW9uKSB7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKHZhbC0+bGVuZ3RoKCkgPiAxKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBzZWNvbmRWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1By aW1pdGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDEpKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYW5nbGVZID0gc2Vjb25kVmFsdWUtPmdldERvdWJsZVZh bHVlKCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzZWNvbmRWYWx1ZS0+ cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUkFEKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5nbGVZID0gcmFkMmRlZyhhbmdsZSk7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHNlY29uZFZhbHVlLT5wcmltaXRp dmVUeXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19HUkFEKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYW5nbGVZID0gZ3JhZDJkZWcoYW5nbGUpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBvcGVyYXRpb25zLmFwcGVuZChTa2V3 VHJhbnNmb3JtT3BlcmF0aW9uOjpjcmVhdGUoYW5nbGVYLCBhbmdsZVkpKTsKKyAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGNhc2Ug V2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6Ok1hdHJpeFRyYW5zZm9ybU9wZXJhdGlvbjogeworICAg ICAgICAgICAgICAgICAgICBkb3VibGUgYSA9IGZpcnN0VmFsdWUtPmdldERvdWJsZVZhbHVlKCk7 CisgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBiID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZl VmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMSkpLT5nZXREb3VibGVWYWx1ZSgp OworICAgICAgICAgICAgICAgICAgICBkb3VibGUgYyA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2 ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDIpKS0+Z2V0RG91YmxlVmFsdWUo KTsKKyAgICAgICAgICAgICAgICAgICAgZG91YmxlIGQgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRp dmVWYWx1ZSo+KHZhbC0+aXRlbVdpdGhvdXRCb3VuZHNDaGVjaygzKSktPmdldERvdWJsZVZhbHVl KCk7CisgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0 aXZlVmFsdWUqPih2YWwtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soNCkpLT5nZXREb3VibGVWYWx1 ZSgpOworICAgICAgICAgICAgICAgICAgICBkb3VibGUgZiA9IHN0YXRpY19jYXN0PENTU1ByaW1p dGl2ZVZhbHVlKj4odmFsLT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDUpKS0+Z2V0RG91YmxlVmFs dWUoKTsKKyAgICAgICAgICAgICAgICAgICAgb3BlcmF0aW9ucy5hcHBlbmQoTWF0cml4VHJhbnNm b3JtT3BlcmF0aW9uOjpjcmVhdGUoYSwgYiwgYywgZCwgZSwgZikpOworICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgY2FzZSBXZWJL aXRDU1NUcmFuc2Zvcm1WYWx1ZTo6VW5rbm93blRyYW5zZm9ybU9wZXJhdGlvbjoKKyAgICAgICAg ICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorICAgIHJldHVybiB0cnVlOwor fQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNlbGVjdG9yLmggYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKaW5kZXggZTJm ZDFlMC4uMTExNGIxYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5o CisrKyBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaApAQCAtMTUwLDYgKzE1MCw4IEBA IHB1YmxpYzoKICAgICAgICAgfQogCiAgICAgICAgIHZvaWQgYWRkS2V5ZnJhbWVTdHlsZShEb2N1 bWVudCogZG9jLCBjb25zdCBXZWJLaXRDU1NLZXlmcmFtZXNSdWxlKiBydWxlKTsKKyAgICAgICAg CisgICAgICAgIHN0YXRpYyBib29sIGNyZWF0ZVRyYW5zZm9ybU9wZXJhdGlvbnMoQ1NTVmFsdWUq IHZhbHVlLCBSZW5kZXJTdHlsZSogc3R5bGUsIFRyYW5zZm9ybU9wZXJhdGlvbnMmIG9wZXJhdGlv bnMpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgZW51bSBTZWxlY3Rvck1hdGNoIHsgU2VsZWN0 b3JNYXRjaGVzLCBTZWxlY3RvckZhaWxzTG9jYWxseSwgU2VsZWN0b3JGYWlsc0NvbXBsZXRlbHkg fTsK