51931 2011-01-05 10:07:04 -0800 Keep track of active text substitution preferences 2011-01-05 10:28:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 329624 0 andersca 2011-01-05 10:07:04 -0800 Keep track of active text substitution preferences 329626 1 78013 andersca 2011-01-05 10:10:05 -0800 Created attachment 78013 Patch 329633 2 78013 mitz 2011-01-05 10:17:53 -0800 Comment on attachment 78013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78013&action=review > WebKit2/UIProcess/API/mac/WKView.mm:544 > + if (flag == TextChecker::state().isAutomaticDashSubstitutionEnabled) Is it safe to compare a BOOL with a bool like this? 329636 3 78013 darin 2011-01-05 10:21:48 -0800 Comment on attachment 78013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78013&action=review > WebKit2/UIProcess/API/mac/WKView.mm:386 > + Strange blank line here. 329641 4 andersca 2011-01-05 10:28:35 -0800 Committed r75079: <http://trac.webkit.org/changeset/75079> 78013 2011-01-05 10:10:05 -0800 2011-01-05 10:21:47 -0800 Patch bug-51931-20110105101004.patch text/plain 15388 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTA3NykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTIgQEAKKzIwMTEtMDEtMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBLZWVwIHRyYWNrIG9mIGFjdGl2ZSB0ZXh0IHN1YnN0aXR1dGlvbiBwcmVmZXJlbmNlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTE5MzEKKworICAg ICAgICAqIFNoYXJlZC9UZXh0Q2hlY2tlclN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgdmFsaWRhdGVVc2VySW50ZXJmYWNl SXRlbTpdKToKKyAgICAgICAgSGFuZGxlIG5ldyBzZWxlY3RvcnMsIG1vc3RseSBjb3BpZWQgZnJv bSBXZWJLaXQxIGNvZGUuCisKKyAgICAgICAgKC1bV0tWaWV3IG9yZGVyRnJvbnRTdWJzdGl0dXRp b25zUGFuZWw6XSk6CisgICAgICAgIE9wZW4gdGhlIHN1YnN0aXR1dGlvbiBwYW5lbC4KKworICAg ICAgICAoLVtXS1ZpZXcgaXNBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWRdKToKKyAg ICAgICAgKC1bV0tWaWV3IHNldEF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uRW5hYmxlZDpdKToK KyAgICAgICAgKC1bV0tWaWV3IHRvZ2dsZUF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uOl0pOgor ICAgICAgICAoLVtXS1ZpZXcgaXNBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZF0pOgor ICAgICAgICAoLVtXS1ZpZXcgc2V0QXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVuYWJsZWQ6XSk6 CisgICAgICAgICgtW1dLVmlldyB0b2dnbGVBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uOl0pOgor ICAgICAgICAoLVtXS1ZpZXcgaXNBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxlZF0pOgorICAg ICAgICAoLVtXS1ZpZXcgc2V0QXV0b21hdGljTGlua0RldGVjdGlvbkVuYWJsZWQ6XSk6CisgICAg ICAgICgtW1dLVmlldyB0b2dnbGVBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uOl0pOgorICAgICAgICAo LVtXS1ZpZXcgaXNBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRFbmFibGVkXSk6CisgICAgICAgICgt W1dLVmlldyBzZXRBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRFbmFibGVkOl0pOgorICAgICAgICAo LVtXS1ZpZXcgdG9nZ2xlQXV0b21hdGljVGV4dFJlcGxhY2VtZW50Ol0pOgorICAgICAgICBDYWxs IHRoZSB0ZXh0IGNoZWNrZXIsIGFuZCB1cGRhdGUgdGhlIHN0YXRlIGluIHRoZSB3ZWIgcHJvY2Vz cyBpZiBuZWVkZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvVGV4dENoZWNrZXIuaDoKKyAgICAg ICAgQWRkIG5ldyBmbGFncy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvVGV4dENoZWNrZXJN YWMubW06CisgICAgICAgIChXZWJLaXQ6OmluaXRpYWxpemVTdGF0ZSk6CisgICAgICAgIEluaXRp YWxpemUgZmxhZ3MgZnJvbSB1c2VyIGRlZmF1bHRzLgorCisgICAgICAgIChXZWJLaXQ6OlRleHRD aGVja2VyOjpzZXRBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWQpOgorICAgICAgICAo V2ViS2l0OjpUZXh0Q2hlY2tlcjo6c2V0QXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVuYWJsZWQp OgorICAgICAgICAoV2ViS2l0OjpUZXh0Q2hlY2tlcjo6c2V0QXV0b21hdGljTGlua0RldGVjdGlv bkVuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpUZXh0Q2hlY2tlcjo6c2V0QXV0b21hdGljVGV4 dFJlcGxhY2VtZW50RW5hYmxlZCk6CisgICAgICAgIFVwZGF0ZSBhbmQgc2F2ZSB0aGUgZmxhZ3Mu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJFZGl0b3JDbGll bnRNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkVkaXRvckNsaWVudDo6aXNBdXRvbWF0aWNR dW90ZVN1YnN0aXR1dGlvbkVuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJFZGl0b3JDbGll bnQ6OmlzQXV0b21hdGljTGlua0RldGVjdGlvbkVuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJFZGl0b3JDbGllbnQ6OmlzQXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVuYWJsZWQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJFZGl0b3JDbGllbnQ6OmlzQXV0b21hdGljVGV4dFJlcGxhY2VtZW50 RW5hYmxlZCk6CisgICAgICAgIEdldCB0aGUgdGV4dCBjaGVja2VyIHN0YXRlLgorCiAyMDExLTAx LTA1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0 YW1wZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9UZXh0Q2hlY2tlclN0 YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvVGV4dENoZWNrZXJTdGF0ZS5oCShy ZXZpc2lvbiA3NTAzNikKKysrIFdlYktpdDIvU2hhcmVkL1RleHRDaGVja2VyU3RhdGUuaAkod29y a2luZyBjb3B5KQpAQCAtMzYsNiArMzYsMTAgQEAgc3RydWN0IFRleHRDaGVja2VyU3RhdGUgewog CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGJvb2wgaXNBdXRvbWF0aWNTcGVsbGluZ0NvcnJlY3Rp b25FbmFibGVkOworICAgIGJvb2wgaXNBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWQ7 CisgICAgYm9vbCBpc0F1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25FbmFibGVkOworICAgIGJvb2wg aXNBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxlZDsKKyAgICBib29sIGlzQXV0b21hdGljVGV4 dFJlcGxhY2VtZW50RW5hYmxlZDsKICNlbmRpZgogfTsKIApJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3MvVGV4dENoZWNrZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9UZXh0Q2hl Y2tlci5oCShyZXZpc2lvbiA3NTAzNykKKysrIFdlYktpdDIvVUlQcm9jZXNzL1RleHRDaGVja2Vy LmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDEwIEBAIHB1YmxpYzoKIAogI2lmIFBMQVRG T1JNKE1BQykKICAgICBzdGF0aWMgdm9pZCBzZXRBdXRvbWF0aWNTcGVsbGluZ0NvcnJlY3Rpb25F bmFibGVkKGJvb2wpOworICAgIHN0YXRpYyB2b2lkIHNldEF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0 aW9uRW5hYmxlZChib29sKTsKKyAgICBzdGF0aWMgdm9pZCBzZXRBdXRvbWF0aWNEYXNoU3Vic3Rp dHV0aW9uRW5hYmxlZChib29sKTsKKyAgICBzdGF0aWMgdm9pZCBzZXRBdXRvbWF0aWNMaW5rRGV0 ZWN0aW9uRW5hYmxlZChib29sKTsKKyAgICBzdGF0aWMgdm9pZCBzZXRBdXRvbWF0aWNUZXh0UmVw bGFjZW1lbnRFbmFibGVkKGJvb2wpOwogI2VuZGlmCiAKICAgICBzdGF0aWMgaW50NjRfdCB1bmlx dWVTcGVsbERvY3VtZW50VGFnKCk7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dL Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQkocmV2aXNpb24gNzUwMzcpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtMzc3LDYgKzM3Nyw0MSBAQCAtIChCT09MKXZhbGlkYXRlVXNl ckludGVyZmFjZUl0ZW06KGlkIDxOCiAgICAgICAgIHJldHVybiBfZGF0YS0+X3BhZ2UtPnNlbGVj dGlvblN0YXRlKCkuaXNDb250ZW50RWRpdGFibGU7CiAgICAgfQogCisgICAgaWYgKGFjdGlvbiA9 PSBAc2VsZWN0b3Iob3JkZXJGcm9udFN1YnN0aXR1dGlvbnNQYW5lbDopKSB7CisgICAgICAgIGlm IChOU01lbnVJdGVtICptZW51SXRlbSA9IDo6bWVudUl0ZW0oaXRlbSkpIHsKKyAgICAgICAgICAg IEJPT0wgcGFuZWxTaG93aW5nID0gW1tbTlNTcGVsbENoZWNrZXIgc2hhcmVkU3BlbGxDaGVja2Vy XSBzdWJzdGl0dXRpb25zUGFuZWxdIGlzVmlzaWJsZV07CisgICAgICAgICAgICBbbWVudUl0ZW0g c2V0VGl0bGU6cGFuZWxTaG93aW5nCisgICAgICAgICAgICAgICAgPyBVSV9TVFJJTkcoIkhpZGUg U3Vic3RpdHV0aW9ucyIsICJtZW51IGl0ZW0gdGl0bGUiKQorICAgICAgICAgICAgICAgIDogVUlf U1RSSU5HKCJTaG93IFN1YnN0aXR1dGlvbnMiLCAibWVudSBpdGVtIHRpdGxlIildOworCisgICAg ICAgIH0KKyAgICAgICAgcmV0dXJuIF9kYXRhLT5fcGFnZS0+c2VsZWN0aW9uU3RhdGUoKS5pc0Nv bnRlbnRFZGl0YWJsZTsKKyAgICB9CisKKyAgICBpZiAoYWN0aW9uID09IEBzZWxlY3Rvcih0b2dn bGVBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbjopKSB7CisgICAgICAgIEJPT0wgY2hlY2tlZCA9 IFRleHRDaGVja2VyOjpzdGF0ZSgpLmlzQXV0b21hdGljUXVvdGVTdWJzdGl0dXRpb25FbmFibGVk OworICAgICAgICBbbWVudUl0ZW0oaXRlbSkgc2V0U3RhdGU6Y2hlY2tlZCA/IE5TT25TdGF0ZSA6 IE5TT2ZmU3RhdGVdOworICAgICAgICByZXR1cm4gX2RhdGEtPl9wYWdlLT5zZWxlY3Rpb25TdGF0 ZSgpLmlzQ29udGVudEVkaXRhYmxlOworICAgIH0KKworICAgIGlmIChhY3Rpb24gPT0gQHNlbGVj dG9yKHRvZ2dsZUF1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb246KSkgeworICAgICAgICBCT09MIGNo ZWNrZWQgPSBUZXh0Q2hlY2tlcjo6c3RhdGUoKS5pc0F1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25F bmFibGVkOworICAgICAgICBbbWVudUl0ZW0oaXRlbSkgc2V0U3RhdGU6Y2hlY2tlZCA/IE5TT25T dGF0ZSA6IE5TT2ZmU3RhdGVdOworICAgICAgICByZXR1cm4gX2RhdGEtPl9wYWdlLT5zZWxlY3Rp b25TdGF0ZSgpLmlzQ29udGVudEVkaXRhYmxlOworICAgIH0KKworICAgIGlmIChhY3Rpb24gPT0g QHNlbGVjdG9yKHRvZ2dsZUF1dG9tYXRpY0xpbmtEZXRlY3Rpb246KSkgeworICAgICAgICBCT09M IGNoZWNrZWQgPSBUZXh0Q2hlY2tlcjo6c3RhdGUoKS5pc0F1dG9tYXRpY0xpbmtEZXRlY3Rpb25F bmFibGVkOworICAgICAgICBbbWVudUl0ZW0oaXRlbSkgc2V0U3RhdGU6Y2hlY2tlZCA/IE5TT25T dGF0ZSA6IE5TT2ZmU3RhdGVdOworICAgICAgICByZXR1cm4gX2RhdGEtPl9wYWdlLT5zZWxlY3Rp b25TdGF0ZSgpLmlzQ29udGVudEVkaXRhYmxlOworICAgIH0KKworICAgIGlmIChhY3Rpb24gPT0g QHNlbGVjdG9yKHRvZ2dsZUF1dG9tYXRpY1RleHRSZXBsYWNlbWVudDopKSB7CisgICAgICAgIEJP T0wgY2hlY2tlZCA9IFRleHRDaGVja2VyOjpzdGF0ZSgpLmlzQXV0b21hdGljVGV4dFJlcGxhY2Vt ZW50RW5hYmxlZDsKKyAgICAgICAgW21lbnVJdGVtKGl0ZW0pIHNldFN0YXRlOmNoZWNrZWQgPyBO U09uU3RhdGUgOiBOU09mZlN0YXRlXTsKKyAgICAgICAgcmV0dXJuIF9kYXRhLT5fcGFnZS0+c2Vs ZWN0aW9uU3RhdGUoKS5pc0NvbnRlbnRFZGl0YWJsZTsKKyAgICB9CisKICAgICBpZiAoYWN0aW9u ID09IEBzZWxlY3RvcihzdG9wU3BlYWtpbmc6KSkKICAgICAgICAgcmV0dXJuIFtOU0FwcCBpc1Nw ZWFraW5nXTsKIApAQCAtNDYzLDYgKzQ5OCwxMDIgQEAgLSAoSUJBY3Rpb24pdG9nZ2xlQXV0b21h dGljU3BlbGxpbmdDb3JyZQogICAgIF9kYXRhLT5fcGFnZS0+cHJvY2VzcygpLT51cGRhdGVUZXh0 Q2hlY2tlclN0YXRlKCk7CiB9CiAKKy0gKHZvaWQpb3JkZXJGcm9udFN1YnN0aXR1dGlvbnNQYW5l bDooaWQpc2VuZGVyCit7CisgICAgTlNTcGVsbENoZWNrZXIgKmNoZWNrZXIgPSBbTlNTcGVsbENo ZWNrZXIgc2hhcmVkU3BlbGxDaGVja2VyXTsKKyAgICBpZiAoIWNoZWNrZXIpIHsKKyAgICAgICAg TE9HX0VSUk9SKCJObyBOU1NwZWxsQ2hlY2tlciIpOworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIAorICAgIE5TUGFuZWwgKnN1YnN0aXR1dGlvbnNQYW5lbCA9IFtjaGVja2VyIHN1YnN0aXR1 dGlvbnNQYW5lbF07CisgICAgaWYgKFtzdWJzdGl0dXRpb25zUGFuZWwgaXNWaXNpYmxlXSkgewor ICAgICAgICBbc3Vic3RpdHV0aW9uc1BhbmVsIG9yZGVyT3V0OnNlbmRlcl07CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgW3N1YnN0aXR1dGlvbnNQYW5lbCBvcmRlckZyb250OnNlbmRlcl07 Cit9CisKKy0gKEJPT0wpaXNBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWQKK3sKKyAg ICByZXR1cm4gVGV4dENoZWNrZXI6OnN0YXRlKCkuaXNBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlv bkVuYWJsZWQ7Cit9CisKKy0gKHZvaWQpc2V0QXV0b21hdGljUXVvdGVTdWJzdGl0dXRpb25FbmFi bGVkOihCT09MKWZsYWcKK3sKKyAgICBpZiAoZmxhZyA9PSBUZXh0Q2hlY2tlcjo6c3RhdGUoKS5p c0F1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uRW5hYmxlZCkKKyAgICAgICAgcmV0dXJuOworCisg ICAgVGV4dENoZWNrZXI6OnNldEF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uRW5hYmxlZChmbGFn KTsKKyAgICBfZGF0YS0+X3BhZ2UtPnByb2Nlc3MoKS0+dXBkYXRlVGV4dENoZWNrZXJTdGF0ZSgp OworfQorCistICh2b2lkKXRvZ2dsZUF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uOihpZClzZW5k ZXIKK3sKKyAgICBUZXh0Q2hlY2tlcjo6c2V0QXV0b21hdGljUXVvdGVTdWJzdGl0dXRpb25FbmFi bGVkKCFUZXh0Q2hlY2tlcjo6c3RhdGUoKS5pc0F1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uRW5h YmxlZCk7CisgICAgX2RhdGEtPl9wYWdlLT5wcm9jZXNzKCktPnVwZGF0ZVRleHRDaGVja2VyU3Rh dGUoKTsKK30KKworLSAoQk9PTClpc0F1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25FbmFibGVkCit7 CisgICAgcmV0dXJuIFRleHRDaGVja2VyOjpzdGF0ZSgpLmlzQXV0b21hdGljRGFzaFN1YnN0aXR1 dGlvbkVuYWJsZWQ7Cit9CisKKy0gKHZvaWQpc2V0QXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVu YWJsZWQ6KEJPT0wpZmxhZworeworICAgIGlmIChmbGFnID09IFRleHRDaGVja2VyOjpzdGF0ZSgp LmlzQXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVuYWJsZWQpCisgICAgICAgIHJldHVybjsKKwor ICAgIFRleHRDaGVja2VyOjpzZXRBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZChmbGFn KTsKKyAgICBfZGF0YS0+X3BhZ2UtPnByb2Nlc3MoKS0+dXBkYXRlVGV4dENoZWNrZXJTdGF0ZSgp OworfQorCistICh2b2lkKXRvZ2dsZUF1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb246KGlkKXNlbmRl cgoreworICAgIFRleHRDaGVja2VyOjpzZXRBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxl ZCghVGV4dENoZWNrZXI6OnN0YXRlKCkuaXNBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxl ZCk7CisgICAgX2RhdGEtPl9wYWdlLT5wcm9jZXNzKCktPnVwZGF0ZVRleHRDaGVja2VyU3RhdGUo KTsKK30KKworLSAoQk9PTClpc0F1dG9tYXRpY0xpbmtEZXRlY3Rpb25FbmFibGVkCit7CisgICAg cmV0dXJuIFRleHRDaGVja2VyOjpzdGF0ZSgpLmlzQXV0b21hdGljTGlua0RldGVjdGlvbkVuYWJs ZWQ7Cit9CisKKy0gKHZvaWQpc2V0QXV0b21hdGljTGlua0RldGVjdGlvbkVuYWJsZWQ6KEJPT0wp ZmxhZworeworICAgIGlmIChmbGFnID09IFRleHRDaGVja2VyOjpzdGF0ZSgpLmlzQXV0b21hdGlj TGlua0RldGVjdGlvbkVuYWJsZWQpCisgICAgICAgIHJldHVybjsKKworICAgIFRleHRDaGVja2Vy OjpzZXRBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxlZChmbGFnKTsKKyAgICBfZGF0YS0+X3Bh Z2UtPnByb2Nlc3MoKS0+dXBkYXRlVGV4dENoZWNrZXJTdGF0ZSgpOworfQorCistICh2b2lkKXRv Z2dsZUF1dG9tYXRpY0xpbmtEZXRlY3Rpb246KGlkKXNlbmRlcgoreworICAgIFRleHRDaGVja2Vy OjpzZXRBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxlZCghVGV4dENoZWNrZXI6OnN0YXRlKCku aXNBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxlZCk7CisgICAgX2RhdGEtPl9wYWdlLT5wcm9j ZXNzKCktPnVwZGF0ZVRleHRDaGVja2VyU3RhdGUoKTsKK30KKworLSAoQk9PTClpc0F1dG9tYXRp Y1RleHRSZXBsYWNlbWVudEVuYWJsZWQKK3sKKyAgICByZXR1cm4gVGV4dENoZWNrZXI6OnN0YXRl KCkuaXNBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRFbmFibGVkOworfQorCistICh2b2lkKXNldEF1 dG9tYXRpY1RleHRSZXBsYWNlbWVudEVuYWJsZWQ6KEJPT0wpZmxhZworeworICAgIGlmIChmbGFn ID09IFRleHRDaGVja2VyOjpzdGF0ZSgpLmlzQXV0b21hdGljVGV4dFJlcGxhY2VtZW50RW5hYmxl ZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgVGV4dENoZWNrZXI6OnNldEF1dG9tYXRpY1RleHRS ZXBsYWNlbWVudEVuYWJsZWQoZmxhZyk7CisgICAgX2RhdGEtPl9wYWdlLT5wcm9jZXNzKCktPnVw ZGF0ZVRleHRDaGVja2VyU3RhdGUoKTsKK30KKworLSAodm9pZCl0b2dnbGVBdXRvbWF0aWNUZXh0 UmVwbGFjZW1lbnQ6KGlkKXNlbmRlcgoreworICAgIFRleHRDaGVja2VyOjpzZXRBdXRvbWF0aWNU ZXh0UmVwbGFjZW1lbnRFbmFibGVkKCFUZXh0Q2hlY2tlcjo6c3RhdGUoKS5pc0F1dG9tYXRpY1Rl eHRSZXBsYWNlbWVudEVuYWJsZWQpOworICAgIF9kYXRhLT5fcGFnZS0+cHJvY2VzcygpLT51cGRh dGVUZXh0Q2hlY2tlclN0YXRlKCk7Cit9CisKIC8vIEV2ZW50cwogCiAvLyBPdmVycmlkZSB0aGlz IHNvIHRoYXQgQXBwS2l0IHdpbGwgc2VuZCB1cyBhcnJvdyBrZXlzIGFzIGtleSBkb3duIGV2ZW50 cyBzbyB3ZSBjYW4KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL21hYy9UZXh0Q2hlY2tlck1hYy5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGV4dENoZWNrZXJNYWMubW0J KHJldmlzaW9uIDc1MDM3KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RleHRDaGVja2VyTWFj Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSwxMCBAQAogc3RhdGljIGNvbnN0IE5TU3Ry aW5nICogY29uc3QgV2ViQXV0b21hdGljU3BlbGxpbmdDb3JyZWN0aW9uRW5hYmxlZCA9IEAiV2Vi QXV0b21hdGljU3BlbGxpbmdDb3JyZWN0aW9uRW5hYmxlZCI7CiBzdGF0aWMgY29uc3QgTlNTdHJp bmcgKiBjb25zdCBXZWJDb250aW51b3VzU3BlbGxDaGVja2luZ0VuYWJsZWQgPSBAIldlYkNvbnRp bnVvdXNTcGVsbENoZWNraW5nRW5hYmxlZCI7CiBzdGF0aWMgY29uc3QgTlNTdHJpbmcgKiBjb25z dCBXZWJHcmFtbWFyQ2hlY2tpbmdFbmFibGVkID0gQCJXZWJHcmFtbWFyQ2hlY2tpbmdFbmFibGVk IjsKK3N0YXRpYyBjb25zdCBOU1N0cmluZyAqIGNvbnN0IFdlYkF1dG9tYXRpY1F1b3RlU3Vic3Rp dHV0aW9uRW5hYmxlZCA9IEAiV2ViQXV0b21hdGljUXVvdGVTdWJzdGl0dXRpb25FbmFibGVkIjsK K3N0YXRpYyBjb25zdCBOU1N0cmluZyAqIGNvbnN0IFdlYkF1dG9tYXRpY0Rhc2hTdWJzdGl0dXRp b25FbmFibGVkID0gQCJXZWJBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZCI7CitzdGF0 aWMgY29uc3QgTlNTdHJpbmcgKiBjb25zdCBXZWJBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxl ZCA9IEAiV2ViQXV0b21hdGljTGlua0RldGVjdGlvbkVuYWJsZWQiOworc3RhdGljIGNvbnN0IE5T U3RyaW5nICogY29uc3QgV2ViQXV0b21hdGljVGV4dFJlcGxhY2VtZW50RW5hYmxlZCA9IEAiV2Vi QXV0b21hdGljVGV4dFJlcGxhY2VtZW50RW5hYmxlZCI7CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwogCkBAIC00Nyw3ICs1MSwxMSBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU3RhdGUoKQog ICAgIHRleHRDaGVja2VyU3RhdGUuaXNDb250aW51b3VzU3BlbGxDaGVja2luZ0VuYWJsZWQgPSBb W05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBib29sRm9yS2V5OldlYkNvbnRp bnVvdXNTcGVsbENoZWNraW5nRW5hYmxlZF0gJiYgVGV4dENoZWNrZXI6OmlzQ29udGludW91c1Nw ZWxsQ2hlY2tpbmdBbGxvd2VkKCk7CiAgICAgdGV4dENoZWNrZXJTdGF0ZS5pc0dyYW1tYXJDaGVj a2luZ0VuYWJsZWQgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBib29s Rm9yS2V5OldlYkdyYW1tYXJDaGVja2luZ0VuYWJsZWRdOwogICAgIHRleHRDaGVja2VyU3RhdGUu aXNBdXRvbWF0aWNTcGVsbGluZ0NvcnJlY3Rpb25FbmFibGVkID0gW1tOU1VzZXJEZWZhdWx0cyBz dGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpXZWJBdXRvbWF0aWNTcGVsbGluZ0NvcnJl Y3Rpb25FbmFibGVkXTsKLSAgICAKKyAgICB0ZXh0Q2hlY2tlclN0YXRlLmlzQXV0b21hdGljUXVv dGVTdWJzdGl0dXRpb25FbmFibGVkID0gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZh dWx0c10gYm9vbEZvcktleTpXZWJBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWRdOwor ICAgIHRleHRDaGVja2VyU3RhdGUuaXNBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZCA9 IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6V2ViQXV0 b21hdGljRGFzaFN1YnN0aXR1dGlvbkVuYWJsZWRdOworICAgIHRleHRDaGVja2VyU3RhdGUuaXNB dXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxlZCA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRV c2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6V2ViQXV0b21hdGljTGlua0RldGVjdGlvbkVuYWJsZWRd OworICAgIHRleHRDaGVja2VyU3RhdGUuaXNBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRFbmFibGVk ID0gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpXZWJB dXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRFbmFibGVkXTsKKwogI2lmICFkZWZpbmVkKEJVSUxESU5H X09OX1NOT1dfTEVPUEFSRCkKICAgICBpZiAoIVtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2Vy RGVmYXVsdHNdIG9iamVjdEZvcktleTpXZWJBdXRvbWF0aWNTcGVsbGluZ0NvcnJlY3Rpb25FbmFi bGVkXSkKICAgICAgICAgdGV4dENoZWNrZXJTdGF0ZS5pc0F1dG9tYXRpY1NwZWxsaW5nQ29ycmVj dGlvbkVuYWJsZWQgPSBbTlNTcGVsbENoZWNrZXIgaXNBdXRvbWF0aWNTcGVsbGluZ0NvcnJlY3Rp b25FbmFibGVkXTsKQEAgLTExMiw2ICsxMjAsNTAgQEAgdm9pZCBUZXh0Q2hlY2tlcjo6c2V0QXV0 b21hdGljU3BlbGxpbmdDbwogICAgIFtbTlNTcGVsbENoZWNrZXIgc2hhcmVkU3BlbGxDaGVja2Vy XSB1cGRhdGVQYW5lbHNdOwogfQogCit2b2lkIFRleHRDaGVja2VyOjpzZXRBdXRvbWF0aWNRdW90 ZVN1YnN0aXR1dGlvbkVuYWJsZWQoYm9vbCBpc0F1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uRW5h YmxlZCkKK3sKKyAgICBpZiAoc3RhdGUoKS5pc0F1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uRW5h YmxlZCA9PSBpc0F1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9uRW5hYmxlZCkKKyAgICAgICAgcmV0 dXJuOworCisgICAgdGV4dENoZWNrZXJTdGF0ZS5pc0F1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9u RW5hYmxlZCA9IGlzQXV0b21hdGljUXVvdGVTdWJzdGl0dXRpb25FbmFibGVkOworICAgIFtbTlNV c2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHNldEJvb2w6aXNBdXRvbWF0aWNRdW90 ZVN1YnN0aXR1dGlvbkVuYWJsZWQgZm9yS2V5OldlYkF1dG9tYXRpY1F1b3RlU3Vic3RpdHV0aW9u RW5hYmxlZF07ICAgIAorICAgIAorICAgIFtbTlNTcGVsbENoZWNrZXIgc2hhcmVkU3BlbGxDaGVj a2VyXSB1cGRhdGVQYW5lbHNdOworfQorCit2b2lkIFRleHRDaGVja2VyOjpzZXRBdXRvbWF0aWNE YXNoU3Vic3RpdHV0aW9uRW5hYmxlZChib29sIGlzQXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVu YWJsZWQpCit7CisgICAgaWYgKHN0YXRlKCkuaXNBdXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5h YmxlZCA9PSBpc0F1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25FbmFibGVkKQorICAgICAgICByZXR1 cm47CisKKyAgICB0ZXh0Q2hlY2tlclN0YXRlLmlzQXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVu YWJsZWQgPSBpc0F1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25FbmFibGVkOworICAgIFtbTlNVc2Vy RGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHNldEJvb2w6aXNBdXRvbWF0aWNEYXNoU3Vi c3RpdHV0aW9uRW5hYmxlZCBmb3JLZXk6V2ViQXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbkVuYWJs ZWRdOworCisgICAgW1tOU1NwZWxsQ2hlY2tlciBzaGFyZWRTcGVsbENoZWNrZXJdIHVwZGF0ZVBh bmVsc107Cit9CisKK3ZvaWQgVGV4dENoZWNrZXI6OnNldEF1dG9tYXRpY0xpbmtEZXRlY3Rpb25F bmFibGVkKGJvb2wgaXNBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxlZCkKK3sKKyAgICBpZiAo c3RhdGUoKS5pc0F1dG9tYXRpY0xpbmtEZXRlY3Rpb25FbmFibGVkID09IGlzQXV0b21hdGljTGlu a0RldGVjdGlvbkVuYWJsZWQpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICB0ZXh0Q2hlY2tl clN0YXRlLmlzQXV0b21hdGljTGlua0RldGVjdGlvbkVuYWJsZWQgPSBpc0F1dG9tYXRpY0xpbmtE ZXRlY3Rpb25FbmFibGVkOworICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVs dHNdIHNldEJvb2w6aXNBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5hYmxlZCBmb3JLZXk6V2ViQXV0 b21hdGljTGlua0RldGVjdGlvbkVuYWJsZWRdOworICAgIAorICAgIFtbTlNTcGVsbENoZWNrZXIg c2hhcmVkU3BlbGxDaGVja2VyXSB1cGRhdGVQYW5lbHNdOworfQorCit2b2lkIFRleHRDaGVja2Vy OjpzZXRBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRFbmFibGVkKGJvb2wgaXNBdXRvbWF0aWNUZXh0 UmVwbGFjZW1lbnRFbmFibGVkKQoreworICAgIGlmIChzdGF0ZSgpLmlzQXV0b21hdGljVGV4dFJl cGxhY2VtZW50RW5hYmxlZCA9PSBpc0F1dG9tYXRpY1RleHRSZXBsYWNlbWVudEVuYWJsZWQpCisg ICAgICAgIHJldHVybjsKKyAgICAKKyAgICB0ZXh0Q2hlY2tlclN0YXRlLmlzQXV0b21hdGljVGV4 dFJlcGxhY2VtZW50RW5hYmxlZCA9IGlzQXV0b21hdGljVGV4dFJlcGxhY2VtZW50RW5hYmxlZDsK KyAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRCb29sOmlzQXV0 b21hdGljVGV4dFJlcGxhY2VtZW50RW5hYmxlZCBmb3JLZXk6V2ViQXV0b21hdGljVGV4dFJlcGxh Y2VtZW50RW5hYmxlZF07CisKKyAgICBbW05TU3BlbGxDaGVja2VyIHNoYXJlZFNwZWxsQ2hlY2tl cl0gdXBkYXRlUGFuZWxzXTsKK30KKwogaW50NjRfdCBUZXh0Q2hlY2tlcjo6dW5pcXVlU3BlbGxE b2N1bWVudFRhZygpCiB7CiAgICAgcmV0dXJuIFtOU1NwZWxsQ2hlY2tlciB1bmlxdWVTcGVsbERv Y3VtZW50VGFnXTsKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMv V2ViRWRpdG9yQ2xpZW50TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9tYWMvV2ViRWRpdG9yQ2xpZW50TWFjLm1tCShyZXZpc2lvbiA3NTAzNykK KysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRWRpdG9yQ2xpZW50 TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQsOCArMTY0LDcgQEAgdm9pZCBXZWJFZGl0b3JD bGllbnQ6OnRvZ2dsZVNtYXJ0SW5zZXJ0RAogCiBib29sIFdlYkVkaXRvckNsaWVudDo6aXNBdXRv bWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7 Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBXZWJQcm9jZXNzOjpzaGFyZWQoKS50ZXh0 Q2hlY2tlclN0YXRlKCkuaXNBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbkVuYWJsZWQ7CiB9CiAK IHZvaWQgV2ViRWRpdG9yQ2xpZW50Ojp0b2dnbGVBdXRvbWF0aWNRdW90ZVN1YnN0aXR1dGlvbigp CkBAIC0xNzUsOCArMTc0LDcgQEAgdm9pZCBXZWJFZGl0b3JDbGllbnQ6OnRvZ2dsZUF1dG9tYXRp Y1F1bwogCiBib29sIFdlYkVkaXRvckNsaWVudDo6aXNBdXRvbWF0aWNMaW5rRGV0ZWN0aW9uRW5h YmxlZCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAg cmV0dXJuIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnRleHRDaGVja2VyU3RhdGUoKS5pc0F1dG9tYXRp Y0xpbmtEZXRlY3Rpb25FbmFibGVkOwogfQogCiB2b2lkIFdlYkVkaXRvckNsaWVudDo6dG9nZ2xl QXV0b21hdGljTGlua0RldGVjdGlvbigpCkBAIC0xODYsOCArMTg0LDcgQEAgdm9pZCBXZWJFZGl0 b3JDbGllbnQ6OnRvZ2dsZUF1dG9tYXRpY0xpbgogCiBib29sIFdlYkVkaXRvckNsaWVudDo6aXNB dXRvbWF0aWNEYXNoU3Vic3RpdHV0aW9uRW5hYmxlZCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQo KTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnRl eHRDaGVja2VyU3RhdGUoKS5pc0F1dG9tYXRpY0Rhc2hTdWJzdGl0dXRpb25FbmFibGVkOwogfQog CiB2b2lkIFdlYkVkaXRvckNsaWVudDo6dG9nZ2xlQXV0b21hdGljRGFzaFN1YnN0aXR1dGlvbigp CkBAIC0xOTcsOCArMTk0LDcgQEAgdm9pZCBXZWJFZGl0b3JDbGllbnQ6OnRvZ2dsZUF1dG9tYXRp Y0RhcwogCiBib29sIFdlYkVkaXRvckNsaWVudDo6aXNBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRF bmFibGVkKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBmYWxzZTsKKyAg ICByZXR1cm4gV2ViUHJvY2Vzczo6c2hhcmVkKCkudGV4dENoZWNrZXJTdGF0ZSgpLmlzQXV0b21h dGljVGV4dFJlcGxhY2VtZW50RW5hYmxlZDsKIH0KIAogdm9pZCBXZWJFZGl0b3JDbGllbnQ6OnRv Z2dsZUF1dG9tYXRpY1RleHRSZXBsYWNlbWVudCgpCkBAIC0yMjEsNyArMjE3LDYgQEAgdm9pZCBX ZWJFZGl0b3JDbGllbnQ6OmNoZWNrVGV4dE9mUGFyYWdyYQogICAgIC8vIEZJWE1FOiBJdCB3b3Vs ZCBiZSBuaWNlIGlmIHdlIHdvdWxkbid0IGhhdmUgdG8gY29weSB0aGUgdGV4dCBoZXJlLgogICAg IG1fcGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Q2hlY2tUZXh0T2ZQYXJh Z3JhcGgoU3RyaW5nKHRleHQsIGxlbmd0aCksIGNoZWNraW5nVHlwZXMpLCBNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpDaGVja1RleHRPZlBhcmFncmFwaDo6UmVwbHkocmVzdWx0cykpOwogfQotCiAj ZW5kaWYKIAogI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX1RJR0VSKSAmJiAhZGVmaW5lZChCVUlM RElOR19PTl9MRU9QQVJEKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQpCg==