78893 2012-02-17 05:41:37 -0800 [GTK] Rename WebKitPrintOperation::done signal to ::finished in WebKit2 2012-02-17 06:32:36 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo oldest_to_newest 559140 0 cgarcia 2012-02-17 05:41:37 -0800 I used 'done' for consistency with GtkPrintOperation, but this signal is not exactly the same. We use ::finished and ::failed in other objects like WebKitDownload, so I think it's better to use finished for consistency. 559146 1 127578 cgarcia 2012-02-17 05:53:37 -0800 Created attachment 127578 Patch It's not emitted anynmore when the print dialog has been cancelled. Since it's not possible to know whether the print dialog was cancelled or not, the enum WebKitPrintOperationResponse has been added, with Print and Cancel values, and it's used as return value of webkit_print_operation_run_dialog(). I've used an enum instead of a boolean just in case we add WEBKIT_PRINT_OPERATION_RESPONSE_PREVIEW in the future 559149 2 127578 gustavo 2012-02-17 06:07:55 -0800 Comment on attachment 127578 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127578&action=review Looks good to me; also having an enum allows us to expand this API more easily, though I think it'll probably not need too much change in the future after it settles =) > Source/WebKit2/ChangeLog:18 > + (webkitPrintOperationRunDialogWin32): Dittoo. s/oo/o/ > Source/WebKit2/ChangeLog:20 > + (webkitPrintOperationRunDialogForFrame): Do ot emit finished if s/ot/not/ 559157 3 cgarcia 2012-02-17 06:32:36 -0800 Committed r108069: <http://trac.webkit.org/changeset/108069> 127578 2012-02-17 05:53:37 -0800 2012-02-17 06:07:55 -0800 Patch wk2-print-finished.diff text/plain 14829 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1YzM2Mjk5Li4xM2NkNDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAg QEAKKzIwMTItMDItMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFJlbmFtZSBXZWJLaXRQcmludE9wZXJhdGlvbjo6ZG9uZSBzaWdu YWwgdG8gOjpmaW5pc2hlZCBpbiBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03ODg5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFuZCBpdCdzIG5vdCBlbWl0dGVkIGFueW5tb3JlIHdoZW4gdGhl IHByaW50IGRpYWxvZyBoYXMgYmVlbgorICAgICAgICBjYW5jZWxsZWQuIFNpbmNlIGl0J3Mgbm90 IHBvc3NpYmxlIHRvIGtub3cgd2hldGhlciB0aGUgcHJpbnQKKyAgICAgICAgZGlhbG9nIHdhcyBj YW5jZWxsZWQgb3Igbm90LCB0aGUgZW51bSBXZWJLaXRQcmludE9wZXJhdGlvblJlc3BvbnNlCisg ICAgICAgIGhhcyBiZWVuIGFkZGVkLCB3aXRoIFByaW50IGFuZCBDYW5jZWwgdmFsdWVzLCBhbmQg aXQncyB1c2VkIGFzCisgICAgICAgIHJldHVybiB2YWx1ZSBvZiB3ZWJraXRfcHJpbnRfb3BlcmF0 aW9uX3J1bl9kaWFsb2coKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFBy aW50T3BlcmF0aW9uLmNwcDoKKyAgICAgICAgKHdlYmtpdF9wcmludF9vcGVyYXRpb25fY2xhc3Nf aW5pdCk6IFJlbmFtZSBkb25lIGFzIGZpbmlzaGVkLgorICAgICAgICAod2Via2l0UHJpbnRPcGVy YXRpb25SdW5EaWFsb2dVbml4KTogUmV0dXJuIGEKKyAgICAgICAgV2ViS2l0UHJpbnRPcGVyYXRp b25SZXNwb25zZSBpbnN0ZWFkIG9mIGJvb2wuCisgICAgICAgICh3ZWJraXRQcmludE9wZXJhdGlv blJ1bkRpYWxvZ1dpbjMyKTogRGl0dG9vLgorICAgICAgICAoZHJhd1BhZ2VzRm9yUHJpbnRpbmdD b21wbGV0ZWQpOiBFbWl0IGZpbmlzaGVkIGluc3RlYWQgb2YgZG9uZS4KKyAgICAgICAgKHdlYmtp dFByaW50T3BlcmF0aW9uUnVuRGlhbG9nRm9yRnJhbWUpOiBEbyBvdCBlbWl0IGZpbmlzaGVkIGlm CisgICAgICAgIHRoZSBkaWFsb2cgd2FzIGNhbmNlbGxlZCBhbmQgcmV0dXJuIGEgV2ViS2l0UHJp bnRPcGVyYXRpb25SZXNwb25zZS4KKyAgICAgICAgKHdlYmtpdF9wcmludF9vcGVyYXRpb25fcnVu X2RpYWxvZyk6IFJldHVybgorICAgICAgICBXZWJLaXRQcmludE9wZXJhdGlvblJlc3BvbnNlLgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFByaW50T3BlcmF0aW9uLmg6IEFkZAor ICAgICAgICBXZWJLaXRQcmludE9wZXJhdGlvblJlc3BvbnNlIGVudW0uCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0UHJpbnRPcGVyYXRpb25Qcml2YXRlLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJraXRXZWJW aWV3UHJpbnRGcmFtZSk6IENoZWNrIHdoZXRoZXIgdGhlIGRpYWxvZyBoYXMgYmVlbgorICAgICAg ICBjYW5jZWxsZWQgb3Igbm90IGFuZCBjb25uZWN0IHRvIGZpbmlzaCB3aGVuIHRoZSBwcmludCBv cGVyYXRpb24gaXMKKyAgICAgICAgaW4gcHJvZ3Jlc3MgdG8gcmVsZWFzZSB0aGUgcHJpbnQgb3Bl cmF0aW9uIG9iamVjdCB3aGVuIHByaW50aW5nCisgICAgICAgIGZpbmlzaGVzLgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQ6IEFkZAorICAg ICAgICBXZWJLaXRQcmludE9wZXJhdGlvblJlc3BvbnNlIHN5bWJvbC4KKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UHJpbnRpbmcuY3BwOgorICAgICAgICAodGVzdFByaW50 T3BlcmF0aW9uUHJpbnRGaW5pc2hlZCk6IFVzZSBmaW5pc2hlZCBpbnN0ZWFkIG9mIGRvbmUuCisg ICAgICAgICh0ZXN0UHJpbnRPcGVyYXRpb25QcmludCk6IERpdHRvLgorCiAyMDEyLTAyLTE3ICBO bydhbSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAKICAgICAgICAgW1F0 XVtXSzJdIEFsbG93IHBhcnRpYWwgdXBkYXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UHJpbnRPcGVyYXRpb24uY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UHJpbnRPcGVyYXRpb24uY3BwCmluZGV4IGQzYzZm NzcuLjBkMmI2NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFByaW50T3BlcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRQcmludE9wZXJhdGlvbi5jcHAKQEAgLTQ1LDcgKzQ1LDcgQEAgZW51bSB7 CiB9OwogCiBlbnVtIHsKLSAgICBET05FLAorICAgIEZJTklTSEVELAogCiAgICAgTEFTVF9TSUdO QUwKIH07CkBAIC0xNzksMTQgKzE3OSwxNCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfcHJpbnRfb3Bl cmF0aW9uX2NsYXNzX2luaXQoV2ViS2l0UHJpbnRPcGVyYXRpb25DbGFzcyogcHJpbnRPcAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VC S0lUX1BBUkFNX1JFQURXUklURSkpOwogCiAgICAgLyoqCi0gICAgICogV2ViS2l0UHJpbnRPcGVy YXRpb246OmRvbmU6CisgICAgICogV2ViS2l0UHJpbnRPcGVyYXRpb246OmZpbmlzaGVkOgogICAg ICAqIEBwcmludF9vcGVyYXRpb246IHRoZSAjV2ViS2l0UHJpbnRPcGVyYXRpb24gb24gd2hpY2gg dGhlIHNpZ25hbCB3YXMgZW1pdHRlZAogICAgICAqCiAgICAgICogRW1pdHRlZCB3aGVuIHRoZSBw cmludCBvcGVyYXRpb24gaGFzIGZpbmlzaGVkIGRvaW5nIGV2ZXJ5dGhpbmcKICAgICAgKiByZXF1 aXJlZCBmb3IgcHJpbnRpbmcuCiAgICAgICovCi0gICAgc2lnbmFsc1tET05FXSA9Ci0gICAgICAg IGdfc2lnbmFsX25ldygiZG9uZSIsCisgICAgc2lnbmFsc1tGSU5JU0hFRF0gPQorICAgICAgICBn X3NpZ25hbF9uZXcoImZpbmlzaGVkIiwKICAgICAgICAgICAgICAgICAgICAgIEdfVFlQRV9GUk9N X0NMQVNTKGdPYmplY3RDbGFzcyksCiAgICAgICAgICAgICAgICAgICAgICBHX1NJR05BTF9SVU5f TEFTVCwKICAgICAgICAgICAgICAgICAgICAgIDAsIDAsIDAsCkBAIC0xOTcsNyArMTk3LDcgQEAg c3RhdGljIHZvaWQgd2Via2l0X3ByaW50X29wZXJhdGlvbl9jbGFzc19pbml0KFdlYktpdFByaW50 T3BlcmF0aW9uQ2xhc3MqIHByaW50T3AKIH0KIAogI2lmZGVmIEhBVkVfR1RLX1VOSVhfUFJJTlRJ TkcKLXN0YXRpYyBib29sIHdlYmtpdFByaW50T3BlcmF0aW9uUnVuRGlhbG9nVW5peChXZWJLaXRQ cmludE9wZXJhdGlvbiogcHJpbnRPcGVyYXRpb24sIEd0a1dpbmRvdyogcGFyZW50KQorc3RhdGlj IFdlYktpdFByaW50T3BlcmF0aW9uUmVzcG9uc2Ugd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFs b2dVbml4KFdlYktpdFByaW50T3BlcmF0aW9uKiBwcmludE9wZXJhdGlvbiwgR3RrV2luZG93KiBw YXJlbnQpCiB7CiAgICAgR3RrUHJpbnRVbml4RGlhbG9nKiBwcmludERpYWxvZyA9IEdUS19QUklO VF9VTklYX0RJQUxPRyhndGtfcHJpbnRfdW5peF9kaWFsb2dfbmV3KDAsIHBhcmVudCkpOwogICAg IGd0a19wcmludF91bml4X2RpYWxvZ19zZXRfbWFudWFsX2NhcGFiaWxpdGllcyhwcmludERpYWxv Zywgc3RhdGljX2Nhc3Q8R3RrUHJpbnRDYXBhYmlsaXRpZXM+KEdUS19QUklOVF9DQVBBQklMSVRZ X05VTUJFUl9VUCB8CkBAIC0yMTcsMTEgKzIxNywxMSBAQCBzdGF0aWMgYm9vbCB3ZWJraXRQcmlu dE9wZXJhdGlvblJ1bkRpYWxvZ1VuaXgoV2ViS2l0UHJpbnRPcGVyYXRpb24qIHByaW50T3BlcmF0 aQogCiAgICAgZ3RrX3ByaW50X3VuaXhfZGlhbG9nX3NldF9lbWJlZF9wYWdlX3NldHVwKHByaW50 RGlhbG9nLCBUUlVFKTsKIAotICAgIGJvb2wgcmV0dXJuVmFsdWUgPSBmYWxzZTsKKyAgICBXZWJL aXRQcmludE9wZXJhdGlvblJlc3BvbnNlIHJldHVyblZhbHVlID0gV0VCS0lUX1BSSU5UX09QRVJB VElPTl9SRVNQT05TRV9DQU5DRUw7CiAgICAgaWYgKGd0a19kaWFsb2dfcnVuKEdUS19ESUFMT0co cHJpbnREaWFsb2cpKSA9PSBHVEtfUkVTUE9OU0VfT0spIHsKICAgICAgICAgcHJpdi0+cHJpbnRT ZXR0aW5ncyA9IGFkb3B0R1JlZihndGtfcHJpbnRfdW5peF9kaWFsb2dfZ2V0X3NldHRpbmdzKHBy aW50RGlhbG9nKSk7CiAgICAgICAgIHByaXYtPnBhZ2VTZXR1cCA9IGd0a19wcmludF91bml4X2Rp YWxvZ19nZXRfcGFnZV9zZXR1cChwcmludERpYWxvZyk7Ci0gICAgICAgIHJldHVyblZhbHVlID0g dHJ1ZTsKKyAgICAgICAgcmV0dXJuVmFsdWUgPSBXRUJLSVRfUFJJTlRfT1BFUkFUSU9OX1JFU1BP TlNFX1BSSU5UOwogICAgIH0KIAogICAgIGd0a193aWRnZXRfZGVzdHJveShHVEtfV0lER0VUKHBy aW50RGlhbG9nKSk7CkBAIC0yMzEsMTAgKzIzMSwxMCBAQCBzdGF0aWMgYm9vbCB3ZWJraXRQcmlu dE9wZXJhdGlvblJ1bkRpYWxvZ1VuaXgoV2ViS2l0UHJpbnRPcGVyYXRpb24qIHByaW50T3BlcmF0 aQogI2VuZGlmIC8vIEhBVkVfR1RLX1VOSVhfUFJJTlRJTkcKIAogI2lmZGVmIEdfT1NfV0lOMzIK LXN0YXRpYyBib29sIHdlYmtpdFByaW50T3BlcmF0aW9uUnVuRGlhbG9nV2luMzIoV2ViS2l0UHJp bnRPcGVyYXRpb24qLCBHdGtXaW5kb3cqKQorc3RhdGljIFdlYktpdFByaW50T3BlcmF0aW9uUmVz cG9uc2Ugd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dXaW4zMihXZWJLaXRQcmludE9wZXJh dGlvbiosIEd0a1dpbmRvdyopCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4g ZmFsc2U7CisgICAgcmV0dXJuIFdFQktJVF9QUklOVF9PUEVSQVRJT05fUkVTUE9OU0VfQ0FOQ0VM OwogfQogI2VuZGlmCiAKQEAgLTI0Myw3ICsyNDMsNyBAQCBzdGF0aWMgdm9pZCBkcmF3UGFnZXNG b3JQcmludGluZ0NvbXBsZXRlZChXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogICAgIEdSZWZQ dHI8V2ViS2l0UHJpbnRPcGVyYXRpb24+IHByaW50T3BlcmF0aW9uID0gYWRvcHRHUmVmKFdFQktJ VF9QUklOVF9PUEVSQVRJT04oY29udGV4dCkpOwogICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHdl YmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRShwcmludE9wZXJhdGlv bi0+cHJpdi0+d2ViVmlldykpOwogICAgIHBhZ2UtPmVuZFByaW50aW5nKCk7Ci0gICAgZ19zaWdu YWxfZW1pdChwcmludE9wZXJhdGlvbi5nZXQoKSwgc2lnbmFsc1tET05FXSwgMCwgTlVMTCk7Cisg ICAgZ19zaWduYWxfZW1pdChwcmludE9wZXJhdGlvbi5nZXQoKSwgc2lnbmFsc1tGSU5JU0hFRF0s IDAsIE5VTEwpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRQcmludE9wZXJhdGlvblByaW50UGFn ZXNGb3JGcmFtZShXZWJLaXRQcmludE9wZXJhdGlvbiogcHJpbnRPcGVyYXRpb24sIFdlYkZyYW1l UHJveHkqIHdlYkZyYW1lLCBHdGtQcmludFNldHRpbmdzKiBwcmludFNldHRpbmdzLCBHdGtQYWdl U2V0dXAqIHBhZ2VTZXR1cCkKQEAgLTI1Myw3ICsyNTMsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRQ cmludE9wZXJhdGlvblByaW50UGFnZXNGb3JGcmFtZShXZWJLaXRQcmludE9wZXJhdGlvbiogcHJp bnRPcAogICAgIHBhZ2UtPmRyYXdQYWdlc0ZvclByaW50aW5nKHdlYkZyYW1lLCBwcmludEluZm8s IFZvaWRDYWxsYmFjazo6Y3JlYXRlKGdfb2JqZWN0X3JlZihwcmludE9wZXJhdGlvbiksICZkcmF3 UGFnZXNGb3JQcmludGluZ0NvbXBsZXRlZCkpOwogfQogCi12b2lkIHdlYmtpdFByaW50T3BlcmF0 aW9uUnVuRGlhbG9nRm9yRnJhbWUoV2ViS2l0UHJpbnRPcGVyYXRpb24qIHByaW50T3BlcmF0aW9u LCBHdGtXaW5kb3cqIHBhcmVudCwgV2ViRnJhbWVQcm94eSogd2ViRnJhbWUpCitXZWJLaXRQcmlu dE9wZXJhdGlvblJlc3BvbnNlIHdlYmtpdFByaW50T3BlcmF0aW9uUnVuRGlhbG9nRm9yRnJhbWUo V2ViS2l0UHJpbnRPcGVyYXRpb24qIHByaW50T3BlcmF0aW9uLCBHdGtXaW5kb3cqIHBhcmVudCwg V2ViRnJhbWVQcm94eSogd2ViRnJhbWUpCiB7CiAgICAgV2ViS2l0UHJpbnRPcGVyYXRpb25Qcml2 YXRlKiBwcml2ID0gcHJpbnRPcGVyYXRpb24tPnByaXY7CiAgICAgaWYgKCFwYXJlbnQpIHsKQEAg LTI2MiwxNyArMjYyLDE3IEBAIHZvaWQgd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dGb3JG cmFtZShXZWJLaXRQcmludE9wZXJhdGlvbiogcHJpbnRPcGVyYXRpb24sCiAgICAgICAgICAgICBw YXJlbnQgPSBHVEtfV0lORE9XKHRvcGxldmVsKTsKICAgICB9CiAjaWZkZWYgSEFWRV9HVEtfVU5J WF9QUklOVElORwotICAgIGJvb2wgc2hvdWxkUHJpbnQgPSB3ZWJraXRQcmludE9wZXJhdGlvblJ1 bkRpYWxvZ1VuaXgocHJpbnRPcGVyYXRpb24sIHBhcmVudCk7CisgICAgV2ViS2l0UHJpbnRPcGVy YXRpb25SZXNwb25zZSByZXNwb25zZSA9IHdlYmtpdFByaW50T3BlcmF0aW9uUnVuRGlhbG9nVW5p eChwcmludE9wZXJhdGlvbiwgcGFyZW50KTsKICNlbmRpZgogI2lmZGVmIEdfT1NfV0lOMzIKLSAg ICBib29sIHNob3VsZFByaW50ID0gd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dXaW4zMihw cmludE9wZXJhdGlvbiwgcGFyZW50KTsKKyAgICBXZWJLaXRQcmludE9wZXJhdGlvblJlc3BvbnNl IHJlc3BvbnNlID0gd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dXaW4zMihwcmludE9wZXJh dGlvbiwgcGFyZW50KTsKICNlbmRpZgogCi0gICAgaWYgKCFzaG91bGRQcmludCkgewotICAgICAg ICBnX3NpZ25hbF9lbWl0KHByaW50T3BlcmF0aW9uLCBzaWduYWxzW0RPTkVdLCAwLCBOVUxMKTsK LSAgICAgICAgcmV0dXJuOwotICAgIH0KKyAgICBpZiAocmVzcG9uc2UgPT0gV0VCS0lUX1BSSU5U X09QRVJBVElPTl9SRVNQT05TRV9DQU5DRUwpCisgICAgICAgIHJldHVybiByZXNwb25zZTsKKwog ICAgIHdlYmtpdFByaW50T3BlcmF0aW9uUHJpbnRQYWdlc0ZvckZyYW1lKHByaW50T3BlcmF0aW9u LCB3ZWJGcmFtZSwgcHJpdi0+cHJpbnRTZXR0aW5ncy5nZXQoKSwgcHJpdi0+cGFnZVNldHVwLmdl dCgpKTsKKyAgICByZXR1cm4gcmVzcG9uc2U7CiB9CiAKIC8qKgpAQCAtMzY5LDIyICszNjksMjYg QEAgdm9pZCB3ZWJraXRfcHJpbnRfb3BlcmF0aW9uX3NldF9wYWdlX3NldHVwKFdlYktpdFByaW50 T3BlcmF0aW9uKiBwcmludE9wZXJhdGlvbiwKICAqIEBwcmludF9vcGVyYXRpb246IGEgI1dlYktp dFByaW50T3BlcmF0aW9uCiAgKiBAcGFyZW50OiAoYWxsb3ctbm9uZSk6IHRyYW5zaWVudCBwYXJl bnQgb2YgdGhlIHByaW50IGRpYWxvZwogICoKLSAqIFJ1biB0aGUgcHJpbnQgZGlhbG9nIHVzaW5n IGFuZCBzdGFydCBwcmludGluZyB1c2luZyB0aGUgb3B0aW9ucyBzZWxlY3RlZCBieQotICogdGhl IHVzZXIuIFRoaXMgbWV0aG9kIHJldHVybnMgd2hlbiB0aGUgcHJpbnQgb3BlcmF0aW9uIGlzIGNs b3NlZC4KLSAqIFRoZSBXZWJLaXRQcmludE9wZXJhdGlvbjo6ZG9uZSBzaWduYWwgaXMgZW1pdHRl ZCB3aGVuIHRoZSBwcmludGluZwotICogb3BlcmF0aW9uIGZpbmlzaGVzLgotICogQ3VycmVudCBw cmludCBzZXR0aW5ncyBhbmQgcGFnZSBzZXR1cCBvZiBAcHJpbnRfb3BlcmF0aW9uIGFyZSB1cGRh dGVkIHdpdGgKLSAqIG9wdGlvbnMgc2VsZWN0ZWQgYnkgdGhlIHVzZXIgd2hlbiBQcmludCBidXR0 b24gaXMgcHJlc3NlZCBpbiBwcmludCBkaWFsb2cuCisgKiBSdW4gdGhlIHByaW50IGRpYWxvZyBh bmQgc3RhcnQgcHJpbnRpbmcgdXNpbmcgdGhlIG9wdGlvbnMgc2VsZWN0ZWQgYnkKKyAqIHRoZSB1 c2VyLiBUaGlzIG1ldGhvZCByZXR1cm5zIHdoZW4gdGhlIHByaW50IGRpYWxvZyBpcyBjbG9zZWQu CisgKiBJZiB0aGUgcHJpbnQgZGlhbG9nIGlzIGNhbmNlbGxlZCAlV0VCS0lUX1BSSU5UX09QRVJB VElPTl9SRVNQT05TRV9DQU5DRUwKKyAqIGlzIHJldHVybmVkLiBJZiB0aGUgdXNlciBjbGlja3Mg b24gdGhlIHByaW50IGJ1dHRvbiwgJVdFQktJVF9QUklOVF9PUEVSQVRJT05fUkVTUE9OU0VfUFJJ TlQKKyAqIGlzIHJldHVybmVkIGFuZCB0aGUgcHJpbnQgb3BlcmF0aW9uIHN0YXJ0cy4gSW4gdGhp cyBjYXNlLCB0aGUgV2ViS2l0UHJpbnRPcGVyYXRpb246OmZpbmlzaGVkCisgKiBzaWduYWwgaXMg ZW1pdHRlZCB3aGVuIHRoZSBvcGVyYXRpb24gZmluaXNoZXMuCisgKiBJZiB0aGUgcHJpbnQgZGlh bG9nIGlzIG5vdCBjYW5jZWxsZWQgY3VycmVudCBwcmludCBzZXR0aW5ncyBhbmQgcGFnZSBzZXR1 cCBvZiBAcHJpbnRfb3BlcmF0aW9uCisgKiBhcmUgdXBkYXRlZCB3aXRoIG9wdGlvbnMgc2VsZWN0 ZWQgYnkgdGhlIHVzZXIgd2hlbiBQcmludCBidXR0b24gaXMgcHJlc3NlZCBpbiBwcmludCBkaWFs b2cuCiAgKiBZb3UgY2FuIGdldCB0aGUgdXBkYXRlZCBwcmludCBzZXR0aW5ncyBhbmQgcGFnZSBz ZXR1cCBieSBjYWxsaW5nCiAgKiB3ZWJraXRfcHJpbnRfb3BlcmF0aW9uX2dldF9wcmludF9zZXR0 aW5ncygpIGFuZCB3ZWJraXRfcHJpbnRfb3BlcmF0aW9uX2dldF9wYWdlX3NldHVwKCkKICAqIGFm dGVyIHRoaXMgbWV0aG9kLgorICoKKyAqIFJldHVybnM6IHRoZSAjV2ViS2l0UHJpbnRPcGVyYXRp b25SZXNwb25zZSBvZiB0aGUgcHJpbnQgZGlhbG9nCiAgKi8KLXZvaWQgd2Via2l0X3ByaW50X29w ZXJhdGlvbl9ydW5fZGlhbG9nKFdlYktpdFByaW50T3BlcmF0aW9uKiBwcmludE9wZXJhdGlvbiwg R3RrV2luZG93KiBwYXJlbnQpCitXZWJLaXRQcmludE9wZXJhdGlvblJlc3BvbnNlIHdlYmtpdF9w cmludF9vcGVyYXRpb25fcnVuX2RpYWxvZyhXZWJLaXRQcmludE9wZXJhdGlvbiogcHJpbnRPcGVy YXRpb24sIEd0a1dpbmRvdyogcGFyZW50KQogewotICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lU X0lTX1BSSU5UX09QRVJBVElPTihwcmludE9wZXJhdGlvbikpOworICAgIGdfcmV0dXJuX3ZhbF9p Zl9mYWlsKFdFQktJVF9JU19QUklOVF9PUEVSQVRJT04ocHJpbnRPcGVyYXRpb24pLCBXRUJLSVRf UFJJTlRfT1BFUkFUSU9OX1JFU1BPTlNFX0NBTkNFTCk7CiAKICAgICBXZWJQYWdlUHJveHkqIHBh Z2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0UocHJpbnRP cGVyYXRpb24tPnByaXYtPndlYlZpZXcpKTsKLSAgICB3ZWJraXRQcmludE9wZXJhdGlvblJ1bkRp YWxvZ0ZvckZyYW1lKHByaW50T3BlcmF0aW9uLCBwYXJlbnQsIHBhZ2UtPm1haW5GcmFtZSgpKTsK KyAgICByZXR1cm4gd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dGb3JGcmFtZShwcmludE9w ZXJhdGlvbiwgcGFyZW50LCBwYWdlLT5tYWluRnJhbWUoKSk7CiB9CiAKIC8qKgpAQCAtMzk2LDYg KzQwMCw4IEBAIHZvaWQgd2Via2l0X3ByaW50X29wZXJhdGlvbl9ydW5fZGlhbG9nKFdlYktpdFBy aW50T3BlcmF0aW9uKiBwcmludE9wZXJhdGlvbiwgR3RrCiAgKiBhcmUgbm90IHNldCB3aXRoIHdl YmtpdF9wcmludF9vcGVyYXRpb25fc2V0X3ByaW50X3NldHRpbmdzKCkgYW5kCiAgKiB3ZWJraXRf cHJpbnRfb3BlcmF0aW9uX3NldF9wYWdlX3NldHVwKCksIHRoZSBkZWZhdWx0IG9wdGlvbnMgd2ls bCBiZSB1c2VkCiAgKiBhbmQgdGhlIHByaW50IGpvYiB3aWxsIGJlIHNlbnQgdG8gdGhlIGRlZmF1 bHQgcHJpbnRlci4KKyAqIFRoZSBXZWJLaXRQcmludE9wZXJhdGlvbjo6ZmluaXNoZWQgc2lnbmFs IGlzIGVtaXR0ZWQgd2hlbiB0aGUgcHJpbnRpbmcKKyAqIG9wZXJhdGlvbiBmaW5pc2hlcy4KICAq Lwogdm9pZCB3ZWJraXRfcHJpbnRfb3BlcmF0aW9uX3ByaW50KFdlYktpdFByaW50T3BlcmF0aW9u KiBwcmludE9wZXJhdGlvbikKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFByaW50T3BlcmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRQcmludE9wZXJhdGlvbi5oCmluZGV4IGY5NTY1NDkuLmEwMmY0ZTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFByaW50 T3BlcmF0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 UHJpbnRPcGVyYXRpb24uaApAQCAtNDAsNiArNDAsMTkgQEAgR19CRUdJTl9ERUNMUwogdHlwZWRl ZiBzdHJ1Y3QgX1dlYktpdFByaW50T3BlcmF0aW9uQ2xhc3MgICBXZWJLaXRQcmludE9wZXJhdGlv bkNsYXNzOwogdHlwZWRlZiBzdHJ1Y3QgX1dlYktpdFByaW50T3BlcmF0aW9uUHJpdmF0ZSBXZWJL aXRQcmludE9wZXJhdGlvblByaXZhdGU7CiAKKy8qKgorICogV2ViS2l0UHJpbnRPcGVyYXRpb25S ZXNwb25zZToKKyAqIEBXRUJLSVRfUFJJTlRfT1BFUkFUSU9OX1JFU1BPTlNFX1BSSU5UOiBQcmlu dCBidXR0b24gd2FzIGNsaWtlZCBpbiBwcmludCBkaWFsb2cKKyAqIEBXRUJLSVRfUFJJTlRfT1BF UkFUSU9OX1JFU1BPTlNFX0NBTkNFTDogUHJpbnQgZGlhbG9nIHdhcyBjYW5jZWxsZWQKKyAqCisg KiBFbnVtIHZhbHVlcyByZXByZXNlbnRpbmcgdGhlIHJlc3BvbnNlIG9mIHRoZSBwcmludCBkaWFs b2cgc2hvd24gd2l0aAorICogd2Via2l0X3ByaW50X29wZXJhdGlvbl9ydW5fZGlhbG9nKCkuCisg Ki8KK3R5cGVkZWYgZW51bSB7CisgICAgV0VCS0lUX1BSSU5UX09QRVJBVElPTl9SRVNQT05TRV9Q UklOVCwKKyAgICBXRUJLSVRfUFJJTlRfT1BFUkFUSU9OX1JFU1BPTlNFX0NBTkNFTAorfSBXZWJL aXRQcmludE9wZXJhdGlvblJlc3BvbnNlOworCiBzdHJ1Y3QgX1dlYktpdFByaW50T3BlcmF0aW9u IHsKICAgICBHT2JqZWN0IHBhcmVudDsKIApAQCAtNzAsNyArODMsNyBAQCBXRUJLSVRfQVBJIHZv aWQKIHdlYmtpdF9wcmludF9vcGVyYXRpb25fc2V0X3BhZ2Vfc2V0dXAgICAgIChXZWJLaXRQcmlu dE9wZXJhdGlvbiAqcHJpbnRfb3BlcmF0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEd0a1BhZ2VTZXR1cCAgICAgICAgICpwYWdlX3NldHVwKTsKIAotV0VC S0lUX0FQSSB2b2lkCitXRUJLSVRfQVBJIFdlYktpdFByaW50T3BlcmF0aW9uUmVzcG9uc2UKIHdl YmtpdF9wcmludF9vcGVyYXRpb25fcnVuX2RpYWxvZyAgICAgICAgIChXZWJLaXRQcmludE9wZXJh dGlvbiAqcHJpbnRfb3BlcmF0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEd0a1dpbmRvdyAgICAgICAgICAgICpwYXJlbnQpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcmludE9wZXJhdGlvblByaXZh dGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFByaW50T3BlcmF0 aW9uUHJpdmF0ZS5oCmluZGV4IDU4ZGM4MDYuLjdhNGZiNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFByaW50T3BlcmF0aW9uUHJpdmF0ZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFByaW50T3BlcmF0aW9u UHJpdmF0ZS5oCkBAIC0yMyw2ICsyMyw2IEBACiAjaW5jbHVkZSAiV2ViRnJhbWVQcm94eS5oIgog I2luY2x1ZGUgIldlYktpdFByaW50T3BlcmF0aW9uLmgiCiAKLXZvaWQgd2Via2l0UHJpbnRPcGVy YXRpb25SdW5EaWFsb2dGb3JGcmFtZShXZWJLaXRQcmludE9wZXJhdGlvbiosIEd0a1dpbmRvdyog cGFyZW50LCBXZWJLaXQ6OldlYkZyYW1lUHJveHkqKTsKK1dlYktpdFByaW50T3BlcmF0aW9uUmVz cG9uc2Ugd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dGb3JGcmFtZShXZWJLaXRQcmludE9w ZXJhdGlvbiosIEd0a1dpbmRvdyogcGFyZW50LCBXZWJLaXQ6OldlYkZyYW1lUHJveHkqKTsKIAog I2VuZGlmIC8vIFdlYktpdFByaW50T3BlcmF0aW9uUHJpdmF0ZV9oCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IDg3MWE3Y2Mu LmJlNTkwZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXcuY3BwCkBAIC04MDksOCArODA5LDEwIEBAIHZvaWQgd2Via2l0V2ViVmlld1By aW50RnJhbWUoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV0tGcmFtZVJlZiB3a0ZyYW1lKQogICAg IGlmIChyZXR1cm5WYWx1ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZ19zaWduYWxfY29ubmVj dChwcmludE9wZXJhdGlvbi5nZXQoKSwgImRvbmUiLCBHX0NBTExCQUNLKGdfb2JqZWN0X3VucmVm KSwgMCk7Ci0gICAgd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dGb3JGcmFtZShwcmludE9w ZXJhdGlvbi5sZWFrUmVmKCksIDAsIHRvSW1wbCh3a0ZyYW1lKSk7CisgICAgV2ViS2l0UHJpbnRP cGVyYXRpb25SZXNwb25zZSByZXNwb25zZSA9IHdlYmtpdFByaW50T3BlcmF0aW9uUnVuRGlhbG9n Rm9yRnJhbWUocHJpbnRPcGVyYXRpb24uZ2V0KCksIDAsIHRvSW1wbCh3a0ZyYW1lKSk7CisgICAg aWYgKHJlc3BvbnNlID09IFdFQktJVF9QUklOVF9PUEVSQVRJT05fUkVTUE9OU0VfQ0FOQ0VMKQor ICAgICAgICByZXR1cm47CisgICAgZ19zaWduYWxfY29ubmVjdChwcmludE9wZXJhdGlvbi5sZWFr UmVmKCksICJmaW5pc2hlZCIsIEdfQ0FMTEJBQ0soZ19vYmplY3RfdW5yZWYpLCAwKTsKIH0KIAog LyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dl YmtpdDJndGstc2VjdGlvbnMudHh0IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv ZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dAppbmRleCA0ZjZiZDJhLi5hYWRkMzljIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGst c2VjdGlvbnMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mv d2Via2l0Mmd0ay1zZWN0aW9ucy50eHQKQEAgLTQyMCw2ICs0MjAsNyBAQCB3ZWJraXRfaGl0X3Rl c3RfcmVzdWx0X2dldF90eXBlCiA8U0VDVElPTj4KIDxGSUxFPldlYktpdFByaW50T3BlcmF0aW9u PC9GSUxFPgogV2ViS2l0UHJpbnRPcGVyYXRpb24KK1dlYktpdFByaW50T3BlcmF0aW9uUmVzcG9u c2UKIHdlYmtpdF9wcmludF9vcGVyYXRpb25fbmV3CiB3ZWJraXRfcHJpbnRfb3BlcmF0aW9uX2dl dF9wcmludF9zZXR0aW5ncwogd2Via2l0X3ByaW50X29wZXJhdGlvbl9zZXRfcHJpbnRfc2V0dGlu Z3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rl c3RQcmludGluZy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9U ZXN0UHJpbnRpbmcuY3BwCmluZGV4IGYwZDU1MzIuLjFkZGRlMDggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RQcmludGluZy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFByaW50aW5nLmNwcApA QCAtNzksNyArNzksNyBAQCBzdGF0aWMgdm9pZCB0ZXN0UHJpbnRPcGVyYXRpb25QcmludExvYWRD aGFuZ2VkKFdlYktpdFdlYlZpZXcqLCBXZWJLaXRMb2FkRXZlbnQgbAogICAgIGdfbWFpbl9sb29w X3F1aXQodGVzdC0+bV9tYWluTG9vcCk7CiB9CiAKLXN0YXRpYyB2b2lkIHRlc3RQcmludE9wZXJh dGlvblByaW50RG9uZShXZWJLaXRQcmludE9wZXJhdGlvbiogcHJpbnRPcGVyYXRpb24sIFdlYlZp ZXdUZXN0KiB0ZXN0KQorc3RhdGljIHZvaWQgdGVzdFByaW50T3BlcmF0aW9uUHJpbnRGaW5pc2hl ZChXZWJLaXRQcmludE9wZXJhdGlvbiogcHJpbnRPcGVyYXRpb24sIFdlYlZpZXdUZXN0KiB0ZXN0 KQogewogICAgIGdfb2JqZWN0X3VucmVmKHByaW50T3BlcmF0aW9uKTsKICAgICBnX21haW5fbG9v cF9xdWl0KHRlc3QtPm1fbWFpbkxvb3ApOwpAQCAtMTE5LDcgKzExOSw3IEBAIHN0YXRpYyB2b2lk IHRlc3RQcmludE9wZXJhdGlvblByaW50KFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVy KQogCiAgICAgR1JlZlB0cjxXZWJLaXRQcmludE9wZXJhdGlvbj4gcHJpbnRPcGVyYXRpb24gPSB3 ZWJraXRfcHJpbnRfb3BlcmF0aW9uX25ldyh0ZXN0LT5tX3dlYlZpZXcpOwogICAgIHRlc3QtPmFz c2VydE9iamVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1QocHJpbnRPcGVyYXRp b24uZ2V0KCkpKTsKLSAgICBnX3NpZ25hbF9jb25uZWN0KHByaW50T3BlcmF0aW9uLmdldCgpLCAi ZG9uZSIsIEdfQ0FMTEJBQ0sodGVzdFByaW50T3BlcmF0aW9uUHJpbnREb25lKSwgdGVzdCk7Cisg ICAgZ19zaWduYWxfY29ubmVjdChwcmludE9wZXJhdGlvbi5nZXQoKSwgImZpbmlzaGVkIiwgR19D QUxMQkFDSyh0ZXN0UHJpbnRPcGVyYXRpb25QcmludEZpbmlzaGVkKSwgdGVzdCk7CiAgICAgd2Vi a2l0X3ByaW50X29wZXJhdGlvbl9zZXRfcHJpbnRfc2V0dGluZ3MocHJpbnRPcGVyYXRpb24uZ2V0 KCksIHByaW50U2V0dGluZ3MuZ2V0KCkpOwogICAgIHdlYmtpdF9wcmludF9vcGVyYXRpb25fcHJp bnQocHJpbnRPcGVyYXRpb24uZ2V0KCkpOwogICAgIGdfbWFpbl9sb29wX3J1bih0ZXN0LT5tX21h aW5Mb29wKTsK