11138 2006-10-03 15:18:48 -0700 Incorrect mouse event generation on Windows 2006-10-05 11:01:09 -0700 1 1 1 Unclassified WebKit Platform 420+ PC Windows XP RESOLVED FIXED P2 Normal --- 11142 0 dgibson77 webkit-unassigned aroben oldest_to_newest 55732 0 dgibson77 2006-10-03 15:18:48 -0700 Mouse events are not generated correctly in the Windows port: * Clicks are only reported for the left button * BUTTONUP events are reported on the wrong button * Some events are reported with <garbage> as the button Patch to fix these issues coming shortly. 55733 1 10883 dgibson77 2006-10-03 15:24:15 -0700 Created attachment 10883 patch v1 This passes the actual button message along to the PlatformMouseEvent constructor, which uses it to set the button state, click count, etc. correctly. Clicks are now produced for all three buttons. Click counting should match Windows' behavior (from Spy++): a MOUSEUP of one button between clicks of another does not reset the click count for the second button, but a MOUSEDOWN does. 55736 2 10884 dgibson77 2006-10-03 15:47:19 -0700 Created attachment 10884 patch v2 Updated to latest trunk... most of the "set the correct button" portion of this bug was fixed yesterday by aroben. The remaining bit of that changed here is to set m_button to something sane for non-click messages (like WM_MOUSEMOVE). Probably unnecessary, but it seems better than leaving m_button uninitialized. That leaves getting click handling correct as the thing taking up most of this patch. 55570 3 10884 aroben 2006-10-03 16:16:43 -0700 Comment on attachment 10884 patch v2 r=me. Thanks! 55571 4 10884 aroben 2006-10-03 16:18:45 -0700 Comment on attachment 10884 patch v2 Oops, code is fine, but we need a ChangeLog entry. 55342 5 hlwebkit 2006-10-03 17:12:17 -0700 >+ case WM_LBUTTONDBLCLK: // For these messages, the OS ensures that the >+ case WM_MBUTTONDBLCLK: // previous BUTTONDOWN was for the same button. >+ case WM_RBUTTONDBLCLK: >+ { >+ DWORD curTime = GetTickCount(); >+ if (curTime - globalPrevClickTime > GetDoubleClickTime() || >+ m_position != globalPrevClickPosition) >+ globalClickCount = 0; >+ globalPrevClickTime = curTime; >+ } >+ globalPrevClickButton = m_button; >+ globalPrevClickPosition = m_position; >+ m_clickCount = ++globalClickCount; >+ return; Isn't a DBLCLK 2 clicks, not one? I saw code further down in WebCore that had if (event.event().clickCount() == 3) that did triple click handling. It seems that with this, for a triple click you'll get one DBLCLK and one LBUTTONDOWN (say) and thus only get m_clickCount = 2... or is clickCount incremented somewhere else independently for WM_*DBLCLK? 55178 6 10885 dgibson77 2006-10-03 17:17:03 -0700 Created attachment 10885 patch v3 Now with 100% more ChangeLog 55179 7 dgibson77 2006-10-03 17:20:03 -0700 (In reply to comment #5) > Isn't a DBLCLK 2 clicks, not one? I saw code further down in WebCore that had > if (event.event().clickCount() == 3) that did triple click handling. It seems > that with this, for a triple click you'll get one DBLCLK and one LBUTTONDOWN > (say) and thus only get m_clickCount = 2... or is clickCount incremented > somewhere else independently for WM_*DBLCLK? WM_LMOUSEDBLCLK is sent in place of the second WM_LBUTTONDOWN on a double click (Windows doesn't queue up clicks to decide whether you're single- or double-clicking before sending messages). So the message sequence on a double click is: WM_LBUTTONDOWN WM_LBUTTONUP WM_LBUTTONDBLCLK WM_LBUTTONUP Thus, a double click message is still just one click. We could avoid click counting altogether and just handle the messages as "double" and "single" clicks more easily if we didn't need to worry about dispatching triple-clicks, which Windows doesn't understand. 55180 8 hlwebkit 2006-10-03 17:28:37 -0700 OK, it's one click on Windows, but in Frame::handleMousePressEvent, there's this test: if (event.event().clickCount() >= 3) { handleMousePressEventTripleClick(event); ... which means that on Mac at least the event is initialized with clickCount = 3 for the triple click case, which means we probably need to do that here too. When you enumerate the messages that get sent, do you mean that Windows counts the first DOWN/UP action as the first component of the double click? i.e. are they coalesced? Do DOWN, UP, DBLCLK get sent for all doubleclick actions? Is the following UP the only message sent for the third click? (What happened to the DOWN for that one?) 55131 9 hlwebkit 2006-10-03 17:53:23 -0700 Apologies, I was confused. I was thinking about another issue, which I have filed in bug 11144. 54394 10 10885 dgibson77 2006-10-04 11:02:16 -0700 Comment on attachment 10885 patch v3 Forgot to ask for review, oops 54398 11 10885 aroben 2006-10-04 11:15:19 -0700 Comment on attachment 10885 patch v3 r=me 54502 12 ap 2006-10-05 11:01:09 -0700 Committed revision 16811. 10883 2006-10-03 15:24:15 -0700 2006-10-03 15:47:19 -0700 patch v1 patch text/plain 7917 dgibson77 SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1Nb3VzZUV2ZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAkocmV2aXNpb24gMTY3MTgp CisrKyBXZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtTW91c2VFdmVudC5oCSh3b3JraW5nIGNvcHkp CkBAIC0zOSw2ICszOSw3IEBACiAKICNpZiBQTEFURk9STShXSU4pCiB0eXBlZGVmIHN0cnVjdCBI V05EX18qIEhXTkQ7Cit0eXBlZGVmIHVuc2lnbmVkIGludCBVSU5UOwogdHlwZWRlZiB1bnNpZ25l ZCBXUEFSQU07CiB0eXBlZGVmIGxvbmcgTFBBUkFNOwogI2VuZGlmCkBAIC05OSw3ICsxMDAsNyBA QAogICAgICAgICBQbGF0Zm9ybU1vdXNlRXZlbnQoTlNFdmVudCopOwogI2VuZGlmCiAjaWYgUExB VEZPUk0oV0lOKQotICAgICAgICBQbGF0Zm9ybU1vdXNlRXZlbnQoSFdORCwgV1BBUkFNLCBMUEFS QU0pOworICAgICAgICBQbGF0Zm9ybU1vdXNlRXZlbnQoSFdORCwgVUlOVCwgV1BBUkFNLCBMUEFS QU0pOwogICAgICAgICB2b2lkIHNldENsaWNrQ291bnQoaW50IGNvdW50KSB7IG1fY2xpY2tDb3Vu dCA9IGNvdW50OyB9CiAjZW5kaWYKICNpZiBQTEFURk9STShHREspIApJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS93aW4vTW91c2VFdmVudFdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0 Zm9ybS93aW4vTW91c2VFdmVudFdpbi5jcHAJKHJldmlzaW9uIDE2NzE4KQorKysgV2ViQ29yZS9w bGF0Zm9ybS93aW4vTW91c2VFdmVudFdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0 LDcgQEAKICNkZWZpbmUgSElHSF9CSVRfTUFTS19TSE9SVCAweDgwMDAKIAogc3RhdGljIGludCBn bG9iYWxDbGlja0NvdW50ID0gMDsKK3N0YXRpYyBlbnVtIE1vdXNlQnV0dG9uIGdsb2JhbFByZXZD bGlja0J1dHRvbiA9IExlZnRCdXR0b247CiBzdGF0aWMgRFdPUkQgZ2xvYmFsUHJldkNsaWNrVGlt ZSA9IDA7CiBzdGF0aWMgSW50UG9pbnQgZ2xvYmFsUHJldkNsaWNrUG9zaXRpb24gPSBJbnRQb2lu dCgpOwogCkBAIC01MCwzNCArNTEsNjkgQEAKICAgICByZXR1cm4gcG9pbnQ7CiB9CiAKLVBsYXRm b3JtTW91c2VFdmVudDo6UGxhdGZvcm1Nb3VzZUV2ZW50KEhXTkQgaFduZCwgV1BBUkFNIHdQYXJh bSwgTFBBUkFNIGxQYXJhbSkKK1BsYXRmb3JtTW91c2VFdmVudDo6UGxhdGZvcm1Nb3VzZUV2ZW50 KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQog ICAgIDogbV9wb3NpdGlvbihwb3NpdGlvbkZvckV2ZW50KGhXbmQsIGxQYXJhbSkpCiAgICAgLCBt X2dsb2JhbFBvc2l0aW9uKGdsb2JhbFBvc2l0aW9uRm9yRXZlbnQoaFduZCwgbFBhcmFtKSkKLSAg ICAsIG1fY2xpY2tDb3VudCgwKQogICAgICwgbV9zaGlmdEtleSh3UGFyYW0gJiBNS19TSElGVCkK ICAgICAsIG1fY3RybEtleSh3UGFyYW0gJiBNS19DT05UUk9MKQogICAgICwgbV9hbHRLZXkoR2V0 QXN5bmNLZXlTdGF0ZShWS19NRU5VKSAmIEhJR0hfQklUX01BU0tfU0hPUlQpCiAgICAgLCBtX21l dGFLZXkobV9hbHRLZXkpIC8vIEZJWE1FOiBXZSdsbCBoYXZlIHRvIHRlc3Qgb3RoZXIgYnJvd3Nl cnMKIHsKLSAgICBpZiAod1BhcmFtICYgTUtfTEJVVFRPTikKLSAgICAgICAgbV9idXR0b24gPSBM ZWZ0QnV0dG9uOwotICAgIGVsc2UgaWYgKHdQYXJhbSAmIE1LX1JCVVRUT04pCi0gICAgICAgIG1f YnV0dG9uID0gUmlnaHRCdXR0b247Ci0gICAgZWxzZSBpZiAod1BhcmFtICYgTUtfTUJVVFRPTikK LSAgICAgICAgbV9idXR0b24gPSBNaWRkbGVCdXR0b247CisgICAgc3dpdGNoIChtZXNzYWdlKSB7 CisgICAgICAgIGNhc2UgV01fTEJVVFRPTlVQOgorICAgICAgICBjYXNlIFdNX0xCVVRUT05ET1dO OgorICAgICAgICBjYXNlIFdNX0xCVVRUT05EQkxDTEs6CisgICAgICAgICAgICBtX2J1dHRvbiA9 IExlZnRCdXR0b247CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBXTV9NQlVUVE9O VVA6CisgICAgICAgIGNhc2UgV01fTUJVVFRPTkRPV046CisgICAgICAgIGNhc2UgV01fTUJVVFRP TkRCTENMSzoKKyAgICAgICAgICAgIG1fYnV0dG9uID0gTWlkZGxlQnV0dG9uOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgV01fUkJVVFRPTlVQOgorICAgICAgICBjYXNlIFdNX1JC VVRUT05ET1dOOgorICAgICAgICBjYXNlIFdNX1JCVVRUT05EQkxDTEs6CisgICAgICAgICAgICBt X2J1dHRvbiA9IFJpZ2h0QnV0dG9uOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1 bHQ6CisgICAgICAgICAgICBpZiAod1BhcmFtICYgTUtfTEJVVFRPTikKKyAgICAgICAgICAgICAg ICBtX2J1dHRvbiA9IExlZnRCdXR0b247CisgICAgICAgICAgICBlbHNlIGlmICh3UGFyYW0gJiBN S19SQlVUVE9OKQorICAgICAgICAgICAgICAgIG1fYnV0dG9uID0gUmlnaHRCdXR0b247CisgICAg ICAgICAgICBlbHNlIGlmICh3UGFyYW0gJiBNS19NQlVUVE9OKQorICAgICAgICAgICAgICAgIG1f YnV0dG9uID0gTWlkZGxlQnV0dG9uOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAg IG1fYnV0dG9uID0gTGVmdEJ1dHRvbjsKKyAgICAgICAgICAgIGJyZWFrOworICAgIH0KIAotICAg IGlmIChtX2J1dHRvbiA9PSBMZWZ0QnV0dG9uKSB7Ci0gICAgICAgIERXT1JEIGN1clRpbWUgPSBH ZXRUaWNrQ291bnQoKTsKLSAgICAgICAgaWYgKGN1clRpbWUgLSBnbG9iYWxQcmV2Q2xpY2tUaW1l ID4gR2V0RG91YmxlQ2xpY2tUaW1lKCkgCi0gICAgICAgICAgICB8fCBnbG9iYWxQcmV2Q2xpY2tQ b3NpdGlvbiAhPSBtX3Bvc2l0aW9uKQotICAgICAgICAgICAgZ2xvYmFsQ2xpY2tDb3VudCA9IDE7 Ci0gICAgICAgIGVsc2UgCi0gICAgICAgICAgICBnbG9iYWxDbGlja0NvdW50Kys7CisgICAgc3dp dGNoIChtZXNzYWdlKSB7CisgICAgICAgIGNhc2UgV01fTEJVVFRPTkRPV046CisgICAgICAgIGNh c2UgV01fTUJVVFRPTkRPV046CisgICAgICAgIGNhc2UgV01fUkJVVFRPTkRPV046CisgICAgICAg ICAgICBpZiAoZ2xvYmFsUHJldkNsaWNrQnV0dG9uICE9IG1fYnV0dG9uKQorICAgICAgICAgICAg ICAgIGdsb2JhbENsaWNrQ291bnQgPSAwOworICAgICAgICAgICAgLy8gRkFMTCBUSFJPVUdICisg ICAgICAgIGNhc2UgV01fTEJVVFRPTkRCTENMSzogIC8vIEZvciB0aGVzZSBtZXNzYWdlcywgdGhl IE9TIGVuc3VyZXMgdGhhdCB0aGUKKyAgICAgICAgY2FzZSBXTV9NQlVUVE9OREJMQ0xLOiAgLy8g cHJldmlvdXMgQlVUVE9ORE9XTiB3YXMgZm9yIHRoZSBzYW1lIGJ1dHRvbi4KKyAgICAgICAgY2Fz ZSBXTV9SQlVUVE9OREJMQ0xLOgorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIERXT1JE IGN1clRpbWUgPSBHZXRUaWNrQ291bnQoKTsKKyAgICAgICAgICAgICAgICBpZiAoY3VyVGltZSAt IGdsb2JhbFByZXZDbGlja1RpbWUgPiBHZXREb3VibGVDbGlja1RpbWUoKSB8fAorICAgICAgICAg ICAgICAgICAgICBtX3Bvc2l0aW9uICE9IGdsb2JhbFByZXZDbGlja1Bvc2l0aW9uKQorICAgICAg ICAgICAgICAgICAgICBnbG9iYWxDbGlja0NvdW50ID0gMDsKKyAgICAgICAgICAgICAgICBnbG9i YWxQcmV2Q2xpY2tUaW1lID0gY3VyVGltZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGds b2JhbFByZXZDbGlja0J1dHRvbiA9IG1fYnV0dG9uOworICAgICAgICAgICAgZ2xvYmFsUHJldkNs aWNrUG9zaXRpb24gPSBtX3Bvc2l0aW9uOworICAgICAgICAgICAgbV9jbGlja0NvdW50ID0gKytn bG9iYWxDbGlja0NvdW50OworICAgICAgICAgICAgcmV0dXJuOworICAgIH0KIAotICAgICAgICBn bG9iYWxQcmV2Q2xpY2tUaW1lID0gY3VyVGltZTsKLSAgICAgICAgZ2xvYmFsUHJldkNsaWNrUG9z aXRpb24gPSBtX3Bvc2l0aW9uOwotICAgICAgICBtX2NsaWNrQ291bnQgPSBnbG9iYWxDbGlja0Nv dW50OwotICAgIH0KKyAgICBtX2NsaWNrQ291bnQgPSAobV9idXR0b24gPT0gZ2xvYmFsUHJldkNs aWNrQnV0dG9uKSA/IGdsb2JhbENsaWNrQ291bnQgOgorICAgICAgICAoKG1lc3NhZ2UgPT0gV01f TEJVVFRPTlVQIHx8IG1lc3NhZ2UgPT0gV01fTUJVVFRPTlVQIHx8CisgICAgICAgICAgbWVzc2Fn ZSA9PSBXTV9SQlVUVE9OVVApID8gMSA6IDApOworICAgIHJldHVybjsKIH0KIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpJbmRleDogV2ViS2l0L0NPTS9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvQ09NL1dlYlZpZXcuY3BwCShyZXZpc2lvbiAxNjcxOCkKKysrIFdlYktpdC9DT00v V2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk2LDI3ICs5NiwyNyBAQAogICAgIHJldHVy biBpbnN0YW5jZTsKIH0KIAotdm9pZCBXZWJWaWV3Ojptb3VzZU1vdmVkKFdQQVJBTSB3UGFyYW0s IExQQVJBTSBsUGFyYW0pCit2b2lkIFdlYlZpZXc6Om1vdXNlTW92ZWQoVUlOVCBtZXNzYWdlLCBX UEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQogewotICAgIFBsYXRmb3JtTW91c2VFdmVudCBt b3VzZUV2ZW50KG1fdmlld1dpbmRvdywgd1BhcmFtLCBsUGFyYW0pOworICAgIFBsYXRmb3JtTW91 c2VFdmVudCBtb3VzZUV2ZW50KG1fdmlld1dpbmRvdywgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0p OwogICAgIG1fbWFpbkZyYW1lLT5pbXBsKCktPnZpZXcoKS0+aGFuZGxlTW91c2VNb3ZlRXZlbnQo bW91c2VFdmVudCk7CiB9CiAKLXZvaWQgV2ViVmlldzo6bW91c2VEb3duKFdQQVJBTSB3UGFyYW0s IExQQVJBTSBsUGFyYW0pCit2b2lkIFdlYlZpZXc6Om1vdXNlRG93bihVSU5UIG1lc3NhZ2UsIFdQ QVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCiB7Ci0gICAgUGxhdGZvcm1Nb3VzZUV2ZW50IG1v dXNlRXZlbnQobV92aWV3V2luZG93LCB3UGFyYW0sIGxQYXJhbSk7CisgICAgUGxhdGZvcm1Nb3Vz ZUV2ZW50IG1vdXNlRXZlbnQobV92aWV3V2luZG93LCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSk7 CiAgICAgbV9tYWluRnJhbWUtPmltcGwoKS0+dmlldygpLT5oYW5kbGVNb3VzZVByZXNzRXZlbnQo bW91c2VFdmVudCk7CiB9CiAKLXZvaWQgV2ViVmlldzo6bW91c2VVcChXUEFSQU0gd1BhcmFtLCBM UEFSQU0gbFBhcmFtKQordm9pZCBXZWJWaWV3Ojptb3VzZVVwKFVJTlQgbWVzc2FnZSwgV1BBUkFN IHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKIHsKLSAgICBQbGF0Zm9ybU1vdXNlRXZlbnQgbW91c2VF dmVudChtX3ZpZXdXaW5kb3csIHdQYXJhbSwgbFBhcmFtKTsKKyAgICBQbGF0Zm9ybU1vdXNlRXZl bnQgbW91c2VFdmVudChtX3ZpZXdXaW5kb3csIG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsKICAg ICBtX21haW5GcmFtZS0+aW1wbCgpLT52aWV3KCktPmhhbmRsZU1vdXNlUmVsZWFzZUV2ZW50KG1v dXNlRXZlbnQpOwogfQogCi12b2lkIFdlYlZpZXc6Om1vdXNlRG91YmxlQ2xpY2soV1BBUkFNIHdQ YXJhbSwgTFBBUkFNIGxQYXJhbSkKK3ZvaWQgV2ViVmlldzo6bW91c2VEb3VibGVDbGljayhVSU5U IG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCiB7Ci0gICAgUGxhdGZvcm1N b3VzZUV2ZW50IG1vdXNlRXZlbnQobV92aWV3V2luZG93LCB3UGFyYW0sIGxQYXJhbSk7CisgICAg UGxhdGZvcm1Nb3VzZUV2ZW50IG1vdXNlRXZlbnQobV92aWV3V2luZG93LCBtZXNzYWdlLCB3UGFy YW0sIGxQYXJhbSk7CiAgICAgbV9tYWluRnJhbWUtPmltcGwoKS0+dmlldygpLT5oYW5kbGVNb3Vz ZVJlbGVhc2VFdmVudChtb3VzZUV2ZW50KTsKIH0KIApAQCAtMjIwLDcgKzIyMCw3IEBACiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBXTV9NT1VTRU1PVkU6CiAgICAgICAgICAgICBp ZiAod2ViVmlldykKLSAgICAgICAgICAgICAgICB3ZWJWaWV3LT5tb3VzZU1vdmVkKHdQYXJhbSwg bFBhcmFtKTsKKyAgICAgICAgICAgICAgICB3ZWJWaWV3LT5tb3VzZU1vdmVkKG1lc3NhZ2UsIHdQ YXJhbSwgbFBhcmFtKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFdNX0xCVVRU T05ET1dOOgogICAgICAgICAgICAgLy8gTWFrZSBvdXJzZWx2ZXMgdGhlIGZvY3VzZWQgd2luZG93 IGJlZm9yZSBkb2luZyBhbnl0aGluZyBlbHNlCkBAIC0yMjgsMjIgKzIyOCwyMyBAQAogICAgICAg ICAgICAgLy8gYnV0IHcvbyB0aGlzIGNhbGwsIHdlIG5ldmVyIGJlY29tZSBmb2N1c2VkIHNpbmNl IHdlIGRvbid0IGFsbG93CiAgICAgICAgICAgICAvLyB0aGUgZGVmYXVsdCBoYW5kbGluZyBvZiBt b3VzZSBldmVudHMuCiAgICAgICAgICAgICBTZXRGb2N1cyhoV25kKTsKKyAgICAgICAgICAgIC8v IEZBTEwgVEhST1VHSAogICAgICAgICBjYXNlIFdNX01CVVRUT05ET1dOOgogICAgICAgICBjYXNl IFdNX1JCVVRUT05ET1dOOgogICAgICAgICAgICAgaWYgKHdlYlZpZXcpCi0gICAgICAgICAgICAg ICAgd2ViVmlldy0+bW91c2VEb3duKHdQYXJhbSwgbFBhcmFtKTsKKyAgICAgICAgICAgICAgICB3 ZWJWaWV3LT5tb3VzZURvd24obWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGNhc2UgV01fTEJVVFRPTlVQOgogICAgICAgICBjYXNlIFdNX01CVVRU T05VUDoKICAgICAgICAgY2FzZSBXTV9SQlVUVE9OVVA6CiAgICAgICAgICAgICBpZiAod2ViVmll dykKLSAgICAgICAgICAgICAgICB3ZWJWaWV3LT5tb3VzZVVwKHdQYXJhbSwgbFBhcmFtKTsKKyAg ICAgICAgICAgICAgICB3ZWJWaWV3LT5tb3VzZVVwKG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFdNX0xCVVRUT05EQkxDTEs6CiAgICAg ICAgIGNhc2UgV01fTUJVVFRPTkRCTENMSzoKICAgICAgICAgY2FzZSBXTV9SQlVUVE9OREJMQ0xL OgogICAgICAgICAgICAgaWYgKHdlYlZpZXcpCi0gICAgICAgICAgICAgICAgd2ViVmlldy0+bW91 c2VEb3VibGVDbGljayh3UGFyYW0sIGxQYXJhbSk7CisgICAgICAgICAgICAgICAgd2ViVmlldy0+ bW91c2VEb3VibGVDbGljayhtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSk7CiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgY2FzZSBXTV9IU0NST0xMOiB7CiAgICAgICAgICAgICBpZiAobWFpbkZy YW1lSW1wbCkgewpJbmRleDogV2ViS2l0L0NPTS9XZWJWaWV3LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L0NPTS9XZWJWaWV3LmgJKHJldmlzaW9uIDE2NzE4KQorKysgV2ViS2l0L0NPTS9XZWJWaWV3 LmgJKHdvcmtpbmcgY29weSkKQEAgLTM5MywxMCArMzkzLDEwIEBACiAKICAgICAvLyBXZWJWaWV3 CiAKLSAgICB2b2lkIG1vdXNlTW92ZWQoV1BBUkFNLCBMUEFSQU0pOwotICAgIHZvaWQgbW91c2VE b3duKFdQQVJBTSwgTFBBUkFNKTsKLSAgICB2b2lkIG1vdXNlVXAoV1BBUkFNLCBMUEFSQU0pOwot ICAgIHZvaWQgbW91c2VEb3VibGVDbGljayhXUEFSQU0sIExQQVJBTSk7CisgICAgdm9pZCBtb3Vz ZU1vdmVkKFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsKKyAgICB2b2lkIG1vdXNlRG93bihVSU5ULCBX UEFSQU0sIExQQVJBTSk7CisgICAgdm9pZCBtb3VzZVVwKFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsK KyAgICB2b2lkIG1vdXNlRG91YmxlQ2xpY2soVUlOVCwgV1BBUkFNLCBMUEFSQU0pOwogICAgIGJv b2wga2V5UHJlc3MoV1BBUkFNLCBMUEFSQU0pOwogICAgIEhSRVNVTFQgZ29Ub0l0ZW0oSVdlYkhp c3RvcnlJdGVtKiBpdGVtLCBXZWJGcmFtZUxvYWRUeXBlIHdpdGhMb2FkVHlwZSk7CiAK 10884 2006-10-03 15:47:19 -0700 2006-10-03 17:17:03 -0700 patch v2 patch text/plain 2886 dgibson77 SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwCShyZXZpc2lvbiAxNjc0 MykKKysrIFdlYkNvcmUvcGxhdGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNCw2ICszNCw3IEBACiAjZGVmaW5lIEhJR0hfQklUX01BU0tfU0hPUlQgMHg4MDAw CiAKIHN0YXRpYyBpbnQgZ2xvYmFsQ2xpY2tDb3VudCA9IDA7CitzdGF0aWMgZW51bSBNb3VzZUJ1 dHRvbiBnbG9iYWxQcmV2Q2xpY2tCdXR0b24gPSBMZWZ0QnV0dG9uOwogc3RhdGljIERXT1JEIGds b2JhbFByZXZDbGlja1RpbWUgPSAwOwogc3RhdGljIEludFBvaW50IGdsb2JhbFByZXZDbGlja1Bv c2l0aW9uID0gSW50UG9pbnQoKTsKIApAQCAtNTMsNyArNTQsNiBAQAogUGxhdGZvcm1Nb3VzZUV2 ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQoSFdORCBoV25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3 UGFyYW0sIExQQVJBTSBsUGFyYW0pCiAgICAgOiBtX3Bvc2l0aW9uKHBvc2l0aW9uRm9yRXZlbnQo aFduZCwgbFBhcmFtKSkKICAgICAsIG1fZ2xvYmFsUG9zaXRpb24oZ2xvYmFsUG9zaXRpb25Gb3JF dmVudChoV25kLCBsUGFyYW0pKQotICAgICwgbV9jbGlja0NvdW50KDApCiAgICAgLCBtX3NoaWZ0 S2V5KHdQYXJhbSAmIE1LX1NISUZUKQogICAgICwgbV9jdHJsS2V5KHdQYXJhbSAmIE1LX0NPTlRS T0wpCiAgICAgLCBtX2FsdEtleShHZXRBc3luY0tleVN0YXRlKFZLX01FTlUpICYgSElHSF9CSVRf TUFTS19TSE9SVCkKQEAgLTc1LDIwICs3NSw0NSBAQAogICAgICAgICBjYXNlIFdNX01CVVRUT05E QkxDTEs6CiAgICAgICAgICAgICBtX2J1dHRvbiA9IE1pZGRsZUJ1dHRvbjsKICAgICAgICAgICAg IGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgaWYgKHdQYXJhbSAmIE1LX0xC VVRUT04pCisgICAgICAgICAgICAgICAgbV9idXR0b24gPSBMZWZ0QnV0dG9uOworICAgICAgICAg ICAgZWxzZSBpZiAod1BhcmFtICYgTUtfUkJVVFRPTikKKyAgICAgICAgICAgICAgICBtX2J1dHRv biA9IFJpZ2h0QnV0dG9uOworICAgICAgICAgICAgZWxzZSBpZiAod1BhcmFtICYgTUtfTUJVVFRP TikKKyAgICAgICAgICAgICAgICBtX2J1dHRvbiA9IE1pZGRsZUJ1dHRvbjsKKyAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICBtX2J1dHRvbiA9IExlZnRCdXR0b247CisgICAgICAgICAg ICBicmVhazsKICAgICB9CiAKLSAgICBpZiAobV9idXR0b24gPT0gTGVmdEJ1dHRvbikgewotICAg ICAgICBEV09SRCBjdXJUaW1lID0gR2V0VGlja0NvdW50KCk7Ci0gICAgICAgIGlmIChjdXJUaW1l IC0gZ2xvYmFsUHJldkNsaWNrVGltZSA+IEdldERvdWJsZUNsaWNrVGltZSgpIAotICAgICAgICAg ICAgfHwgZ2xvYmFsUHJldkNsaWNrUG9zaXRpb24gIT0gbV9wb3NpdGlvbikKLSAgICAgICAgICAg IGdsb2JhbENsaWNrQ291bnQgPSAxOwotICAgICAgICBlbHNlIAotICAgICAgICAgICAgZ2xvYmFs Q2xpY2tDb3VudCsrOworICAgIHN3aXRjaCAobWVzc2FnZSkgeworICAgICAgICBjYXNlIFdNX0xC VVRUT05ET1dOOgorICAgICAgICBjYXNlIFdNX01CVVRUT05ET1dOOgorICAgICAgICBjYXNlIFdN X1JCVVRUT05ET1dOOgorICAgICAgICAgICAgaWYgKGdsb2JhbFByZXZDbGlja0J1dHRvbiAhPSBt X2J1dHRvbikKKyAgICAgICAgICAgICAgICBnbG9iYWxDbGlja0NvdW50ID0gMDsKKyAgICAgICAg ICAgIC8vIEZBTEwgVEhST1VHSAorICAgICAgICBjYXNlIFdNX0xCVVRUT05EQkxDTEs6ICAvLyBG b3IgdGhlc2UgbWVzc2FnZXMsIHRoZSBPUyBlbnN1cmVzIHRoYXQgdGhlCisgICAgICAgIGNhc2Ug V01fTUJVVFRPTkRCTENMSzogIC8vIHByZXZpb3VzIEJVVFRPTkRPV04gd2FzIGZvciB0aGUgc2Ft ZSBidXR0b24uCisgICAgICAgIGNhc2UgV01fUkJVVFRPTkRCTENMSzoKKyAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICBEV09SRCBjdXJUaW1lID0gR2V0VGlja0NvdW50KCk7CisgICAgICAg ICAgICAgICAgaWYgKGN1clRpbWUgLSBnbG9iYWxQcmV2Q2xpY2tUaW1lID4gR2V0RG91YmxlQ2xp Y2tUaW1lKCkgfHwKKyAgICAgICAgICAgICAgICAgICAgbV9wb3NpdGlvbiAhPSBnbG9iYWxQcmV2 Q2xpY2tQb3NpdGlvbikKKyAgICAgICAgICAgICAgICAgICAgZ2xvYmFsQ2xpY2tDb3VudCA9IDA7 CisgICAgICAgICAgICAgICAgZ2xvYmFsUHJldkNsaWNrVGltZSA9IGN1clRpbWU7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBnbG9iYWxQcmV2Q2xpY2tCdXR0b24gPSBtX2J1dHRvbjsKKyAg ICAgICAgICAgIGdsb2JhbFByZXZDbGlja1Bvc2l0aW9uID0gbV9wb3NpdGlvbjsKKyAgICAgICAg ICAgIG1fY2xpY2tDb3VudCA9ICsrZ2xvYmFsQ2xpY2tDb3VudDsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICB9CiAKLSAgICAgICAgZ2xvYmFsUHJldkNsaWNrVGltZSA9IGN1clRpbWU7Ci0gICAg ICAgIGdsb2JhbFByZXZDbGlja1Bvc2l0aW9uID0gbV9wb3NpdGlvbjsKLSAgICAgICAgbV9jbGlj a0NvdW50ID0gZ2xvYmFsQ2xpY2tDb3VudDsKLSAgICB9CisgICAgbV9jbGlja0NvdW50ID0gKG1f YnV0dG9uID09IGdsb2JhbFByZXZDbGlja0J1dHRvbikgPyBnbG9iYWxDbGlja0NvdW50IDoKKyAg ICAgICAgKChtZXNzYWdlID09IFdNX0xCVVRUT05VUCB8fCBtZXNzYWdlID09IFdNX01CVVRUT05V UCB8fAorICAgICAgICAgIG1lc3NhZ2UgPT0gV01fUkJVVFRPTlVQKSA/IDEgOiAwKTsKKyAgICBy ZXR1cm47CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 10885 2006-10-03 17:17:03 -0700 2006-10-04 11:15:19 -0700 patch v3 patch text/plain 3795 dgibson77 SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNjc1NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDYtMTAtMDMgIERvbiBHaWJzb24gIDxkZ2lic29uNzdAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTM4CisgICAgICAgIEJ1ZyAx MTEzODogSW5jb3JyZWN0IG1vdXNlIGV2ZW50IGdlbmVyYXRpb24gb24gV2luZG93cworCisgICAg ICAgIFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisgICAgICAgICog cGxhdGZvcm0vd2luL01vdXNlRXZlbnRXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZv cm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQpOgorICAgICAgICAoMSkgU2V0IG1vdXNl IGJ1dHRvbiBldmVuIGZvciBub24tY2xpY2stcmVsYXRlZCBtZXNzYWdlcy4KKyAgICAgICAgKDIp IFRyYWNrIGNsaWNrcyBjb3JyZWN0bHkgZm9yIGFsbCBidXR0b25zLCBub3QganVzdCB0aGUgbGVm dCBidXR0b24uCisKIDIwMDYtMTAtMDIgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNv bT4KIAogICAgICAgICBGZWFyZWQsIGxvYXRoZWQsIHJldmlld2VkIGJ5IERhcmluLgpJbmRleDog V2ViQ29yZS9wbGF0Zm9ybS93aW4vTW91c2VFdmVudFdpbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS93aW4vTW91c2VFdmVudFdpbi5jcHAJKHJldmlzaW9uIDE2NzQzKQorKysg V2ViQ29yZS9wbGF0Zm9ybS93aW4vTW91c2VFdmVudFdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTM0LDYgKzM0LDcgQEAgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50OjpDdXJyZW50RXZlbnRUYQog I2RlZmluZSBISUdIX0JJVF9NQVNLX1NIT1JUIDB4ODAwMAogCiBzdGF0aWMgaW50IGdsb2JhbENs aWNrQ291bnQgPSAwOworc3RhdGljIGVudW0gTW91c2VCdXR0b24gZ2xvYmFsUHJldkNsaWNrQnV0 dG9uID0gTGVmdEJ1dHRvbjsKIHN0YXRpYyBEV09SRCBnbG9iYWxQcmV2Q2xpY2tUaW1lID0gMDsK IHN0YXRpYyBJbnRQb2ludCBnbG9iYWxQcmV2Q2xpY2tQb3NpdGlvbiA9IEludFBvaW50KCk7CiAK QEAgLTUzLDcgKzU0LDYgQEAgc3RhdGljIEludFBvaW50IGdsb2JhbFBvc2l0aW9uRm9yRXZlbnQo SAogUGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQoSFdORCBoV25kLCBVSU5U IG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCiAgICAgOiBtX3Bvc2l0aW9u KHBvc2l0aW9uRm9yRXZlbnQoaFduZCwgbFBhcmFtKSkKICAgICAsIG1fZ2xvYmFsUG9zaXRpb24o Z2xvYmFsUG9zaXRpb25Gb3JFdmVudChoV25kLCBsUGFyYW0pKQotICAgICwgbV9jbGlja0NvdW50 KDApCiAgICAgLCBtX3NoaWZ0S2V5KHdQYXJhbSAmIE1LX1NISUZUKQogICAgICwgbV9jdHJsS2V5 KHdQYXJhbSAmIE1LX0NPTlRST0wpCiAgICAgLCBtX2FsdEtleShHZXRBc3luY0tleVN0YXRlKFZL X01FTlUpICYgSElHSF9CSVRfTUFTS19TSE9SVCkKQEAgLTc1LDIwICs3NSw0NSBAQCBQbGF0Zm9y bU1vdXNlRXZlbnQ6OlBsYXRmb3JtTW91c2VFdmVudChICiAgICAgICAgIGNhc2UgV01fTUJVVFRP TkRCTENMSzoKICAgICAgICAgICAgIG1fYnV0dG9uID0gTWlkZGxlQnV0dG9uOwogICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBpZiAod1BhcmFtICYgTUtf TEJVVFRPTikKKyAgICAgICAgICAgICAgICBtX2J1dHRvbiA9IExlZnRCdXR0b247CisgICAgICAg ICAgICBlbHNlIGlmICh3UGFyYW0gJiBNS19SQlVUVE9OKQorICAgICAgICAgICAgICAgIG1fYnV0 dG9uID0gUmlnaHRCdXR0b247CisgICAgICAgICAgICBlbHNlIGlmICh3UGFyYW0gJiBNS19NQlVU VE9OKQorICAgICAgICAgICAgICAgIG1fYnV0dG9uID0gTWlkZGxlQnV0dG9uOworICAgICAgICAg ICAgZWxzZQorICAgICAgICAgICAgICAgIG1fYnV0dG9uID0gTGVmdEJ1dHRvbjsKKyAgICAgICAg ICAgIGJyZWFrOwogICAgIH0KIAotICAgIGlmIChtX2J1dHRvbiA9PSBMZWZ0QnV0dG9uKSB7Ci0g ICAgICAgIERXT1JEIGN1clRpbWUgPSBHZXRUaWNrQ291bnQoKTsKLSAgICAgICAgaWYgKGN1clRp bWUgLSBnbG9iYWxQcmV2Q2xpY2tUaW1lID4gR2V0RG91YmxlQ2xpY2tUaW1lKCkgCi0gICAgICAg ICAgICB8fCBnbG9iYWxQcmV2Q2xpY2tQb3NpdGlvbiAhPSBtX3Bvc2l0aW9uKQotICAgICAgICAg ICAgZ2xvYmFsQ2xpY2tDb3VudCA9IDE7Ci0gICAgICAgIGVsc2UgCi0gICAgICAgICAgICBnbG9i YWxDbGlja0NvdW50Kys7Ci0KLSAgICAgICAgZ2xvYmFsUHJldkNsaWNrVGltZSA9IGN1clRpbWU7 Ci0gICAgICAgIGdsb2JhbFByZXZDbGlja1Bvc2l0aW9uID0gbV9wb3NpdGlvbjsKLSAgICAgICAg bV9jbGlja0NvdW50ID0gZ2xvYmFsQ2xpY2tDb3VudDsKKyAgICBzd2l0Y2ggKG1lc3NhZ2UpIHsK KyAgICAgICAgY2FzZSBXTV9MQlVUVE9ORE9XTjoKKyAgICAgICAgY2FzZSBXTV9NQlVUVE9ORE9X TjoKKyAgICAgICAgY2FzZSBXTV9SQlVUVE9ORE9XTjoKKyAgICAgICAgICAgIGlmIChnbG9iYWxQ cmV2Q2xpY2tCdXR0b24gIT0gbV9idXR0b24pCisgICAgICAgICAgICAgICAgZ2xvYmFsQ2xpY2tD b3VudCA9IDA7CisgICAgICAgICAgICAvLyBGQUxMIFRIUk9VR0gKKyAgICAgICAgY2FzZSBXTV9M QlVUVE9OREJMQ0xLOiAgLy8gRm9yIHRoZXNlIG1lc3NhZ2VzLCB0aGUgT1MgZW5zdXJlcyB0aGF0 IHRoZQorICAgICAgICBjYXNlIFdNX01CVVRUT05EQkxDTEs6ICAvLyBwcmV2aW91cyBCVVRUT05E T1dOIHdhcyBmb3IgdGhlIHNhbWUgYnV0dG9uLgorICAgICAgICBjYXNlIFdNX1JCVVRUT05EQkxD TEs6CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgRFdPUkQgY3VyVGltZSA9IEdldFRp Y2tDb3VudCgpOworICAgICAgICAgICAgICAgIGlmIChjdXJUaW1lIC0gZ2xvYmFsUHJldkNsaWNr VGltZSA+IEdldERvdWJsZUNsaWNrVGltZSgpIHx8CisgICAgICAgICAgICAgICAgICAgIG1fcG9z aXRpb24gIT0gZ2xvYmFsUHJldkNsaWNrUG9zaXRpb24pCisgICAgICAgICAgICAgICAgICAgIGds b2JhbENsaWNrQ291bnQgPSAwOworICAgICAgICAgICAgICAgIGdsb2JhbFByZXZDbGlja1RpbWUg PSBjdXJUaW1lOworICAgICAgICAgICAgfQorICAgICAgICAgICAgZ2xvYmFsUHJldkNsaWNrQnV0 dG9uID0gbV9idXR0b247CisgICAgICAgICAgICBnbG9iYWxQcmV2Q2xpY2tQb3NpdGlvbiA9IG1f cG9zaXRpb247CisgICAgICAgICAgICBtX2NsaWNrQ291bnQgPSArK2dsb2JhbENsaWNrQ291bnQ7 CisgICAgICAgICAgICByZXR1cm47CiAgICAgfQorCisgICAgbV9jbGlja0NvdW50ID0gKG1fYnV0 dG9uID09IGdsb2JhbFByZXZDbGlja0J1dHRvbikgPyBnbG9iYWxDbGlja0NvdW50IDoKKyAgICAg ICAgKChtZXNzYWdlID09IFdNX0xCVVRUT05VUCB8fCBtZXNzYWdlID09IFdNX01CVVRUT05VUCB8 fAorICAgICAgICAgIG1lc3NhZ2UgPT0gV01fUkJVVFRPTlVQKSA/IDEgOiAwKTsKKyAgICByZXR1 cm47CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK