75339 2011-12-29 01:50:38 -0800 [GTK] Fix several conding style issues in WebKit2 GTK+ code 2011-12-29 08:33:59 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo pnormand webkit.review.bot oldest_to_newest 527858 0 cgarcia 2011-12-29 01:50:38 -0800 To follow http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 527859 1 120725 cgarcia 2011-12-29 02:01:17 -0800 Created attachment 120725 Patch 527860 2 webkit.review.bot 2011-12-29 02:03:07 -0800 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 527941 3 cgarcia 2011-12-29 08:33:59 -0800 Committed r103801: <http://trac.webkit.org/changeset/103801> 120725 2011-12-29 02:01:17 -0800 2011-12-29 07:19:06 -0800 Patch wk2-coding-style-issues.diff text/plain 45317 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxOTQ2NzE1Li5hNWFkNzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAg QEAKKzIwMTEtMTItMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEZpeCBzZXZlcmFsIGNvbmRpbmcgc3R5bGUgaXNzdWVzIGluIFdl YktpdDIgR1RLKyBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NTMzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluIGFkZGl0aW9uIHRvIHRoZSBXZWJLaXQgY29kaW5nIHN0eWxlLCBjb2RlIGluIFVJ UHJvY2Vzcy9BUEkvZ3RrCisgICAgICAgIHNob3VsZCBmb2xsb3cgc3R5bGUgYW5kIGNvbnZlbnRp b25zIGRlc2NyaWJlZCBoZXJlCisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvd2lraS9X ZWJLaXRHVEsvQWRkaW5nTmV3V2ViS2l0MkFQSQorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0U2V0dGluZ3MuY3BwOiBSZW1vdmUgdHJhaWxpbmcgd2hpdGVzcGFjZXMuCisgICAg ICAgICh3ZWJraXRfc2V0dGluZ3NfY2xhc3NfaW5pdCk6IFJlbW92ZSB0cmFpbGluZyB3aGl0ZXNw YWNlcywgZml4CisgICAgICAgIGluZGVudGF0aW9uIGlzc3VlcyBpbiBBUEkgZG9jIGNvbW1lbnRz LCBhZGQgbWlzc2luZyB0cmFpbGluZyB0bworICAgICAgICBzb21lIHByb3BlcnRpZXMuCisgICAg ICAgICh3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9mdWxsc2NyZWVuKTogTW92ZSB0aGUgY29k ZSBhZnRlcgorICAgICAgICBnZXRfZW5hYmxlX2Z1bGxzY3JlZW4oKSBmb3IgY29uc2lzdGVuY3ku CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaDogUmVtb3ZlIHRy YWlsaW5nCisgICAgICAgIHdoaXRlc3BhY2VzLiBGaXggKiBwbGFjZW1lbnQgYW5kIGxpbmUgdXAg cGFyYW1ldGVycy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNw cDogUmVtb3ZlIHNldmVyYWwgZW1wdHkgbGluZXMuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdf Y2xhc3NfaW5pdCk6IE1hcmsgcHJvcGVydHkgbmlja3MgYW5kIGJsdXJicyBmb3IgdHJhbnNsYXRp b24uCisgICAgICAgICh3ZWJraXRXZWJWaWV3U2V0VGl0bGUpOiBSZW1vdmUgdHJhaWxpbmcgd2hp dGVzcGFjZXMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oOiBM aW5lIHVwIHBhcmFtZXRlcnMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0Jhc2UuY3BwOiBVc2UgdGhlIGFuZ2xlLWJyYWNrZXQKKyAgICAgICAgZm9ybSBmb3IgaW5j bHVkaW5nIGZpbGUgZnJvbSBXZWJDb3JlIGFuZCB3dGYuIFVzZSBHUmVmUHRyIGZvcgorICAgICAg ICBHdGtJTUNvbnRleHQgYW5kIGJvb2wgaW5zdGVhZCBvZiBnYm9vbGVhbi4gVXNlIHRoZSBwbGFj ZW1lbnQgbmV3CisgICAgICAgIHN5bnRheCBmb3IgcHJpdmF0ZSBzdHJ1Y3QgaW5zdGVhZCBvZiBu ZXcvZGVsZXRlLgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VSZWFsaXplKToKKyAgICAgICAg KHdlYmtpdFdlYlZpZXdCYXNlRmluYWxpemUpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2Jh c2VfaW5pdCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUZvY3VzSW5FdmVudCk6CisgICAg ICAgICh3ZWJraXRXZWJWaWV3QmFzZUZvY3VzT3V0RXZlbnQpOgorICAgICAgICAod2Via2l0V2Vi Vmlld0Jhc2VLZXlQcmVzc0V2ZW50KTogUmVtb3ZlIHRyYWlsaW5nIHdoaXRlc3BhY2VzLgorICAg ICAgICAod2Via2l0V2ViVmlld0Jhc2VLZXlSZWxlYXNlRXZlbnQpOgorICAgICAgICAod2Via2l0 X3dlYl92aWV3X2Jhc2VfY2xhc3NfaW5pdCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUdl dElNQ29udGV4dCk6CisKIDIwMTEtMTItMjggIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJr aXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBDcmFzaCBpbiB+V2ViR3JhcGhpY3NMYXllciB3 aGVuIHJ1bm5pbmcgZmFzdC9tdWx0aWNvbC9wYWdpbmF0aW9uLSogdGVzdHMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcAppbmRleCAw MTYxMWM4Li44MzdhOWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwCkBAIC0xLDMwICsxLDMwIEBACiAvKgogICogQ29weXJp Z2h0IChjKSAyMDExIE1vdG9yb2xhIE1vYmlsaXR5LCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVk LgogICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dCBtb2RpZmljYXRpb24sIAorICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0IG1vZGlmaWNh dGlvbiwKICAqIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMgYXJlIG1ldDoKICAqCi0gKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UsIAorICogUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlLAog ICogdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4K ICAqCi0gKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodCBub3RpY2UsIAotICogdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3IgCisg KiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodCBub3RpY2UsCisgKiB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vcgogICogb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KICAqCi0gKiBOZWl0aGVy IHRoZSBuYW1lIG9mIE1vdG9yb2xhIE1vYmlsaXR5LCBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRz IGNvbnRyaWJ1dG9ycyBtYXkgCi0gKiBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9k dWN0cyBkZXJpdmVkIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IAorICogTmVpdGhlciB0aGUg bmFtZSBvZiBNb3Rvcm9sYSBNb2JpbGl0eSwgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cyBjb250 cmlidXRvcnMgbWF5CisgKiBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBk ZXJpdmVkIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0CiAgKiBzcGVjaWZpYyBwcmlvciB3cml0 dGVuIHBlcm1pc3Npb24uCiAgKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUg Q09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUyAKLSAqICJBUyBJUyIgQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUiAKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBO TyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUIEhPTERFUiBPUiAKLSAqIENPTlRSSUJVVE9SUyBC RSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCAK LSAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgCi0gKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgCi0gKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIAotICogT0YgTElB QklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJ TkNMVURJTkcgCi0gKiBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElO IE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQgSE9MREVSIE9SCisgKiBDT05UUklCVVRPUlMg QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwK KyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklM SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM VURJTkcKKyAqIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UgT0YgVEhJUwogICogU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIApAQCAtNTUsOSArNTUsOSBAQCBzdHJ1 Y3QgX1dlYktpdFNldHRpbmdzUHJpdmF0ZSB7CiAgKiBTRUNUSU9OOldlYktpdFNldHRpbmdzCiAg KiBAc2hvcnRfZGVzY3JpcHRpb246IENvbnRyb2wgdGhlIGJlaGF2aW91ciBvZiBhICNXZWJLaXRX ZWJWaWV3CiAgKgotICogI1dlYktpdFNldHRpbmdzIGNhbiBiZSBhcHBsaWVkIHRvIGEgI1dlYktp dFdlYlZpZXcgdG8gY29udHJvbCB0ZXh0IGNoYXJzZXQsIAotICogY29sb3IsIGZvbnQgc2l6ZXMs IHByaW50aW5nIG1vZGUsIHNjcmlwdCBzdXBwb3J0LCBsb2FkaW5nIG9mIGltYWdlcyBhbmQgdmFy aW91cyBvdGhlciB0aGluZ3MuIAotICogQWZ0ZXIgY3JlYXRpb24sIGEgI1dlYktpdFNldHRpbmdz IG9iamVjdCBjb250YWlucyBkZWZhdWx0IHNldHRpbmdzLiAKKyAqICNXZWJLaXRTZXR0aW5ncyBj YW4gYmUgYXBwbGllZCB0byBhICNXZWJLaXRXZWJWaWV3IHRvIGNvbnRyb2wgdGV4dCBjaGFyc2V0 LAorICogY29sb3IsIGZvbnQgc2l6ZXMsIHByaW50aW5nIG1vZGUsIHNjcmlwdCBzdXBwb3J0LCBs b2FkaW5nIG9mIGltYWdlcyBhbmQgdmFyaW91cyBvdGhlciB0aGluZ3MuCisgKiBBZnRlciBjcmVh dGlvbiwgYSAjV2ViS2l0U2V0dGluZ3Mgb2JqZWN0IGNvbnRhaW5zIGRlZmF1bHQgc2V0dGluZ3Mu CiAgKgogICogPGluZm9ybWFsZXhhbXBsZT48cHJvZ3JhbWxpc3Rpbmc+CiAgKiAvPCEtLSAtLT4q IENyZWF0ZSBhIG5ldyAjV2ViS2l0U2V0dGluZ3MgYW5kIGRpc2FibGUgSmF2YVNjcmlwdC4gKjwh LS0gLS0+LwpAQCAtNTA1LDEwICs1MDUsMTAgQEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdz X2NsYXNzX2luaXQoV2ViS2l0U2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWFkV3JpdGVDb25zdHJ1 Y3RQYXJhbUZsYWdzKSk7CiAKICAgICAvKioKLSAgICAqIFdlYktpdFdlYlNldHRpbmdzOmRlZmF1 bHQtZm9udC1mYW1pbHkKLSAgICAqCi0gICAgKiBUaGUgZm9udCBmYW1pbHkgdG8gdXNlIGFzIHRo ZSBkZWZhdWx0IGZvciBjb250ZW50IHRoYXQgZG9lcyBub3Qgc3BlY2lmeSBhIGZvbnQuCi0gICAg Ki8KKyAgICAgKiBXZWJLaXRXZWJTZXR0aW5nczpkZWZhdWx0LWZvbnQtZmFtaWx5OgorICAgICAq CisgICAgICogVGhlIGZvbnQgZmFtaWx5IHRvIHVzZSBhcyB0aGUgZGVmYXVsdCBmb3IgY29udGVu dCB0aGF0IGRvZXMgbm90IHNwZWNpZnkgYSBmb250LgorICAgICAqLwogICAgIGdfb2JqZWN0X2Ns YXNzX2luc3RhbGxfcHJvcGVydHkoZ09iamVjdENsYXNzLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUFJPUF9ERUZBVUxUX0ZPTlRfRkFNSUxZLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygiZGVmYXVsdC1mb250LWZh bWlseSIsCkBAIC01MTgsMTEgKzUxOCwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfc2V0dGluZ3Nf Y2xhc3NfaW5pdChXZWJLaXRTZXR0aW5nc0NsYXNzKiBrbGFzcykKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0 UGFyYW1GbGFncykpOwogCiAgICAgLyoqCi0gICAgKiBXZWJLaXRXZWJTZXR0aW5nczptb25vc3Bh Y2UtZm9udC1mYW1pbHkKLSAgICAqCi0gICAgKiBUaGUgZm9udCBmYW1pbHkgdXNlZCBhcyB0aGUg ZGVmYXVsdCBmb3IgY29udGVudCB1c2luZyBhIG1vbm9zcGFjZSBmb250LgotICAgICoKLSAgICAq LworICAgICAqIFdlYktpdFdlYlNldHRpbmdzOm1vbm9zcGFjZS1mb250LWZhbWlseToKKyAgICAg KgorICAgICAqIFRoZSBmb250IGZhbWlseSB1c2VkIGFzIHRoZSBkZWZhdWx0IGZvciBjb250ZW50 IHVzaW5nIGEgbW9ub3NwYWNlIGZvbnQuCisgICAgICoKKyAgICAgKi8KICAgICBnX29iamVjdF9j bGFzc19pbnN0YWxsX3Byb3BlcnR5KGdPYmplY3RDbGFzcywKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFBST1BfTU9OT1NQQUNFX0ZPTlRfRkFNSUxZLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygibW9ub3NwYWNlLWZv bnQtZmFtaWx5IiwKQEAgLTUzMiwxMCArNTMyLDEwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0 aW5nc19jbGFzc19pbml0KFdlYktpdFNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWFkV3JpdGVDb25z dHJ1Y3RQYXJhbUZsYWdzKSk7CiAKICAgICAvKioKLSAgICAqIFdlYktpdFdlYlNldHRpbmdzOnNl cmlmLWZvbnQtZmFtaWx5Ci0gICAgKgotICAgICogVGhlIGZvbnQgZmFtaWx5IHVzZWQgYXMgdGhl IGRlZmF1bHQgZm9yIGNvbnRlbnQgdXNpbmcgYSBzZXJpZiBmb250LgotICAgICovCisgICAgICog V2ViS2l0V2ViU2V0dGluZ3M6c2VyaWYtZm9udC1mYW1pbHk6CisgICAgICoKKyAgICAgKiBUaGUg Zm9udCBmYW1pbHkgdXNlZCBhcyB0aGUgZGVmYXVsdCBmb3IgY29udGVudCB1c2luZyBhIHNlcmlm IGZvbnQuCisgICAgICovCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2Jq ZWN0Q2xhc3MsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX1NFUklG X0ZPTlRfRkFNSUxZLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJh bV9zcGVjX3N0cmluZygic2VyaWYtZm9udC1mYW1pbHkiLApAQCAtNTQ1LDEwICs1NDUsMTAgQEAg c3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0U2V0dGluZ3NDbGFz cyoga2xhc3MpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJlYWRXcml0ZUNvbnN0cnVjdFBhcmFtRmxhZ3MpKTsKIAogICAgIC8qKgotICAg ICogV2ViS2l0V2ViU2V0dGluZ3M6c2Fucy1zZXJpZi1mb250LWZhbWlseQotICAgICoKLSAgICAq IFRoZSBmb250IGZhbWlseSB1c2VkIGFzIHRoZSBkZWZhdWx0IGZvciBjb250ZW50IHVzaW5nIGEg c2Fucy1zZXJpZiBmb250LgotICAgICovCisgICAgICogV2ViS2l0V2ViU2V0dGluZ3M6c2Fucy1z ZXJpZi1mb250LWZhbWlseToKKyAgICAgKgorICAgICAqIFRoZSBmb250IGZhbWlseSB1c2VkIGFz IHRoZSBkZWZhdWx0IGZvciBjb250ZW50IHVzaW5nIGEgc2Fucy1zZXJpZiBmb250LgorICAgICAq LwogICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoZ09iamVjdENsYXNzLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPUF9TQU5TX1NFUklGX0ZPTlRfRkFN SUxZLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0 cmluZygic2Fucy1zZXJpZi1mb250LWZhbWlseSIsCkBAIC01NTgsMTAgKzU1OCwxMCBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRfc2V0dGluZ3NfY2xhc3NfaW5pdChXZWJLaXRTZXR0aW5nc0NsYXNzKiBr bGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1GbGFncykpOwogCiAgICAgLyoqCi0gICAgKiBX ZWJLaXRXZWJTZXR0aW5nczpjdXJzaXZlLWZvbnQtZmFtaWx5Ci0gICAgKgotICAgICogVGhlIGZv bnQgZmFtaWx5IHVzZWQgYXMgdGhlIGRlZmF1bHQgZm9yIGNvbnRlbnQgdXNpbmcgYSBjdXJzaXZl IGZvbnQuCi0gICAgKi8KKyAgICAgKiBXZWJLaXRXZWJTZXR0aW5nczpjdXJzaXZlLWZvbnQtZmFt aWx5OgorICAgICAqCisgICAgICogVGhlIGZvbnQgZmFtaWx5IHVzZWQgYXMgdGhlIGRlZmF1bHQg Zm9yIGNvbnRlbnQgdXNpbmcgYSBjdXJzaXZlIGZvbnQuCisgICAgICovCiAgICAgZ19vYmplY3Rf Y2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3MsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBQUk9QX0NVUlNJVkVfRk9OVF9GQU1JTFksCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKCJjdXJzaXZlLWZvbnQt ZmFtaWx5IiwKQEAgLTU3MSwxMCArNTcxLDEwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0aW5n c19jbGFzc19pbml0KFdlYktpdFNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWFkV3JpdGVDb25zdHJ1 Y3RQYXJhbUZsYWdzKSk7CiAKICAgICAvKioKLSAgICAqIFdlYktpdFdlYlNldHRpbmdzOmZhbnRh c3ktZm9udC1mYW1pbHkKLSAgICAqCi0gICAgKiBUaGUgZm9udCBmYW1pbHkgdXNlZCBhcyB0aGUg ZGVmYXVsdCBmb3IgY29udGVudCB1c2luZyBhIGZhbnRhc3kgZm9udC4KLSAgICAqLworICAgICAq IFdlYktpdFdlYlNldHRpbmdzOmZhbnRhc3ktZm9udC1mYW1pbHk6CisgICAgICoKKyAgICAgKiBU aGUgZm9udCBmYW1pbHkgdXNlZCBhcyB0aGUgZGVmYXVsdCBmb3IgY29udGVudCB1c2luZyBhIGZh bnRhc3kgZm9udC4KKyAgICAgKi8KICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5 KGdPYmplY3RDbGFzcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1Bf RkFOVEFTWV9GT05UX0ZBTUlMWSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdfcGFyYW1fc3BlY19zdHJpbmcoImZhbnRhc3ktZm9udC1mYW1pbHkiLApAQCAtNTg0LDEwICs1 ODQsMTAgQEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0U2V0 dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJlYWRXcml0ZUNvbnN0cnVjdFBhcmFtRmxhZ3MpKTsKIAogICAg IC8qKgotICAgICogV2ViS2l0V2ViU2V0dGluZ3M6cGljdG9ncmFwaC1mb250LWZhbWlseQotICAg ICoKLSAgICAqIFRoZSBmb250IGZhbWlseSB1c2VkIGFzIHRoZSBkZWZhdWx0IGZvciBjb250ZW50 IHVzaW5nIGEgcGljdG9ncmFwaCBmb250LgotICAgICovCisgICAgICogV2ViS2l0V2ViU2V0dGlu Z3M6cGljdG9ncmFwaC1mb250LWZhbWlseToKKyAgICAgKgorICAgICAqIFRoZSBmb250IGZhbWls eSB1c2VkIGFzIHRoZSBkZWZhdWx0IGZvciBjb250ZW50IHVzaW5nIGEgcGljdG9ncmFwaCBmb250 LgorICAgICAqLwogICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoZ09iamVjdENs YXNzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPUF9QSUNUT0dSQVBI X0ZPTlRfRkFNSUxZLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJh bV9zcGVjX3N0cmluZygicGljdG9ncmFwaC1mb250LWZhbWlseSIsCkBAIC01OTcsMTEgKzU5Nywx MSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfc2V0dGluZ3NfY2xhc3NfaW5pdChXZWJLaXRTZXR0aW5n c0NsYXNzKiBrbGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1GbGFncykpOwogCiAgICAgLyoq Ci0gICAgKiBXZWJLaXRXZWJTZXR0aW5nczpkZWZhdWx0LWZvbnQtc2l6ZQotICAgICoKLSAgICAq IFRoZSBkZWZhdWx0IGZvbnQgc2l6ZSBpbiBwaXhlbHMgdG8gdXNlIGZvciBjb250ZW50IGRpc3Bs YXllZCBpZgotICAgICogbm8gZm9udCBzaXplIGlzIHNwZWNpZmllZC4KLSAgICAqLworICAgICAq IFdlYktpdFdlYlNldHRpbmdzOmRlZmF1bHQtZm9udC1zaXplOgorICAgICAqCisgICAgICogVGhl IGRlZmF1bHQgZm9udCBzaXplIGluIHBpeGVscyB0byB1c2UgZm9yIGNvbnRlbnQgZGlzcGxheWVk IGlmCisgICAgICogbm8gZm9udCBzaXplIGlzIHNwZWNpZmllZC4KKyAgICAgKi8KICAgICBnX29i amVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdPYmplY3RDbGFzcywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFBST1BfREVGQVVMVF9GT05UX1NJWkUsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfdWludCgiZGVmYXVsdC1mb250 LXNpemUiLApAQCAtNjExLDExICs2MTEsMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdz X2NsYXNzX2luaXQoV2ViS2l0U2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWFkV3JpdGVDb25zdHJ1Y3RQ YXJhbUZsYWdzKSk7CiAKICAgICAvKioKLSAgICAqIFdlYktpdFdlYlNldHRpbmdzOmRlZmF1bHQt bW9ub3NwYWNlLWZvbnQtc2l6ZQotICAgICoKLSAgICAqIFRoZSBkZWZhdWx0IGZvbnQgc2l6ZSBp biBwaXhlbHMgdG8gdXNlIGZvciBjb250ZW50IGRpc3BsYXllZCBpbgotICAgICogbW9ub3NwYWNl IGZvbnQgaWYgbm8gZm9udCBzaXplIGlzIHNwZWNpZmllZC4KLSAgICAqLworICAgICAqIFdlYktp dFdlYlNldHRpbmdzOmRlZmF1bHQtbW9ub3NwYWNlLWZvbnQtc2l6ZToKKyAgICAgKgorICAgICAq IFRoZSBkZWZhdWx0IGZvbnQgc2l6ZSBpbiBwaXhlbHMgdG8gdXNlIGZvciBjb250ZW50IGRpc3Bs YXllZCBpbgorICAgICAqIG1vbm9zcGFjZSBmb250IGlmIG5vIGZvbnQgc2l6ZSBpcyBzcGVjaWZp ZWQuCisgICAgICovCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0 Q2xhc3MsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX0RFRkFVTFRf TU9OT1NQQUNFX0ZPTlRfU0laRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdfcGFyYW1fc3BlY191aW50KCJkZWZhdWx0LW1vbm9zcGFjZS1mb250LXNpemUiLApAQCAtNjI1 LDEyICs2MjUsMTIgQEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQoV2Vi S2l0U2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICByZWFkV3JpdGVDb25zdHJ1Y3RQYXJhbUZsYWdzKSk7CiAK ICAgICAvKioKLSAgICAqIFdlYktpdFdlYlNldHRpbmdzOm1pbmltdW0tZm9udC1zaXplCi0gICAg KgotICAgICogVGhlIG1pbmltdW0gZm9udCBzaXplIGluIHBvaW50cyB1c2VkIHRvIGRpc3BsYXkg dGV4dC4gVGhpcyBzZXR0aW5nIAotICAgICogY29udHJvbHMgdGhlIGFic29sdXRlIHNtYWxsZXN0 IHNpemUuIFZhbHVlcyBvdGhlciB0aGFuIDAgY2FuIAotICAgICogcG90ZW50aWFsbHkgYnJlYWsg cGFnZSBsYXlvdXRzLgotICAgICovCisgICAgICogV2ViS2l0V2ViU2V0dGluZ3M6bWluaW11bS1m b250LXNpemU6CisgICAgICoKKyAgICAgKiBUaGUgbWluaW11bSBmb250IHNpemUgaW4gcG9pbnRz IHVzZWQgdG8gZGlzcGxheSB0ZXh0LiBUaGlzIHNldHRpbmcKKyAgICAgKiBjb250cm9scyB0aGUg YWJzb2x1dGUgc21hbGxlc3Qgc2l6ZS4gVmFsdWVzIG90aGVyIHRoYW4gMCBjYW4KKyAgICAgKiBw b3RlbnRpYWxseSBicmVhayBwYWdlIGxheW91dHMuCisgICAgICovCiAgICAgZ19vYmplY3RfY2xh c3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3MsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBQUk9QX01JTklNVU1fRk9OVF9TSVpFLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3VpbnQoIm1pbmltdW0tZm9udC1zaXplIiwK QEAgLTY0MCwxMCArNjQwLDEwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0aW5nc19jbGFzc19p bml0KFdlYktpdFNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1GbGFn cykpOwogCiAgICAgLyoqCi0gICAgKiBXZWJLaXRTZXR0aW5nczpkZWZhdWx0LWNoYXJzZXQKLSAg ICAqCi0gICAgKiBUaGUgZGVmYXVsdCB0ZXh0IGNoYXJzZXQgdXNlZCB3aGVuIGludGVycHJldGlu ZyBjb250ZW50IHdpdGggYW4gdW5zcGVjaWZpZWQgY2hhcnNldC4KLSAgICAqLworICAgICAqIFdl YktpdFNldHRpbmdzOmRlZmF1bHQtY2hhcnNldDoKKyAgICAgKgorICAgICAqIFRoZSBkZWZhdWx0 IHRleHQgY2hhcnNldCB1c2VkIHdoZW4gaW50ZXJwcmV0aW5nIGNvbnRlbnQgd2l0aCBhbiB1bnNw ZWNpZmllZCBjaGFyc2V0LgorICAgICAqLwogICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJv cGVydHkoZ09iamVjdENsYXNzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UFJPUF9ERUZBVUxUX0NIQVJTRVQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBnX3BhcmFtX3NwZWNfc3RyaW5nKCJkZWZhdWx0LWNoYXJzZXQiLApAQCAtNjk1LDggKzY5NSw4 IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0aW5nc19jbGFzc19pbml0KFdlYktpdFNldHRpbmdz Q2xhc3MqIGtsYXNzKQogICAgIC8qKgogICAgICAqIFdlYktpdFNldHRpbmdzOmVuYWJsZS10YWJz LXRvLWxpbmtzOgogICAgICAqCi0gICAgICogRGV0ZXJtaW5lcyB3aGV0aGVyIHRoZSB0YWIga2V5 IGN5Y2xlcyB0aHJvdWdoIHRoZSBlbGVtZW50cyBvbiB0aGUgcGFnZS4gCi0gICAgICogV2hlbiB0 aGlzIHNldHRpbmcgaXMgZW5hYmxlZCwgdXNlcnMgd2lsbCBiZSBhYmxlIHRvIGZvY3VzIHRoZSBu ZXh0IGVsZW1lbnQgCisgICAgICogRGV0ZXJtaW5lcyB3aGV0aGVyIHRoZSB0YWIga2V5IGN5Y2xl cyB0aHJvdWdoIHRoZSBlbGVtZW50cyBvbiB0aGUgcGFnZS4KKyAgICAgKiBXaGVuIHRoaXMgc2V0 dGluZyBpcyBlbmFibGVkLCB1c2VycyB3aWxsIGJlIGFibGUgdG8gZm9jdXMgdGhlIG5leHQgZWxl bWVudAogICAgICAqIGluIHRoZSBwYWdlIGJ5IHByZXNzaW5nIHRoZSB0YWIga2V5LiBJZiB0aGUg c2VsZWN0ZWQgZWxlbWVudCBpcyBlZGl0YWJsZSwKICAgICAgKiB0aGVuIHByZXNzaW5nIHRhYiBr ZXkgd2lsbCBpbnNlcnQgdGhlIHRhYiBjaGFyYWN0ZXIuCiAgICAgICovCkBAIC0xNjk1LDI2ICsx Njk1LDYgQEAgdm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9wcml2YXRlX2Jyb3dzaW5n KFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncywgZ2Jvb2wKIH0KIAogLyoqCi0gKiB3ZWJraXRfc2V0 dGluZ3Nfc2V0X2VuYWJsZV9mdWxsc2NyZWVuCi0gKiBAc2V0dGluZ3M6IGEgI1dlYktpdFNldHRp bmdzCi0gKiBAZW5hYmxlZDogVmFsdWUgdG8gYmUgc2V0Ci0gKgotICogU2V0IHRoZSAjV2ViS2l0 U2V0dGluZ3M6ZW5hYmxlLWZ1bGxzY3JlZW4gcHJvcGVydHkuCi0gKi8KLXZvaWQgd2Via2l0X3Nl dHRpbmdzX3NldF9lbmFibGVfZnVsbHNjcmVlbihXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdi b29sZWFuIGVuYWJsZWQpCi17Ci0gICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElO R1Moc2V0dGluZ3MpKTsKLQotICAgIFdlYktpdFNldHRpbmdzUHJpdmF0ZSogcHJpdiA9IHNldHRp bmdzLT5wcml2OwotICAgIGJvb2wgY3VycmVudFZhbHVlID0gV0tQcmVmZXJlbmNlc0dldEZ1bGxT Y3JlZW5FbmFibGVkKHByaXYtPnByZWZlcmVuY2VzLmdldCgpKTsKLSAgICBpZiAoY3VycmVudFZh bHVlID09IGVuYWJsZWQpCi0gICAgICAgIHJldHVybjsKLQotICAgIFdLUHJlZmVyZW5jZXNTZXRG dWxsU2NyZWVuRW5hYmxlZChwcml2LT5wcmVmZXJlbmNlcy5nZXQoKSwgZW5hYmxlZCk7Ci0gICAg Z19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHNldHRpbmdzKSwgImVuYWJsZS1mdWxsc2NyZWVuIik7 Ci19Ci0KLS8qKgogICogd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfZGV2ZWxvcGVyX2V4dHJh czoKICAqIEBzZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MKICAqCkBAIC0xOTAzLDMgKzE4ODMs MjMgQEAgZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfZnVsbHNjcmVlbihXZWJL aXRTZXR0aW5ncyogc2V0dGluZ3MpCiAKICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldEZ1bGxT Y3JlZW5FbmFibGVkKHNldHRpbmdzLT5wcml2LT5wcmVmZXJlbmNlcy5nZXQoKSk7CiB9CisKKy8q KgorICogd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfZnVsbHNjcmVlbgorICogQHNldHRpbmdz OiBhICNXZWJLaXRTZXR0aW5ncworICogQGVuYWJsZWQ6IFZhbHVlIHRvIGJlIHNldAorICoKKyAq IFNldCB0aGUgI1dlYktpdFNldHRpbmdzOmVuYWJsZS1mdWxsc2NyZWVuIHByb3BlcnR5LgorICov Cit2b2lkIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2Z1bGxzY3JlZW4oV2ViS2l0U2V0dGlu Z3MqIHNldHRpbmdzLCBnYm9vbGVhbiBlbmFibGVkKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwo V0VCS0lUX0lTX1NFVFRJTkdTKHNldHRpbmdzKSk7CisKKyAgICBXZWJLaXRTZXR0aW5nc1ByaXZh dGUqIHByaXYgPSBzZXR0aW5ncy0+cHJpdjsKKyAgICBib29sIGN1cnJlbnRWYWx1ZSA9IFdLUHJl ZmVyZW5jZXNHZXRGdWxsU2NyZWVuRW5hYmxlZChwcml2LT5wcmVmZXJlbmNlcy5nZXQoKSk7Cisg ICAgaWYgKGN1cnJlbnRWYWx1ZSA9PSBlbmFibGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBX S1ByZWZlcmVuY2VzU2V0RnVsbFNjcmVlbkVuYWJsZWQocHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCks IGVuYWJsZWQpOworICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChzZXR0aW5ncyksICJlbmFi bGUtZnVsbHNjcmVlbiIpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFNldHRpbmdzLmgKaW5kZXggNDJjY2RiMi4uOGIxOWE0NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oCkBAIC0xLDMw ICsxLDMwIEBACiAvKgogICogQ29weXJpZ2h0IChjKSAyMDExIE1vdG9yb2xhIE1vYmlsaXR5LCBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dCBtb2RpZmljYXRpb24s IAorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0IG1vZGlmaWNhdGlvbiwKICAqIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlIG1ldDoKICAqCi0gKiBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodCBub3Rp Y2UsIAorICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQgbm90aWNlLAogICogdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KICAqCi0gKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UsIAotICogdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUg ZG9jdW1lbnRhdGlvbiBhbmQvb3IgCisgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UsCisgKiB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZSBkb2N1bWVu dGF0aW9uIGFuZC9vcgogICogb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4KICAqCi0gKiBOZWl0aGVyIHRoZSBuYW1lIG9mIE1vdG9yb2xhIE1vYmlsaXR5LCBJ bmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzIGNvbnRyaWJ1dG9ycyBtYXkgCi0gKiBiZSB1c2VkIHRv IGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20gdGhpcyBzb2Z0d2FyZSB3 aXRob3V0IAorICogTmVpdGhlciB0aGUgbmFtZSBvZiBNb3Rvcm9sYSBNb2JpbGl0eSwgSW5jLiBu b3IgdGhlIG5hbWVzIG9mIGl0cyBjb250cmlidXRvcnMgbWF5CisgKiBiZSB1c2VkIHRvIGVuZG9y c2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0 CiAgKiBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCiAgKgotICogVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9S UyAKLSAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiAKLSAqIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUIEhPTERF UiBPUiAKLSAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCAKLSAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBE QU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgCi0gKiBQUk9DVVJFTUVOVCBP RiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgCi0g KiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBP TiBBTlkgVEhFT1JZIAotICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgCi0gKiBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJ QlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQgSE9M REVSIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVD VCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBE QU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9G IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICog UFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04g QU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1Qg TElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcKKyAqIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUwogICogU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8K IApAQCAtMTYxLDEwOCArMTYxLDEwOCBAQCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9oeXBl cmxpbmtfYXVkaXRpbmcgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdib29sZWFuICAgICAgICBlbmFibGVkKTsKIAogV0VCS0lUX0FQSSBjb25zdCBnY2hhciAqCi13 ZWJraXRfc2V0dGluZ3NfZ2V0X2RlZmF1bHRfZm9udF9mYW1pbHkgICAgICAgICAgICAgICAgICAg ICAgICAoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKTsKK3dlYmtpdF9zZXR0aW5nc19nZXRfZGVm YXVsdF9mb250X2ZhbWlseSAgICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAq c2V0dGluZ3MpOwogCiBXRUJLSVRfQVBJIHZvaWQKLXdlYmtpdF9zZXR0aW5nc19zZXRfZGVmYXVs dF9mb250X2ZhbWlseSAgICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyogc2V0 dGluZ3MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIqIGRlZmF1bHRfZm9udF9mYW1pbHkpOword2Via2l0 X3NldHRpbmdzX3NldF9kZWZhdWx0X2ZvbnRfZmFtaWx5ICAgICAgICAgICAgICAgICAgICAgICAg KFdlYktpdFNldHRpbmdzICpzZXR0aW5ncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAqZGVmYXVs dF9mb250X2ZhbWlseSk7CiAKIFdFQktJVF9BUEkgY29uc3QgZ2NoYXIgKgotd2Via2l0X3NldHRp bmdzX2dldF9tb25vc3BhY2VfZm9udF9mYW1pbHkgICAgICAgICAgICAgICAgICAgICAgKFdlYktp dFNldHRpbmdzKiBzZXR0aW5ncyk7Cit3ZWJraXRfc2V0dGluZ3NfZ2V0X21vbm9zcGFjZV9mb250 X2ZhbWlseSAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzKTsK IAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfc2V0dGluZ3Nfc2V0X21vbm9zcGFjZV9mb250X2Zh bWlseSAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IGdjaGFyKiBtb25vc3BhY2VfZm9udF9mYW1pbHkpOword2Via2l0X3NldHRpbmdz X3NldF9tb25vc3BhY2VfZm9udF9mYW1pbHkgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNl dHRpbmdzICpzZXR0aW5ncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAqbW9ub3NwYWNlX2ZvbnRf ZmFtaWx5KTsKIAogV0VCS0lUX0FQSSBjb25zdCBnY2hhciAqCi13ZWJraXRfc2V0dGluZ3NfZ2V0 X3NlcmlmX2ZvbnRfZmFtaWx5ICAgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGlu Z3MqIHNldHRpbmdzKTsKK3dlYmtpdF9zZXR0aW5nc19nZXRfc2VyaWZfZm9udF9mYW1pbHkgICAg ICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MpOwogCiBXRUJL SVRfQVBJIHZvaWQKLXdlYmtpdF9zZXR0aW5nc19zZXRfc2VyaWZfZm9udF9mYW1pbHkgICAgICAg ICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgZ2NoYXIqIHNlcmlmX2ZvbnRfZmFtaWx5KTsKK3dlYmtpdF9zZXR0aW5nc19zZXRfc2VyaWZf Zm9udF9mYW1pbHkgICAgICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0 dGluZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgKnNlcmlmX2ZvbnRfZmFtaWx5KTsKIAogV0VC S0lUX0FQSSBjb25zdCBnY2hhciAqCi13ZWJraXRfc2V0dGluZ3NfZ2V0X3NhbnNfc2VyaWZfZm9u dF9mYW1pbHkgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKTsK K3dlYmtpdF9zZXR0aW5nc19nZXRfc2Fuc19zZXJpZl9mb250X2ZhbWlseSAgICAgICAgICAgICAg ICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MpOwogCiBXRUJLSVRfQVBJIHZvaWQKLXdl YmtpdF9zZXR0aW5nc19zZXRfc2Fuc19zZXJpZl9mb250X2ZhbWlseSAgICAgICAgICAgICAgICAg ICAgIChXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIqIHNhbnNf c2VyaWZfZm9udF9mYW1pbHkpOword2Via2l0X3NldHRpbmdzX3NldF9zYW5zX3NlcmlmX2ZvbnRf ZmFtaWx5ICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5ncywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBnY2hhciAgICAqc2Fuc19zZXJpZl9mb250X2ZhbWlseSk7CiAKIFdFQktJVF9B UEkgY29uc3QgZ2NoYXIgKgotd2Via2l0X3NldHRpbmdzX2dldF9jdXJzaXZlX2ZvbnRfZmFtaWx5 ICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncyk7Cit3ZWJr aXRfc2V0dGluZ3NfZ2V0X2N1cnNpdmVfZm9udF9mYW1pbHkgICAgICAgICAgICAgICAgICAgICAg ICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzKTsKIAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRf c2V0dGluZ3Nfc2V0X2N1cnNpdmVfZm9udF9mYW1pbHkgICAgICAgICAgICAgICAgICAgICAgICAo V2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyKiBjdXJzaXZlX2Zv bnRfZmFtaWx5KTsKK3dlYmtpdF9zZXR0aW5nc19zZXRfY3Vyc2l2ZV9mb250X2ZhbWlseSAgICAg ICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgZ2NoYXIgICAgKmN1cnNpdmVfZm9udF9mYW1pbHkpOwogCiBXRUJLSVRfQVBJIGNvbnN0IGdj aGFyICoKLXdlYmtpdF9zZXR0aW5nc19nZXRfZmFudGFzeV9mb250X2ZhbWlseSAgICAgICAgICAg ICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpOword2Via2l0X3NldHRpbmdz X2dldF9mYW50YXN5X2ZvbnRfZmFtaWx5ICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNl dHRpbmdzICpzZXR0aW5ncyk7CiAKIFdFQktJVF9BUEkgdm9pZAotd2Via2l0X3NldHRpbmdzX3Nl dF9mYW50YXN5X2ZvbnRfZmFtaWx5ICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRp bmdzKiBzZXR0aW5ncywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciogZmFudGFzeV9mb250X2ZhbWlseSk7 Cit3ZWJraXRfc2V0dGluZ3Nfc2V0X2ZhbnRhc3lfZm9udF9mYW1pbHkgICAgICAgICAgICAgICAg ICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAg ICpmYW50YXN5X2ZvbnRfZmFtaWx5KTsKIAogV0VCS0lUX0FQSSBjb25zdCBnY2hhciAqCi13ZWJr aXRfc2V0dGluZ3NfZ2V0X3BpY3RvZ3JhcGhfZm9udF9mYW1pbHkgICAgICAgICAgICAgICAgICAg ICAoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKTsKK3dlYmtpdF9zZXR0aW5nc19nZXRfcGljdG9n cmFwaF9mb250X2ZhbWlseSAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0 dGluZ3MpOwogCiBXRUJLSVRfQVBJIHZvaWQKLXdlYmtpdF9zZXR0aW5nc19zZXRfcGljdG9ncmFw aF9mb250X2ZhbWlseSAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyogc2V0dGlu Z3MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgZ2NoYXIqIHBpY3RvZ3JhcGhfZm9udF9mYW1pbHkpOword2Via2l0 X3NldHRpbmdzX3NldF9waWN0b2dyYXBoX2ZvbnRfZmFtaWx5ICAgICAgICAgICAgICAgICAgICAg KFdlYktpdFNldHRpbmdzICpzZXR0aW5ncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAqcGljdG9n cmFwaF9mb250X2ZhbWlseSk7CiAKIFdFQktJVF9BUEkgZ3VpbnQzMgotd2Via2l0X3NldHRpbmdz X2dldF9kZWZhdWx0X2ZvbnRfc2l6ZSAgICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNl dHRpbmdzKiBzZXR0aW5ncyk7Cit3ZWJraXRfc2V0dGluZ3NfZ2V0X2RlZmF1bHRfZm9udF9zaXpl ICAgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzKTsKIAog V0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfc2V0dGluZ3Nfc2V0X2RlZmF1bHRfZm9udF9zaXplICAg ICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGd1aW50MzIgZm9udF9zaXplKTsKK3dlYmtpdF9zZXR0aW5nc19zZXRfZGVmYXVsdF9mb250X3Np emUgICAgICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ3VpbnQzMiAgICAgICAgIGZvbnRfc2l6ZSk7CiAKIFdFQktJVF9BUEkgZ3VpbnQzMgot d2Via2l0X3NldHRpbmdzX2dldF9kZWZhdWx0X21vbm9zcGFjZV9mb250X3NpemUgICAgICAgICAg ICAgICAgKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncyk7Cit3ZWJraXRfc2V0dGluZ3NfZ2V0X2Rl ZmF1bHRfbW9ub3NwYWNlX2ZvbnRfc2l6ZSAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3Mg KnNldHRpbmdzKTsKIAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfc2V0dGluZ3Nfc2V0X2RlZmF1 bHRfbW9ub3NwYWNlX2ZvbnRfc2l6ZSAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MqIHNl dHRpbmdzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGd1aW50MzIgZm9udF9zaXplKTsKK3dlYmtpdF9zZXR0aW5nc19zZXRf ZGVmYXVsdF9tb25vc3BhY2VfZm9udF9zaXplICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5n cyAqc2V0dGluZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZ3VpbnQzMiAgICAgICAgIGZvbnRfc2l6ZSk7CiAKIFdFQktJ VF9BUEkgZ3VpbnQzMgotd2Via2l0X3NldHRpbmdzX2dldF9taW5pbXVtX2ZvbnRfc2l6ZSAgICAg ICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncyk7Cit3ZWJraXRf c2V0dGluZ3NfZ2V0X21pbmltdW1fZm9udF9zaXplICAgICAgICAgICAgICAgICAgICAgICAgICAo V2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzKTsKIAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfc2V0 dGluZ3Nfc2V0X21pbmltdW1fZm9udF9zaXplICAgICAgICAgICAgICAgICAgICAgICAgICAoV2Vi S2l0U2V0dGluZ3MqIHNldHRpbmdzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd1aW50MzIgZm9udF9zaXplKTsKK3dlYmtp dF9zZXR0aW5nc19zZXRfbWluaW11bV9mb250X3NpemUgICAgICAgICAgICAgICAgICAgICAgICAg IChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3VpbnQzMiAgICAgICAgIGZvbnRf c2l6ZSk7CiAKIFdFQktJVF9BUEkgY29uc3QgZ2NoYXIgKgotd2Via2l0X3NldHRpbmdzX2dldF9k ZWZhdWx0X2NoYXJzZXQgICAgICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdz KiBzZXR0aW5ncyk7Cit3ZWJraXRfc2V0dGluZ3NfZ2V0X2RlZmF1bHRfY2hhcnNldCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzKTsKIAogV0VCS0lU X0FQSSB2b2lkCi13ZWJraXRfc2V0dGluZ3Nfc2V0X2RlZmF1bHRfY2hhcnNldCAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IGdjaGFyKiBkZWZhdWx0X2NoYXJzZXQpOword2Via2l0X3NldHRpbmdzX3NldF9kZWZhdWx0X2No YXJzZXQgICAgICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5n cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBnY2hhciAgICAqZGVmYXVsdF9jaGFyc2V0KTsKIAogV0VCS0lUX0FQ SSBnYm9vbGVhbgotd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfcHJpdmF0ZV9icm93c2luZyAg ICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncyk7Cit3ZWJraXRfc2V0 dGluZ3NfZ2V0X2VuYWJsZV9wcml2YXRlX2Jyb3dzaW5nICAgICAgICAgICAgICAgICAgICAoV2Vi S2l0U2V0dGluZ3MgKnNldHRpbmdzKTsKIAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfc2V0dGlu Z3Nfc2V0X2VuYWJsZV9wcml2YXRlX2Jyb3dzaW5nICAgICAgICAgICAgICAgICAgICAoV2ViS2l0 U2V0dGluZ3MqIHNldHRpbmdzLAord2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfcHJpdmF0ZV9i cm93c2luZyAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5ncywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBnYm9vbGVhbiAgICAgICAgZW5hYmxlZCk7CiAKIFdFQktJVF9BUEkgZ2Jvb2xlYW4KLXdl YmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX2RldmVsb3Blcl9leHRyYXMgICAgICAgICAgICAgICAg ICAgIChXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpOword2Via2l0X3NldHRpbmdzX2dldF9lbmFi bGVfZGV2ZWxvcGVyX2V4dHJhcyAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzICpz ZXR0aW5ncyk7CiAKIFdFQktJVF9BUEkgdm9pZAotd2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVf ZGV2ZWxvcGVyX2V4dHJhcyAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzKiBzZXR0 aW5ncywKK3dlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2RldmVsb3Blcl9leHRyYXMgICAgICAg ICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2Jvb2xlYW4g ICAgICAgIGVuYWJsZWQpOwogCiBXRUJLSVRfQVBJIGdib29sZWFuCi13ZWJraXRfc2V0dGluZ3Nf Z2V0X2VuYWJsZV9yZXNpemFibGVfdGV4dF9hcmVhcyAgICAgICAgICAgICAgICAoV2ViS2l0U2V0 dGluZ3MqIHNldHRpbmdzKTsKK3dlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX3Jlc2l6YWJsZV90 ZXh0X2FyZWFzICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MpOwogCiBX RUJLSVRfQVBJIHZvaWQKLXdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX3Jlc2l6YWJsZV90ZXh0 X2FyZWFzICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsCit3ZWJraXRf c2V0dGluZ3Nfc2V0X2VuYWJsZV9yZXNpemFibGVfdGV4dF9hcmVhcyAgICAgICAgICAgICAgICAo V2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFuICAgICAgICBlbmFibGVk KTsKIAogV0VCS0lUX0FQSSBnYm9vbGVhbgotd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfdGFi c190b19saW5rcyAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzKiBzZXR0aW5n cyk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCit3ZWJraXRfc2V0dGluZ3NfZ2V0X2Vu YWJsZV90YWJzX3RvX2xpbmtzICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3Mg KnNldHRpbmdzKTsKIAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJs ZV90YWJzX3RvX2xpbmtzICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MqIHNl dHRpbmdzLAord2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfdGFic190b19saW5rcyAgICAgICAg ICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5ncywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnYm9vbGVh biAgICAgICAgZW5hYmxlZCk7CiAKIFdFQktJVF9BUEkgZ2Jvb2xlYW4KQEAgLTI3MywxOSArMjcz LDE5IEBAIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2Ruc19wcmVmZXRjaGluZyAgICAgICAg ICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2Jvb2xlYW4gICAgICAgIGVu YWJsZWQpOwogCiBXRUJLSVRfQVBJIGdib29sZWFuCi13ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJs ZV9jYXJldF9icm93c2luZyAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MqIHNl dHRpbmdzKTsKK3dlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX2NhcmV0X2Jyb3dzaW5nICAgICAg ICAgICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MpOwogCiBXRUJLSVRfQVBJ IHZvaWQKLXdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX2NhcmV0X2Jyb3dzaW5nICAgICAgICAg ICAgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2Jvb2xlYW4g ZW5hYmxlZCk7Cit3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9jYXJldF9icm93c2luZyAgICAg ICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29s ZWFuICAgICAgICBlbmFibGVkKTsKIAogV0VCS0lUX0FQSSBnYm9vbGVhbgotd2Via2l0X3NldHRp bmdzX2dldF9lbmFibGVfZnVsbHNjcmVlbiAgICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktp dFNldHRpbmdzKiBzZXR0aW5ncyk7Cit3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9mdWxsc2Ny ZWVuICAgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzKTsK IAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9mdWxsc2NyZWVu ICAgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGdib29sZWFuIGVuYWJsZWQpOword2Via2l0X3NldHRpbmdzX3NldF9lbmFibGVfZnVsbHNj cmVlbiAgICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5ncywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBnYm9vbGVhbiAgICAgICAgZW5hYmxlZCk7CiAKIEdfRU5EX0RFQ0xTCiAKLSNlbmRp ZiAvKiB3ZWJraXR3ZWJzZXR0aW5nc19oICovCisjZW5kaWYgLyogV2ViS2l0U2V0dGluZ3NfaCAq LwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 LmNwcAppbmRleCA2OTEzOGQwLi43OTg5NmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAtMzcsNiArMzcsNyBAQAogI2lu Y2x1ZGUgPFdlYktpdDIvV0tCYXNlLmg+CiAjaW5jbHVkZSA8V2ViS2l0Mi9XS1JldGFpblB0ci5o PgogI2luY2x1ZGUgPFdlYktpdDIvV0tVUkwuaD4KKyNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5o PgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dPd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvZ29iamVj dC9HUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtMTAwLDcgKzEw MSw2IEBAIHN0YXRpYyBHdGtXaWRnZXQqIHdlYmtpdFdlYlZpZXdDcmVhdGVKYXZhU2NyaXB0RGlh bG9nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIEd0CiAgICAgcmV0dXJuIGRpYWxvZzsKIH0KIAot CiBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld1NjcmlwdEFsZXJ0KFdlYktpdFdlYlZpZXcq IHdlYlZpZXcsIGNvbnN0IGNoYXIqIG1lc3NhZ2UpCiB7CiAgICAgR3RrV2lkZ2V0KiBkaWFsb2cg PSB3ZWJraXRXZWJWaWV3Q3JlYXRlSmF2YVNjcmlwdERpYWxvZyh3ZWJWaWV3LCBHVEtfTUVTU0FH RV9XQVJOSU5HLCBHVEtfQlVUVE9OU19DTE9TRSwgR1RLX1JFU1BPTlNFX0NMT1NFLCBtZXNzYWdl KTsKQEAgLTEzMCw3ICsxMzAsNiBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld1Njcmlw dFByb21wdChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBjaGFyKiBtZQogICAgIHJldHVy biBUUlVFOwogfQogCi0KIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdTZXRMb2FkZXJDbGllbnQo V2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0V2ViTG9hZGVyQ2xpZW50KiBsb2FkZXJDbGll bnQsIFdLUGFnZVJlZiB3a1BhZ2UpCiB7CiAgICAgd2ViVmlldy0+cHJpdi0+bG9hZGVyQ2xpZW50 ID0gbG9hZGVyQ2xpZW50OwpAQCAtMjQ1LDI1ICsyNDQsMjUgQEAgc3RhdGljIHZvaWQgd2Via2l0 X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAg ICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3MsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX1dFQl9DT05URVhULAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX29iamVjdCgid2ViLWNvbnRl eHQiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiV2ViIENvbnRleHQiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiVGhlIHdlYiBjb250ZXh0IGZvciB0aGUgdmlldyIsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIldl YiBDb250ZXh0IiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIF8oIlRoZSB3ZWIgY29udGV4dCBmb3IgdGhlIHZpZXciKSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1RZ UEVfV0VCX0NPTlRFWFQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PEdQYXJhbUZsYWdzPihXRUJLSVRfUEFSQU1fUkVB RFdSSVRFIHwgR19QQVJBTV9DT05TVFJVQ1RfT05MWSkpKTsKIAogICAgIC8qKgogICAgICAqIFdl YktpdFdlYlZpZXc6dGl0bGU6Ci0gICAgICogCi0gICAgICogVGhlIG1haW4gZnJhbWUgZG9jdW1l bnQgdGl0bGUgb2YgdGhpcyAjV2ViS2l0V2ViVmlldy4gSWYgCisgICAgICoKKyAgICAgKiBUaGUg bWFpbiBmcmFtZSBkb2N1bWVudCB0aXRsZSBvZiB0aGlzICNXZWJLaXRXZWJWaWV3LiBJZgogICAg ICAqIHRoZSB0aXRsZSBoYXMgbm90IGJlZW4gcmVjZWl2ZWQgeWV0LCBpdCB3aWxsIGJlICVOVUxM LgogICAgICAqLwogICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoZ09iamVjdENs YXNzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPUF9USVRMRSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19zdHJpbmcoInRp dGxlIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIlRpdGxlIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIk1haW4gZnJhbWUgZG9jdW1lbnQgdGl0bGUiLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJUaXRsZSIpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBf KCJNYWluIGZyYW1lIGRvY3VtZW50IHRpdGxlIiksCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEQUJMRSkp OwotICAgIAorCiAgICAgLyoqCiAgICAgICogV2ViS2l0V2ViVmlldzplc3RpbWF0ZWQtbG9hZC1w cm9ncmVzczoKICAgICAgKgpAQCAtMjc4LDggKzI3Nyw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93 ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQogICAg IGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoZ09iamVjdENsYXNzLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPUF9FU1RJTUFURURfTE9BRF9QUk9HUkVTUywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19kb3VibGUo ImVzdGltYXRlZC1sb2FkLXByb2dyZXNzIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIkVzdGltYXRlZCBMb2FkIFByb2dyZXNzIiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkFu IGVzdGltYXRlIG9mIHRoZSBwZXJjZW50IGNvbXBsZXRpb24gZm9yIGEgZG9jdW1lbnQgbG9hZCIs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IF8oIkVzdGltYXRlZCBMb2FkIFByb2dyZXNzIiksCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIkFuIGVzdGltYXRlIG9mIHRoZSBwZXJj ZW50IGNvbXBsZXRpb24gZm9yIGEgZG9jdW1lbnQgbG9hZCIpLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLjAsIDEuMCwgMC4wLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXRUJL SVRfUEFSQU1fUkVBREFCTEUpKTsKICAgICAvKioKQEAgLTI5MSw4ICsyOTAsOCBAQCBzdGF0aWMg dm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZp ZXdDbGFzcykKICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdPYmplY3RDbGFz cywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1BfVVJJLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygidXJpIiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IlVSSSIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJUaGUgY3VycmVudCBhY3RpdmUgVVJJIG9mIHRoZSB2aWV3IiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiVVJJIiksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8o IlRoZSBjdXJyZW50IGFjdGl2ZSBVUkkgb2YgdGhlIHZpZXciKSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JF QURBQkxFKSk7CiAKQEAgLTQzNSw3ICs0MzQsNyBAQCB2b2lkIHdlYmtpdFdlYlZpZXdTZXRUaXRs ZShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBDU3RyaW5nJiB0aXRsZSkKICAgICBXZWJL aXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CiAgICAgaWYgKHByaXYtPnRp dGxlID09IHRpdGxlKQogICAgICAgICByZXR1cm47Ci0gICAgCisKICAgICBwcml2LT50aXRsZSA9 IHRpdGxlOwogICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVCh3ZWJWaWV3KSwgInRpdGxlIik7 CiB9CkBAIC02MTIsMTEgKzYxMSwxMSBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaShX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogdXJpKQogICogQGNvbnRlbnQ6IFRo ZSBIVE1MIHN0cmluZyB0byBsb2FkCiAgKiBAYmFzZV91cmk6IChhbGxvdy1ub25lKTogVGhlIGJh c2UgVVJJIGZvciByZWxhdGl2ZSBsb2NhdGlvbnMgb3IgJU5VTEwKICAqCi0gKiBMb2FkIHRoZSBn aXZlbiBAY29udGVudCBzdHJpbmcgd2l0aCB0aGUgc3BlY2lmaWVkIEBiYXNlX3VyaS4gCisgKiBM b2FkIHRoZSBnaXZlbiBAY29udGVudCBzdHJpbmcgd2l0aCB0aGUgc3BlY2lmaWVkIEBiYXNlX3Vy aS4KICAqIFJlbGF0aXZlIFVSTHMgaW4gdGhlIEBjb250ZW50IHdpbGwgYmUgcmVzb2x2ZWQgYWdh aW5zdCBAYmFzZV91cmkuCi0gKiBXaGVuIEBiYXNlX3VyaSBpcyAlTlVMTCwgaXQgZGVmYXVsdHMg dG8gImFib3V0OmJsYW5rIi4gVGhlIG1pbWUgdHlwZSAKLSAqIG9mIHRoZSBkb2N1bWVudCB3aWxs IGJlICJ0ZXh0L2h0bWwiLiBZb3UgY2FuIG1vbml0b3IgdGhlIHN0YXR1cyBvZiAKLSAqIHRoZSBs b2FkIG9wZXJhdGlvbiB1c2luZyB0aGUgI1dlYktpdFdlYkxvYWRlckNsaWVudCBvZiBAd2ViX3Zp ZXcuIAorICogV2hlbiBAYmFzZV91cmkgaXMgJU5VTEwsIGl0IGRlZmF1bHRzIHRvICJhYm91dDpi bGFuayIuIFRoZSBtaW1lIHR5cGUKKyAqIG9mIHRoZSBkb2N1bWVudCB3aWxsIGJlICJ0ZXh0L2h0 bWwiLiBZb3UgY2FuIG1vbml0b3IgdGhlIHN0YXR1cyBvZgorICogdGhlIGxvYWQgb3BlcmF0aW9u IHVzaW5nIHRoZSAjV2ViS2l0V2ViTG9hZGVyQ2xpZW50IG9mIEB3ZWJfdmlldy4KICAqIFNlZSB3 ZWJraXRfd2ViX3ZpZXdfZ2V0X2xvYWRlcl9jbGllbnQoKS4KICAqLwogdm9pZCB3ZWJraXRfd2Vi X3ZpZXdfbG9hZF9odG1sKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiBjb250 ZW50LCBjb25zdCBnY2hhciogYmFzZVVSSSkKQEAgLTYzNiw4ICs2MzUsOCBAQCB2b2lkIHdlYmtp dF93ZWJfdmlld19sb2FkX2h0bWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIq IGNvbnRlbnQsIGNvbgogICogQHBsYWluX3RleHQ6IFRoZSBwbGFpbiB0ZXh0IHRvIGxvYWQKICAq CiAgKiBMb2FkIHRoZSBzcGVjaWZpZWQgQHBsYWluX3RleHQgc3RyaW5nIGludG8gQHdlYl92aWV3 LiBUaGUgbWltZSB0eXBlIG9mCi0gKiBkb2N1bWVudCB3aWxsIGJlICJ0ZXh0L3BsYWluIi4gWW91 IGNhbiBtb25pdG9yICB0aGUgc3RhdHVzIG9mIHRoZSBsb2FkIAotICogb3BlcmF0aW9uIHVzaW5n IHRoZSAjV2ViS2l0V2ViTG9hZGVyQ2xpZW50IG9mIEB3ZWJfdmlldy4gCisgKiBkb2N1bWVudCB3 aWxsIGJlICJ0ZXh0L3BsYWluIi4gWW91IGNhbiBtb25pdG9yICB0aGUgc3RhdHVzIG9mIHRoZSBs b2FkCisgKiBvcGVyYXRpb24gdXNpbmcgdGhlICNXZWJLaXRXZWJMb2FkZXJDbGllbnQgb2YgQHdl Yl92aWV3LgogICogU2VlIHdlYmtpdF93ZWJfdmlld19nZXRfbG9hZGVyX2NsaWVudCgpLgogICov CiB2b2lkIHdlYmtpdF93ZWJfdmlld19sb2FkX3BsYWluX3RleHQoV2ViS2l0V2ViVmlldyogd2Vi VmlldywgY29uc3QgZ2NoYXIqIHBsYWluVGV4dCkKQEAgLTcwMyw5ICs3MDIsOSBAQCB2b2lkIHdl YmtpdF93ZWJfdmlld19sb2FkX3JlcXVlc3QoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0 VVJJUmVxdWVzdCogcmVxdQogLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RpdGxlOgogICog QHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3Ci0gKiAKKyAqCiAgKiBHZXRzIHRoZSB2YWx1ZSBv ZiB0aGUgI1dlYktpdFdlYlZpZXc6dGl0bGUgcHJvcGVydHkuCi0gKiBZb3UgY2FuIGNvbm5lY3Qg dG8gbm90aWZ5Ojp0aXRsZSBzaWduYWwgb2YgQHdlYl92aWV3IHRvIAorICogWW91IGNhbiBjb25u ZWN0IHRvIG5vdGlmeTo6dGl0bGUgc2lnbmFsIG9mIEB3ZWJfdmlldyB0bwogICogYmUgbm90aWZp ZWQgd2hlbiB0aGUgdGl0bGUgaGFzIGJlZW4gcmVjZWl2ZWQuCiAgKgogICogUmV0dXJuczogVGhl IG1haW4gZnJhbWUgZG9jdW1lbnQgdGl0bGUgb2YgQHdlYl92aWV3LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCmluZGV4IDQ3ZThkNDEuLjA0 NGIwNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3LmgKQEAgLTEwNywxMyArMTA3LDEzIEBAIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSAg ICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAgICp3ZWJfdmllCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIg ICAgICAgICAgICAgICAqdXJpKTsKIAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfd2ViX3ZpZXdf bG9hZF9odG1sICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICp3ZWJf dmlldywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBnY2hhciAgICAgICAgICAgKmNvbnRlbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICpiYXNlX3VyaSk7Cit3ZWJr aXRfd2ViX3ZpZXdfbG9hZF9odG1sICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAg ICAgICAgICAgICAqd2ViX3ZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgZ2NoYXIgICAgICAgICAgICAgICAqY29udGVudCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAg ICAgICAgICpiYXNlX3VyaSk7CiAKIFdFQktJVF9BUEkgdm9pZAotd2Via2l0X3dlYl92aWV3X2xv YWRfcGxhaW5fdGV4dCAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3Zp ZXcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg Z2NoYXIgICAgICAgICAgICpwbGFpbl90ZXh0KTsKK3dlYmtpdF93ZWJfdmlld19sb2FkX3BsYWlu X3RleHQgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAgICp3ZWJfdmlldywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hh ciAgICAgICAgICAgICAgICpwbGFpbl90ZXh0KTsKIAogV0VCS0lUX0FQSSB2b2lkCiB3ZWJraXRf d2ViX3ZpZXdfbG9hZF9hbHRlcm5hdGVfaHRtbCAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAg ICAgICAgICAqd2ViX3ZpZXcsCkBAIC0xMjcsNyArMTI3LDcgQEAgd2Via2l0X3dlYl92aWV3X2xv YWRfcmVxdWVzdCAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAgICAgKndl Yl92aWUKIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3dlYl92aWV3X3N0b3BfbG9hZGluZyAgICAg ICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAgICAgKndlYl92aWV3KTsKIAotV0VC S0lUX0FQSSBjb25zdCBnY2hhciAqIAorV0VCS0lUX0FQSSBjb25zdCBnY2hhciAqCiB3ZWJraXRf d2ViX3ZpZXdfZ2V0X3RpdGxlICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAg ICAgICAgICAqd2ViX3ZpZXcpOwogCiBXRUJLSVRfQVBJIHZvaWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCA3 ZWJhNzNlLi5jMzg3OTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBAIC0yOCwzMSArMjgsMzEgQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJLaXRXZWJWaWV3QmFzZS5oIgogCi0jaW5jbHVk ZSAiQ2xpcGJvYXJkR3RrLmgiCi0jaW5jbHVkZSAiQ2xpcGJvYXJkVXRpbGl0aWVzR3RrLmgiCi0j aW5jbHVkZSAiRGF0YU9iamVjdEd0ay5oIgotI2luY2x1ZGUgIkRyYWdEYXRhLmgiCiAjaW5jbHVk ZSAiRHJhd2luZ0FyZWFQcm94eUltcGwuaCIKLSNpbmNsdWRlICJHT3duUHRyR3RrLmgiCi0jaW5j bHVkZSAiR3RrQ2xpY2tDb3VudGVyLmgiCi0jaW5jbHVkZSAiR3RrVXRpbGl0aWVzLmgiCi0jaW5j bHVkZSAiR3RrVmVyc2lvbmluZy5oIgogI2luY2x1ZGUgIk5hdGl2ZVdlYktleWJvYXJkRXZlbnQu aCIKICNpbmNsdWRlICJOYXRpdmVXZWJNb3VzZUV2ZW50LmgiCiAjaW5jbHVkZSAiTmF0aXZlV2Vi V2hlZWxFdmVudC5oIgotI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAjaW5jbHVkZSAiUGFn ZUNsaWVudEltcGwuaCIKLSNpbmNsdWRlICJQYXN0ZWJvYXJkSGVscGVyLmgiCi0jaW5jbHVkZSAi UmVmUHRyQ2Fpcm8uaCIKICNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViRXZl bnRGYWN0b3J5LmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmgiCiAjaW5j bHVkZSAiV2ViUGFnZVByb3h5LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9DbGlwYm9hcmRHdGsuaD4K KyNpbmNsdWRlIDxXZWJDb3JlL0NsaXBib2FyZFV0aWxpdGllc0d0ay5oPgorI2luY2x1ZGUgPFdl YkNvcmUvRGF0YU9iamVjdEd0ay5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRHJhZ0RhdGEuaD4KICNp bmNsdWRlIDxXZWJDb3JlL0RyYWdJY29uLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9HdGtDbGlja0Nv dW50ZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0d0a0RyYWdBbmREcm9wSGVscGVyLmg+CisjaW5j bHVkZSA8V2ViQ29yZS9HdGtVdGlsaXRpZXMuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0d0a1ZlcnNp b25pbmcuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CisjaW5jbHVkZSA8 V2ViQ29yZS9QYXN0ZWJvYXJkSGVscGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZWZQdHJDYWly by5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVnaW9uLmg+CiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0Nv bnRleHQuaD4KKyNpbmNsdWRlIDx3dGYvZ29iamVjdC9HT3duUHRyLmg+CisjaW5jbHVkZSA8d3Rm L2dvYmplY3QvR1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogdXNp bmcgbmFtZXNwYWNlIFdlYktpdDsKQEAgLTYxLDkgKzYxLDkgQEAgdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiBzdHJ1Y3QgX1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSB7CiAgICAgT3duUHRyPFBh Z2VDbGllbnRJbXBsPiBwYWdlQ2xpZW50OwogICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IHBhZ2VQ cm94eTsKLSAgICBnYm9vbGVhbiBpc1BhZ2VBY3RpdmU7Ci0gICAgZ2Jvb2xlYW4gc2hvdWxkRm9y d2FyZE5leHRLZXlFdmVudDsKLSAgICBHdGtJTUNvbnRleHQqIGltQ29udGV4dDsKKyAgICBib29s IGlzUGFnZUFjdGl2ZTsKKyAgICBib29sIHNob3VsZEZvcndhcmROZXh0S2V5RXZlbnQ7CisgICAg R1JlZlB0cjxHdGtJTUNvbnRleHQ+IGltQ29udGV4dDsKICAgICBHdGtDbGlja0NvdW50ZXIgY2xp Y2tDb3VudGVyOwogICAgIENTdHJpbmcgdG9vbHRpcFRleHQ7CiAgICAgR3RrRHJhZ0FuZERyb3BI ZWxwZXIgZHJhZ0FuZERyb3BIZWxwZXI7CkBAIC0xMDksNyArMTA5LDcgQEAgc3RhdGljIHZvaWQg d2Via2l0V2ViVmlld0Jhc2VSZWFsaXplKEd0a1dpZGdldCogd2lkZ2V0KQogCiAgICAgV2ViS2l0 V2ViVmlld0Jhc2UqIHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwogICAg IFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7Ci0gICAgZ3Rr X2ltX2NvbnRleHRfc2V0X2NsaWVudF93aW5kb3cocHJpdi0+aW1Db250ZXh0LCB3aW5kb3cpOwor ICAgIGd0a19pbV9jb250ZXh0X3NldF9jbGllbnRfd2luZG93KHByaXYtPmltQ29udGV4dC5nZXQo KSwgd2luZG93KTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDb250YWluZXJB ZGQoR3RrQ29udGFpbmVyKiBjb250YWluZXIsIEd0a1dpZGdldCogd2lkZ2V0KQpAQCAtMTIwLDI1 ICsxMjAsMTcgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDb250YWluZXJBZGQoR3Rr Q29udGFpbmVyKiBjb250YWluZXIsIEd0a1dpZGdldCogd2kKIHN0YXRpYyB2b2lkIHdlYmtpdFdl YlZpZXdCYXNlRmluYWxpemUoR09iamVjdCogZ29iamVjdCkKIHsKICAgICBXZWJLaXRXZWJWaWV3 QmFzZSogd2Via2l0V2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRShnb2JqZWN0KTsK LSAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJraXRXZWJWaWV3QmFzZS0+ cHJpdjsKLQotICAgIGlmIChwcml2LT5pbUNvbnRleHQpIHsKLSAgICAgICAgZ19vYmplY3RfdW5y ZWYocHJpdi0+aW1Db250ZXh0KTsKLSAgICAgICAgcHJpdi0+aW1Db250ZXh0ID0gMDsKLSAgICB9 Ci0KLSAgICBwcml2LT5wYWdlUHJveHktPmNsb3NlKCk7Ci0KLSAgICBkZWxldGUgcHJpdjsKLSAg ICB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdiA9IDA7CisgICAgd2Via2l0V2ViVmlld0Jhc2UtPnBy aXYtPnBhZ2VQcm94eS0+Y2xvc2UoKTsKIAorICAgIHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT5+ V2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKCk7CiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dl Yl92aWV3X2Jhc2VfcGFyZW50X2NsYXNzKS0+ZmluYWxpemUoZ29iamVjdCk7CiB9CiAKIHN0YXRp YyB2b2lkIHdlYmtpdF93ZWJfdmlld19iYXNlX2luaXQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtp dFdlYlZpZXdCYXNlKQogewotICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IG5l dyBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUoKTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZh dGUqIHByaXYgPSBHX1RZUEVfSU5TVEFOQ0VfR0VUX1BSSVZBVEUod2Via2l0V2ViVmlld0Jhc2Us IFdFQktJVF9UWVBFX1dFQl9WSUVXX0JBU0UsIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSk7CiAg ICAgd2Via2l0V2ViVmlld0Jhc2UtPnByaXYgPSBwcml2OworICAgIG5ldyAocHJpdikgV2ViS2l0 V2ViVmlld0Jhc2VQcml2YXRlKCk7CiAKICAgICBwcml2LT5pc1BhZ2VBY3RpdmUgPSBUUlVFOwog ICAgIHByaXYtPnNob3VsZEZvcndhcmROZXh0S2V5RXZlbnQgPSBGQUxTRTsKQEAgLTE0Niw3ICsx MzgsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfYmFzZV9pbml0KFdlYktpdFdlYlZp ZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKICAgICBHdGtXaWRnZXQqIHZpZXdXaWRnZXQgPSBH VEtfV0lER0VUKHdlYmtpdFdlYlZpZXdCYXNlKTsKICAgICBndGtfd2lkZ2V0X3NldF9kb3VibGVf YnVmZmVyZWQodmlld1dpZGdldCwgRkFMU0UpOwogICAgIGd0a193aWRnZXRfc2V0X2Nhbl9mb2N1 cyh2aWV3V2lkZ2V0LCBUUlVFKTsKLSAgICBwcml2LT5pbUNvbnRleHQgPSBndGtfaW1fbXVsdGlj b250ZXh0X25ldygpOworICAgIHByaXYtPmltQ29udGV4dCA9IGFkb3B0R1JlZihndGtfaW1fbXVs dGljb250ZXh0X25ldygpKTsKIAogICAgIHByaXYtPnBhZ2VDbGllbnQgPSBQYWdlQ2xpZW50SW1w bDo6Y3JlYXRlKHZpZXdXaWRnZXQpOwogCkBAIC0xOTIsNyArMTg0LDcgQEAgc3RhdGljIGdib29s ZWFuIHdlYmtpdFdlYlZpZXdCYXNlRm9jdXNJbkV2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtF dmVudEZvY3VzKgogCiAgICAgR3RrV2lkZ2V0KiB0b3BsZXZlbCA9IGd0a193aWRnZXRfZ2V0X3Rv cGxldmVsKHdpZGdldCk7CiAgICAgaWYgKGd0a193aWRnZXRfaXNfdG9wbGV2ZWwodG9wbGV2ZWwp ICYmIGd0a193aW5kb3dfaGFzX3RvcGxldmVsX2ZvY3VzKEdUS19XSU5ET1codG9wbGV2ZWwpKSkg ewotICAgICAgICBndGtfaW1fY29udGV4dF9mb2N1c19pbihwcml2LT5pbUNvbnRleHQpOworICAg ICAgICBndGtfaW1fY29udGV4dF9mb2N1c19pbihwcml2LT5pbUNvbnRleHQuZ2V0KCkpOwogICAg ICAgICBpZiAoIXByaXYtPmlzUGFnZUFjdGl2ZSkgewogICAgICAgICAgICAgcHJpdi0+aXNQYWdl QWN0aXZlID0gVFJVRTsKICAgICAgICAgICAgIHByaXYtPnBhZ2VQcm94eS0+dmlld1N0YXRlRGlk Q2hhbmdlKFdlYlBhZ2VQcm94eTo6Vmlld1dpbmRvd0lzQWN0aXZlKTsKQEAgLTIxMCw3ICsyMDIs NyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld0Jhc2VGb2N1c091dEV2ZW50KEd0a1dp ZGdldCogd2lkZ2V0LCBHZGtFdmVudEZvY3VzKgogICAgIHByaXYtPmlzUGFnZUFjdGl2ZSA9IEZB TFNFOwogICAgIHByaXYtPnBhZ2VQcm94eS0+dmlld1N0YXRlRGlkQ2hhbmdlKFdlYlBhZ2VQcm94 eTo6Vmlld1dpbmRvd0lzQWN0aXZlKTsKICAgICBpZiAocHJpdi0+aW1Db250ZXh0KQotICAgICAg ICBndGtfaW1fY29udGV4dF9mb2N1c19vdXQocHJpdi0+aW1Db250ZXh0KTsKKyAgICAgICAgZ3Rr X2ltX2NvbnRleHRfZm9jdXNfb3V0KHByaXYtPmltQ29udGV4dC5nZXQoKSk7CiAKICAgICByZXR1 cm4gR1RLX1dJREdFVF9DTEFTUyh3ZWJraXRfd2ViX3ZpZXdfYmFzZV9wYXJlbnRfY2xhc3MpLT5m b2N1c19vdXRfZXZlbnQod2lkZ2V0LCBldmVudCk7CiB9CkBAIC0yMjEsOCArMjEzLDggQEAgc3Rh dGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlS2V5UHJlc3NFdmVudChHdGtXaWRnZXQqIHdp ZGdldCwgR2RrRXZlbnRLZXkqIGUKICAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYg PSB3ZWJWaWV3QmFzZS0+cHJpdjsKIAogICAgIC8vIFNpbmNlIFdlYlByb2Nlc3Mga2V5IGV2ZW50 IGhhbmRsaW5nIGlzIG5vdCBzeW5jaHJvbm91cywgaGFuZGxlIHRoZSBldmVudCBpbiB0d28gcGFz c2VzLgotICAgIC8vIFdoZW4gV2ViUHJvY2VzcyBwcm9jZXNzZXMgdGhlIGlucHV0IGV2ZW50LCBp dCB3aWxsIGNhbGwgUGFnZUNsaWVudEltcGw6OmRvbmVXaXRoS2V5RXZlbnQgCi0gICAgLy8gd2l0 aCBldmVudCBoYW5kbGVkIHN0YXR1cyB3aGljaCBkZXRlcm1pbmVzIHdoZXRoZXIgdG8gcGFzcyB0 aGUgaW5wdXQgZXZlbnQgdG8gcGFyZW50IG9yIG5vdCAKKyAgICAvLyBXaGVuIFdlYlByb2Nlc3Mg cHJvY2Vzc2VzIHRoZSBpbnB1dCBldmVudCwgaXQgd2lsbCBjYWxsIFBhZ2VDbGllbnRJbXBsOjpk b25lV2l0aEtleUV2ZW50CisgICAgLy8gd2l0aCBldmVudCBoYW5kbGVkIHN0YXR1cyB3aGljaCBk ZXRlcm1pbmVzIHdoZXRoZXIgdG8gcGFzcyB0aGUgaW5wdXQgZXZlbnQgdG8gcGFyZW50IG9yIG5v dAogICAgIC8vIHVzaW5nIGd0a19tYWluX2RvX2V2ZW50KCkuCiAgICAgaWYgKHByaXYtPnNob3Vs ZEZvcndhcmROZXh0S2V5RXZlbnQpIHsKICAgICAgICAgcHJpdi0+c2hvdWxkRm9yd2FyZE5leHRL ZXlFdmVudCA9IEZBTFNFOwpAQCAtMjM3LDcgKzIyOSw3IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJr aXRXZWJWaWV3QmFzZUtleVJlbGVhc2VFdmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRL ZXkqCiAgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVX X0JBU0Uod2lkZ2V0KTsKICAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJW aWV3QmFzZS0+cHJpdjsKIAotICAgIGlmIChndGtfaW1fY29udGV4dF9maWx0ZXJfa2V5cHJlc3Mo cHJpdi0+aW1Db250ZXh0LCBldmVudCkpCisgICAgaWYgKGd0a19pbV9jb250ZXh0X2ZpbHRlcl9r ZXlwcmVzcyhwcml2LT5pbUNvbnRleHQuZ2V0KCksIGV2ZW50KSkKICAgICAgICAgcmV0dXJuIFRS VUU7CiAKICAgICBpZiAocHJpdi0+c2hvdWxkRm9yd2FyZE5leHRLZXlFdmVudCkgewpAQCAtNDE0 LDYgKzQwNiw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19iYXNlX2NsYXNzX2luaXQo V2ViS2l0V2ViVmlld0Jhc2VDbGFzcyogd2Via2l0V2ViVmllCiAKICAgICBHdGtDb250YWluZXJD bGFzcyogY29udGFpbmVyQ2xhc3MgPSBHVEtfQ09OVEFJTkVSX0NMQVNTKHdlYmtpdFdlYlZpZXdC YXNlQ2xhc3MpOwogICAgIGNvbnRhaW5lckNsYXNzLT5hZGQgPSB3ZWJraXRXZWJWaWV3QmFzZUNv bnRhaW5lckFkZDsKKworICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZSh3ZWJraXRXZWJWaWV3 QmFzZUNsYXNzLCBzaXplb2YoV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKSk7CiB9CiAKIFdlYktp dFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZShXZWJDb250ZXh0KiBjb250ZXh0 LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCkKQEAgLTQyNSw3ICs0MTksNyBAQCBXZWJLaXRXZWJW aWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2VDcmVhdGUoV2ViQ29udGV4dCogY29udGV4dCwgV2Vi UGFnZUdyb3VwKiBwYQogCiBHdGtJTUNvbnRleHQqIHdlYmtpdFdlYlZpZXdCYXNlR2V0SU1Db250 ZXh0KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKIHsKLSAgICByZXR1cm4g d2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPmltQ29udGV4dDsKKyAgICByZXR1cm4gd2Via2l0V2Vi Vmlld0Jhc2UtPnByaXYtPmltQ29udGV4dC5nZXQoKTsKIH0KIAogV2ViUGFnZVByb3h5KiB3ZWJr aXRXZWJWaWV3QmFzZUdldFBhZ2UoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNl KQo=