34160 2010-01-26 04:33:32 -0800 [Qt] Add support for Maemo zoom keys in QtLauncher 2010-01-29 06:00:45 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 kling webkit-unassigned commit-queue dbates laszlo.gombos tonikitoo webkit.review.bot oldest_to_newest 184554 0 kling 2010-01-26 04:33:32 -0800 [Qt] Add support for Maemo zoom keys in QtLauncher 184555 1 47399 kling 2010-01-26 04:34:34 -0800 Created attachment 47399 Patch 184556 2 webkit.review.bot 2010-01-26 04:37:38 -0800 Attachment 47399 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKitTools/QtLauncher/main.cpp:106: Alphabetical sorting problem. [build/include_order] [4] WebKitTools/QtLauncher/main.cpp:107: Alphabetical sorting problem. [build/include_order] [4] WebKitTools/QtLauncher/main.cpp:213: QEvent_KeyPress is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 3 If any of these errors are false positives, please file a bug against check-webkit-style. 184792 3 dbates 2010-01-26 15:37:28 -0800 I am not too familiar with Maemo or its supported devices, but is there a reason why you chose the keys F7 and F8 for zooming in and out, respectively, as opposed to conforming to the + and - keys used currently by QtLauncher, Safari, and Firefox? Also, wouldn't this change break current functionality: - } else if (event->type() == QEvent::KeyPress + } else if (event->type() == QEvent_KeyPress You seem to point this out by your comment: // MAEMO: The X11 headers macro "KeyPress" which breaks "QEvent::KeyPress"... Moreover, can you elaborate what you implying by the "..."? 184896 4 tonikitoo 2010-01-26 19:03:04 -0800 (In reply to comment #3) > I am not too familiar with Maemo or its supported devices, but is there a > reason why you chose the keys F7 and F8 for zooming in and out, respectively, > as opposed to conforming to the + and - keys used currently by QtLauncher, > Safari, and Firefox? the zoom dedicated HW keys are mapped to f7 and f8 on maemo 184998 5 47399 hausmann 2010-01-27 01:25:52 -0800 Comment on attachment 47399 Patch > + > +#ifdef Q_WS_MAEMO_5 > + ~MainWindow() > + { > + grabZoomKeys(false); > } > +#endif I suggest to move the #ifdefs into the function body. (as well as in keyPressEvent) > #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0) > void sendTouchEvent() > @@ -193,6 +209,9 @@ public: > > bool eventFilter(QObject* obj, QEvent* event) > { > + // MAEMO: The X11 headers macro "KeyPress" which breaks "QEvent::KeyPress"... > + const int QEvent_KeyPress = 6; A better way to fix this is to #undef KeyPress after including the X11 headers. The rest looks good to me :) 185009 6 47512 kling 2010-01-27 02:02:28 -0800 Created attachment 47512 Patch Same patch with raised issues addressed. For info on the F7/F8 keys, see http://qt.nokia.com/doc/qt-maemo-4.6/maemo5-zoom.html 185159 7 47512 commit-queue 2010-01-27 11:27:01 -0800 Comment on attachment 47512 Patch Rejecting patch 47512 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Simon Hausmann', '--force']" exit_code: 1 patching file WebKitTools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKitTools/QtLauncher/main.cpp Hunk #1 FAILED at 50. Hunk #2 succeeded at 118 (offset -55 lines). Hunk #3 succeeded at 401 (offset -55 lines). 1 out of 3 hunks FAILED -- saving rejects to file WebKitTools/QtLauncher/main.cpp.rej Full output: http://webkit-commit-queue.appspot.com/results/215236 185790 8 47693 kling 2010-01-29 02:46:48 -0800 Created attachment 47693 Same patch, updated to merge 185806 9 47693 kenneth 2010-01-29 03:46:42 -0800 Comment on attachment 47693 Same patch, updated to merge > +#ifdef Q_WS_MAEMO_5 > + grabZoomKeys(false); > +#endif I would prefer having the ifdef tests inside grabZoomKeys instead. > if (!winId()) > qWarning("can't grab keys unless we have a window id"); Why no return after this? 185823 10 47705 kling 2010-01-29 05:21:05 -0800 Created attachment 47705 Same patch, issues addressed Thanks for the comments, Kenneth! 185839 11 47705 commit-queue 2010-01-29 06:00:34 -0800 Comment on attachment 47705 Same patch, issues addressed Clearing flags on attachment: 47705 Committed r54058: <http://trac.webkit.org/changeset/54058> 185840 12 commit-queue 2010-01-29 06:00:45 -0800 All reviewed patches have been landed. Closing bug. 47399 2010-01-26 04:34:34 -0800 2010-01-27 02:02:28 -0800 Patch bug-34160.diff text/plain 3118 kling ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0NDI3YTlkLi42YjRjMzU5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDEt MjYgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEFkZCBzdXBwb3J0IGZv ciBNYWVtbyB6b29tIGtleXMgaW4gUXRMYXVuY2hlcgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2MAorCisgICAgICAgICogUXRMYXVuY2hlci9t YWluLmNwcDoKKyAgICAgICAgKE1haW5XaW5kb3c6Ok1haW5XaW5kb3cpOgorICAgICAgICAoTWFp bldpbmRvdzo6fk1haW5XaW5kb3cpOgorICAgICAgICAoTWFpbldpbmRvdzo6ZXZlbnRGaWx0ZXIp OgorICAgICAgICAoTWFpbldpbmRvdzo6a2V5UHJlc3NFdmVudCk6CisgICAgICAgIChNYWluV2lu ZG93OjpncmFiWm9vbUtleXMpOgorCiAyMDEwLTAxLTI1ICBDaHJpcyBKZXJkb25layAgPGNqZXJk b25la0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNoaW5pY2hpcm8gSGFtYWpp LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcCBiL1dlYktpdFRv b2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAKaW5kZXggMWZkMzdmNS4uOWU0YTAxZiAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcAorKysgYi9XZWJLaXRUb29scy9RdExh dW5jaGVyL21haW4uY3BwCkBAIC0xMDEsNiArMTAxLDExIEBAIHByb3RlY3RlZDoKIAogfTsKIAor I2lmZGVmIFFfV1NfTUFFTU9fNQorI2luY2x1ZGUgPHF4MTFpbmZvX3gxMS5oPgorI2luY2x1ZGUg PFgxMS9YbGliLmg+CisjaW5jbHVkZSA8WDExL1hhdG9tLmg+CisjZW5kaWYKIAogY2xhc3MgTWFp bldpbmRvdyA6IHB1YmxpYyBRTWFpbldpbmRvdyB7CiAgICAgUV9PQkpFQ1QKQEAgLTE2NCw3ICsx NjksMTggQEAgcHVibGljOgogICAgICAgICB6b29tTGV2ZWxzIDw8IDMwIDw8IDUwIDw8IDY3IDw8 IDgwIDw8IDkwOwogICAgICAgICB6b29tTGV2ZWxzIDw8IDEwMDsKICAgICAgICAgem9vbUxldmVs cyA8PCAxMTAgPDwgMTIwIDw8IDEzMyA8PCAxNTAgPDwgMTcwIDw8IDIwMCA8PCAyNDAgPDwgMzAw OworCisjaWZkZWYgUV9XU19NQUVNT181CisgICAgICAgIGdyYWJab29tS2V5cyh0cnVlKTsKKyNl bmRpZgorICAgIH0KKworI2lmZGVmIFFfV1NfTUFFTU9fNQorICAgIH5NYWluV2luZG93KCkKKyAg ICB7CisgICAgICAgIGdyYWJab29tS2V5cyhmYWxzZSk7CiAgICAgfQorI2VuZGlmCiAKICNpZiBR VF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNiwgMCkKICAgICB2b2lkIHNlbmRUb3Vj aEV2ZW50KCkKQEAgLTE5Myw2ICsyMDksOSBAQCBwdWJsaWM6CiAKICAgICBib29sIGV2ZW50Rmls dGVyKFFPYmplY3QqIG9iaiwgUUV2ZW50KiBldmVudCkKICAgICB7CisgICAgICAgIC8vIE1BRU1P OiBUaGUgWDExIGhlYWRlcnMgbWFjcm8gIktleVByZXNzIiB3aGljaCBicmVha3MgIlFFdmVudDo6 S2V5UHJlc3MiLi4uCisgICAgICAgIGNvbnN0IGludCBRRXZlbnRfS2V5UHJlc3MgPSA2OworCiAg ICAgICAgIGlmICghdG91Y2hNb2NraW5nIHx8IG9iaiAhPSB2aWV3KQogICAgICAgICAgICAgcmV0 dXJuIFFPYmplY3Q6OmV2ZW50RmlsdGVyKG9iaiwgZXZlbnQpOwogCkBAIC0yMjgsNyArMjQ3LDcg QEAgcHVibGljOgogICAgICAgICAgICAgICAgIHRvdWNoUG9pbnRzLmFwcGVuZCh0b3VjaFBvaW50 KTsKIAogICAgICAgICAgICAgc2VuZFRvdWNoRXZlbnQoKTsKLSAgICAgICAgfSBlbHNlIGlmIChl dmVudC0+dHlwZSgpID09IFFFdmVudDo6S2V5UHJlc3MKKyAgICAgICAgfSBlbHNlIGlmIChldmVu dC0+dHlwZSgpID09IFFFdmVudF9LZXlQcmVzcwogICAgICAgICAgICAgJiYgc3RhdGljX2Nhc3Q8 UUtleUV2ZW50Kj4oZXZlbnQpLT5rZXkoKSA9PSBRdDo6S2V5X0YKICAgICAgICAgICAgICYmIHN0 YXRpY19jYXN0PFFLZXlFdmVudCo+KGV2ZW50KS0+bW9kaWZpZXJzKCkgPT0gUXQ6OkNvbnRyb2xN b2RpZmllcikgewogCkBAIC00MzYsNiArNDU1LDM0IEBAIHByaXZhdGU6CiAgICAgUVZlY3Rvcjxp bnQ+IHpvb21MZXZlbHM7CiAgICAgaW50IGN1cnJlbnRab29tOwogCisjaWZkZWYgUV9XU19NQUVN T181CisgICAgdm9pZCBrZXlQcmVzc0V2ZW50KFFLZXlFdmVudCogZXZlbnQpCisgICAgeworICAg ICAgICBzd2l0Y2ggKGV2ZW50LT5rZXkoKSkgeworICAgICAgICBjYXNlIFF0OjpLZXlfRjc6Cisg ICAgICAgICAgICB6b29tSW4oKTsKKyAgICAgICAgICAgIGV2ZW50LT5hY2NlcHQoKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgY2FzZSBRdDo6S2V5X0Y4OgorICAgICAgICAgICAgem9v bU91dCgpOworICAgICAgICAgICAgZXZlbnQtPmFjY2VwdCgpOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisgICAgICAgIFFNYWluV2luZG93OjprZXlQcmVzc0V2ZW50KGV2ZW50KTsK KyAgICB9CisKKyAgICB2b2lkIGdyYWJab29tS2V5cyhib29sIGdyYWIpCisgICAgeworICAgICAg ICBpZiAoIXdpbklkKCkpCisgICAgICAgICAgICBxV2FybmluZygiY2FuJ3QgZ3JhYiBrZXlzIHVu bGVzcyB3ZSBoYXZlIGEgd2luZG93IGlkIik7CisKKyAgICAgICAgdW5zaWduZWQgbG9uZyB2YWwg PSAoZ3JhYikgPyAxIDogMDsKKyAgICAgICAgQXRvbSBhdG9tOworICAgICAgICBhdG9tID0gWElu dGVybkF0b20oUVgxMUluZm86OmRpc3BsYXkoKSwgIl9ISUxET05fWk9PTV9LRVlfQVRPTSIsIDAp OworICAgICAgICBYQ2hhbmdlUHJvcGVydHkoUVgxMUluZm86OmRpc3BsYXkoKSwgd2luSWQoKSwg YXRvbSwgWEFfSU5URUdFUiwgMzIsIFByb3BNb2RlUmVwbGFjZSwgKHVuc2lnbmVkIGNoYXIqKSAm dmFsLCAxKTsKKyAgICB9CisjZW5kaWYKKwogICAgIHZvaWQgbG9hZFVSTChjb25zdCBRVXJsJiB1 cmwpCiAgICAgewogICAgICAgICBpZiAoIXVybC5pc1ZhbGlkKCkpCg== 47512 2010-01-27 02:02:28 -0800 2010-01-29 02:46:48 -0800 Patch bug-34160-2.diff text/plain 2561 kling ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmYjczY2FjLi4xMTU3YjZkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEt MjcgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEFkZCBzdXBwb3J0IGZv ciBNYWVtbyB6b29tIGtleXMgaW4gUXRMYXVuY2hlcgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2MAorCisgICAgICAgICogUXRMYXVuY2hlci9t YWluLmNwcDoKKyAgICAgICAgKE1haW5XaW5kb3c6Ok1haW5XaW5kb3cpOgorICAgICAgICAoTWFp bldpbmRvdzo6fk1haW5XaW5kb3cpOgorICAgICAgICAoTWFpbldpbmRvdzo6a2V5UHJlc3NFdmVu dCk6CisgICAgICAgIChNYWluV2luZG93OjpncmFiWm9vbUtleXMpOgorCiAyMDEwLTAxLTI2ICBE YW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBB ZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcCBi L1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAKaW5kZXggZTY1OGJmZS4uYWExNWUzYiAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcAorKysgYi9XZWJLaXRU b29scy9RdExhdW5jaGVyL21haW4uY3BwCkBAIC01MCwxMCArNTAsMjEgQEAKICNpbmNsdWRlIDxx d2ViaW5zcGVjdG9yLmg+CiAjaW5jbHVkZSA8cXdlYnNldHRpbmdzLmg+CiAjaW5jbHVkZSA8cXdl YnZpZXcuaD4KKworI2lmZGVmIFFfV1NfTUFFTU9fNQorI2luY2x1ZGUgPHF4MTFpbmZvX3gxMS5o PgorI2VuZGlmCisKICNpbmNsdWRlICJ1cmxsb2FkZXIuaCIKICNpbmNsdWRlICJ3ZWJpbnNwZWN0 b3IuaCIKICNpbmNsdWRlICJ3ZWJwYWdlLmgiCiAKKyNpZmRlZiBRX1dTX01BRU1PXzUKKyNpbmNs dWRlIDxYMTEvWGF0b20uaD4KKyNpbmNsdWRlIDxYMTEvWGxpYi5oPgorI3VuZGVmIEtleVByZXNz CisjZW5kaWYKKwogI2lmbmRlZiBOREVCVUcKIHZvaWQgUVdFQktJVF9FWFBPUlQgcXRfZHJ0X2dh cmJhZ2VDb2xsZWN0b3JfY29sbGVjdCgpOwogI2VuZGlmCkBAIC0xNjIsNiArMTczLDE3IEBAIHB1 YmxpYzoKICAgICAgICAgem9vbUxldmVscyA8PCAzMCA8PCA1MCA8PCA2NyA8PCA4MCA8PCA5MDsK ICAgICAgICAgem9vbUxldmVscyA8PCAxMDA7CiAgICAgICAgIHpvb21MZXZlbHMgPDwgMTEwIDw8 IDEyMCA8PCAxMzMgPDwgMTUwIDw8IDE3MCA8PCAyMDAgPDwgMjQwIDw8IDMwMDsKKworI2lmZGVm IFFfV1NfTUFFTU9fNQorICAgICAgICBncmFiWm9vbUtleXModHJ1ZSk7CisjZW5kaWYKKyAgICB9 CisKKyAgICB+TWFpbldpbmRvdygpCisgICAgeworI2lmZGVmIFFfV1NfTUFFTU9fNQorICAgICAg ICBncmFiWm9vbUtleXMoZmFsc2UpOworI2VuZGlmCiAgICAgfQogCiAjaWYgUVRfVkVSU0lPTiA+ PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCkBAIC00MzQsNiArNDU2LDM0IEBAIHByaXZhdGU6 CiAgICAgUVZlY3RvcjxpbnQ+IHpvb21MZXZlbHM7CiAgICAgaW50IGN1cnJlbnRab29tOwogCisj aWZkZWYgUV9XU19NQUVNT181CisgICAgdm9pZCBrZXlQcmVzc0V2ZW50KFFLZXlFdmVudCogZXZl bnQpCisgICAgeworICAgICAgICBzd2l0Y2ggKGV2ZW50LT5rZXkoKSkgeworICAgICAgICBjYXNl IFF0OjpLZXlfRjc6CisgICAgICAgICAgICB6b29tSW4oKTsKKyAgICAgICAgICAgIGV2ZW50LT5h Y2NlcHQoKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFF0OjpLZXlfRjg6Cisg ICAgICAgICAgICB6b29tT3V0KCk7CisgICAgICAgICAgICBldmVudC0+YWNjZXB0KCk7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBRTWFpbldpbmRvdzo6a2V5UHJlc3NF dmVudChldmVudCk7CisgICAgfQorCisgICAgdm9pZCBncmFiWm9vbUtleXMoYm9vbCBncmFiKQor ICAgIHsKKyAgICAgICAgaWYgKCF3aW5JZCgpKQorICAgICAgICAgICAgcVdhcm5pbmcoImNhbid0 IGdyYWIga2V5cyB1bmxlc3Mgd2UgaGF2ZSBhIHdpbmRvdyBpZCIpOworCisgICAgICAgIHVuc2ln bmVkIGxvbmcgdmFsID0gKGdyYWIpID8gMSA6IDA7CisgICAgICAgIEF0b20gYXRvbTsKKyAgICAg ICAgYXRvbSA9IFhJbnRlcm5BdG9tKFFYMTFJbmZvOjpkaXNwbGF5KCksICJfSElMRE9OX1pPT01f S0VZX0FUT00iLCAwKTsKKyAgICAgICAgWENoYW5nZVByb3BlcnR5KFFYMTFJbmZvOjpkaXNwbGF5 KCksIHdpbklkKCksIGF0b20sIFhBX0lOVEVHRVIsIDMyLCBQcm9wTW9kZVJlcGxhY2UsICh1bnNp Z25lZCBjaGFyKikgJnZhbCwgMSk7CisgICAgfQorI2VuZGlmCisKICAgICB2b2lkIGxvYWRVUkwo Y29uc3QgUVVybCYgdXJsKQogICAgIHsKICAgICAgICAgaWYgKCF1cmwuaXNWYWxpZCgpKQo= 47693 2010-01-29 02:46:48 -0800 2010-01-29 05:21:05 -0800 Same patch, updated to merge bug-34160-3.diff text/plain 2577 kling ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2NDlhNDhhLi43ZTQwMDhjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEt MjkgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEFkZCBzdXBwb3J0IGZv ciBNYWVtbyB6b29tIGtleXMgaW4gUXRMYXVuY2hlcgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2MAorCisgICAgICAgICogUXRMYXVuY2hlci9t YWluLmNwcDoKKyAgICAgICAgKExhdW5jaGVyV2luZG93OjpMYXVuY2hlcldpbmRvdyk6CisgICAg ICAgIChMYXVuY2hlcldpbmRvdzo6fkxhdW5jaGVyV2luZG93KToKKyAgICAgICAgKExhdW5jaGVy V2luZG93OjprZXlQcmVzc0V2ZW50KToKKyAgICAgICAgKExhdW5jaGVyV2luZG93OjpncmFiWm9v bUtleXMpOgorCiAyMDEwLTAxLTI4ICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxpdmll cnMuY29tPgogCiAgICAgICAgIFt3eF0gQnVpbGQgZml4IGZvciBNU1csIHVzZSBUaHJlYWRpbmdX aW4uY3BwIGFzIHRoZSBXaW5kb3dzIHB0aHJlYWRzIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hl ci9tYWluLmNwcAppbmRleCA4MjUzOTdmLi43ZTZjOTVhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9RdExhdW5jaGVyL21haW4uY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5j cHAKQEAgLTQ5LDEyICs0OSwyMyBAQAogI2luY2x1ZGUgPHF3ZWJmcmFtZS5oPgogI2luY2x1ZGUg PHF3ZWJpbnNwZWN0b3IuaD4KICNpbmNsdWRlIDxxd2Vic2V0dGluZ3MuaD4KKworI2lmZGVmIFFf V1NfTUFFTU9fNQorI2luY2x1ZGUgPHF4MTFpbmZvX3gxMS5oPgorI2VuZGlmCisKICNpbmNsdWRl ICJ1cmxsb2FkZXIuaCIKICNpbmNsdWRlICJ1dGlscy5oIgogI2luY2x1ZGUgIndlYmluc3BlY3Rv ci5oIgogI2luY2x1ZGUgIndlYnBhZ2UuaCIKICNpbmNsdWRlICJ3ZWJ2aWV3LmgiCiAKKyNpZmRl ZiBRX1dTX01BRU1PXzUKKyNpbmNsdWRlIDxYMTEvWGF0b20uaD4KKyNpbmNsdWRlIDxYMTEvWGxp Yi5oPgorI3VuZGVmIEtleVByZXNzCisjZW5kaWYKKwogI2lmbmRlZiBOREVCVUcKIHZvaWQgUVdF QktJVF9FWFBPUlQgcXRfZHJ0X2dhcmJhZ2VDb2xsZWN0b3JfY29sbGVjdCgpOwogI2VuZGlmCkBA IC05NSw5ICsxMDYsNTAgQEAgcHVibGljOgogICAgICAgICB6b29tTGV2ZWxzIDw8IDEwMDsKICAg ICAgICAgem9vbUxldmVscyA8PCAxMTAgPDwgMTIwIDw8IDEzMyA8PCAxNTAgPDwgMTcwIDw8IDIw MCA8PCAyNDAgPDwgMzAwOwogCisjaWZkZWYgUV9XU19NQUVNT181CisgICAgICAgIGdyYWJab29t S2V5cyh0cnVlKTsKKyNlbmRpZgorCiAgICAgICAgIGxvYWQodXJsKTsKICAgICB9CiAKKyAgICB+ TGF1bmNoZXJXaW5kb3coKQorICAgIHsKKyNpZmRlZiBRX1dTX01BRU1PXzUKKyAgICAgICAgZ3Jh Ylpvb21LZXlzKGZhbHNlKTsKKyNlbmRpZgorICAgIH0KKworICAgIHZvaWQga2V5UHJlc3NFdmVu dChRS2V5RXZlbnQqIGV2ZW50KQorICAgIHsKKyNpZmRlZiBRX1dTX01BRU1PXzUKKyAgICAgICAg c3dpdGNoIChldmVudC0+a2V5KCkpIHsKKyAgICAgICAgY2FzZSBRdDo6S2V5X0Y3OgorICAgICAg ICAgICAgem9vbUluKCk7CisgICAgICAgICAgICBldmVudC0+YWNjZXB0KCk7CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgY2FzZSBRdDo6S2V5X0Y4OgorICAgICAgICAgICAgem9vbU91dCgp OworICAgICAgICAgICAgZXZlbnQtPmFjY2VwdCgpOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIH0KKyNlbmRpZgorICAgICAgICBNYWluV2luZG93OjprZXlQcmVzc0V2ZW50KGV2ZW50KTsK KyAgICB9CisKKyNpZmRlZiBRX1dTX01BRU1PXzUKKyAgICB2b2lkIGdyYWJab29tS2V5cyhib29s IGdyYWIpCisgICAgeworICAgICAgICBpZiAoIXdpbklkKCkpCisgICAgICAgICAgICBxV2Fybmlu ZygiY2FuJ3QgZ3JhYiBrZXlzIHVubGVzcyB3ZSBoYXZlIGEgd2luZG93IGlkIik7CisKKyAgICAg ICAgdW5zaWduZWQgbG9uZyB2YWwgPSAoZ3JhYikgPyAxIDogMDsKKyAgICAgICAgQXRvbSBhdG9t OworICAgICAgICBhdG9tID0gWEludGVybkF0b20oUVgxMUluZm86OmRpc3BsYXkoKSwgIl9ISUxE T05fWk9PTV9LRVlfQVRPTSIsIDApOworICAgICAgICBYQ2hhbmdlUHJvcGVydHkoUVgxMUluZm86 OmRpc3BsYXkoKSwgd2luSWQoKSwgYXRvbSwgWEFfSU5URUdFUiwgMzIsIFByb3BNb2RlUmVwbGFj ZSwgKHVuc2lnbmVkIGNoYXIqKSAmdmFsLCAxKTsKKyAgICB9CisjZW5kaWYKKwogI2lmIFFUX1ZF UlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogICAgIHZvaWQgc2VuZFRvdWNoRXZl bnQoKQogICAgIHsK 47705 2010-01-29 05:21:05 -0800 2010-01-29 06:00:34 -0800 Same patch, issues addressed bug-34160-4.diff text/plain 2641 kling ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYTk0ZDQ5Li5kMDZhZTRlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEt MjkgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEFkZCBzdXBwb3J0IGZv ciBNYWVtbyB6b29tIGtleXMgaW4gUXRMYXVuY2hlcgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2MAorCisgICAgICAgICogUXRMYXVuY2hlci9t YWluLmNwcDoKKyAgICAgICAgKExhdW5jaGVyV2luZG93OjpMYXVuY2hlcldpbmRvdyk6CisgICAg ICAgIChMYXVuY2hlcldpbmRvdzo6fkxhdW5jaGVyV2luZG93KToKKyAgICAgICAgKExhdW5jaGVy V2luZG93OjprZXlQcmVzc0V2ZW50KToKKyAgICAgICAgKExhdW5jaGVyV2luZG93OjpncmFiWm9v bUtleXMpOgorCiAyMDEwLTAxLTI5ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW4ucG91bGFp bkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwIGIvV2Vi S2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcAppbmRleCA4MjUzOTdmLi45YTcxYzExIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCisrKyBiL1dlYktpdFRvb2xz L1F0TGF1bmNoZXIvbWFpbi5jcHAKQEAgLTQ5LDEyICs0OSwyMyBAQAogI2luY2x1ZGUgPHF3ZWJm cmFtZS5oPgogI2luY2x1ZGUgPHF3ZWJpbnNwZWN0b3IuaD4KICNpbmNsdWRlIDxxd2Vic2V0dGlu Z3MuaD4KKworI2lmZGVmIFFfV1NfTUFFTU9fNQorI2luY2x1ZGUgPHF4MTFpbmZvX3gxMS5oPgor I2VuZGlmCisKICNpbmNsdWRlICJ1cmxsb2FkZXIuaCIKICNpbmNsdWRlICJ1dGlscy5oIgogI2lu Y2x1ZGUgIndlYmluc3BlY3Rvci5oIgogI2luY2x1ZGUgIndlYnBhZ2UuaCIKICNpbmNsdWRlICJ3 ZWJ2aWV3LmgiCiAKKyNpZmRlZiBRX1dTX01BRU1PXzUKKyNpbmNsdWRlIDxYMTEvWGF0b20uaD4K KyNpbmNsdWRlIDxYMTEvWGxpYi5oPgorI3VuZGVmIEtleVByZXNzCisjZW5kaWYKKwogI2lmbmRl ZiBOREVCVUcKIHZvaWQgUVdFQktJVF9FWFBPUlQgcXRfZHJ0X2dhcmJhZ2VDb2xsZWN0b3JfY29s bGVjdCgpOwogI2VuZGlmCkBAIC05NSw5ICsxMDYsNTIgQEAgcHVibGljOgogICAgICAgICB6b29t TGV2ZWxzIDw8IDEwMDsKICAgICAgICAgem9vbUxldmVscyA8PCAxMTAgPDwgMTIwIDw8IDEzMyA8 PCAxNTAgPDwgMTcwIDw8IDIwMCA8PCAyNDAgPDwgMzAwOwogCisgICAgICAgIGdyYWJab29tS2V5 cyh0cnVlKTsKKwogICAgICAgICBsb2FkKHVybCk7CiAgICAgfQogCisgICAgfkxhdW5jaGVyV2lu ZG93KCkKKyAgICB7CisgICAgICAgIGdyYWJab29tS2V5cyhmYWxzZSk7CisgICAgfQorCisgICAg dm9pZCBrZXlQcmVzc0V2ZW50KFFLZXlFdmVudCogZXZlbnQpCisgICAgeworI2lmZGVmIFFfV1Nf TUFFTU9fNQorICAgICAgICBzd2l0Y2ggKGV2ZW50LT5rZXkoKSkgeworICAgICAgICBjYXNlIFF0 OjpLZXlfRjc6CisgICAgICAgICAgICB6b29tSW4oKTsKKyAgICAgICAgICAgIGV2ZW50LT5hY2Nl cHQoKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFF0OjpLZXlfRjg6CisgICAg ICAgICAgICB6b29tT3V0KCk7CisgICAgICAgICAgICBldmVudC0+YWNjZXB0KCk7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgfQorI2VuZGlmCisgICAgICAgIE1haW5XaW5kb3c6OmtleVBy ZXNzRXZlbnQoZXZlbnQpOworICAgIH0KKworICAgIHZvaWQgZ3JhYlpvb21LZXlzKGJvb2wgZ3Jh YikKKyAgICB7CisjaWZkZWYgUV9XU19NQUVNT181CisgICAgICAgIGlmICghd2luSWQoKSkgewor ICAgICAgICAgICAgcVdhcm5pbmcoIkNhbid0IGdyYWIga2V5cyB1bmxlc3Mgd2UgaGF2ZSBhIHdp bmRvdyBpZCIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgQXRv bSBhdG9tID0gWEludGVybkF0b20oUVgxMUluZm86OmRpc3BsYXkoKSwgIl9ISUxET05fWk9PTV9L RVlfQVRPTSIsIEZhbHNlKTsKKyAgICAgICAgaWYgKCFhdG9tKSB7CisgICAgICAgICAgICBxV2Fy bmluZygiVW5hYmxlIHRvIG9idGFpbiBfSElMRE9OX1pPT01fS0VZX0FUT00iKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHVuc2lnbmVkIGxvbmcgdmFsID0gKGdy YWIpID8gMSA6IDA7CisgICAgICAgIFhDaGFuZ2VQcm9wZXJ0eShRWDExSW5mbzo6ZGlzcGxheSgp LCB3aW5JZCgpLCBhdG9tLCBYQV9JTlRFR0VSLCAzMiwgUHJvcE1vZGVSZXBsYWNlLCByZWludGVy cHJldF9jYXN0PHVuc2lnbmVkIGNoYXIqPigmdmFsKSwgMSk7CisjZW5kaWYKKyAgICB9CisKICNp ZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNiwgMCkKICAgICB2b2lkIHNlbmRU b3VjaEV2ZW50KCkKICAgICB7Cg==