34210 2010-01-27 02:56:45 -0800 [Qt] Display page loading progress inside the QtLauncher location bar 2010-01-29 08:49:50 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 kling webkit-unassigned commit-queue webkit.review.bot oldest_to_newest 185014 0 kling 2010-01-27 02:56:45 -0800 [Qt] Display page loading progress inside the QtLauncher location bar 185015 1 47514 kling 2010-01-27 03:13:24 -0800 Created attachment 47514 Patch 185100 2 47514 hausmann 2010-01-27 08:00:37 -0800 Comment on attachment 47514 Patch > +class LocationEdit : public QLineEdit { > + Q_OBJECT > +public: > + LocationEdit(QWidget *parent = 0) Coding style: * placement is wrong. > +protected: > + virtual void paintEvent(QPaintEvent *event) Ditto. > +#ifndef Q_WS_MAEMO_5 > statusBar()->showMessage(link); > +#endif > #ifndef QT_NO_TOOLTIP > if (!toolTip.isEmpty()) > QToolTip::showText(QCursor::pos(), toolTip); > @@ -410,7 +453,9 @@ protected slots: > QWebElementCollection result = view->page()->mainFrame()->findAllElements(str); > foreach (QWebElement e, result) > e.setStyleProperty("background-color", "yellow"); > +#ifndef Q_WS_MAEMO_5 > statusBar()->showMessage(QString("%1 element(s) selected").arg(result.count()), 5000); > +#endif While I agree with the above two hunks (the flicker in the status bar is annoying), but technically that's unrelated to the progress bar stuff, no? I suggest to mention it at least in the changelog. The rest looks good to me :) 185841 3 47709 kling 2010-01-29 06:02:23 -0800 Created attachment 47709 Patch, issues addressed + LocationEdit class moved to its own file 185842 4 47710 kling 2010-01-29 06:05:02 -0800 Created attachment 47710 Same patch, one accidental \t expanded 185843 5 webkit.review.bot 2010-01-29 06:06:41 -0800 Attachment 47710 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKitTools/QtLauncher/locationedit.cpp:28: Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 If any of these errors are false positives, please file a bug against check-webkit-style. 185850 6 47714 kling 2010-01-29 06:26:56 -0800 Created attachment 47714 Same patch yet again, style issue fixed 185853 7 webkit.review.bot 2010-01-29 06:31:47 -0800 Attachment 47714 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKitTools/QtLauncher/locationedit.cpp:28: Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 If any of these errors are false positives, please file a bug against check-webkit-style. 185878 8 47714 commit-queue 2010-01-29 08:49:45 -0800 Comment on attachment 47714 Same patch yet again, style issue fixed Clearing flags on attachment: 47714 Committed r54065: <http://trac.webkit.org/changeset/54065> 185879 9 commit-queue 2010-01-29 08:49:50 -0800 All reviewed patches have been landed. Closing bug. 47514 2010-01-27 03:13:24 -0800 2010-01-29 06:02:23 -0800 Patch bug-34210.diff text/plain 4448 kling ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4ZDVlMjM2Li5kNWI1NDg1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDEt MjcgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIERpc3BsYXkgcGFnZSBs b2FkaW5nIHByb2dyZXNzIGluc2lkZSB0aGUgUXRMYXVuY2hlciBsb2NhdGlvbiBiYXIKKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQyMTAKKworICAg ICAgICAqIFF0TGF1bmNoZXIvbWFpbi5jcHA6CisgICAgICAgIChMb2NhdGlvbkVkaXQ6OkxvY2F0 aW9uRWRpdCk6CisgICAgICAgIChMb2NhdGlvbkVkaXQ6OnNldFByb2dyZXNzKToKKyAgICAgICAg KExvY2F0aW9uRWRpdDo6cGFpbnRFdmVudCk6CisgICAgICAgIChNYWluV2luZG93OjpzaG93TGlu a0hvdmVyKToKKyAgICAgICAgKE1haW5XaW5kb3c6OnNlbGVjdEVsZW1lbnRzKToKKyAgICAgICAg KE1haW5XaW5kb3c6OnNldHVwVUkpOgorCiAyMDEwLTAxLTI2ICBKb2NlbHluIFR1cmNvdHRlICA8 am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9yIEFy bmUgVmVzdGLDuC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAg Yi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCmluZGV4IGU2NThiZmUuLjI2NjYzNzIg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAKKysrIGIvV2ViS2l0 VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcApAQCAtNjcsNiArNjcsNDcgQEAgc3RhdGljIFFVcmwg dXJsRnJvbVVzZXJJbnB1dChjb25zdCBRU3RyaW5nJiBpbnB1dCkKICNlbmRpZgogfQogCitjbGFz cyBMb2NhdGlvbkVkaXQgOiBwdWJsaWMgUUxpbmVFZGl0IHsKKyAgICBRX09CSkVDVAorcHVibGlj OgorICAgIExvY2F0aW9uRWRpdChRV2lkZ2V0ICpwYXJlbnQgPSAwKQorICAgICAgICA6IFFMaW5l RWRpdChwYXJlbnQpLAorICAgICAgICAgIG1fcHJvZ3Jlc3MoMCkKKyAgICB7CisgICAgfQorCitw dWJsaWMgc2xvdHM6CisgICAgdm9pZCBzZXRQcm9ncmVzcyhpbnQgcHJvZ3Jlc3MpCisgICAgewor ICAgICAgICBtX3Byb2dyZXNzID0gcHJvZ3Jlc3M7CisgICAgICAgIHVwZGF0ZSgpOworICAgIH0K KworcHJvdGVjdGVkOgorICAgIHZpcnR1YWwgdm9pZCBwYWludEV2ZW50KFFQYWludEV2ZW50ICpl dmVudCkKKyAgICB7CisgICAgICAgIFFDb2xvciBiYWNrZ3JvdW5kQ29sb3IgPSBRQXBwbGljYXRp b246OnBhbGV0dGUoKS5jb2xvcihRUGFsZXR0ZTo6QmFzZSk7CisgICAgICAgIFFDb2xvciBwcm9n cmVzc0NvbG9yID0gUUNvbG9yKDEyMCwgMTgwLCAyNDApOworICAgICAgICBRUGFsZXR0ZSBwID0g cGFsZXR0ZSgpOworCisgICAgICAgIGlmICghbV9wcm9ncmVzcyB8fCBtX3Byb2dyZXNzID09IDEw MCkKKyAgICAgICAgICAgIHAuc2V0QnJ1c2goUVBhbGV0dGU6OkJhc2UsIGJhY2tncm91bmRDb2xv cik7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgUUxpbmVhckdyYWRpZW50IGdyYWRpZW50 KDAsIDAsIHdpZHRoKCksIDApOworICAgICAgICAgICAgZ3JhZGllbnQuc2V0Q29sb3JBdCgwLCBw cm9ncmVzc0NvbG9yKTsKKyAgICAgICAgICAgIGdyYWRpZW50LnNldENvbG9yQXQoKChkb3VibGUp bV9wcm9ncmVzcykgLyAxMDAsIHByb2dyZXNzQ29sb3IpOworICAgICAgICAgICAgZ3JhZGllbnQu c2V0Q29sb3JBdCgoKGRvdWJsZSltX3Byb2dyZXNzKSAvIDEwMCArIDAuMDAxLCBiYWNrZ3JvdW5k Q29sb3IpOworICAgICAgICAgICAgcC5zZXRCcnVzaChRUGFsZXR0ZTo6QmFzZSwgZ3JhZGllbnQp OworICAgICAgICB9CisgICAgICAgIHNldFBhbGV0dGUocCk7CisKKyAgICAgICAgUUxpbmVFZGl0 OjpwYWludEV2ZW50KGV2ZW50KTsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgaW50IG1fcHJvZ3Jl c3M7Cit9OworCiBjbGFzcyBXZWJWaWV3IDogcHVibGljIFFXZWJWaWV3IHsKICAgICBRX09CSkVD VAogcHVibGljOgpAQCAtMzEzLDcgKzM1NCw5IEBAIHByb3RlY3RlZCBzbG90czoKIAogICAgIHZv aWQgc2hvd0xpbmtIb3Zlcihjb25zdCBRU3RyaW5nICZsaW5rLCBjb25zdCBRU3RyaW5nICZ0b29s VGlwKQogICAgIHsKKyNpZm5kZWYgUV9XU19NQUVNT181CiAgICAgICAgIHN0YXR1c0JhcigpLT5z aG93TWVzc2FnZShsaW5rKTsKKyNlbmRpZgogI2lmbmRlZiBRVF9OT19UT09MVElQCiAgICAgICAg IGlmICghdG9vbFRpcC5pc0VtcHR5KCkpCiAgICAgICAgICAgICBRVG9vbFRpcDo6c2hvd1RleHQo UUN1cnNvcjo6cG9zKCksIHRvb2xUaXApOwpAQCAtNDEwLDcgKzQ1Myw5IEBAIHByb3RlY3RlZCBz bG90czoKICAgICAgICAgICAgIFFXZWJFbGVtZW50Q29sbGVjdGlvbiByZXN1bHQgPSAgdmlldy0+ cGFnZSgpLT5tYWluRnJhbWUoKS0+ZmluZEFsbEVsZW1lbnRzKHN0cik7CiAgICAgICAgICAgICBm b3JlYWNoIChRV2ViRWxlbWVudCBlLCByZXN1bHQpCiAgICAgICAgICAgICAgICAgZS5zZXRTdHls ZVByb3BlcnR5KCJiYWNrZ3JvdW5kLWNvbG9yIiwgInllbGxvdyIpOworI2lmbmRlZiBRX1dTX01B RU1PXzUKICAgICAgICAgICAgIHN0YXR1c0JhcigpLT5zaG93TWVzc2FnZShRU3RyaW5nKCIlMSBl bGVtZW50KHMpIHNlbGVjdGVkIikuYXJnKHJlc3VsdC5jb3VudCgpKSwgNTAwMCk7CisjZW5kaWYK ICAgICAgICAgfQogICAgIH0KIApAQCAtNDQ3LDE4ICs0OTIsMTIgQEAgcHJpdmF0ZToKICAgICAv LyBjcmVhdGUgdGhlIHN0YXR1cyBiYXIsIHRvb2wgYmFyICYgbWVudQogICAgIHZvaWQgc2V0dXBV SSgpCiAgICAgewotICAgICAgICBwcm9ncmVzcyA9IG5ldyBRUHJvZ3Jlc3NCYXIodGhpcyk7Ci0g ICAgICAgIHByb2dyZXNzLT5zZXRSYW5nZSgwLCAxMDApOwotICAgICAgICBwcm9ncmVzcy0+c2V0 TWluaW11bVNpemUoMTAwLCAyMCk7Ci0gICAgICAgIHByb2dyZXNzLT5zZXRTaXplUG9saWN5KFFT aXplUG9saWN5OjpNaW5pbXVtLCBRU2l6ZVBvbGljeTo6TWluaW11bSk7Ci0gICAgICAgIHByb2dy ZXNzLT5oaWRlKCk7Ci0gICAgICAgIHN0YXR1c0JhcigpLT5hZGRQZXJtYW5lbnRXaWRnZXQocHJv Z3Jlc3MpOwotCi0gICAgICAgIGNvbm5lY3QodmlldywgU0lHTkFMKGxvYWRQcm9ncmVzcyhpbnQp KSwgcHJvZ3Jlc3MsIFNMT1Qoc2hvdygpKSk7Ci0gICAgICAgIGNvbm5lY3QodmlldywgU0lHTkFM KGxvYWRQcm9ncmVzcyhpbnQpKSwgcHJvZ3Jlc3MsIFNMT1Qoc2V0VmFsdWUoaW50KSkpOwotICAg ICAgICBjb25uZWN0KHZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLCBwcm9ncmVzcywg U0xPVChoaWRlKCkpKTsKLQotICAgICAgICB1cmxFZGl0ID0gbmV3IFFMaW5lRWRpdCh0aGlzKTsK KyNpZm5kZWYgUV9XU19NQUVNT181CisgICAgICAgIC8vIE1ha2Ugc3VyZSB0aGUgc3RhdHVzIGJh ciBpcyB2aXNpYmxlLgorICAgICAgICBzdGF0dXNCYXIoKTsKKyNlbmRpZgorCisgICAgICAgIHVy bEVkaXQgPSBuZXcgTG9jYXRpb25FZGl0KHRoaXMpOwogICAgICAgICB1cmxFZGl0LT5zZXRTaXpl UG9saWN5KFFTaXplUG9saWN5OjpFeHBhbmRpbmcsIHVybEVkaXQtPnNpemVQb2xpY3koKS52ZXJ0 aWNhbFBvbGljeSgpKTsKICAgICAgICAgY29ubmVjdCh1cmxFZGl0LCBTSUdOQUwocmV0dXJuUHJl c3NlZCgpKSwKICAgICAgICAgICAgICAgICBTTE9UKGNoYW5nZUxvY2F0aW9uKCkpKTsKQEAgLTQ2 Niw2ICs1MDUsOCBAQCBwcml2YXRlOgogICAgICAgICB1cmxFZGl0LT5zZXRDb21wbGV0ZXIoY29t cGxldGVyKTsKICAgICAgICAgY29tcGxldGVyLT5zZXRNb2RlbCgmdXJsTW9kZWwpOwogCisgICAg ICAgIGNvbm5lY3QodmlldywgU0lHTkFMKGxvYWRQcm9ncmVzcyhpbnQpKSwgdXJsRWRpdCwgU0xP VChzZXRQcm9ncmVzcyhpbnQpKSk7CisKICAgICAgICAgUVRvb2xCYXIqIGJhciA9IGFkZFRvb2xC YXIoIk5hdmlnYXRpb24iKTsKICAgICAgICAgYmFyLT5hZGRBY3Rpb24odmlldy0+cGFnZUFjdGlv bihRV2ViUGFnZTo6QmFjaykpOwogICAgICAgICBiYXItPmFkZEFjdGlvbih2aWV3LT5wYWdlQWN0 aW9uKFFXZWJQYWdlOjpGb3J3YXJkKSk7CkBAIC01NDksOCArNTkwLDcgQEAgcHJpdmF0ZToKICAg ICB9CiAKICAgICBRV2ViVmlldyogdmlldzsKLSAgICBRTGluZUVkaXQqIHVybEVkaXQ7Ci0gICAg UVByb2dyZXNzQmFyKiBwcm9ncmVzczsKKyAgICBMb2NhdGlvbkVkaXQqIHVybEVkaXQ7CiAgICAg V2ViSW5zcGVjdG9yKiBpbnNwZWN0b3I7CiAKICAgICBRQWN0aW9uKiBmb3JtYXRNZW51QWN0aW9u Owo= 47709 2010-01-29 06:02:23 -0800 2010-01-29 06:05:02 -0800 Patch, issues addressed + LocationEdit class moved to its own file bug-34210-2.diff text/plain 8084 kling ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYTk0ZDQ5Li5kMjlmOGY3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDEt MjkgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIERpc3BsYXkgcGFnZSBs b2FkaW5nIHByb2dyZXNzIGluc2lkZSB0aGUgUXRMYXVuY2hlciBsb2NhdGlvbiBiYXIKKworCQlo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQyMTAKKworICAgICAgICAq IFF0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm86CisgICAgICAgICogUXRMYXVuY2hlci9sb2NhdGlv bmVkaXQuY3BwOiBBZGRlZC4KKyAgICAgICAgKExvY2F0aW9uRWRpdDo6TG9jYXRpb25FZGl0KToK KyAgICAgICAgKExvY2F0aW9uRWRpdDo6c2V0UHJvZ3Jlc3MpOgorICAgICAgICAoTG9jYXRpb25F ZGl0OjpwYWludEV2ZW50KToKKyAgICAgICAgKiBRdExhdW5jaGVyL2xvY2F0aW9uZWRpdC5oOiBB ZGRlZC4KKyAgICAgICAgKiBRdExhdW5jaGVyL21haW53aW5kb3cuY3BwOgorICAgICAgICAoTWFp bldpbmRvdzo6YnVpbGRVSSk6CisgICAgICAgICogUXRMYXVuY2hlci9tYWlud2luZG93Lmg6CisK IDIwMTAtMDEtMjkgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5va2lhLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8gYi9XZWJLaXRU b29scy9RdExhdW5jaGVyL1F0TGF1bmNoZXIucHJvCmluZGV4IDg4OTRlMGEuLmU0NDhmNjkgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8KKysrIGIvV2Vi S2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybwpAQCAtMSw2ICsxLDcgQEAKIFRFTVBM QVRFID0gYXBwCiAKIFNPVVJDRVMgKz0gXAorICAgIGxvY2F0aW9uZWRpdC5jcHAgXAogICAgIG1h aW4uY3BwIFwKICAgICBtYWlud2luZG93LmNwcCBcCiAgICAgdXJsbG9hZGVyLmNwcCBcCkBAIC05 LDYgKzEwLDcgQEAgU09VUkNFUyArPSBcCiAgICAgd2Vidmlldy5jcHAgXAogCiBIRUFERVJTICs9 IFwKKyAgICBsb2NhdGlvbmVkaXQuaCBcCiAgICAgbWFpbndpbmRvdy5oIFwKICAgICB1cmxsb2Fk ZXIuaCBcCiAgICAgdXRpbHMuaCBcCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExhdW5jaGVy L2xvY2F0aW9uZWRpdC5jcHAgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL2xvY2F0aW9uZWRpdC5j cHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmJhNDJlYQotLS0gL2Rldi9u dWxsCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbG9jYXRpb25lZGl0LmNwcApAQCAtMCww ICsxLDYwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIE5va2lhIENvcnBvcmF0aW9uIGFu ZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQorICoKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmli dXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBDT01QVVRF UiwgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIENPTVBVVEVS LCBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5U IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgor ICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisg Ki8KKworI2luY2x1ZGUgImxvY2F0aW9uZWRpdC5oIgorCitMb2NhdGlvbkVkaXQ6OkxvY2F0aW9u RWRpdChRV2lkZ2V0ICpwYXJlbnQpCisgICAgOiBRTGluZUVkaXQocGFyZW50KSwKKyAgICAgIG1f cHJvZ3Jlc3MoMCkKK3sKK30KKwordm9pZCBMb2NhdGlvbkVkaXQ6OnNldFByb2dyZXNzKGludCBw cm9ncmVzcykKK3sKKyAgICBtX3Byb2dyZXNzID0gcHJvZ3Jlc3M7CisgICAgdXBkYXRlKCk7Cit9 CisKK3ZvaWQgTG9jYXRpb25FZGl0OjpwYWludEV2ZW50KFFQYWludEV2ZW50KiBldikKK3sKKyAg ICBRQ29sb3IgYmFja2dyb3VuZENvbG9yID0gUUFwcGxpY2F0aW9uOjpwYWxldHRlKCkuY29sb3Io UVBhbGV0dGU6OkJhc2UpOworICAgIFFDb2xvciBwcm9ncmVzc0NvbG9yID0gUUNvbG9yKDEyMCwg MTgwLCAyNDApOworICAgIFFQYWxldHRlIHAgPSBwYWxldHRlKCk7CisKKyAgICBpZiAoIW1fcHJv Z3Jlc3MgfHwgbV9wcm9ncmVzcyA9PSAxMDApCisgICAgICAgIHAuc2V0QnJ1c2goUVBhbGV0dGU6 OkJhc2UsIGJhY2tncm91bmRDb2xvcik7CisgICAgZWxzZSB7CisgICAgICAgIFFMaW5lYXJHcmFk aWVudCBncmFkaWVudCgwLCAwLCB3aWR0aCgpLCAwKTsKKyAgICAgICAgZ3JhZGllbnQuc2V0Q29s b3JBdCgwLCBwcm9ncmVzc0NvbG9yKTsKKyAgICAgICAgZ3JhZGllbnQuc2V0Q29sb3JBdCgoKGRv dWJsZSltX3Byb2dyZXNzKSAvIDEwMCwgcHJvZ3Jlc3NDb2xvcik7CisgICAgICAgIGdyYWRpZW50 LnNldENvbG9yQXQoKChkb3VibGUpbV9wcm9ncmVzcykgLyAxMDAgKyAwLjAwMSwgYmFja2dyb3Vu ZENvbG9yKTsKKyAgICAgICAgcC5zZXRCcnVzaChRUGFsZXR0ZTo6QmFzZSwgZ3JhZGllbnQpOwor ICAgIH0KKyAgICBzZXRQYWxldHRlKHApOworCisgICAgUUxpbmVFZGl0OjpwYWludEV2ZW50KGV2 KTsKK30KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbG9jYXRpb25lZGl0Lmgg Yi9XZWJLaXRUb29scy9RdExhdW5jaGVyL2xvY2F0aW9uZWRpdC5oCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLjkzY2JlODgKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29s cy9RdExhdW5jaGVyL2xvY2F0aW9uZWRpdC5oCkBAIC0wLDAgKzEsNDkgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTAgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1p ZXMpCisgKgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNP RlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBgQVMgSVMnJyBBTkQg QU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyAqIENPTlRSSUJV VE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVD SUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVT UyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQK KyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdB WSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIGxvY2F0aW9u ZWRpdF9oCisjZGVmaW5lIGxvY2F0aW9uZWRpdF9oCisKKyNpbmNsdWRlIDxRdEd1aT4KKworY2xh c3MgTG9jYXRpb25FZGl0IDogcHVibGljIFFMaW5lRWRpdCB7CisgICAgUV9PQkpFQ1QKKworcHVi bGljOgorICAgIExvY2F0aW9uRWRpdChRV2lkZ2V0KiBwYXJlbnQgPSAwKTsKKworcHVibGljIHNs b3RzOgorICAgIHZvaWQgc2V0UHJvZ3Jlc3MoaW50IHByb2dyZXNzKTsKKworcHJvdGVjdGVkOgor ICAgIHZvaWQgcGFpbnRFdmVudChRUGFpbnRFdmVudCopOworCitwcml2YXRlOgorICAgIGludCBt X3Byb2dyZXNzOworfTsKKworI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExhdW5j aGVyL21haW53aW5kb3cuY3BwIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWlud2luZG93LmNw cAppbmRleCAxNDg3ZjFjLi4yNjYyZjVlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5j aGVyL21haW53aW5kb3cuY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbndpbmRv dy5jcHAKQEAgLTMyLDYgKzMyLDcgQEAKIAogI2luY2x1ZGUgIm1haW53aW5kb3cuaCIKIAorI2lu Y2x1ZGUgImxvY2F0aW9uZWRpdC5oIgogI2luY2x1ZGUgInV0aWxzLmgiCiAKIE1haW5XaW5kb3c6 Ok1haW5XaW5kb3coY29uc3QgUVN0cmluZyYgdXJsKQpAQCAtNTQsNyArNTUsNyBAQCB2b2lkIE1h aW5XaW5kb3c6OmJ1aWxkVUkoKQogICAgIGJhci0+YWRkQWN0aW9uKHBhZ2UoKS0+YWN0aW9uKFFX ZWJQYWdlOjpSZWxvYWQpKTsKICAgICBiYXItPmFkZEFjdGlvbihwYWdlKCktPmFjdGlvbihRV2Vi UGFnZTo6U3RvcCkpOwogCi0gICAgdXJsRWRpdCA9IG5ldyBRTGluZUVkaXQodGhpcyk7CisgICAg dXJsRWRpdCA9IG5ldyBMb2NhdGlvbkVkaXQodGhpcyk7CiAgICAgdXJsRWRpdC0+c2V0U2l6ZVBv bGljeShRU2l6ZVBvbGljeTo6RXhwYW5kaW5nLCB1cmxFZGl0LT5zaXplUG9saWN5KCkudmVydGlj YWxQb2xpY3koKSk7CiAgICAgY29ubmVjdCh1cmxFZGl0LCBTSUdOQUwocmV0dXJuUHJlc3NlZCgp KSwgU0xPVChjaGFuZ2VMb2NhdGlvbigpKSk7CiAgICAgUUNvbXBsZXRlciogY29tcGxldGVyID0g bmV3IFFDb21wbGV0ZXIodGhpcyk7CkBAIC02MiwxOCArNjMsOSBAQCB2b2lkIE1haW5XaW5kb3c6 OmJ1aWxkVUkoKQogICAgIGNvbXBsZXRlci0+c2V0TW9kZWwoJnVybE1vZGVsKTsKICAgICBiYXIt PmFkZFdpZGdldCh1cmxFZGl0KTsKIAotICAgIHByb2dyZXNzID0gbmV3IFFQcm9ncmVzc0Jhcih0 aGlzKTsKLSAgICBwcm9ncmVzcy0+c2V0UmFuZ2UoMCwgMTAwKTsKLSAgICBwcm9ncmVzcy0+c2V0 TWluaW11bVNpemUoMTAwLCAyMCk7Ci0gICAgcHJvZ3Jlc3MtPnNldFNpemVQb2xpY3koUVNpemVQ b2xpY3k6Ok1pbmltdW0sIFFTaXplUG9saWN5OjpNaW5pbXVtKTsKLSAgICBwcm9ncmVzcy0+aGlk ZSgpOwotICAgIHN0YXR1c0JhcigpLT5hZGRQZXJtYW5lbnRXaWRnZXQocHJvZ3Jlc3MpOwotCiAg ICAgY29ubmVjdChwYWdlKCktPm1haW5GcmFtZSgpLCBTSUdOQUwodGl0bGVDaGFuZ2VkKGNvbnN0 IFFTdHJpbmcmKSksCiAgICAgICAgICAgICB0aGlzLCBTTE9UKHNldFdpbmRvd1RpdGxlKGNvbnN0 IFFTdHJpbmcmKSkpOwotICAgIGNvbm5lY3QocGFnZSgpLCBTSUdOQUwobG9hZFByb2dyZXNzKGlu dCkpLCBwcm9ncmVzcywgU0xPVChzaG93KCkpKTsKLSAgICBjb25uZWN0KHBhZ2UoKSwgU0lHTkFM KGxvYWRQcm9ncmVzcyhpbnQpKSwgcHJvZ3Jlc3MsIFNMT1Qoc2V0VmFsdWUoaW50KSkpOwotICAg IGNvbm5lY3QocGFnZSgpLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSwgcHJvZ3Jlc3MsIFNM T1QoaGlkZSgpKSk7CisgICAgY29ubmVjdChwYWdlKCksIFNJR05BTChsb2FkUHJvZ3Jlc3MoaW50 KSksIHVybEVkaXQsIFNMT1Qoc2V0UHJvZ3Jlc3MoaW50KSkpOwogICAgIGNvbm5lY3QocGFnZSgp LCBTSUdOQUwod2luZG93Q2xvc2VSZXF1ZXN0ZWQoKSksIHRoaXMsIFNMT1QoY2xvc2UoKSkpOwog CiAgICAgLy8gc2hvcnQtY3V0cwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9t YWlud2luZG93LmggYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW53aW5kb3cuaAppbmRleCAy YjU5NDFkLi4xYTMwYTA5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW53 aW5kb3cuaAorKysgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW53aW5kb3cuaApAQCAtMzYs NiArMzYsOCBAQAogI2luY2x1ZGUgPFF0R3VpPgogI2luY2x1ZGUgIndlYnBhZ2UuaCIKIAorY2xh c3MgTG9jYXRpb25FZGl0OworCiBjbGFzcyBNYWluV2luZG93IDogcHVibGljIFFNYWluV2luZG93 IHsKICAgICBRX09CSkVDVAogCkBAIC01OSw5ICs2MSw3IEBAIHByaXZhdGU6CiAKICAgICBRU3Ry aW5nTGlzdE1vZGVsIHVybE1vZGVsOwogICAgIFFTdHJpbmdMaXN0IHVybExpc3Q7Ci0gICAgUUxp bmVFZGl0KiB1cmxFZGl0OwotCi0gICAgUVByb2dyZXNzQmFyKiBwcm9ncmVzczsKKyAgICBMb2Nh dGlvbkVkaXQqIHVybEVkaXQ7CiAKICAgICBXZWJQYWdlKiBtX3BhZ2U7CiB9Owo= 47710 2010-01-29 06:05:02 -0800 2010-01-29 06:26:56 -0800 Same patch, one accidental \t expanded bug-34210-2.diff text/plain 8090 kling ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYTk0ZDQ5Li5kMjlmOGY3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDEt MjkgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIERpc3BsYXkgcGFnZSBs b2FkaW5nIHByb2dyZXNzIGluc2lkZSB0aGUgUXRMYXVuY2hlciBsb2NhdGlvbiBiYXIKKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQyMTAKKworICAg ICAgICAqIFF0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm86CisgICAgICAgICogUXRMYXVuY2hlci9s b2NhdGlvbmVkaXQuY3BwOiBBZGRlZC4KKyAgICAgICAgKExvY2F0aW9uRWRpdDo6TG9jYXRpb25F ZGl0KToKKyAgICAgICAgKExvY2F0aW9uRWRpdDo6c2V0UHJvZ3Jlc3MpOgorICAgICAgICAoTG9j YXRpb25FZGl0OjpwYWludEV2ZW50KToKKyAgICAgICAgKiBRdExhdW5jaGVyL2xvY2F0aW9uZWRp dC5oOiBBZGRlZC4KKyAgICAgICAgKiBRdExhdW5jaGVyL21haW53aW5kb3cuY3BwOgorICAgICAg ICAoTWFpbldpbmRvdzo6YnVpbGRVSSk6CisgICAgICAgICogUXRMYXVuY2hlci9tYWlud2luZG93 Lmg6CisKIDIwMTAtMDEtMjkgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5v a2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNl bi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8gYi9X ZWJLaXRUb29scy9RdExhdW5jaGVyL1F0TGF1bmNoZXIucHJvCmluZGV4IDg4OTRlMGEuLmU0NDhm NjkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8KKysr IGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybwpAQCAtMSw2ICsxLDcgQEAK IFRFTVBMQVRFID0gYXBwCiAKIFNPVVJDRVMgKz0gXAorICAgIGxvY2F0aW9uZWRpdC5jcHAgXAog ICAgIG1haW4uY3BwIFwKICAgICBtYWlud2luZG93LmNwcCBcCiAgICAgdXJsbG9hZGVyLmNwcCBc CkBAIC05LDYgKzEwLDcgQEAgU09VUkNFUyArPSBcCiAgICAgd2Vidmlldy5jcHAgXAogCiBIRUFE RVJTICs9IFwKKyAgICBsb2NhdGlvbmVkaXQuaCBcCiAgICAgbWFpbndpbmRvdy5oIFwKICAgICB1 cmxsb2FkZXIuaCBcCiAgICAgdXRpbHMuaCBcCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExh dW5jaGVyL2xvY2F0aW9uZWRpdC5jcHAgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL2xvY2F0aW9u ZWRpdC5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmJhNDJlYQotLS0g L2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbG9jYXRpb25lZGl0LmNwcApA QCAtMCwwICsxLDYwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIE5va2lhIENvcnBvcmF0 aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQorICoKKyAqIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBD T01QVVRFUiwgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIENP TVBVVEVSLCBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NV UkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgImxvY2F0aW9uZWRpdC5oIgorCitMb2NhdGlvbkVkaXQ6Okxv Y2F0aW9uRWRpdChRV2lkZ2V0ICpwYXJlbnQpCisgICAgOiBRTGluZUVkaXQocGFyZW50KSwKKyAg ICAgIG1fcHJvZ3Jlc3MoMCkKK3sKK30KKwordm9pZCBMb2NhdGlvbkVkaXQ6OnNldFByb2dyZXNz KGludCBwcm9ncmVzcykKK3sKKyAgICBtX3Byb2dyZXNzID0gcHJvZ3Jlc3M7CisgICAgdXBkYXRl KCk7Cit9CisKK3ZvaWQgTG9jYXRpb25FZGl0OjpwYWludEV2ZW50KFFQYWludEV2ZW50KiBldikK K3sKKyAgICBRQ29sb3IgYmFja2dyb3VuZENvbG9yID0gUUFwcGxpY2F0aW9uOjpwYWxldHRlKCku Y29sb3IoUVBhbGV0dGU6OkJhc2UpOworICAgIFFDb2xvciBwcm9ncmVzc0NvbG9yID0gUUNvbG9y KDEyMCwgMTgwLCAyNDApOworICAgIFFQYWxldHRlIHAgPSBwYWxldHRlKCk7CisKKyAgICBpZiAo IW1fcHJvZ3Jlc3MgfHwgbV9wcm9ncmVzcyA9PSAxMDApCisgICAgICAgIHAuc2V0QnJ1c2goUVBh bGV0dGU6OkJhc2UsIGJhY2tncm91bmRDb2xvcik7CisgICAgZWxzZSB7CisgICAgICAgIFFMaW5l YXJHcmFkaWVudCBncmFkaWVudCgwLCAwLCB3aWR0aCgpLCAwKTsKKyAgICAgICAgZ3JhZGllbnQu c2V0Q29sb3JBdCgwLCBwcm9ncmVzc0NvbG9yKTsKKyAgICAgICAgZ3JhZGllbnQuc2V0Q29sb3JB dCgoKGRvdWJsZSltX3Byb2dyZXNzKSAvIDEwMCwgcHJvZ3Jlc3NDb2xvcik7CisgICAgICAgIGdy YWRpZW50LnNldENvbG9yQXQoKChkb3VibGUpbV9wcm9ncmVzcykgLyAxMDAgKyAwLjAwMSwgYmFj a2dyb3VuZENvbG9yKTsKKyAgICAgICAgcC5zZXRCcnVzaChRUGFsZXR0ZTo6QmFzZSwgZ3JhZGll bnQpOworICAgIH0KKyAgICBzZXRQYWxldHRlKHApOworCisgICAgUUxpbmVFZGl0OjpwYWludEV2 ZW50KGV2KTsKK30KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbG9jYXRpb25l ZGl0LmggYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL2xvY2F0aW9uZWRpdC5oCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkzY2JlODgKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJL aXRUb29scy9RdExhdW5jaGVyL2xvY2F0aW9uZWRpdC5oCkBAIC0wLDAgKzEsNDkgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTAgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRp YXJ5KC1pZXMpCisgKgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAy LiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBgQVMgSVMn JyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyAqIENP TlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFM LCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBC VVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisg KiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9S IFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4g QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIGxv Y2F0aW9uZWRpdF9oCisjZGVmaW5lIGxvY2F0aW9uZWRpdF9oCisKKyNpbmNsdWRlIDxRdEd1aT4K KworY2xhc3MgTG9jYXRpb25FZGl0IDogcHVibGljIFFMaW5lRWRpdCB7CisgICAgUV9PQkpFQ1QK KworcHVibGljOgorICAgIExvY2F0aW9uRWRpdChRV2lkZ2V0KiBwYXJlbnQgPSAwKTsKKworcHVi bGljIHNsb3RzOgorICAgIHZvaWQgc2V0UHJvZ3Jlc3MoaW50IHByb2dyZXNzKTsKKworcHJvdGVj dGVkOgorICAgIHZvaWQgcGFpbnRFdmVudChRUGFpbnRFdmVudCopOworCitwcml2YXRlOgorICAg IGludCBtX3Byb2dyZXNzOworfTsKKworI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9R dExhdW5jaGVyL21haW53aW5kb3cuY3BwIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWlud2lu ZG93LmNwcAppbmRleCAxNDg3ZjFjLi4yNjYyZjVlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9R dExhdW5jaGVyL21haW53aW5kb3cuY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFp bndpbmRvdy5jcHAKQEAgLTMyLDYgKzMyLDcgQEAKIAogI2luY2x1ZGUgIm1haW53aW5kb3cuaCIK IAorI2luY2x1ZGUgImxvY2F0aW9uZWRpdC5oIgogI2luY2x1ZGUgInV0aWxzLmgiCiAKIE1haW5X aW5kb3c6Ok1haW5XaW5kb3coY29uc3QgUVN0cmluZyYgdXJsKQpAQCAtNTQsNyArNTUsNyBAQCB2 b2lkIE1haW5XaW5kb3c6OmJ1aWxkVUkoKQogICAgIGJhci0+YWRkQWN0aW9uKHBhZ2UoKS0+YWN0 aW9uKFFXZWJQYWdlOjpSZWxvYWQpKTsKICAgICBiYXItPmFkZEFjdGlvbihwYWdlKCktPmFjdGlv bihRV2ViUGFnZTo6U3RvcCkpOwogCi0gICAgdXJsRWRpdCA9IG5ldyBRTGluZUVkaXQodGhpcyk7 CisgICAgdXJsRWRpdCA9IG5ldyBMb2NhdGlvbkVkaXQodGhpcyk7CiAgICAgdXJsRWRpdC0+c2V0 U2l6ZVBvbGljeShRU2l6ZVBvbGljeTo6RXhwYW5kaW5nLCB1cmxFZGl0LT5zaXplUG9saWN5KCku dmVydGljYWxQb2xpY3koKSk7CiAgICAgY29ubmVjdCh1cmxFZGl0LCBTSUdOQUwocmV0dXJuUHJl c3NlZCgpKSwgU0xPVChjaGFuZ2VMb2NhdGlvbigpKSk7CiAgICAgUUNvbXBsZXRlciogY29tcGxl dGVyID0gbmV3IFFDb21wbGV0ZXIodGhpcyk7CkBAIC02MiwxOCArNjMsOSBAQCB2b2lkIE1haW5X aW5kb3c6OmJ1aWxkVUkoKQogICAgIGNvbXBsZXRlci0+c2V0TW9kZWwoJnVybE1vZGVsKTsKICAg ICBiYXItPmFkZFdpZGdldCh1cmxFZGl0KTsKIAotICAgIHByb2dyZXNzID0gbmV3IFFQcm9ncmVz c0Jhcih0aGlzKTsKLSAgICBwcm9ncmVzcy0+c2V0UmFuZ2UoMCwgMTAwKTsKLSAgICBwcm9ncmVz cy0+c2V0TWluaW11bVNpemUoMTAwLCAyMCk7Ci0gICAgcHJvZ3Jlc3MtPnNldFNpemVQb2xpY3ko UVNpemVQb2xpY3k6Ok1pbmltdW0sIFFTaXplUG9saWN5OjpNaW5pbXVtKTsKLSAgICBwcm9ncmVz cy0+aGlkZSgpOwotICAgIHN0YXR1c0JhcigpLT5hZGRQZXJtYW5lbnRXaWRnZXQocHJvZ3Jlc3Mp OwotCiAgICAgY29ubmVjdChwYWdlKCktPm1haW5GcmFtZSgpLCBTSUdOQUwodGl0bGVDaGFuZ2Vk KGNvbnN0IFFTdHJpbmcmKSksCiAgICAgICAgICAgICB0aGlzLCBTTE9UKHNldFdpbmRvd1RpdGxl KGNvbnN0IFFTdHJpbmcmKSkpOwotICAgIGNvbm5lY3QocGFnZSgpLCBTSUdOQUwobG9hZFByb2dy ZXNzKGludCkpLCBwcm9ncmVzcywgU0xPVChzaG93KCkpKTsKLSAgICBjb25uZWN0KHBhZ2UoKSwg U0lHTkFMKGxvYWRQcm9ncmVzcyhpbnQpKSwgcHJvZ3Jlc3MsIFNMT1Qoc2V0VmFsdWUoaW50KSkp OwotICAgIGNvbm5lY3QocGFnZSgpLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSwgcHJvZ3Jl c3MsIFNMT1QoaGlkZSgpKSk7CisgICAgY29ubmVjdChwYWdlKCksIFNJR05BTChsb2FkUHJvZ3Jl c3MoaW50KSksIHVybEVkaXQsIFNMT1Qoc2V0UHJvZ3Jlc3MoaW50KSkpOwogICAgIGNvbm5lY3Qo cGFnZSgpLCBTSUdOQUwod2luZG93Q2xvc2VSZXF1ZXN0ZWQoKSksIHRoaXMsIFNMT1QoY2xvc2Uo KSkpOwogCiAgICAgLy8gc2hvcnQtY3V0cwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRMYXVu Y2hlci9tYWlud2luZG93LmggYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW53aW5kb3cuaApp bmRleCAyYjU5NDFkLi4xYTMwYTA5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVy L21haW53aW5kb3cuaAorKysgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW53aW5kb3cuaApA QCAtMzYsNiArMzYsOCBAQAogI2luY2x1ZGUgPFF0R3VpPgogI2luY2x1ZGUgIndlYnBhZ2UuaCIK IAorY2xhc3MgTG9jYXRpb25FZGl0OworCiBjbGFzcyBNYWluV2luZG93IDogcHVibGljIFFNYWlu V2luZG93IHsKICAgICBRX09CSkVDVAogCkBAIC01OSw5ICs2MSw3IEBAIHByaXZhdGU6CiAKICAg ICBRU3RyaW5nTGlzdE1vZGVsIHVybE1vZGVsOwogICAgIFFTdHJpbmdMaXN0IHVybExpc3Q7Ci0g ICAgUUxpbmVFZGl0KiB1cmxFZGl0OwotCi0gICAgUVByb2dyZXNzQmFyKiBwcm9ncmVzczsKKyAg ICBMb2NhdGlvbkVkaXQqIHVybEVkaXQ7CiAKICAgICBXZWJQYWdlKiBtX3BhZ2U7CiB9Owo= 47714 2010-01-29 06:26:56 -0800 2010-01-29 08:49:45 -0800 Same patch yet again, style issue fixed bug-34210-3.diff text/plain 8090 kling ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYTk0ZDQ5Li5kMjlmOGY3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDEt MjkgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIERpc3BsYXkgcGFnZSBs b2FkaW5nIHByb2dyZXNzIGluc2lkZSB0aGUgUXRMYXVuY2hlciBsb2NhdGlvbiBiYXIKKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQyMTAKKworICAg ICAgICAqIFF0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm86CisgICAgICAgICogUXRMYXVuY2hlci9s b2NhdGlvbmVkaXQuY3BwOiBBZGRlZC4KKyAgICAgICAgKExvY2F0aW9uRWRpdDo6TG9jYXRpb25F ZGl0KToKKyAgICAgICAgKExvY2F0aW9uRWRpdDo6c2V0UHJvZ3Jlc3MpOgorICAgICAgICAoTG9j YXRpb25FZGl0OjpwYWludEV2ZW50KToKKyAgICAgICAgKiBRdExhdW5jaGVyL2xvY2F0aW9uZWRp dC5oOiBBZGRlZC4KKyAgICAgICAgKiBRdExhdW5jaGVyL21haW53aW5kb3cuY3BwOgorICAgICAg ICAoTWFpbldpbmRvdzo6YnVpbGRVSSk6CisgICAgICAgICogUXRMYXVuY2hlci9tYWlud2luZG93 Lmg6CisKIDIwMTAtMDEtMjkgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5v a2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNl bi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8gYi9X ZWJLaXRUb29scy9RdExhdW5jaGVyL1F0TGF1bmNoZXIucHJvCmluZGV4IDg4OTRlMGEuLmU0NDhm NjkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8KKysr IGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybwpAQCAtMSw2ICsxLDcgQEAK IFRFTVBMQVRFID0gYXBwCiAKIFNPVVJDRVMgKz0gXAorICAgIGxvY2F0aW9uZWRpdC5jcHAgXAog ICAgIG1haW4uY3BwIFwKICAgICBtYWlud2luZG93LmNwcCBcCiAgICAgdXJsbG9hZGVyLmNwcCBc CkBAIC05LDYgKzEwLDcgQEAgU09VUkNFUyArPSBcCiAgICAgd2Vidmlldy5jcHAgXAogCiBIRUFE RVJTICs9IFwKKyAgICBsb2NhdGlvbmVkaXQuaCBcCiAgICAgbWFpbndpbmRvdy5oIFwKICAgICB1 cmxsb2FkZXIuaCBcCiAgICAgdXRpbHMuaCBcCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExh dW5jaGVyL2xvY2F0aW9uZWRpdC5jcHAgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL2xvY2F0aW9u ZWRpdC5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmJhNDJlYQotLS0g L2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbG9jYXRpb25lZGl0LmNwcApA QCAtMCwwICsxLDYwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIE5va2lhIENvcnBvcmF0 aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQorICoKKyAqIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBD T01QVVRFUiwgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIENP TVBVVEVSLCBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NV UkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgImxvY2F0aW9uZWRpdC5oIgorCitMb2NhdGlvbkVkaXQ6Okxv Y2F0aW9uRWRpdChRV2lkZ2V0KiBwYXJlbnQpCisgICAgOiBRTGluZUVkaXQocGFyZW50KSwKKyAg ICAgIG1fcHJvZ3Jlc3MoMCkKK3sKK30KKwordm9pZCBMb2NhdGlvbkVkaXQ6OnNldFByb2dyZXNz KGludCBwcm9ncmVzcykKK3sKKyAgICBtX3Byb2dyZXNzID0gcHJvZ3Jlc3M7CisgICAgdXBkYXRl KCk7Cit9CisKK3ZvaWQgTG9jYXRpb25FZGl0OjpwYWludEV2ZW50KFFQYWludEV2ZW50KiBldikK K3sKKyAgICBRQ29sb3IgYmFja2dyb3VuZENvbG9yID0gUUFwcGxpY2F0aW9uOjpwYWxldHRlKCku Y29sb3IoUVBhbGV0dGU6OkJhc2UpOworICAgIFFDb2xvciBwcm9ncmVzc0NvbG9yID0gUUNvbG9y KDEyMCwgMTgwLCAyNDApOworICAgIFFQYWxldHRlIHAgPSBwYWxldHRlKCk7CisKKyAgICBpZiAo IW1fcHJvZ3Jlc3MgfHwgbV9wcm9ncmVzcyA9PSAxMDApCisgICAgICAgIHAuc2V0QnJ1c2goUVBh bGV0dGU6OkJhc2UsIGJhY2tncm91bmRDb2xvcik7CisgICAgZWxzZSB7CisgICAgICAgIFFMaW5l YXJHcmFkaWVudCBncmFkaWVudCgwLCAwLCB3aWR0aCgpLCAwKTsKKyAgICAgICAgZ3JhZGllbnQu c2V0Q29sb3JBdCgwLCBwcm9ncmVzc0NvbG9yKTsKKyAgICAgICAgZ3JhZGllbnQuc2V0Q29sb3JB dCgoKGRvdWJsZSltX3Byb2dyZXNzKSAvIDEwMCwgcHJvZ3Jlc3NDb2xvcik7CisgICAgICAgIGdy YWRpZW50LnNldENvbG9yQXQoKChkb3VibGUpbV9wcm9ncmVzcykgLyAxMDAgKyAwLjAwMSwgYmFj a2dyb3VuZENvbG9yKTsKKyAgICAgICAgcC5zZXRCcnVzaChRUGFsZXR0ZTo6QmFzZSwgZ3JhZGll bnQpOworICAgIH0KKyAgICBzZXRQYWxldHRlKHApOworCisgICAgUUxpbmVFZGl0OjpwYWludEV2 ZW50KGV2KTsKK30KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbG9jYXRpb25l ZGl0LmggYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL2xvY2F0aW9uZWRpdC5oCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkzY2JlODgKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJL aXRUb29scy9RdExhdW5jaGVyL2xvY2F0aW9uZWRpdC5oCkBAIC0wLDAgKzEsNDkgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTAgTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRp YXJ5KC1pZXMpCisgKgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAy LiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBgQVMgSVMn JyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyAqIENP TlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFM LCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBC VVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisg KiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9S IFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4g QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIGxv Y2F0aW9uZWRpdF9oCisjZGVmaW5lIGxvY2F0aW9uZWRpdF9oCisKKyNpbmNsdWRlIDxRdEd1aT4K KworY2xhc3MgTG9jYXRpb25FZGl0IDogcHVibGljIFFMaW5lRWRpdCB7CisgICAgUV9PQkpFQ1QK KworcHVibGljOgorICAgIExvY2F0aW9uRWRpdChRV2lkZ2V0KiBwYXJlbnQgPSAwKTsKKworcHVi bGljIHNsb3RzOgorICAgIHZvaWQgc2V0UHJvZ3Jlc3MoaW50IHByb2dyZXNzKTsKKworcHJvdGVj dGVkOgorICAgIHZvaWQgcGFpbnRFdmVudChRUGFpbnRFdmVudCopOworCitwcml2YXRlOgorICAg IGludCBtX3Byb2dyZXNzOworfTsKKworI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9R dExhdW5jaGVyL21haW53aW5kb3cuY3BwIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWlud2lu ZG93LmNwcAppbmRleCAxNDg3ZjFjLi4yNjYyZjVlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9R dExhdW5jaGVyL21haW53aW5kb3cuY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFp bndpbmRvdy5jcHAKQEAgLTMyLDYgKzMyLDcgQEAKIAogI2luY2x1ZGUgIm1haW53aW5kb3cuaCIK IAorI2luY2x1ZGUgImxvY2F0aW9uZWRpdC5oIgogI2luY2x1ZGUgInV0aWxzLmgiCiAKIE1haW5X aW5kb3c6Ok1haW5XaW5kb3coY29uc3QgUVN0cmluZyYgdXJsKQpAQCAtNTQsNyArNTUsNyBAQCB2 b2lkIE1haW5XaW5kb3c6OmJ1aWxkVUkoKQogICAgIGJhci0+YWRkQWN0aW9uKHBhZ2UoKS0+YWN0 aW9uKFFXZWJQYWdlOjpSZWxvYWQpKTsKICAgICBiYXItPmFkZEFjdGlvbihwYWdlKCktPmFjdGlv bihRV2ViUGFnZTo6U3RvcCkpOwogCi0gICAgdXJsRWRpdCA9IG5ldyBRTGluZUVkaXQodGhpcyk7 CisgICAgdXJsRWRpdCA9IG5ldyBMb2NhdGlvbkVkaXQodGhpcyk7CiAgICAgdXJsRWRpdC0+c2V0 U2l6ZVBvbGljeShRU2l6ZVBvbGljeTo6RXhwYW5kaW5nLCB1cmxFZGl0LT5zaXplUG9saWN5KCku dmVydGljYWxQb2xpY3koKSk7CiAgICAgY29ubmVjdCh1cmxFZGl0LCBTSUdOQUwocmV0dXJuUHJl c3NlZCgpKSwgU0xPVChjaGFuZ2VMb2NhdGlvbigpKSk7CiAgICAgUUNvbXBsZXRlciogY29tcGxl dGVyID0gbmV3IFFDb21wbGV0ZXIodGhpcyk7CkBAIC02MiwxOCArNjMsOSBAQCB2b2lkIE1haW5X aW5kb3c6OmJ1aWxkVUkoKQogICAgIGNvbXBsZXRlci0+c2V0TW9kZWwoJnVybE1vZGVsKTsKICAg ICBiYXItPmFkZFdpZGdldCh1cmxFZGl0KTsKIAotICAgIHByb2dyZXNzID0gbmV3IFFQcm9ncmVz c0Jhcih0aGlzKTsKLSAgICBwcm9ncmVzcy0+c2V0UmFuZ2UoMCwgMTAwKTsKLSAgICBwcm9ncmVz cy0+c2V0TWluaW11bVNpemUoMTAwLCAyMCk7Ci0gICAgcHJvZ3Jlc3MtPnNldFNpemVQb2xpY3ko UVNpemVQb2xpY3k6Ok1pbmltdW0sIFFTaXplUG9saWN5OjpNaW5pbXVtKTsKLSAgICBwcm9ncmVz cy0+aGlkZSgpOwotICAgIHN0YXR1c0JhcigpLT5hZGRQZXJtYW5lbnRXaWRnZXQocHJvZ3Jlc3Mp OwotCiAgICAgY29ubmVjdChwYWdlKCktPm1haW5GcmFtZSgpLCBTSUdOQUwodGl0bGVDaGFuZ2Vk KGNvbnN0IFFTdHJpbmcmKSksCiAgICAgICAgICAgICB0aGlzLCBTTE9UKHNldFdpbmRvd1RpdGxl KGNvbnN0IFFTdHJpbmcmKSkpOwotICAgIGNvbm5lY3QocGFnZSgpLCBTSUdOQUwobG9hZFByb2dy ZXNzKGludCkpLCBwcm9ncmVzcywgU0xPVChzaG93KCkpKTsKLSAgICBjb25uZWN0KHBhZ2UoKSwg U0lHTkFMKGxvYWRQcm9ncmVzcyhpbnQpKSwgcHJvZ3Jlc3MsIFNMT1Qoc2V0VmFsdWUoaW50KSkp OwotICAgIGNvbm5lY3QocGFnZSgpLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSwgcHJvZ3Jl c3MsIFNMT1QoaGlkZSgpKSk7CisgICAgY29ubmVjdChwYWdlKCksIFNJR05BTChsb2FkUHJvZ3Jl c3MoaW50KSksIHVybEVkaXQsIFNMT1Qoc2V0UHJvZ3Jlc3MoaW50KSkpOwogICAgIGNvbm5lY3Qo cGFnZSgpLCBTSUdOQUwod2luZG93Q2xvc2VSZXF1ZXN0ZWQoKSksIHRoaXMsIFNMT1QoY2xvc2Uo KSkpOwogCiAgICAgLy8gc2hvcnQtY3V0cwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRMYXVu Y2hlci9tYWlud2luZG93LmggYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW53aW5kb3cuaApp bmRleCAyYjU5NDFkLi4xYTMwYTA5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVy L21haW53aW5kb3cuaAorKysgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW53aW5kb3cuaApA QCAtMzYsNiArMzYsOCBAQAogI2luY2x1ZGUgPFF0R3VpPgogI2luY2x1ZGUgIndlYnBhZ2UuaCIK IAorY2xhc3MgTG9jYXRpb25FZGl0OworCiBjbGFzcyBNYWluV2luZG93IDogcHVibGljIFFNYWlu V2luZG93IHsKICAgICBRX09CSkVDVAogCkBAIC01OSw5ICs2MSw3IEBAIHByaXZhdGU6CiAKICAg ICBRU3RyaW5nTGlzdE1vZGVsIHVybE1vZGVsOwogICAgIFFTdHJpbmdMaXN0IHVybExpc3Q7Ci0g ICAgUUxpbmVFZGl0KiB1cmxFZGl0OwotCi0gICAgUVByb2dyZXNzQmFyKiBwcm9ncmVzczsKKyAg ICBMb2NhdGlvbkVkaXQqIHVybEVkaXQ7CiAKICAgICBXZWJQYWdlKiBtX3BhZ2U7CiB9Owo=