70924 2011-10-26 07:39:14 -0700 [GTK] Inconsistent name of WebKitSettings macros 2011-10-26 08:41:15 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 70927 1 cgarcia webkit-unassigned cgarcia webkit.review.bot oldest_to_newest 490829 0 cgarcia 2011-10-26 07:39:14 -0700 WEB_SETTINGS is used in some macros. 490831 1 112505 cgarcia 2011-10-26 07:47:23 -0700 Created attachment 112505 Patch 490833 2 webkit.review.bot 2011-10-26 07:50:22 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 490871 3 cgarcia 2011-10-26 08:41:15 -0700 Committed r98484: <http://trac.webkit.org/changeset/98484> 112505 2011-10-26 07:47:23 -0700 2011-10-26 08:31:57 -0700 Patch wk2-web-settings-macros.diff text/plain 15331 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwYWQzYzI3Li5lYjJiYzY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDQg QEAKIDIwMTEtMTAtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEluY29uc2lzdGVudCBuYW1lIG9mIFdlYktpdFNldHRpbmdzIG1h Y3JvcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA5 MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5h bWUgV0VCS0lUX1RZUEVfV0VCX1NFVFRJTkdTIGFzIFdFQktJVF9UWVBFX1NFVFRJTkdTIGFuZAor ICAgICAgICBXRUJLSVRfSVNfV0VCX1NFVFRJTkdTIGFzIFdFQktJVF9JU19TRVRUSU5HUy4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcDoKKyAgICAgICAg KHdlYmtpdF9zZXR0aW5nc19pbml0KToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19uZXcpOgor ICAgICAgICAod2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfamF2YXNjcmlwdCk6CisgICAgICAg ICh3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9qYXZhc2NyaXB0KToKKyAgICAgICAgKHdlYmtp dF9zZXR0aW5nc19nZXRfYXV0b19sb2FkX2ltYWdlcyk6CisgICAgICAgICh3ZWJraXRfc2V0dGlu Z3Nfc2V0X2F1dG9fbG9hZF9pbWFnZXMpOgorICAgICAgICAod2Via2l0X3NldHRpbmdzX2dldF9s b2FkX2ljb25zX2lnbm9yaW5nX2ltYWdlX2xvYWRfc2V0dGluZyk6CisgICAgICAgICh3ZWJraXRf c2V0dGluZ3Nfc2V0X2xvYWRfaWNvbnNfaWdub3JpbmdfaW1hZ2VfbG9hZF9zZXR0aW5nKToKKyAg ICAgICAgKHdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX29mZmxpbmVfd2ViX2FwcGxpY2F0aW9u X2NhY2hlKToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX29mZmxpbmVfd2Vi X2FwcGxpY2F0aW9uX2NhY2hlKToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxl X2h0bWw1X2xvY2FsX3N0b3JhZ2UpOgorICAgICAgICAod2Via2l0X3NldHRpbmdzX3NldF9lbmFi bGVfaHRtbDVfbG9jYWxfc3RvcmFnZSk6CisgICAgICAgICh3ZWJraXRfc2V0dGluZ3NfZ2V0X2Vu YWJsZV9odG1sNV9kYXRhYmFzZSk6CisgICAgICAgICh3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJs ZV9odG1sNV9kYXRhYmFzZSk6CisgICAgICAgICh3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV94 c3NfYXVkaXRvcik6CisgICAgICAgICh3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV94c3NfYXVk aXRvcik6CisgICAgICAgICh3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9mcmFtZV9mbGF0dGVu aW5nKToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2ZyYW1lX2ZsYXR0ZW5p bmcpOgorICAgICAgICAod2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfcGx1Z2lucyk6CisgICAg ICAgICh3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9wbHVnaW5zKToKKyAgICAgICAgKHdlYmtp dF9zZXR0aW5nc19nZXRfZW5hYmxlX2phdmEpOgorICAgICAgICAod2Via2l0X3NldHRpbmdzX3Nl dF9lbmFibGVfamF2YSk6CisgICAgICAgICh3ZWJraXRfc2V0dGluZ3NfZ2V0X2phdmFzY3JpcHRf Y2FuX29wZW5fd2luZG93c19hdXRvbWF0aWNhbGx5KToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5n c19zZXRfamF2YXNjcmlwdF9jYW5fb3Blbl93aW5kb3dzX2F1dG9tYXRpY2FsbHkpOgorICAgICAg ICAod2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfaHlwZXJsaW5rX2F1ZGl0aW5nKToKKyAgICAg ICAgKHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2h5cGVybGlua19hdWRpdGluZyk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaDoKKworMjAxMS0xMC0yNiAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dU S10gUmVtb3ZlIGdfdGhyZWFkX2luaXQoKSBjYWxscyBmcm9tIGd0ay1kb2Mgc2Nhbm5lciB0b28K ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwOTA4CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRp bmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdz LmNwcAppbmRleCBlY2U2MzcxLi45YmZiZDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwCkBAIC0zODUsNyArMzg1LDcgQEAg c3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0U2V0dGluZ3NDbGFz cyoga2xhc3MpCiAKIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0aW5nc19pbml0KFdlYktpdFNldHRp bmdzKiBzZXR0aW5ncykKIHsKLSAgICBXZWJLaXRTZXR0aW5nc1ByaXZhdGUqIHByaXYgPSBHX1RZ UEVfSU5TVEFOQ0VfR0VUX1BSSVZBVEUoc2V0dGluZ3MsIFdFQktJVF9UWVBFX1dFQl9TRVRUSU5H UywgV2ViS2l0U2V0dGluZ3NQcml2YXRlKTsKKyAgICBXZWJLaXRTZXR0aW5nc1ByaXZhdGUqIHBy aXYgPSBHX1RZUEVfSU5TVEFOQ0VfR0VUX1BSSVZBVEUoc2V0dGluZ3MsIFdFQktJVF9UWVBFX1NF VFRJTkdTLCBXZWJLaXRTZXR0aW5nc1ByaXZhdGUpOwogICAgIHNldHRpbmdzLT5wcml2ID0gcHJp djsKICAgICBuZXcgKHByaXYpIFdlYktpdFNldHRpbmdzUHJpdmF0ZSgpOwogCkBAIC00MDIsNyAr NDAyLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2luaXQoV2ViS2l0U2V0dGluZ3Mq IHNldHRpbmdzKQogICoqLwogV2ViS2l0U2V0dGluZ3MqIHdlYmtpdF9zZXR0aW5nc19uZXcoKQog ewotICAgIHJldHVybiBXRUJLSVRfU0VUVElOR1MoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1dF Ql9TRVRUSU5HUywgTlVMTCkpOworICAgIHJldHVybiBXRUJLSVRfU0VUVElOR1MoZ19vYmplY3Rf bmV3KFdFQktJVF9UWVBFX1NFVFRJTkdTLCBOVUxMKSk7CiB9CiAKIC8qKgpAQCAtNDE2LDcgKzQx Niw3IEBAIFdlYktpdFNldHRpbmdzKiB3ZWJraXRfc2V0dGluZ3NfbmV3KCkKICAqKi8KIGdib29s ZWFuIHdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX2phdmFzY3JpcHQoV2ViS2l0U2V0dGluZ3Mq IHNldHRpbmdzKQogewotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfU0VU VElOR1Moc2V0dGluZ3MpLCBGQUxTRSk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lU X0lTX1NFVFRJTkdTKHNldHRpbmdzKSwgRkFMU0UpOwogCiAgICAgcmV0dXJuIFdLUHJlZmVyZW5j ZXNHZXRKYXZhU2NyaXB0RW5hYmxlZChzZXR0aW5ncy0+cHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCkp OwogfQpAQCAtNDMxLDcgKzQzMSw3IEBAIGdib29sZWFuIHdlYmtpdF9zZXR0aW5nc19nZXRfZW5h YmxlX2phdmFzY3JpcHQoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQogICoqLwogdm9pZCB3ZWJr aXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9qYXZhc2NyaXB0KFdlYktpdFNldHRpbmdzKiBzZXR0aW5n cywgZ2Jvb2xlYW4gZW5hYmxlZCkKIHsKLSAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19X RUJfU0VUVElOR1Moc2V0dGluZ3MpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19T RVRUSU5HUyhzZXR0aW5ncykpOwogCiAgICAgV2ViS2l0U2V0dGluZ3NQcml2YXRlKiBwcml2ID0g c2V0dGluZ3MtPnByaXY7CiAgICAgYm9vbCBjdXJyZW50VmFsdWUgPSBXS1ByZWZlcmVuY2VzR2V0 SmF2YVNjcmlwdEVuYWJsZWQocHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCkpOwpAQCAtNDUzLDcgKzQ1 Myw3IEBAIHZvaWQgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfamF2YXNjcmlwdChXZWJLaXRT ZXR0aW5ncyogc2V0dGluZ3MsIGdib29sZWFuIGVuCiAgKiovCiBnYm9vbGVhbiB3ZWJraXRfc2V0 dGluZ3NfZ2V0X2F1dG9fbG9hZF9pbWFnZXMoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQogewot ICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfU0VUVElOR1Moc2V0dGluZ3Mp LCBGQUxTRSk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNl dHRpbmdzKSwgRkFMU0UpOwogCiAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRMb2Fkc0ltYWdl c0F1dG9tYXRpY2FsbHkoc2V0dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLmdldCgpKTsKIH0KQEAg LTQ2OCw3ICs0NjgsNyBAQCBnYm9vbGVhbiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2F1dG9fbG9hZF9p bWFnZXMoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQogICoqLwogdm9pZCB3ZWJraXRfc2V0dGlu Z3Nfc2V0X2F1dG9fbG9hZF9pbWFnZXMoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLCBnYm9vbGVh biBlbmFibGVkKQogewotICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9TRVRUSU5H UyhzZXR0aW5ncykpOworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNl dHRpbmdzKSk7CiAKICAgICBXZWJLaXRTZXR0aW5nc1ByaXZhdGUqIHByaXYgPSBzZXR0aW5ncy0+ cHJpdjsKICAgICBib29sIGN1cnJlbnRWYWx1ZSA9IFdLUHJlZmVyZW5jZXNHZXRMb2Fkc0ltYWdl c0F1dG9tYXRpY2FsbHkocHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCkpOwpAQCAtNDkwLDcgKzQ5MCw3 IEBAIHZvaWQgd2Via2l0X3NldHRpbmdzX3NldF9hdXRvX2xvYWRfaW1hZ2VzKFdlYktpdFNldHRp bmdzKiBzZXR0aW5ncywgZ2Jvb2xlYW4gZW5hCiAgKiovCiBnYm9vbGVhbiB3ZWJraXRfc2V0dGlu Z3NfZ2V0X2xvYWRfaWNvbnNfaWdub3JpbmdfaW1hZ2VfbG9hZF9zZXR0aW5nKFdlYktpdFNldHRp bmdzKiBzZXR0aW5ncykKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VC X1NFVFRJTkdTKHNldHRpbmdzKSwgRkFMU0UpOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdF QktJVF9JU19TRVRUSU5HUyhzZXR0aW5ncyksIEZBTFNFKTsKIAogICAgIHJldHVybiBXS1ByZWZl cmVuY2VzR2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVuY2Uoc2V0 dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLmdldCgpKTsKIH0KQEAgLTUwNSw3ICs1MDUsNyBAQCBn Ym9vbGVhbiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2xvYWRfaWNvbnNfaWdub3JpbmdfaW1hZ2VfbG9h ZF9zZXR0aW5nKFdlYktpdFNldHRpbgogICoqLwogdm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2xv YWRfaWNvbnNfaWdub3JpbmdfaW1hZ2VfbG9hZF9zZXR0aW5nKFdlYktpdFNldHRpbmdzKiBzZXR0 aW5ncywgZ2Jvb2xlYW4gZW5hYmxlZCkKIHsKLSAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9J U19XRUJfU0VUVElOR1Moc2V0dGluZ3MpKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9J U19TRVRUSU5HUyhzZXR0aW5ncykpOwogCiAgICAgV2ViS2l0U2V0dGluZ3NQcml2YXRlKiBwcml2 ID0gc2V0dGluZ3MtPnByaXY7CiAgICAgYm9vbCBjdXJyZW50VmFsdWUgPSBXS1ByZWZlcmVuY2Vz R2V0TG9hZHNTaXRlSWNvbnNJZ25vcmluZ0ltYWdlTG9hZGluZ1ByZWZlcmVuY2UocHJpdi0+cHJl ZmVyZW5jZXMuZ2V0KCkpOwpAQCAtNTI3LDcgKzUyNyw3IEBAIHZvaWQgd2Via2l0X3NldHRpbmdz X3NldF9sb2FkX2ljb25zX2lnbm9yaW5nX2ltYWdlX2xvYWRfc2V0dGluZyhXZWJLaXRTZXR0aW5n cyoKICAqKi8KIGdib29sZWFuIHdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX29mZmxpbmVfd2Vi X2FwcGxpY2F0aW9uX2NhY2hlKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykKIHsKLSAgICBnX3Jl dHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1NFVFRJTkdTKHNldHRpbmdzKSwgRkFMU0Up OworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19TRVRUSU5HUyhzZXR0aW5ncyks IEZBTFNFKTsKIAogICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0T2ZmbGluZVdlYkFwcGxpY2F0 aW9uQ2FjaGVFbmFibGVkKHNldHRpbmdzLT5wcml2LT5wcmVmZXJlbmNlcy5nZXQoKSk7CiB9CkBA IC01NDIsNyArNTQyLDcgQEAgZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfb2Zm bGluZV93ZWJfYXBwbGljYXRpb25fY2FjaGUoV2ViS2l0U2V0dGluZ3MKICAqKi8KIHZvaWQgd2Vi a2l0X3NldHRpbmdzX3NldF9lbmFibGVfb2ZmbGluZV93ZWJfYXBwbGljYXRpb25fY2FjaGUoV2Vi S2l0U2V0dGluZ3MqIHNldHRpbmdzLCBnYm9vbGVhbiBlbmFibGVkKQogewotICAgIGdfcmV0dXJu X2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9TRVRUSU5HUyhzZXR0aW5ncykpOworICAgIGdfcmV0dXJu X2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNldHRpbmdzKSk7CiAKICAgICBXZWJLaXRTZXR0 aW5nc1ByaXZhdGUqIHByaXYgPSBzZXR0aW5ncy0+cHJpdjsKICAgICBib29sIGN1cnJlbnRWYWx1 ZSA9IFdLUHJlZmVyZW5jZXNHZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQocHJp di0+cHJlZmVyZW5jZXMuZ2V0KCkpOwpAQCAtNTY0LDcgKzU2NCw3IEBAIHZvaWQgd2Via2l0X3Nl dHRpbmdzX3NldF9lbmFibGVfb2ZmbGluZV93ZWJfYXBwbGljYXRpb25fY2FjaGUoV2ViS2l0U2V0 dGluZ3MqIHNlCiAgKiovCiBnYm9vbGVhbiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9odG1s NV9sb2NhbF9zdG9yYWdlKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykKIHsKLSAgICBnX3JldHVy bl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1NFVFRJTkdTKHNldHRpbmdzKSwgRkFMU0UpOwor ICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19TRVRUSU5HUyhzZXR0aW5ncyksIEZB TFNFKTsKIAogICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0TG9jYWxTdG9yYWdlRW5hYmxlZChz ZXR0aW5ncy0+cHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCkpOwogfQpAQCAtNTc5LDcgKzU3OSw3IEBA IGdib29sZWFuIHdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX2h0bWw1X2xvY2FsX3N0b3JhZ2Uo V2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzCiAgKiovCiB2b2lkIHdlYmtpdF9zZXR0aW5nc19zZXRf ZW5hYmxlX2h0bWw1X2xvY2FsX3N0b3JhZ2UoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLCBnYm9v bGVhbiBlbmFibGVkKQogewotICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9TRVRU SU5HUyhzZXR0aW5ncykpOworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdT KHNldHRpbmdzKSk7CiAKICAgICBXZWJLaXRTZXR0aW5nc1ByaXZhdGUqIHByaXYgPSBzZXR0aW5n cy0+cHJpdjsKICAgICBib29sIGN1cnJlbnRWYWx1ZSA9IFdLUHJlZmVyZW5jZXNHZXRMb2NhbFN0 b3JhZ2VFbmFibGVkKHByaXYtPnByZWZlcmVuY2VzLmdldCgpKTsKQEAgLTYwMSw3ICs2MDEsNyBA QCB2b2lkIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2h0bWw1X2xvY2FsX3N0b3JhZ2UoV2Vi S2l0U2V0dGluZ3MqIHNldHRpbmdzLCBnYgogICoqLwogZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdz X2dldF9lbmFibGVfaHRtbDVfZGF0YWJhc2UoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQogewot ICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfU0VUVElOR1Moc2V0dGluZ3Mp LCBGQUxTRSk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNl dHRpbmdzKSwgRkFMU0UpOwogCiAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXREYXRhYmFzZXNF bmFibGVkKHNldHRpbmdzLT5wcml2LT5wcmVmZXJlbmNlcy5nZXQoKSk7CiB9CkBAIC02MTYsNyAr NjE2LDcgQEAgZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfaHRtbDVfZGF0YWJh c2UoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQogICoqLwogdm9pZCB3ZWJraXRfc2V0dGluZ3Nf c2V0X2VuYWJsZV9odG1sNV9kYXRhYmFzZShXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdib29s ZWFuIGVuYWJsZWQpCiB7Ci0gICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1NFVFRJ TkdTKHNldHRpbmdzKSk7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Mo c2V0dGluZ3MpKTsKIAogICAgIFdlYktpdFNldHRpbmdzUHJpdmF0ZSogcHJpdiA9IHNldHRpbmdz LT5wcml2OwogICAgIGJvb2wgY3VycmVudFZhbHVlID0gV0tQcmVmZXJlbmNlc0dldERhdGFiYXNl c0VuYWJsZWQocHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCkpOwpAQCAtNjM4LDcgKzYzOCw3IEBAIHZv aWQgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfaHRtbDVfZGF0YWJhc2UoV2ViS2l0U2V0dGlu Z3MqIHNldHRpbmdzLCBnYm9vbGVhCiAgKiovCiBnYm9vbGVhbiB3ZWJraXRfc2V0dGluZ3NfZ2V0 X2VuYWJsZV94c3NfYXVkaXRvcihXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpCiB7Ci0gICAgZ19y ZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9TRVRUSU5HUyhzZXR0aW5ncyksIEZBTFNF KTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3Mp LCBGQUxTRSk7CiAKICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldFhTU0F1ZGl0b3JFbmFibGVk KHNldHRpbmdzLT5wcml2LT5wcmVmZXJlbmNlcy5nZXQoKSk7CiB9CkBAIC02NTMsNyArNjUzLDcg QEAgZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfeHNzX2F1ZGl0b3IoV2ViS2l0 U2V0dGluZ3MqIHNldHRpbmdzKQogICoqLwogdm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJs ZV94c3NfYXVkaXRvcihXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdib29sZWFuIGVuYWJsZWQp CiB7Ci0gICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1NFVFRJTkdTKHNldHRpbmdz KSk7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpKTsK IAogICAgIFdlYktpdFNldHRpbmdzUHJpdmF0ZSogcHJpdiA9IHNldHRpbmdzLT5wcml2OwogICAg IGJvb2wgY3VycmVudFZhbHVlID0gV0tQcmVmZXJlbmNlc0dldFhTU0F1ZGl0b3JFbmFibGVkKHBy aXYtPnByZWZlcmVuY2VzLmdldCgpKTsKQEAgLTY3NSw3ICs2NzUsNyBAQCB2b2lkIHdlYmtpdF9z ZXR0aW5nc19zZXRfZW5hYmxlX3hzc19hdWRpdG9yKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncywg Z2Jvb2xlYW4gZQogICoqLwogZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfZnJh bWVfZmxhdHRlbmluZyhXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpCiB7Ci0gICAgZ19yZXR1cm5f dmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9TRVRUSU5HUyhzZXR0aW5ncyksIEZBTFNFKTsKKyAg ICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpLCBGQUxT RSk7CiAKICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldEZyYW1lRmxhdHRlbmluZ0VuYWJsZWQo c2V0dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLmdldCgpKTsKIH0KQEAgLTY5MCw3ICs2OTAsNyBA QCBnYm9vbGVhbiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9mcmFtZV9mbGF0dGVuaW5nKFdl YktpdFNldHRpbmdzKiBzZXR0aW5ncykKICAqKi8KIHZvaWQgd2Via2l0X3NldHRpbmdzX3NldF9l bmFibGVfZnJhbWVfZmxhdHRlbmluZyhXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdib29sZWFu IGVuYWJsZWQpCiB7Ci0gICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1NFVFRJTkdT KHNldHRpbmdzKSk7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0 dGluZ3MpKTsKIAogICAgIFdlYktpdFNldHRpbmdzUHJpdmF0ZSogcHJpdiA9IHNldHRpbmdzLT5w cml2OwogICAgIGJvb2wgY3VycmVudFZhbHVlID0gV0tQcmVmZXJlbmNlc0dldEZyYW1lRmxhdHRl bmluZ0VuYWJsZWQocHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCkpOwpAQCAtNzEyLDcgKzcxMiw3IEBA IHZvaWQgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfZnJhbWVfZmxhdHRlbmluZyhXZWJLaXRT ZXR0aW5ncyogc2V0dGluZ3MsIGdib29sCiAgKiovCiBnYm9vbGVhbiB3ZWJraXRfc2V0dGluZ3Nf Z2V0X2VuYWJsZV9wbHVnaW5zKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykKIHsKLSAgICBnX3Jl dHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1NFVFRJTkdTKHNldHRpbmdzKSwgRkFMU0Up OworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19TRVRUSU5HUyhzZXR0aW5ncyks IEZBTFNFKTsKIAogICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0UGx1Z2luc0VuYWJsZWQoc2V0 dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLmdldCgpKTsKIH0KQEAgLTcyNyw3ICs3MjcsNyBAQCBn Ym9vbGVhbiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9wbHVnaW5zKFdlYktpdFNldHRpbmdz KiBzZXR0aW5ncykKICAqKi8KIHZvaWQgd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfcGx1Z2lu cyhXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdib29sZWFuIGVuYWJsZWQpCiB7Ci0gICAgZ19y ZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1NFVFRJTkdTKHNldHRpbmdzKSk7CisgICAgZ19y ZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpKTsKIAogICAgIFdlYktp dFNldHRpbmdzUHJpdmF0ZSogcHJpdiA9IHNldHRpbmdzLT5wcml2OwogICAgIGJvb2wgY3VycmVu dFZhbHVlID0gV0tQcmVmZXJlbmNlc0dldFBsdWdpbnNFbmFibGVkKHByaXYtPnByZWZlcmVuY2Vz LmdldCgpKTsKQEAgLTc0OSw3ICs3NDksNyBAQCB2b2lkIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5h YmxlX3BsdWdpbnMoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLCBnYm9vbGVhbiBlbmFibAogICoq LwogZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfamF2YShXZWJLaXRTZXR0aW5n cyogc2V0dGluZ3MpCiB7Ci0gICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9T RVRUSU5HUyhzZXR0aW5ncyksIEZBTFNFKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJL SVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpLCBGQUxTRSk7CiAKICAgICByZXR1cm4gV0tQcmVmZXJl bmNlc0dldEphdmFFbmFibGVkKHNldHRpbmdzLT5wcml2LT5wcmVmZXJlbmNlcy5nZXQoKSk7CiB9 CkBAIC03NjQsNyArNzY0LDcgQEAgZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVf amF2YShXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpCiAgKiovCiB2b2lkIHdlYmtpdF9zZXR0aW5n c19zZXRfZW5hYmxlX2phdmEoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLCBnYm9vbGVhbiBlbmFi bGVkKQogewotICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9TRVRUSU5HUyhzZXR0 aW5ncykpOworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNldHRpbmdz KSk7CiAKICAgICBXZWJLaXRTZXR0aW5nc1ByaXZhdGUqIHByaXYgPSBzZXR0aW5ncy0+cHJpdjsK ICAgICBib29sIGN1cnJlbnRWYWx1ZSA9IFdLUHJlZmVyZW5jZXNHZXRKYXZhRW5hYmxlZChwcml2 LT5wcmVmZXJlbmNlcy5nZXQoKSk7CkBAIC03ODYsNyArNzg2LDcgQEAgdm9pZCB3ZWJraXRfc2V0 dGluZ3Nfc2V0X2VuYWJsZV9qYXZhKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncywgZ2Jvb2xlYW4g ZW5hYmxlZCkKICAqKi8KIGdib29sZWFuIHdlYmtpdF9zZXR0aW5nc19nZXRfamF2YXNjcmlwdF9j YW5fb3Blbl93aW5kb3dzX2F1dG9tYXRpY2FsbHkoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQog ewotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfU0VUVElOR1Moc2V0dGlu Z3MpLCBGQUxTRSk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdT KHNldHRpbmdzKSwgRkFMU0UpOwogCiAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRKYXZhU2Ny aXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5KHNldHRpbmdzLT5wcml2LT5wcmVmZXJlbmNl cy5nZXQoKSk7CiB9CkBAIC04MDEsNyArODAxLDcgQEAgZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdz X2dldF9qYXZhc2NyaXB0X2Nhbl9vcGVuX3dpbmRvd3NfYXV0b21hdGljYWxseShXZWJLaXRTZXQK ICAqKi8KIHZvaWQgd2Via2l0X3NldHRpbmdzX3NldF9qYXZhc2NyaXB0X2Nhbl9vcGVuX3dpbmRv d3NfYXV0b21hdGljYWxseShXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdib29sZWFuIGVuYWJs ZWQpCiB7Ci0gICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1NFVFRJTkdTKHNldHRp bmdzKSk7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3Mp KTsKIAogICAgIFdlYktpdFNldHRpbmdzUHJpdmF0ZSogcHJpdiA9IHNldHRpbmdzLT5wcml2Owog ICAgIGJvb2wgY3VycmVudFZhbHVlID0gV0tQcmVmZXJlbmNlc0dldEphdmFTY3JpcHRDYW5PcGVu V2luZG93c0F1dG9tYXRpY2FsbHkocHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCkpOwpAQCAtODIzLDcg KzgyMyw3IEBAIHZvaWQgd2Via2l0X3NldHRpbmdzX3NldF9qYXZhc2NyaXB0X2Nhbl9vcGVuX3dp bmRvd3NfYXV0b21hdGljYWxseShXZWJLaXRTZXR0aW5nCiAgKiovCiBnYm9vbGVhbiB3ZWJraXRf c2V0dGluZ3NfZ2V0X2VuYWJsZV9oeXBlcmxpbmtfYXVkaXRpbmcoV2ViS2l0U2V0dGluZ3MqIHNl dHRpbmdzKQogewotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfU0VUVElO R1Moc2V0dGluZ3MpLCBGQUxTRSk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lT X1NFVFRJTkdTKHNldHRpbmdzKSwgRkFMU0UpOwogCiAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNH ZXRIeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQoc2V0dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLmdl dCgpKTsKIH0KQEAgLTgzOCw3ICs4MzgsNyBAQCBnYm9vbGVhbiB3ZWJraXRfc2V0dGluZ3NfZ2V0 X2VuYWJsZV9oeXBlcmxpbmtfYXVkaXRpbmcoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQogICoq Lwogdm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9oeXBlcmxpbmtfYXVkaXRpbmcoV2Vi S2l0U2V0dGluZ3MqIHNldHRpbmdzLCBnYm9vbGVhbiBlbmFibGVkKQogewotICAgIGdfcmV0dXJu X2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9TRVRUSU5HUyhzZXR0aW5ncykpOworICAgIGdfcmV0dXJu X2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNldHRpbmdzKSk7CiAKICAgICBXZWJLaXRTZXR0 aW5nc1ByaXZhdGUqIHByaXYgPSBzZXR0aW5ncy0+cHJpdjsKICAgICBib29sIGN1cnJlbnRWYWx1 ZSA9IFdLUHJlZmVyZW5jZXNHZXRIeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQocHJpdi0+cHJlZmVy ZW5jZXMuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0U2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFNldHRpbmdzLmgKaW5kZXggOTVlYzdhNC4uNDRhODFiNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oCkBAIC00MCwxMiArNDAs MTIgQEAKIAogR19CRUdJTl9ERUNMUwogCi0jZGVmaW5lIFdFQktJVF9UWVBFX1dFQl9TRVRUSU5H UyAgICAgICAgICAgICh3ZWJraXRfc2V0dGluZ3NfZ2V0X3R5cGUoKSkKLSNkZWZpbmUgV0VCS0lU X1NFVFRJTkdTKG9iaikgICAgICAgICAgICAgICAgKEdfVFlQRV9DSEVDS19JTlNUQU5DRV9DQVNU KChvYmopLCBXRUJLSVRfVFlQRV9XRUJfU0VUVElOR1MsIFdlYktpdFNldHRpbmdzKSkKLSNkZWZp bmUgV0VCS0lUX1NFVFRJTkdTX0NMQVNTKGtsYXNzKSAgICAgICAgKEdfVFlQRV9DSEVDS19DTEFT U19DQVNUKChrbGFzcyksICBXRUJLSVRfVFlQRV9XRUJfU0VUVElOR1MsIFdlYktpdFNldHRpbmdz Q2xhc3MpKQotI2RlZmluZSBXRUJLSVRfSVNfV0VCX1NFVFRJTkdTKG9iaikgICAgICAgICAoR19U WVBFX0NIRUNLX0lOU1RBTkNFX1RZUEUoKG9iaiksIFdFQktJVF9UWVBFX1dFQl9TRVRUSU5HUykp Ci0jZGVmaW5lIFdFQktJVF9JU19XRUJfU0VUVElOR1NfQ0xBU1Moa2xhc3MpIChHX1RZUEVfQ0hF Q0tfQ0xBU1NfVFlQRSgoa2xhc3MpLCAgV0VCS0lUX1RZUEVfV0VCX1NFVFRJTkdTKSkKLSNkZWZp bmUgV0VCS0lUX1NFVFRJTkdTX0dFVF9DTEFTUyhvYmopICAgICAgKEdfVFlQRV9JTlNUQU5DRV9H RVRfQ0xBU1MoKG9iaiksICBXRUJLSVRfVFlQRV9XRUJfU0VUVElOR1MsIFdlYktpdFNldHRpbmdz Q2xhc3MpKQorI2RlZmluZSBXRUJLSVRfVFlQRV9TRVRUSU5HUyAgICAgICAgICAgICh3ZWJraXRf c2V0dGluZ3NfZ2V0X3R5cGUoKSkKKyNkZWZpbmUgV0VCS0lUX1NFVFRJTkdTKG9iaikgICAgICAg ICAgICAoR19UWVBFX0NIRUNLX0lOU1RBTkNFX0NBU1QoKG9iaiksIFdFQktJVF9UWVBFX1NFVFRJ TkdTLCBXZWJLaXRTZXR0aW5ncykpCisjZGVmaW5lIFdFQktJVF9TRVRUSU5HU19DTEFTUyhrbGFz cykgICAgKEdfVFlQRV9DSEVDS19DTEFTU19DQVNUKChrbGFzcyksICBXRUJLSVRfVFlQRV9TRVRU SU5HUywgV2ViS2l0U2V0dGluZ3NDbGFzcykpCisjZGVmaW5lIFdFQktJVF9JU19TRVRUSU5HUyhv YmopICAgICAgICAgKEdfVFlQRV9DSEVDS19JTlNUQU5DRV9UWVBFKChvYmopLCBXRUJLSVRfVFlQ RV9TRVRUSU5HUykpCisjZGVmaW5lIFdFQktJVF9JU19TRVRUSU5HU19DTEFTUyhrbGFzcykgKEdf VFlQRV9DSEVDS19DTEFTU19UWVBFKChrbGFzcyksICBXRUJLSVRfVFlQRV9TRVRUSU5HUykpCisj ZGVmaW5lIFdFQktJVF9TRVRUSU5HU19HRVRfQ0xBU1Mob2JqKSAgKEdfVFlQRV9JTlNUQU5DRV9H RVRfQ0xBU1MoKG9iaiksICBXRUJLSVRfVFlQRV9TRVRUSU5HUywgV2ViS2l0U2V0dGluZ3NDbGFz cykpCiAKIHR5cGVkZWYgc3RydWN0IF9XZWJLaXRTZXR0aW5ncyBXZWJLaXRTZXR0aW5nczsKIHR5 cGVkZWYgc3RydWN0IF9XZWJLaXRTZXR0aW5nc0NsYXNzIFdlYktpdFNldHRpbmdzQ2xhc3M7Cg==