33165 2010-01-04 11:50:58 -0800 [Qt] onKeyPress/Down/Up event handlers cannot be used when the text is entered through InputMethod 2014-02-03 03:06:43 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED INVALID Qt P2 Major --- 1 vikram.malaiya jay.tucker eric jay.tucker jesus jturcotte laszlo.gombos peojala11 robert vestbo vikram.malaiya webkit.review.bot oldest_to_newest 176783 0 vikram.malaiya 2010-01-04 11:50:58 -0800 STEPS TO REPRODUCE: 1.Open Browser and Load http://waplabdc.nokia-boston.com/Browser/users/diana/enteralphabets.html 2.Begin entering text in the field given ACTUAL RESULTS: Accepts all the input characters EXPECTED RESULTS: Only alphabetical input should be accepted Linked to https://qtrequirements.europe.nokia.com/browse/BR-976 196497 1 vestbo 2010-03-05 09:39:38 -0800 Please follow the QtWebKit bug reporting guidelines when reporting bugs. See http://trac.webkit.org/wiki/QtWebKitBugs Specifically: - The 'QtWebKit' component should be used for bugs/features in the public QtWebKit API layer, not to signify that the bug is specific to the Qt port of WebKit http://trac.webkit.org/wiki/QtWebKitBugs#Component 200294 2 robert 2010-03-16 10:56:00 -0700 I can't reproduce this in QtLauncher - only alphabetical characters are accepted (and backspace of course). I notice firefox, konqueror and opera prevent backspace but that seems wrong to me. 200296 3 robert 2010-03-16 11:01:28 -0700 Pretty sure webkit has nothing to do with this, but will reopen since I'm not testing on S60. 200656 4 peojala11 2010-03-17 03:50:36 -0700 The problem is that a function defined to 'onKeyPress' never gets called. (<input type='text' onkeypress='validate(event)' />). With QtWebKit, InputBox gets its content via InputmethodEvents, not via keyevents. 200670 5 robert 2010-03-17 04:13:18 -0700 (In reply to comment #4) > The problem is that a function defined to 'onKeyPress' never gets called. > (<input type='text' onkeypress='validate(event)' />). > > With QtWebKit, InputBox gets its content via InputmethodEvents, not via > keyevents. Are you sure? It seems to me that in QtLauncher the validate() function _is_ getting called and only allowing alphabetical characters as per the regex defined in the function. It also allows backspace/DEL but that seems a good thing. The test case is working fine so far as I can tell. 200675 6 peojala11 2010-03-17 04:29:30 -0700 Yes, I'm sure. I tested it on N97 emulator and in N97 hw. This bug seems to exists with Symbian platform only. 200685 7 jturcotte 2010-03-17 04:45:42 -0700 (In reply to comment #4) > The problem is that a function defined to 'onKeyPress' never gets called. > (<input type='text' onkeypress='validate(event)' />). > > With QtWebKit, InputBox gets its content via InputmethodEvents, not via > keyevents. It might be possible to call onKeyPress for each char in the string returned from the input method event, however I guess that this would create other problems related to onKeyDown and onKeyUp not being called. What kind of problem would the end user encounter on a real website because of this limitation? 200876 8 jturcotte 2010-03-17 11:23:32 -0700 *** Bug 29372 has been marked as a duplicate of this bug. *** 200881 9 jturcotte 2010-03-17 11:26:15 -0700 (In reply to comment #8) > *** Bug 29372 has been marked as a duplicate of this bug. *** This seems like the same problem (if I understood well that S60 input is using the same channel as input method internationalization on other platforms) If I'm wrong please re-open the other bug. The other bug report also states that this works well in Safari and IE. 210086 10 peojala11 2010-04-08 01:57:14 -0700 *** Bug 33166 has been marked as a duplicate of this bug. *** 216016 11 54086 jay.tucker 2010-04-22 12:32:14 -0700 Created attachment 54086 patch file First attempt at patch. Tested on both Symbian and Linux platforms. 216017 12 webkit.review.bot 2010-04-22 12:37:00 -0700 Attachment 54086 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/qt/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] WARNING: File exempt from style guide. Skipping: "WebKit/qt/Api/qwebpage.cpp" Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 216445 13 54168 jay.tucker 2010-04-23 09:29:51 -0700 Created attachment 54168 patch file OK, let's try it again without the tab characters! 217342 14 eric 2010-04-26 16:00:28 -0700 Are you using webkit-patch upload to post your patch? Why is the first one not getting obsoleted and its review flags cleared? 217920 15 54086 hausmann 2010-04-27 14:04:26 -0700 Comment on attachment 54086 patch file I'll do a more thorough review tomorrow. Here are a few comments: > + //simulate keypress and keyrelease event for QWebpage to fire the javascript key event listeners > + //some input method can input more than 1 character at one time like Chinese input method, so a loop is needed. > + for (int i = 0; i < cmtedit.length(); ++i) { > + QChar echar = cmtedit.at(i); > + //if it's a ascii char, just transform it to key event to fire the javascript key event listeners QKeyEvents can be constructed with unicode characters. > + if (echar >= 0 && echar <= 255) { > + QKeyEvent* keypressevent = new QKeyEvent(QEvent::KeyPress, echar.toAscii(), Qt::NoModifier, echar); > + qApp->sendEvent(q, keypressevent); > + QKeyEvent* keyreleaseevent = new QKeyEvent(QEvent::KeyRelease, echar.toAscii(), Qt::NoModifier, echar); > + qApp->sendEvent(q, keyreleaseevent); I think you should allocate the key event on the stack instead of on the heap, to avoid leaking it. > + } else { > + //if it's an unicode char, insert it to the editor directly, since unicode char cannot be from a keyevent. > + editor->confirmComposition(QString(echar)); > + } > + } > + } else if (!ev->preeditString().isEmpty()) { > QString preedit = ev->preeditString(); > editor->setComposition(preedit, underlines, preedit.length(), 0); > } 218563 16 54168 hausmann 2010-04-28 12:33:06 -0700 Comment on attachment 54168 patch file > Index: WebKit/qt/ChangeLog > =================================================================== > --- WebKit/qt/ChangeLog (revision 58169) > +++ WebKit/qt/ChangeLog (working copy) > @@ -1,3 +1,16 @@ > +2010-04-23 Tucker Jay <jay.tucker@nokia.com> > + > + Reviewed by NOBODY (OOPS!). > + > + [Qt] onKeyPress/Down/Up event handlers cannot be used when the text is entered through InputMethod > + https://bugs.webkit.org/show_bug.cgi?id=33165 > + > + Fixed bug preventing alpha-only and numeric-only text entry > + fields from working on Symbian platform. > + > + * Api/qwebpage.cpp: > + (QWebPagePrivate::inputMethodEvent): > + > 2010-04-22 John Pavan <john.pavan@nokia.com> > > Reviewed by Laszlo Gombos. > Index: WebKit/qt/Api/qwebpage.cpp > =================================================================== > --- WebKit/qt/Api/qwebpage.cpp (revision 58169) > +++ WebKit/qt/Api/qwebpage.cpp (working copy) > @@ -1188,9 +1188,26 @@ void QWebPagePrivate::inputMethodEvent(Q > } > } > > - if (!ev->commitString().isEmpty()) > - editor->confirmComposition(ev->commitString()); > - else if (!ev->preeditString().isEmpty()) { > + if (!ev->commitString().isEmpty()) { > + QString cmtedit = ev->commitString(); > + //delete the selection > + editor->confirmComposition(""); > + //simulate keypress and keyrelease event for QWebpage to fire the javascript key event listeners > + //some input method can input more than 1 character at one time like Chinese input method, so a loop is needed. > + for (int i = 0; i < cmtedit.length(); ++i) { > + QChar echar = cmtedit.at(i); > + //if it's a ascii char, just transform it to key event to fire the javascript key event listeners > + if (echar >= 0 && echar <= 255) { > + QKeyEvent* keypressevent = new QKeyEvent(QEvent::KeyPress, echar.toAscii(), Qt::NoModifier, echar); > + qApp->sendEvent(q, keypressevent); > + QKeyEvent* keyreleaseevent = new QKeyEvent(QEvent::KeyRelease, echar.toAscii(), Qt::NoModifier, echar); > + qApp->sendEvent(q, keyreleaseevent); > + } else { > + //if it's an unicode char, insert it to the editor directly, since unicode char cannot be from a keyevent. > + editor->confirmComposition(QString(echar)); > + } > + } > + } else if (!ev->preeditString().isEmpty()) { > QString preedit = ev->preeditString(); > editor->setComposition(preedit, underlines, preedit.length(), 0); > } WebKit/qt/Api/qwebpage.cpp:1193 + //delete the selection Please add a space after the comment sign WebKit/qt/Api/qwebpage.cpp:1194 + editor->confirmComposition(""); Please use String()'s default constructor instead of passing "", which does an implicit conversion from ascii and also allocate a StringImpl object on the heap for no reason. WebKit/qt/Api/qwebpage.cpp:1206 + //if it's an unicode char, insert it to the editor directly, since unicode char cannot be from a keyevent. This comment doesn't make sense to me. Why can't be a unicode char be sent from a key event? QKeyEvent takes a QString, and certainly there are keyboards out there that produce characters outside the ASCII range. WebKit/qt/Api/qwebpage.cpp:1201 + QKeyEvent* keypressevent = new QKeyEvent(QEvent::KeyPress, echar.toAscii(), Qt::NoModifier, echar); This QKeyEvent is allocated on the heap, but it is never deleted. Please allocate it on the stack instead. Please also add a test for this. For example you could write a unit test that generates synthetic input method events and before sending them initialize a snippet of JS that registers event listeners. Then you can verify if they were called correctly during the synthetic composition sequence or not. 220230 17 54950 jay.tucker 2010-05-03 12:05:04 -0700 Created attachment 54950 revised patch Please take a look at the revised patch and the associated test case. 220711 18 54950 jay.tucker 2010-05-04 12:33:41 -0700 Comment on attachment 54950 revised patch Please cancel the requested review. First of all, we've discovered that the test case being used (the test website) is itself flawed. More importantly, it's become apparent that it's not even sufficiently clear what the bug is and how it manifests itself, particularly on handheld devices. 225266 19 jesus 2010-05-13 07:11:37 -0700 (In reply to comment #18) > (From update of attachment 54950 [details]) > Please cancel the requested review. First of all, we've discovered that the test case being used (the test website) is itself flawed. More importantly, it's become apparent that it's not even sufficiently clear what the bug is and how it manifests itself, particularly on handheld devices. Is this still a valid bug report? 225474 20 jay.tucker 2010-05-13 13:38:01 -0700 Yes, it is. It's still a topic of heated discussion. :-) 974983 21 jturcotte 2014-02-03 03:06:43 -0800 === Bulk closing of Qt bugs === If you believe that this bug report is still relevant for a non-Qt port of webkit.org, please re-open it and remove [Qt] from the summary. If you believe that this is still an important QtWebKit bug, please fill a new report at https://bugreports.qt-project.org and add a link to this issue. See http://qt-project.org/wiki/ReportingBugsInQt for additional guidelines. 54086 2010-04-22 12:32:14 -0700 2010-04-28 12:34:26 -0700 patch file bug-33165.patch text/plain 2564 jay.tucker SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTgxMDcpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDQtMjIgIFR1Y2tlciBKYXkgIDxqYXkudHVja2Vy QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIG9uS2V5UHJlc3MvRG93bi9VcCBldmVudCBoYW5kbGVycyBjYW5ub3QgYmUgdXNl ZCB3aGVuIHRoZSB0ZXh0IGlzIGVudGVyZWQgdGhyb3VnaCBJbnB1dE1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNjUKKworCUZpeGVkIGJ1 ZyBwcmV2ZW50aW5nIGFscGhhLW9ubHkgYW5kIG51bWVyaWMtb25seSB0ZXh0IGVudHJ5CisJZmll bGRzIGZyb20gd29ya2luZyBvbiBTeW1iaWFuIHBsYXRmb3JtLgorCisgICAgICAgICogQXBpL3F3 ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdlUHJpdmF0ZTo6aW5wdXRNZXRob2RFdmVudCk6 CisKIDIwMTAtMDQtMjIgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4K SW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9x dC9BcGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA1ODEwNykKKysrIFdlYktpdC9xdC9BcGkvcXdl YnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTg4LDkgKzExODgsMjYgQEAgdm9pZCBRV2Vi UGFnZVByaXZhdGU6OmlucHV0TWV0aG9kRXZlbnQoUQogICAgICAgICB9CiAgICAgfQogCi0gICAg aWYgKCFldi0+Y29tbWl0U3RyaW5nKCkuaXNFbXB0eSgpKQotICAgICAgICBlZGl0b3ItPmNvbmZp cm1Db21wb3NpdGlvbihldi0+Y29tbWl0U3RyaW5nKCkpOwotICAgIGVsc2UgaWYgKCFldi0+cHJl ZWRpdFN0cmluZygpLmlzRW1wdHkoKSkgeworICAgIGlmICghZXYtPmNvbW1pdFN0cmluZygpLmlz RW1wdHkoKSkgeworICAgICAgICBRU3RyaW5nIGNtdGVkaXQgPSBldi0+Y29tbWl0U3RyaW5nKCk7 CisgICAgICAgIC8vZGVsZXRlIHRoZSBzZWxlY3Rpb24KKyAgICAgICAgZWRpdG9yLT5jb25maXJt Q29tcG9zaXRpb24oIiIpOworICAgICAgICAvL3NpbXVsYXRlIGtleXByZXNzIGFuZCBrZXlyZWxl YXNlIGV2ZW50IGZvciBRV2VicGFnZSB0byBmaXJlIHRoZSBqYXZhc2NyaXB0IGtleSBldmVudCBs aXN0ZW5lcnMKKyAgICAgICAgLy9zb21lIGlucHV0IG1ldGhvZCBjYW4gaW5wdXQgbW9yZSB0aGFu IDEgY2hhcmFjdGVyIGF0IG9uZSB0aW1lIGxpa2UgQ2hpbmVzZSBpbnB1dCBtZXRob2QsIHNvIGEg bG9vcCBpcyBuZWVkZWQuCisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgY210ZWRpdC5sZW5n dGgoKTsgKytpKSB7CisgICAgICAgICAgICBRQ2hhciBlY2hhciA9IGNtdGVkaXQuYXQoaSk7Cisg ICAgICAgICAgICAvL2lmIGl0J3MgYSBhc2NpaSBjaGFyLCBqdXN0IHRyYW5zZm9ybSBpdCB0byBr ZXkgZXZlbnQgdG8gZmlyZSB0aGUgamF2YXNjcmlwdCBrZXkgZXZlbnQgbGlzdGVuZXJzCisgICAg ICAgICAgICBpZiAoZWNoYXIgPj0gMCAmJiBlY2hhciA8PSAyNTUpIHsKKyAgICAgICAgICAgICAg ICBRS2V5RXZlbnQqIGtleXByZXNzZXZlbnQgPSBuZXcgUUtleUV2ZW50KFFFdmVudDo6S2V5UHJl c3MsIGVjaGFyLnRvQXNjaWkoKSwgUXQ6Ok5vTW9kaWZpZXIsIGVjaGFyKTsKKyAgICAgICAgICAg ICAgICBxQXBwLT5zZW5kRXZlbnQocSwga2V5cHJlc3NldmVudCk7CisgICAgICAgICAgICAgICAg UUtleUV2ZW50KiBrZXlyZWxlYXNlZXZlbnQgPSBuZXcgUUtleUV2ZW50KFFFdmVudDo6S2V5UmVs ZWFzZSwgZWNoYXIudG9Bc2NpaSgpLCBRdDo6Tm9Nb2RpZmllciwgZWNoYXIpOworICAgICAgICAg ICAgICAgIHFBcHAtPnNlbmRFdmVudChxLCBrZXlyZWxlYXNlZXZlbnQpOworICAgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICAgICAvL2lmIGl0J3MgYW4gdW5pY29kZSBjaGFyLCBpbnNl cnQgaXQgdG8gdGhlIGVkaXRvciBkaXJlY3RseSwgc2luY2UgdW5pY29kZSBjaGFyIGNhbm5vdCBi ZSBmcm9tIGEga2V5ZXZlbnQuCisgICAgICAgICAgICAgICAgZWRpdG9yLT5jb25maXJtQ29tcG9z aXRpb24oUVN0cmluZyhlY2hhcikpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0gZWxz ZSBpZiAoIWV2LT5wcmVlZGl0U3RyaW5nKCkuaXNFbXB0eSgpKSB7CiAgICAgICAgIFFTdHJpbmcg cHJlZWRpdCA9IGV2LT5wcmVlZGl0U3RyaW5nKCk7CiAgICAgICAgIGVkaXRvci0+c2V0Q29tcG9z aXRpb24ocHJlZWRpdCwgdW5kZXJsaW5lcywgcHJlZWRpdC5sZW5ndGgoKSwgMCk7CiAgICAgfQo= 54168 2010-04-23 09:29:51 -0700 2010-05-03 12:05:04 -0700 patch file bug-33165.patch text/plain 2553 jay.tucker SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTgxNjkpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDQtMjMgIFR1Y2tlciBKYXkgIDxqYXkudHVja2Vy QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIG9uS2V5UHJlc3MvRG93bi9VcCBldmVudCBoYW5kbGVycyBjYW5ub3QgYmUgdXNl ZCB3aGVuIHRoZSB0ZXh0IGlzIGVudGVyZWQgdGhyb3VnaCBJbnB1dE1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNjUKKworICAgICAgICBG aXhlZCBidWcgcHJldmVudGluZyBhbHBoYS1vbmx5IGFuZCBudW1lcmljLW9ubHkgdGV4dCBlbnRy eQorICAgICAgICBmaWVsZHMgZnJvbSB3b3JraW5nIG9uIFN5bWJpYW4gcGxhdGZvcm0uCisKKyAg ICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2VQcml2YXRlOjppbnB1 dE1ldGhvZEV2ZW50KToKKwogMjAxMC0wNC0yMiAgSm9obiBQYXZhbiAgPGpvaG4ucGF2YW5Abm9r aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IExhc3psbyBHb21ib3MuCkluZGV4OiBXZWJL aXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJw YWdlLmNwcAkocmV2aXNpb24gNTgxNjkpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTE4OCw5ICsxMTg4LDI2IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRl OjppbnB1dE1ldGhvZEV2ZW50KFEKICAgICAgICAgfQogICAgIH0KIAotICAgIGlmICghZXYtPmNv bW1pdFN0cmluZygpLmlzRW1wdHkoKSkKLSAgICAgICAgZWRpdG9yLT5jb25maXJtQ29tcG9zaXRp b24oZXYtPmNvbW1pdFN0cmluZygpKTsKLSAgICBlbHNlIGlmICghZXYtPnByZWVkaXRTdHJpbmco KS5pc0VtcHR5KCkpIHsKKyAgICBpZiAoIWV2LT5jb21taXRTdHJpbmcoKS5pc0VtcHR5KCkpIHsK KyAgICAgICAgUVN0cmluZyBjbXRlZGl0ID0gZXYtPmNvbW1pdFN0cmluZygpOworICAgICAgICAv L2RlbGV0ZSB0aGUgc2VsZWN0aW9uCisgICAgICAgIGVkaXRvci0+Y29uZmlybUNvbXBvc2l0aW9u KCIiKTsKKyAgICAgICAgLy9zaW11bGF0ZSBrZXlwcmVzcyBhbmQga2V5cmVsZWFzZSBldmVudCBm b3IgUVdlYnBhZ2UgdG8gZmlyZSB0aGUgamF2YXNjcmlwdCBrZXkgZXZlbnQgbGlzdGVuZXJzCisg ICAgICAgIC8vc29tZSBpbnB1dCBtZXRob2QgY2FuIGlucHV0IG1vcmUgdGhhbiAxIGNoYXJhY3Rl ciBhdCBvbmUgdGltZSBsaWtlIENoaW5lc2UgaW5wdXQgbWV0aG9kLCBzbyBhIGxvb3AgaXMgbmVl ZGVkLgorICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGNtdGVkaXQubGVuZ3RoKCk7ICsraSkg eworICAgICAgICAgICAgUUNoYXIgZWNoYXIgPSBjbXRlZGl0LmF0KGkpOworICAgICAgICAgICAg Ly9pZiBpdCdzIGEgYXNjaWkgY2hhciwganVzdCB0cmFuc2Zvcm0gaXQgdG8ga2V5IGV2ZW50IHRv IGZpcmUgdGhlIGphdmFzY3JpcHQga2V5IGV2ZW50IGxpc3RlbmVycworICAgICAgICAgICAgaWYg KGVjaGFyID49IDAgJiYgZWNoYXIgPD0gMjU1KSB7CisgICAgICAgICAgICAgICAgUUtleUV2ZW50 KiBrZXlwcmVzc2V2ZW50ID0gbmV3IFFLZXlFdmVudChRRXZlbnQ6OktleVByZXNzLCBlY2hhci50 b0FzY2lpKCksIFF0OjpOb01vZGlmaWVyLCBlY2hhcik7CisgICAgICAgICAgICAgICAgcUFwcC0+ c2VuZEV2ZW50KHEsIGtleXByZXNzZXZlbnQpOworICAgICAgICAgICAgICAgIFFLZXlFdmVudCog a2V5cmVsZWFzZWV2ZW50ID0gbmV3IFFLZXlFdmVudChRRXZlbnQ6OktleVJlbGVhc2UsIGVjaGFy LnRvQXNjaWkoKSwgUXQ6Ok5vTW9kaWZpZXIsIGVjaGFyKTsKKyAgICAgICAgICAgICAgICBxQXBw LT5zZW5kRXZlbnQocSwga2V5cmVsZWFzZWV2ZW50KTsKKyAgICAgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICAgICAgLy9pZiBpdCdzIGFuIHVuaWNvZGUgY2hhciwgaW5zZXJ0IGl0IHRvIHRo ZSBlZGl0b3IgZGlyZWN0bHksIHNpbmNlIHVuaWNvZGUgY2hhciBjYW5ub3QgYmUgZnJvbSBhIGtl eWV2ZW50LgorICAgICAgICAgICAgICAgIGVkaXRvci0+Y29uZmlybUNvbXBvc2l0aW9uKFFTdHJp bmcoZWNoYXIpKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9IGVsc2UgaWYgKCFldi0+ cHJlZWRpdFN0cmluZygpLmlzRW1wdHkoKSkgewogICAgICAgICBRU3RyaW5nIHByZWVkaXQgPSBl di0+cHJlZWRpdFN0cmluZygpOwogICAgICAgICBlZGl0b3ItPnNldENvbXBvc2l0aW9uKHByZWVk aXQsIHVuZGVybGluZXMsIHByZWVkaXQubGVuZ3RoKCksIDApOwogICAgIH0K 54950 2010-05-03 12:05:04 -0700 2010-06-11 12:23:57 -0700 revised patch bug-33165.patch text/plain 4926 jay.tucker SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTg2ODkpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDUtMDMgIFR1Y2tlciBKYXkgIDxqYXkudHVja2Vy QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIG9uS2V5UHJlc3MvRG93bi9VcCBldmVudCBoYW5kbGVycyBjYW5ub3QgYmUgdXNl ZCB3aGVuIHRoZSB0ZXh0IGlzIGVudGVyZWQgdGhyb3VnaCBJbnB1dE1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNjUKKworICAgICAgICAq IEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OmlucHV0TWV0aG9k RXZlbnQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAg ICAgICh0c3RfUVdlYlBhZ2U6OmlucHV0TWV0aG9kS2V5RXZlbnRHZW5lcmF0aW9uKToKKwogMjAx MC0wNS0wMyAgSmVucyBBbGZrZSAgPHNuZWpAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA1ODY3MykK KysrIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTc5LDkg KzExNzksMTkgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmlucHV0TWV0aG9kRXZlbnQoUQogICAg ICAgICB9CiAgICAgfQogCi0gICAgaWYgKCFldi0+Y29tbWl0U3RyaW5nKCkuaXNFbXB0eSgpKQot ICAgICAgICBlZGl0b3ItPmNvbmZpcm1Db21wb3NpdGlvbihldi0+Y29tbWl0U3RyaW5nKCkpOwot ICAgIGVsc2UgeworICAgIGlmICghZXYtPmNvbW1pdFN0cmluZygpLmlzRW1wdHkoKSkgeworICAg ICAgICBRU3RyaW5nIGNtdGVkaXQgPSBldi0+Y29tbWl0U3RyaW5nKCk7CisgICAgICAgIC8vIGNs ZWFyIHRoZSBpbnB1dCBzdHJpbmcgYXQgZmlyc3QgCisgICAgICAgIGVkaXRvci0+Y29uZmlybUNv bXBvc2l0aW9uKFN0cmluZygpKTsKKyAgICAgICAgLy8gc2ltdWxhdGUga2V5cHJlc3MgYW5kIGtl eXJlbGVhc2UgZXZlbnQgZm9yIFFXZWJwYWdlIHRvIGZpcmUgSmF2YVNjcmlwdCBrZXlldmVudCBs aXN0ZW5lcnMgCisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgY210ZWRpdC5sZW5ndGgoKTsg KytpKSB7CisgICAgICAgICAgICBRQ2hhciBlY2hhciA9IGNtdGVkaXQuYXQoaSk7CisgICAgICAg ICAgICBRS2V5RXZlbnQga2V5cHJlc3NldmVudChRRXZlbnQ6OktleVByZXNzLCBlY2hhci51bmlj b2RlKCksIFF0OjpOb01vZGlmaWVyLCBlY2hhcik7CisgICAgICAgICAgICBxQXBwLT5zZW5kRXZl bnQocSwgJmtleXByZXNzZXZlbnQpOworICAgICAgICAgICAgUUtleUV2ZW50IGtleXJlbGVhc2Vl dmVudChRRXZlbnQ6OktleVJlbGVhc2UsIGVjaGFyLnVuaWNvZGUoKSwgUXQ6Ok5vTW9kaWZpZXIs IGVjaGFyKTsKKyAgICAgICAgICAgIHFBcHAtPnNlbmRFdmVudChxLCAma2V5cmVsZWFzZWV2ZW50 KTsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIDEuIGVtcHR5IHByZWVkaXQg d2l0aCBhIHNlbGVjdGlvbiBhdHRyaWJ1dGUsIGFuZCBzdGFydC9lbmQgb2YgMCBjYW5jZWxzIGNv bXBvc2l0aW9uCiAgICAgICAgIC8vIDIuIGVtcHR5IHByZWVkaXQgd2l0aCBhIHNlbGVjdGlvbiBh dHRyaWJ1dGUsIGFuZCBzdGFydC9lbmQgb2Ygbm9uLTAgdXBkYXRlcyBzZWxlY3Rpb24gb2YgY3Vy cmVudCBwcmVlZGl0IHRleHQKICAgICAgICAgLy8gMy4gcG9wdWxhdGVkIHByZWVkaXQgd2l0aCBh IHNlbGVjdGlvbiBhdHRyaWJ1dGUsIGFuZCBzdGFydC9lbmQgb2YgMCBvciBub24tMCB1cGRhdGVz IHNlbGVjdGlvbiBvZiBzdXBwbGllZCBwcmVlZGl0IHRleHQKSW5kZXg6IFdlYktpdC9xdC90ZXN0 cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC90ZXN0 cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA1ODY3MykKKysrIFdlYktpdC9x dC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIs NiArMTAyLDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGNvbnNvbGVPdXRwdXQoKTsKICAg ICB2b2lkIGlucHV0TWV0aG9kc19kYXRhKCk7CiAgICAgdm9pZCBpbnB1dE1ldGhvZHMoKTsKKyAg ICB2b2lkIGlucHV0TWV0aG9kS2V5RXZlbnRHZW5lcmF0aW9uKCk7CiAgICAgdm9pZCBpbnB1dE1l dGhvZHNUZXh0Rm9ybWF0X2RhdGEoKTsKICAgICB2b2lkIGlucHV0TWV0aG9kc1RleHRGb3JtYXQo KTsKICAgICB2b2lkIGRlZmF1bHRUZXh0RW5jb2RpbmcoKTsKQEAgLTE1MDYsNiArMTUwNyw0OSBA QCB2b2lkIHRzdF9RV2ViUGFnZTo6aW5wdXRNZXRob2RzKCkKICAgICBkZWxldGUgY29udGFpbmVy OwogfQogCit2b2lkIHRzdF9RV2ViUGFnZTo6aW5wdXRNZXRob2RLZXlFdmVudEdlbmVyYXRpb24o KQoreworICAgIG1fcGFnZS0+bWFpbkZyYW1lKCktPnNldEh0bWwoIjxodG1sPjxoZWFkPjxzY3Jp cHQ+IiBcCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZnVuY3Rpb24gdmFsaWRh dGUoZXZ0KSB7IiBcCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiICAgIHZhciB0 aGVFdmVudCA9IGV2dCB8fCB3aW5kb3cuZXZlbnQ7IiBcCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiICAgIHZhciBrZXkgPSB0aGVFdmVudC5rZXlDb2RlIHx8IHRoZUV2ZW50Lndo aWNoOyIgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAgICBrZXkgPSBTdHJp bmcuZnJvbUNoYXJDb2RlKCBrZXkgKTsiIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICIgICAgdmFyIHJlZ2V4ID0gL1swLTldLzsiIFwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICIgICAgaWYoICFyZWdleC50ZXN0KGtleSkgKSB7IiBcCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiICAgICAgICB0aGVFdmVudC5yZXR1cm5WYWx1ZSA9IGZhbHNl OyIgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAgICAgICAgdGhlRXZlbnQu cHJldmVudERlZmF1bHQoKTsiIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIg ICAgfSIgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIn0iIFwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICI8L3NjcmlwdD48L2hlYWQ+PGJvZHk+IiBcCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiPGlucHV0IHR5cGU9J3RleHQnIGlkPSdpbnB1 dDEnIHN0eWxlPSdmb250LWZhbWlseTogc2VyaWYnIHZhbHVlPScnIG1heGxlbmd0aD0nMjAnIG9u a2V5cHJlc3M9J3ZhbGlkYXRlKGV2ZW50KScvPjxicj4iIFwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICI8L2JvZHk+PC9odG1sPiIpOworCisgICAgbV9wYWdlLT5tYWluRnJhbWUo KS0+c2V0Rm9jdXMoKTsKKyAgICBRV2ViRWxlbWVudCBpbnB1dCA9IG1fcGFnZS0+bWFpbkZyYW1l KCktPmRvY3VtZW50RWxlbWVudCgpLmZpbmRGaXJzdCgiaW5wdXQiKTsKKyAgICBRTW91c2VFdmVu dCBldnByZXMoUUV2ZW50OjpNb3VzZUJ1dHRvblByZXNzLCBpbnB1dC5nZW9tZXRyeSgpLmNlbnRl cigpLCBRdDo6TGVmdEJ1dHRvbiwgUXQ6Ok5vQnV0dG9uLCBRdDo6Tm9Nb2RpZmllcik7CisgICAg bV9wYWdlLT5ldmVudCgmZXZwcmVzKTsKKyAgICBRTW91c2VFdmVudCBldnJlbChRRXZlbnQ6Ok1v dXNlQnV0dG9uUmVsZWFzZSwgaW5wdXQuZ2VvbWV0cnkoKS5jZW50ZXIoKSwgUXQ6OkxlZnRCdXR0 b24sIFF0OjpOb0J1dHRvbiwgUXQ6Ok5vTW9kaWZpZXIpOworICAgIG1fcGFnZS0+ZXZlbnQoJmV2 cmVsKTsKKworICAgIFFMaXN0PFFJbnB1dE1ldGhvZEV2ZW50OjpBdHRyaWJ1dGU+IGlucHV0QXR0 cmlidXRlczsKKworICAgIHsKKyAgICAgICAgUUlucHV0TWV0aG9kRXZlbnQgZXZlbnRUZXh0KCIi LCBpbnB1dEF0dHJpYnV0ZXMpOworICAgICAgICBldmVudFRleHQuc2V0Q29tbWl0U3RyaW5nKCIx MjM0NTY3ODkwIik7CisgICAgICAgIFFTaWduYWxTcHkgc2lnbmFsU3B5KG1fcGFnZSwgU0lHTkFM KGNvbnRlbnRzQ2hhbmdlZCgpKSk7CisgICAgICAgIG1fcGFnZS0+ZXZlbnQoJmV2ZW50VGV4dCk7 CisgICAgICAgIFFDT01QQVJFKHNpZ25hbFNweS5jb3VudCgpLCAxMCk7CisgICAgfQorCisgICAg eworICAgICAgICBRSW5wdXRNZXRob2RFdmVudCBldmVudFRleHQoIiIsIGlucHV0QXR0cmlidXRl cyk7CisgICAgICAgIGV2ZW50VGV4dC5zZXRDb21taXRTdHJpbmcoImExIWIyQGMzI2Q0JGU1JSIp OworICAgICAgICBRU2lnbmFsU3B5IHNpZ25hbFNweShtX3BhZ2UsIFNJR05BTChjb250ZW50c0No YW5nZWQoKSkpOworICAgICAgICBtX3BhZ2UtPmV2ZW50KCZldmVudFRleHQpOworICAgICAgICBR Q09NUEFSRShzaWduYWxTcHkuY291bnQoKSwgNSk7CisgICAgfQorfQorCiB2b2lkIHRzdF9RV2Vi UGFnZTo6aW5wdXRNZXRob2RzVGV4dEZvcm1hdF9kYXRhKCkKIHsKICAgICBRVGVzdDo6YWRkQ29s dW1uPFFTdHJpbmc+KCJzdHJpbmciKTsK