5619 2005-11-03 13:06:31 -0800 CSS2: pre-wrap has overflow/selection problems 2006-01-15 14:37:09 -0800 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 RESOLVED FIXED HasReduction P2 Normal --- 1 hyatt webkit-unassigned ap mitz oldest_to_newest 23639 0 hyatt 2005-11-03 13:06:31 -0800 See the test case attached to bug 5593. The first line when editing cleanly keeps the caret in the block, but the selection is allowed to extend outside the block. Also, if you put overflow onto the pre, there seems to be a slight rounding error. A horizontal scrollbar exists that lets you scroll the block slightly. No scrollbar should appear. 24452 1 catfish.man 2005-11-23 01:57:04 -0800 The second issue mentioned (the un-needed scrollbar) also occurs on other types of elements when the width is exactly right, and overflow:auto is set. We run into this relatively often in narrow Adium windows due to our use of webkit in the message view. 24600 2 4812 catfish.man 2005-11-26 22:16:26 -0800 Created attachment 4812 Patch to fix scrollbar problem This appears to fixes the horizontal scrollbar issue, and passed the regression tests when I ran them. It appears that the width calculations were ignoring one border, but not the other, and only get the correct results when they ignore both. 24601 3 4813 catfish.man 2005-11-26 22:21:29 -0800 Created attachment 4813 Example file for the scrollbar problem 24602 4 4812 catfish.man 2005-11-26 22:50:25 -0800 Comment on attachment 4812 Patch to fix scrollbar problem mitzpettel on irc points out a test case in which this patch fails. It looks like it's specifically related to text wrapping in some way, not borders as I suspected at first. 26936 5 eric 2005-12-28 00:36:42 -0800 The test case is not entirely clear to me (what I'm supposed to be seeing) but it looks "wrong" still on TOT. 28010 6 5552 mitz 2006-01-08 13:32:39 -0800 Created attachment 5552 Proposed patch 28059 7 5552 darin 2006-01-09 09:03:13 -0800 Comment on attachment 5552 Proposed patch Looks good to me. What happens if tx + m_x + m_width - r.left() is negative in InlineTextBox::selectionRect? Extra space after "r.setWidth" in InlineTextBox::selectionRect. 28519 8 5698 mitz 2006-01-15 08:46:46 -0800 Created attachment 5698 Revised patch 28525 9 5698 darin 2006-01-15 13:40:41 -0800 Comment on attachment 5698 Revised patch Looks fine. I'd like a comment for the change log about the computeHorizontalPositionsForLine change. 28526 10 darin 2006-01-15 13:43:34 -0800 The comment should be something like: "Remove code that re-added border width which was already included in availableWidth." 4812 2005-11-26 22:16:26 -0800 2005-11-26 22:50:25 -0800 Patch to fix scrollbar problem wrap.patch text/plain 821 catfish.man SW5kZXg6IGtodG1sL3JlbmRlcmluZy9yZW5kZXJfbGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZp bGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL3JlbmRlcmluZy9yZW5kZXJfbGF5ZXIuY3BwLHYK cmV0cmlldmluZyByZXZpc2lvbiAxLjEyNQpkaWZmIC1wIC11IC1yMS4xMjUga2h0bWwvcmVuZGVy aW5nL3JlbmRlcl9sYXllci5jcHAKLS0tIGtodG1sL3JlbmRlcmluZy9yZW5kZXJfbGF5ZXIuY3Bw CTIxIE5vdiAyMDA1IDAxOjIwOjI1IC0wMDAwCTEuMTI1CisrKyBraHRtbC9yZW5kZXJpbmcvcmVu ZGVyX2xheWVyLmNwcAkyNyBOb3YgMjAwNSAwNjoxNToyMCAtMDAwMApAQCAtNzk2LDcgKzc5Niw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNvbXB1dGVTY3JvbGxEaW1lbnNpb24KIHsKICAgICBtX3Nj cm9sbERpbWVuc2lvbnNEaXJ0eSA9IGZhbHNlOwogCi0gICAgaW50IHJpZ2h0UG9zID0gbV9vYmpl Y3QtPnJpZ2h0bW9zdFBvc2l0aW9uKHRydWUsIGZhbHNlKSAtIG1fb2JqZWN0LT5ib3JkZXJMZWZ0 KCk7CisgICAgaW50IHJpZ2h0UG9zID0gbV9vYmplY3QtPnJpZ2h0bW9zdFBvc2l0aW9uKHRydWUs IGZhbHNlKSAtIG1fb2JqZWN0LT5ib3JkZXJMZWZ0KCkgLSBtX29iamVjdC0+Ym9yZGVyUmlnaHQo KTsKICAgICBpbnQgYm90dG9tUG9zID0gbV9vYmplY3QtPmxvd2VzdFBvc2l0aW9uKHRydWUsIGZh bHNlKSAtIG1fb2JqZWN0LT5ib3JkZXJUb3AoKTsKIAogICAgIGludCBjbGllbnRXaWR0aCA9IG1f b2JqZWN0LT5jbGllbnRXaWR0aCgpOwo= 4813 2005-11-26 22:21:29 -0800 2005-11-26 22:21:29 -0800 Example file for the scrollbar problem wraptest.html text/html 251 catfish.man PGh0bWw+CjxoZWFkPgo8dGl0bGU+UHJlLVdyYXAgVGVzdCBQYWdlPC90aXRsZT4KPC9oZWFkPgo8 Ym9keT4KPGgxPlRlc3Qgb2YgdGhlIHdyYXAgYXR0cmlidXRlIG9uIHByZTwvaDE+CjxwcmUgY29u dGVudGVkaXRhYmxlIHdyYXAgc3R5bGU9Im92ZXJmbG93OmF1dG87IGJvcmRlcjo0cHggc29saWQg cmVkOyB3aWR0aDoxMDBweCI+ClRoaXMgICB0ZXh0ICAgICB3aWxsIHdyYXAKYW5kICAgZml0ICAg d2l0aGluIHRoZQpib3guCjwvcHJlPgo= 5552 2006-01-08 13:32:39 -0800 2006-01-15 08:46:46 -0800 Proposed patch 5619_r1.patch text/plain 9561 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jv b3QvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIzNApkaWZm IC1wIC11IC1yMS4yMzQgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCi0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJNyBKYW4gMjAwNiAxMToyNzoxMSAtMDAwMAkxLjIzNAorKysgTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCTggSmFuIDIwMDYgMjE6MzQ6NDUgLTAwMDAKQEAgLTEsMyArMSwxNSBAQAorMjAwNi0w MS0jIyAgTWl0eiBQZXR0ZWwgIDxvcGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KKyAgICAg ICAgCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAg ICAgLSB0ZXN0IGZvciBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dp P2lkPTU2MTkKKyAgICAgICAgICBDU1MyOiBwcmUtd3JhcCBoYXMgb3ZlcmZsb3cvc2VsZWN0aW9u IHByb2JsZW1zCisgICAgICAgICAgCisgICAgICAgICogZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJl LXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLWV4cGVjdGVkLmNoZWNrc3VtOiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24tZXhw ZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3Jh cC1vdmVyZmxvdy1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24uaHRtbDogQWRkZWQu CisKIDIwMDYtMDEtMDcgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdAbWl0enBldHRlbC5j b20+CiAgICAgICAgIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4gbGFuZGVkIGJ5IGFwLgpJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ct c2VsZWN0aW9uLWV4cGVjdGVkLmNoZWNrc3VtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KZGlmZiAtTnB1IExheW91dFRl c3RzL2Zhc3QvdGV4dC93aGl0ZXNwYWNlL3ByZS13cmFwLW92ZXJmbG93LXNlbGVjdGlvbi1leHBl Y3RlZC5jaGVja3N1bQotLS0gTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJlLXdy YXAtb3ZlcmZsb3ctc2VsZWN0aW9uLWV4cGVjdGVkLmNoZWNrc3VtCTEgSmFuIDE5NzAgMDA6MDA6 MDAgLTAwMDAKKysrIExheW91dFRlc3RzL2Zhc3QvdGV4dC93aGl0ZXNwYWNlL3ByZS13cmFwLW92 ZXJmbG93LXNlbGVjdGlvbi1leHBlY3RlZC5jaGVja3N1bQk4IEphbiAyMDA2IDIwOjQ4OjA5IC0w MDAwCkBAIC0wLDAgKzEgQEAKKzQ4MmFjN2M4OGIxMTZmZjZiZjJkNWE3NDRkMjBjOTkzClwgTm8g bmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3doaXRl c3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLWV4cGVjdGVkLnR4dAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 CmRpZmYgLU5wdSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVy Zmxvdy1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvd2hp dGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0CTEgSmFuIDE5 NzAgMDA6MDA6MDAgLTAwMDAKKysrIExheW91dFRlc3RzL2Zhc3QvdGV4dC93aGl0ZXNwYWNlL3By ZS13cmFwLW92ZXJmbG93LXNlbGVjdGlvbi1leHBlY3RlZC50eHQJOCBKYW4gMjAwNiAyMDo0ODow OSAtMDAwMApAQCAtMCwwICsxLDQwIEBACitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hh bmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK2xheWVy IGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJDYW52YXMgYXQgKDAsMCkgc2l6ZSA4MDB4 NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0 ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUg Nzg0eDU3OQorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0eDM2CisgICAg ICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgMjUzeDE4CisgICAgICAgICAgdGV4 dCBydW4gYXQgKDAsMCkgd2lkdGggMjUzOiAiVGhpcyB0ZXN0IGNoZWNrcyBmb3IgYSByZWdyZXNz aW9uIGFnYWluc3QgIgorICAgICAgICBSZW5kZXJJbmxpbmUge0l9IGF0ICgwLDApIHNpemUgNzM0 eDM2CisgICAgICAgICAgUmVuZGVySW5saW5lIHtBfSBhdCAoMCwwKSBzaXplIDM0OHgxOCBbY29s b3I9IzAwMDBFRV0KKyAgICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgyNTMsMCkgc2l6 ZSAzNDh4MTgKKyAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDI1MywwKSB3aWR0aCAzNDg6ICJo dHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTU2MTkiCisgICAg ICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDYwMSwwKSBzaXplIDczNHgzNgorICAgICAgICAg ICAgdGV4dCBydW4gYXQgKDYwMSwwKSB3aWR0aCAxMzM6ICIgQ1NTMjogcHJlLXdyYXAgaGFzIgor ICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTgpIHdpZHRoIDE3NzogIm92ZXJmbG93L3NlbGVj dGlvbiBwcm9ibGVtcyIKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDE3NywxOCkgc2l6 ZSA0eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDE3NywxOCkgd2lkdGggNDogIi4iCisgICAg ICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsNTIpIHNpemUgNzg0eDE4CisgICAgICAgIFJlbmRlclRl eHQge1RFWFR9IGF0ICgwLDApIHNpemUgNjkzeDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAs MCkgd2lkdGggNjkzOiAiQm90aCBib3hlcyBzaG91bGQgbm90IGhhdmUgc2Nyb2xsIGJhcnMuIFRo ZSBzZWxlY3Rpb24gc2hvdWxkIG5vdCBzcGlsbCBvdXQgb2YgdGhlIGJsdWUgYm94IHRvIHRoZSBy aWdodCBvZiBceHsyMDFDfXRleHRceHsyMDFEfS4iCisgICAgICBSZW5kZXJCbG9jayB7SFJ9IGF0 ICgwLDg2KSBzaXplIDc4NHgyIFtib3JkZXI6ICgxcHggaW5zZXQgIzAwMDAwMCldCisgICAgICBS ZW5kZXJCbG9jayB7SFJ9IGF0ICgwLDE5Nykgc2l6ZSA3ODR4MiBbYm9yZGVyOiAoMXB4IGluc2V0 ICMwMDAwMDApXQorICAgICAgUmVuZGVyQmxvY2sge1BSRX0gYXQgKDAsMjEyKSBzaXplIDEwOHg4 MyBbYm9yZGVyOiAoNHB4IHNvbGlkICMwMDAwRkYpXQorICAgICAgICBSZW5kZXJUZXh0IHtURVhU fSBhdCAoNCw0KSBzaXplIDEwMHg3NQorICAgICAgICAgIHRleHQgcnVuIGF0ICg0LDQpIHdpZHRo IDEwMDogIlRoaXMgICB0ZXh0ICAgICAiCisgICAgICAgICAgdGV4dCBydW4gYXQgKDQsMTkpIHdp ZHRoIDcyOiAid2lsbCB3cmFwIgorICAgICAgICAgIHRleHQgcnVuIGF0ICg0LDM0KSB3aWR0aCA5 NjogImFuZCAgIGZpdCAgICIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNCw0OSkgd2lkdGggODA6 ICJ3aXRoaW4gdGhlIgorICAgICAgICAgIHRleHQgcnVuIGF0ICg0LDY0KSB3aWR0aCAzMjogImJv eC4iCitsYXllciBhdCAoOCwxMDkpIHNpemUgMTA4eDgzIGNsaXAgYXQgKDEyLDExMykgc2l6ZSAx MDB4NzUKKyAgUmVuZGVyQmxvY2sge1BSRX0gYXQgKDAsMTAxKSBzaXplIDEwOHg4MyBbYm9yZGVy OiAoNHB4IHNvbGlkICNBNTJBMkEpXQorICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICg0LDQpIHNp emUgMTAweDc1CisgICAgICB0ZXh0IHJ1biBhdCAoNCw0KSB3aWR0aCAxMDA6ICJUaGlzICAgdGV4 dCAgICAgIgorICAgICAgdGV4dCBydW4gYXQgKDQsMTkpIHdpZHRoIDcyOiAid2lsbCB3cmFwIgor ICAgICAgdGV4dCBydW4gYXQgKDQsMzQpIHdpZHRoIDk2OiAiYW5kICAgZml0ICAgIgorICAgICAg dGV4dCBydW4gYXQgKDQsNDkpIHdpZHRoIDgwOiAid2l0aGluIHRoZSIKKyAgICAgIHRleHQgcnVu IGF0ICg0LDY0KSB3aWR0aCAzMjogImJveC4iCitzZWxlY3Rpb24gc3RhcnQ6IHBvc2l0aW9uIDcg b2YgY2hpbGQgMCB7VEVYVH0gb2YgY2hpbGQgNyB7UFJFfSBvZiBjaGlsZCAxIHtCT0RZfSBvZiBj aGlsZCAwIHtIVE1MfSBvZiBkb2N1bWVudAorc2VsZWN0aW9uIGVuZDogICBwb3NpdGlvbiAxNSBv ZiBjaGlsZCAwIHtURVhUfSBvZiBjaGlsZCAxMCB7UFJFfSBvZiBjaGlsZCAxIHtCT0RZfSBvZiBj aGlsZCAwIHtIVE1MfSBvZiBkb2N1bWVudApJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3do aXRlc3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLmh0bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZm IC1OcHUgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ct c2VsZWN0aW9uLmh0bWwKLS0tIExheW91dFRlc3RzL2Zhc3QvdGV4dC93aGl0ZXNwYWNlL3ByZS13 cmFwLW92ZXJmbG93LXNlbGVjdGlvbi5odG1sCTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAKKysr IExheW91dFRlc3RzL2Zhc3QvdGV4dC93aGl0ZXNwYWNlL3ByZS13cmFwLW92ZXJmbG93LXNlbGVj dGlvbi5odG1sCTggSmFuIDIwMDYgMjA6NDU6NDEgLTAwMDAKQEAgLTAsMCArMSwzNiBAQAorPGh0 bWw+Cis8aGVhZD4KKzx0aXRsZT5QcmUtV3JhcCBUZXN0IFBhZ2U8L3RpdGxlPgorPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorZnVuY3Rpb24gdGVzdCgpCit7CisgICAgdmFyIHQgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgndDEnKS5jaGlsZE5vZGVzWzBdOworICAgIHZhciB1ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3QyJykuY2hpbGROb2Rlc1swXTsKKyAgICB3aW5kb3cu Z2V0U2VsZWN0aW9uKCkuc2V0QmFzZUFuZEV4dGVudCh1LCA3LCB0LCAxNSk7Cit9Cis8L3Njcmlw dD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4KKzxwPgorVGhpcyB0ZXN0IGNoZWNr cyBmb3IgYSByZWdyZXNzaW9uIGFnYWluc3QKKzxpPjxhIGhyZWY9Imh0dHA6Ly9idWd6aWxsYS5v cGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYxOSI+aHR0cDovL2J1Z3ppbGxhLm9wZW5k YXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD01NjE5PC9hPgorQ1NTMjogcHJlLXdyYXAgaGFzIG92 ZXJmbG93L3NlbGVjdGlvbiBwcm9ibGVtczwvaT4uCis8L3A+Cis8cD4KK0JvdGggYm94ZXMgc2hv dWxkIG5vdCBoYXZlIHNjcm9sbCBiYXJzLiBUaGUgc2VsZWN0aW9uIHNob3VsZAorbm90IHNwaWxs IG91dCBvZiB0aGUgYmx1ZSBib3ggdG8gdGhlIHJpZ2h0IG9mICZsZHF1bzt0ZXh0JnJkcXVvOy4K KzwvcD4KKzxocj4KKzxwcmUgaWQ9InQyIiB3cmFwIHN0eWxlPSJvdmVyZmxvdzphdXRvOyBib3Jk ZXI6NHB4IHNvbGlkIGJyb3duOyB3aWR0aDoxMDBweCI+CitUaGlzICAgdGV4dCAgICAgd2lsbCB3 cmFwCithbmQgICBmaXQgICB3aXRoaW4gdGhlCitib3guCis8L3ByZT4KKzxocj4KKzxwcmUgaWQ9 InQxIiB3cmFwIHN0eWxlPSJib3JkZXI6NHB4IHNvbGlkIGJsdWU7IHdpZHRoOjEwMHB4Ij4KK1Ro aXMgICB0ZXh0ICAgICB3aWxsIHdyYXAKK2FuZCAgIGZpdCAgIHdpdGhpbiB0aGUKK2JveC4KKzwv cHJlPgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUvQ2hhbmdlTG9nLHYKcmV0cmlldmluZyByZXZp c2lvbiAxLjk3CmRpZmYgLXAgLXUgLXIxLjk3IFdlYkNvcmUvQ2hhbmdlTG9nCi0tLSBXZWJDb3Jl L0NoYW5nZUxvZwk3IEphbiAyMDA2IDEwOjMzOjI1IC0wMDAwCTEuOTcKKysrIFdlYkNvcmUvQ2hh bmdlTG9nCTggSmFuIDIwMDYgMjE6MzQ6NTkgLTAwMDAKQEAgLTEsMyArMSwxOSBAQAorMjAwNi0w MS0jIyAgTWl0eiBQZXR0ZWwgIDxvcGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KKworICAg ICAgICBUZXN0OiBmYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rp b24uaHRtbAorICAgICAgICAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisg ICAgICAgIAorICAgICAgICAtIGZpeCBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hv d19idWcuY2dpP2lkPTU2MTkKKyAgICAgICAgICBDU1MyOiBwcmUtd3JhcCBoYXMgb3ZlcmZsb3cv c2VsZWN0aW9uIHByb2JsZW1zCisgICAgICAgICAgCisgICAgICAgICoga2h0bWwvcmVuZGVyaW5n L2JpZGkuY3BwOgorICAgICAgICAoa2h0bWw6OlJlbmRlckJsb2NrOjpjb21wdXRlSG9yaXpvbnRh bFBvc2l0aW9uc0ZvckxpbmUpOgorICAgICAgICAqIGtodG1sL3JlbmRlcmluZy9yZW5kZXJfdGV4 dC5jcHA6CisgICAgICAgIChraHRtbDo6SW5saW5lVGV4dEJveDo6c2VsZWN0aW9uUmVjdCk6IENs aXAgc2VsZWN0aW9uIHJlY3QgdG8gdGhlIHRleHQgYm94CisgICAgICAgIChraHRtbDo6SW5saW5l VGV4dEJveDo6cGFpbnRTZWxlY3Rpb24pOiBDbGlwIHNlbGVjdGlvbiBwYWludGluZyB0byB0aGUK KyAgICAgICAgdGV4dCBib3guCisKIDIwMDYtMDEtMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQG1hYy5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqLgpJbmRleDogV2ViQ29y ZS9raHRtbC9yZW5kZXJpbmcvYmlkaS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290 L1dlYkNvcmUva2h0bWwvcmVuZGVyaW5nL2JpZGkuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAx LjE2NApkaWZmIC1wIC11IC1yMS4xNjQgV2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvYmlkaS5jcHAK LS0tIFdlYkNvcmUva2h0bWwvcmVuZGVyaW5nL2JpZGkuY3BwCTE5IERlYyAyMDA1IDE5OjUyOjQ4 IC0wMDAwCTEuMTY0CisrKyBXZWJDb3JlL2todG1sL3JlbmRlcmluZy9iaWRpLmNwcAk4IEphbiAy MDA2IDIwOjE5OjIwIC0wMDAwCkBAIC04NjEsNyArODYxLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6 Y29tcHV0ZUhvcml6b250YWxQb3NpdAogICAgICAgICAgICAgICAgIFJlbmRlclN0eWxlICpzdHls ZSA9IHItPm9iai0+c3R5bGUoKTsKICAgICAgICAgICAgICAgICBpZiAoc3R5bGUtPmF1dG9XcmFw KCkgJiYgc3R5bGUtPmJyZWFrT25seUFmdGVyV2hpdGVTcGFjZSgpKSB7CiAgICAgICAgICAgICAg ICAgICAgIC8vIHNocmluayB0aGUgYm94IGFzIG5lZWRlZCB0byBrZWVwIHRoZSBsaW5lIGZyb20g b3ZlcmZsb3dpbmcgdGhlIGF2YWlsYWJsZSB3aWR0aAotICAgICAgICAgICAgICAgICAgICB0ZXh0 V2lkdGggPSBrTWluKGVmZmVjdGl2ZVdpZHRoLCBhdmFpbGFibGVXaWR0aCAtIHRvdFdpZHRoICsg c3R5bGUtPmJvcmRlckxlZnRXaWR0aCgpKTsKKyAgICAgICAgICAgICAgICAgICAgdGV4dFdpZHRo ID0ga01pbihlZmZlY3RpdmVXaWR0aCwgYXZhaWxhYmxlV2lkdGggLSB0b3RXaWR0aCk7CiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICAgICAgci0+Ym94LT5zZXRXaWR0 aCh0ZXh0V2lkdGgpOwpJbmRleDogV2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvcmVuZGVyX3RleHQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL3JlbmRlcmlu Zy9yZW5kZXJfdGV4dC5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjE3CmRpZmYgLXAgLXUg LXIxLjIxNyBXZWJDb3JlL2todG1sL3JlbmRlcmluZy9yZW5kZXJfdGV4dC5jcHAKLS0tIFdlYkNv cmUva2h0bWwvcmVuZGVyaW5nL3JlbmRlcl90ZXh0LmNwcAkzMCBEZWMgMjAwNSAyMjoxNzowNSAt MDAwMAkxLjIxNworKysgV2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvcmVuZGVyX3RleHQuY3BwCTgg SmFuIDIwMDYgMjA6MTk6MjcgLTAwMDAKQEAgLTEyNyw3ICsxMjcsMTAgQEAgUVJlY3QgSW5saW5l VGV4dEJveDo6c2VsZWN0aW9uUmVjdChpbnQgdAogICAgIGludCBzZWxIZWlnaHQgPSByb290Qm94 LT5zZWxlY3Rpb25IZWlnaHQoKTsKICAgICBjb25zdCBGb250ICpmID0gdGV4dE9iai0+aHRtbEZv bnQobV9maXJzdExpbmUpOwogCi0gICAgcmV0dXJuIGYtPnNlbGVjdGlvblJlY3RGb3JUZXh0KHR4 ICsgbV94LCB0eSArIHNlbFRvcCwgc2VsSGVpZ2h0LCB0ZXh0T2JqLT50YWJXaWR0aCgpLCB0ZXh0 UG9zKCksIHRleHRPYmotPnN0ci0+cywgdGV4dE9iai0+c3RyLT5sLCBtX3N0YXJ0LCBtX2xlbiwg bV90b0FkZCwgbV9yZXZlcnNlZCwgbV9kaXJPdmVycmlkZSwgc1BvcywgZVBvcyk7CisgICAgUVJl Y3QgciA9IGYtPnNlbGVjdGlvblJlY3RGb3JUZXh0KHR4ICsgbV94LCB0eSArIHNlbFRvcCwgc2Vs SGVpZ2h0LCB0ZXh0T2JqLT50YWJXaWR0aCgpLCB0ZXh0UG9zKCksIHRleHRPYmotPnN0ci0+cywg dGV4dE9iai0+c3RyLT5sLCBtX3N0YXJ0LCBtX2xlbiwgbV90b0FkZCwgbV9yZXZlcnNlZCwgbV9k aXJPdmVycmlkZSwgc1BvcywgZVBvcyk7CisgICAgaWYgKHIucmlnaHQoKSA+IHR4ICsgbV94ICsg bV93aWR0aCkKKyAgICAgICAgci5zZXRXaWR0aCggdHggKyBtX3ggKyBtX3dpZHRoIC0gci5sZWZ0 KCkpOworICAgIHJldHVybiByOwogfQogCiB2b2lkIElubGluZVRleHRCb3g6OmRlbGV0ZUxpbmUo UmVuZGVyQXJlbmEqIGFyZW5hKQpAQCAtNDgwLDYgKzQ4Myw3IEBAIHZvaWQgSW5saW5lVGV4dEJv eDo6cGFpbnRTZWxlY3Rpb24oUVBhaW4KICAgICBSb290SW5saW5lQm94KiByID0gcm9vdCgpOwog ICAgIGludCB5ID0gci0+c2VsZWN0aW9uVG9wKCk7CiAgICAgaW50IGggPSByLT5zZWxlY3Rpb25I ZWlnaHQoKTsKKyAgICBwLT5hZGRDbGlwKFFSZWN0KG1feCArIHR4LCB5ICsgdHksIG1fd2lkdGgs IGgpKTsKICAgICBmLT5kcmF3SGlnaGxpZ2h0Rm9yVGV4dChwLCBtX3ggKyB0eCwgeSArIHR5LCBo LCB0ZXh0T2JqZWN0KCktPnRhYldpZHRoKCksIHRleHRQb3MoKSwgCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdGV4dE9iamVjdCgpLT5zdHItPnMsIHRleHRPYmplY3QoKS0+c3RyLT5sLCBt X3N0YXJ0LCBtX2xlbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3RvQWRkLCBtX3Jl dmVyc2VkID8gUVBhaW50ZXI6OlJUTCA6IFFQYWludGVyOjpMVFIsIG1fZGlyT3ZlcnJpZGUgfHwg c3R5bGUtPnZpc3VhbGx5T3JkZXJlZCgpLCBzUG9zLCBlUG9zLCBjKTsK 5698 2006-01-15 08:46:46 -0800 2006-01-15 13:40:41 -0800 Revised patch 5619_r2.patch text/plain 8871 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEyMTE0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDYtMDEtIyMgIE1pdHogUGV0dGVsICA8b3Bl bmRhcndpbi5vcmdAbWl0enBldHRlbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgLSB0ZXN0IGZvciBodHRwOi8vYnVnemlsbGEub3BlbmRhcndp bi5vcmcvc2hvd19idWcuY2dpP2lkPTU2MTkKKyAgICAgICAgICBDU1MyOiBwcmUtd3JhcCBoYXMg b3ZlcmZsb3cvc2VsZWN0aW9uIHByb2JsZW1zCisgICAgICAgICAgCisgICAgICAgICogZmFzdC90 ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLWV4cGVjdGVkLmNoZWNr c3VtOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVy Zmxvdy1zZWxlY3Rpb24tZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQv d2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBmYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxl Y3Rpb24uaHRtbDogQWRkZWQuCisKIDIwMDYtMDEtMTUgIEVyaWMgU2VpZGVsICA8ZXNlaWRlbEBh cHBsZS5jb20+CiAKICAgICAgICAgRGlzYWJsaW5nIGJyb2tlbiB0ZXN0IHVudGlsIHJlc3VsdHMg Y2FuIGJlIGNvbnNpc3RlbnQ6CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3RleHQvd2hpdGVzcGFj ZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24tZXhwZWN0ZWQucG5nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KQ2Fu bm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGUuCnN2bjptaW1lLXR5cGUg PSBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRl c3RzL2Zhc3QvdGV4dC93aGl0ZXNwYWNlL3ByZS13cmFwLW92ZXJmbG93LXNlbGVjdGlvbi1leHBl Y3RlZC5wbmcKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpOYW1lOiBzdm46bWltZS10eXBlCiAgICsgYXBwbGljYXRpb24v b2N0ZXQtc3RyZWFtCgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJl LXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24t ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3doaXRl c3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSw0MCBAQAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNl bGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitsYXllciBhdCAo MCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQ2FudmFzIGF0ICgwLDApIHNpemUgODAweDYwMAor bGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCww KSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1 NzkKKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwwKSBzaXplIDc4NHgzNgorICAgICAgICBS ZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDI1M3gxOAorICAgICAgICAgIHRleHQgcnVu IGF0ICgwLDApIHdpZHRoIDI1MzogIlRoaXMgdGVzdCBjaGVja3MgZm9yIGEgcmVncmVzc2lvbiBh Z2FpbnN0ICIKKyAgICAgICAgUmVuZGVySW5saW5lIHtJfSBhdCAoMCwwKSBzaXplIDczNHgzNgor ICAgICAgICAgIFJlbmRlcklubGluZSB7QX0gYXQgKDAsMCkgc2l6ZSAzNDh4MTggW2NvbG9yPSMw MDAwRUVdCisgICAgICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMjUzLDApIHNpemUgMzQ4 eDE4CisgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgyNTMsMCkgd2lkdGggMzQ4OiAiaHR0cDov L2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD01NjE5IgorICAgICAgICAg IFJlbmRlclRleHQge1RFWFR9IGF0ICg2MDEsMCkgc2l6ZSA3MzR4MzYKKyAgICAgICAgICAgIHRl eHQgcnVuIGF0ICg2MDEsMCkgd2lkdGggMTMzOiAiIENTUzI6IHByZS13cmFwIGhhcyIKKyAgICAg ICAgICAgIHRleHQgcnVuIGF0ICgwLDE4KSB3aWR0aCAxNzc6ICJvdmVyZmxvdy9zZWxlY3Rpb24g cHJvYmxlbXMiCisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgxNzcsMTgpIHNpemUgNHgx OAorICAgICAgICAgIHRleHQgcnVuIGF0ICgxNzcsMTgpIHdpZHRoIDQ6ICIuIgorICAgICAgUmVu ZGVyQmxvY2sge1B9IGF0ICgwLDUyKSBzaXplIDc4NHgxOAorICAgICAgICBSZW5kZXJUZXh0IHtU RVhUfSBhdCAoMCwwKSBzaXplIDY5M3gxOAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdp ZHRoIDY5MzogIkJvdGggYm94ZXMgc2hvdWxkIG5vdCBoYXZlIHNjcm9sbCBiYXJzLiBUaGUgc2Vs ZWN0aW9uIHNob3VsZCBub3Qgc3BpbGwgb3V0IG9mIHRoZSBibHVlIGJveCB0byB0aGUgcmlnaHQg b2YgXHh7MjAxQ310ZXh0XHh7MjAxRH0uIgorICAgICAgUmVuZGVyQmxvY2sge0hSfSBhdCAoMCw4 Nikgc2l6ZSA3ODR4MiBbYm9yZGVyOiAoMXB4IGluc2V0ICMwMDAwMDApXQorICAgICAgUmVuZGVy QmxvY2sge0hSfSBhdCAoMCwxOTcpIHNpemUgNzg0eDIgW2JvcmRlcjogKDFweCBpbnNldCAjMDAw MDAwKV0KKyAgICAgIFJlbmRlckJsb2NrIHtQUkV9IGF0ICgwLDIxMikgc2l6ZSAxMDh4ODMgW2Jv cmRlcjogKDRweCBzb2xpZCAjMDAwMEZGKV0KKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQg KDQsNCkgc2l6ZSAxMDB4NzUKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNCw0KSB3aWR0aCAxMDA6 ICJUaGlzICAgdGV4dCAgICAgIgorICAgICAgICAgIHRleHQgcnVuIGF0ICg0LDE5KSB3aWR0aCA3 MjogIndpbGwgd3JhcCIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNCwzNCkgd2lkdGggOTY6ICJh bmQgICBmaXQgICAiCisgICAgICAgICAgdGV4dCBydW4gYXQgKDQsNDkpIHdpZHRoIDgwOiAid2l0 aGluIHRoZSIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNCw2NCkgd2lkdGggMzI6ICJib3guIgor bGF5ZXIgYXQgKDgsMTA5KSBzaXplIDEwOHg4MyBjbGlwIGF0ICgxMiwxMTMpIHNpemUgMTAweDc1 CisgIFJlbmRlckJsb2NrIHtQUkV9IGF0ICgwLDEwMSkgc2l6ZSAxMDh4ODMgW2JvcmRlcjogKDRw eCBzb2xpZCAjQTUyQTJBKV0KKyAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoNCw0KSBzaXplIDEw MHg3NQorICAgICAgdGV4dCBydW4gYXQgKDQsNCkgd2lkdGggMTAwOiAiVGhpcyAgIHRleHQgICAg ICIKKyAgICAgIHRleHQgcnVuIGF0ICg0LDE5KSB3aWR0aCA3MjogIndpbGwgd3JhcCIKKyAgICAg IHRleHQgcnVuIGF0ICg0LDM0KSB3aWR0aCA5NjogImFuZCAgIGZpdCAgICIKKyAgICAgIHRleHQg cnVuIGF0ICg0LDQ5KSB3aWR0aCA4MDogIndpdGhpbiB0aGUiCisgICAgICB0ZXh0IHJ1biBhdCAo NCw2NCkgd2lkdGggMzI6ICJib3guIgorc2VsZWN0aW9uIHN0YXJ0OiBwb3NpdGlvbiA3IG9mIGNo aWxkIDAge1RFWFR9IG9mIGNoaWxkIDcge1BSRX0gb2YgY2hpbGQgMSB7Qk9EWX0gb2YgY2hpbGQg MCB7SFRNTH0gb2YgZG9jdW1lbnQKK3NlbGVjdGlvbiBlbmQ6ICAgcG9zaXRpb24gMTUgb2YgY2hp bGQgMCB7VEVYVH0gb2YgY2hpbGQgMTAge1BSRX0gb2YgY2hpbGQgMSB7Qk9EWX0gb2YgY2hpbGQg MCB7SFRNTH0gb2YgZG9jdW1lbnQKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvdGV4dC93aGl0ZXNw YWNlL3ByZS13cmFwLW92ZXJmbG93LXNlbGVjdGlvbi1leHBlY3RlZC5jaGVja3N1bQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxv dy1zZWxlY3Rpb24tZXhwZWN0ZWQuY2hlY2tzdW0JKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0 cy9mYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24tZXhwZWN0 ZWQuY2hlY2tzdW0JKHJldmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKKzQ4MmFjN2M4OGIxMTZmZjZi ZjJkNWE3NDRkMjBjOTkzClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogTGF5b3V0 VGVzdHMvZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJlLXdy YXAtb3ZlcmZsb3ctc2VsZWN0aW9uLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9m YXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24uaHRtbAkocmV2 aXNpb24gMCkKQEAgLTAsMCArMSwzNiBAQAorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5QcmUtV3Jh cCBUZXN0IFBhZ2U8L3RpdGxlPgorPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorZnVu Y3Rpb24gdGVzdCgpCit7CisgICAgdmFyIHQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndDEn KS5jaGlsZE5vZGVzWzBdOworICAgIHZhciB1ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Qy JykuY2hpbGROb2Rlc1swXTsKKyAgICB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuc2V0QmFzZUFuZEV4 dGVudCh1LCA3LCB0LCAxNSk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0i dGVzdCgpIj4KKzxwPgorVGhpcyB0ZXN0IGNoZWNrcyBmb3IgYSByZWdyZXNzaW9uIGFnYWluc3QK KzxpPjxhIGhyZWY9Imh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTYxOSI+aHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD01 NjE5PC9hPgorQ1NTMjogcHJlLXdyYXAgaGFzIG92ZXJmbG93L3NlbGVjdGlvbiBwcm9ibGVtczwv aT4uCis8L3A+Cis8cD4KK0JvdGggYm94ZXMgc2hvdWxkIG5vdCBoYXZlIHNjcm9sbCBiYXJzLiBU aGUgc2VsZWN0aW9uIHNob3VsZAorbm90IHNwaWxsIG91dCBvZiB0aGUgYmx1ZSBib3ggdG8gdGhl IHJpZ2h0IG9mICZsZHF1bzt0ZXh0JnJkcXVvOy4KKzwvcD4KKzxocj4KKzxwcmUgaWQ9InQyIiB3 cmFwIHN0eWxlPSJvdmVyZmxvdzphdXRvOyBib3JkZXI6NHB4IHNvbGlkIGJyb3duOyB3aWR0aDox MDBweCI+CitUaGlzICAgdGV4dCAgICAgd2lsbCB3cmFwCithbmQgICBmaXQgICB3aXRoaW4gdGhl Citib3guCis8L3ByZT4KKzxocj4KKzxwcmUgaWQ9InQxIiB3cmFwIHN0eWxlPSJib3JkZXI6NHB4 IHNvbGlkIGJsdWU7IHdpZHRoOjEwMHB4Ij4KK1RoaXMgICB0ZXh0ICAgICB3aWxsIHdyYXAKK2Fu ZCAgIGZpdCAgIHdpdGhpbiB0aGUKK2JveC4KKzwvcHJlPgorPC9ib2R5PgorPC9odG1sPgpJbmRl eDogV2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvYmlkaS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9raHRtbC9yZW5kZXJpbmcvYmlkaS5jcHAJKHJldmlzaW9uIDEyMTE0KQorKysgV2ViQ29yZS9r aHRtbC9yZW5kZXJpbmcvYmlkaS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg2Myw3ICs4NjMsNyBA QAogICAgICAgICAgICAgICAgIFJlbmRlclN0eWxlICpzdHlsZSA9IHItPm9iai0+c3R5bGUoKTsK ICAgICAgICAgICAgICAgICBpZiAoc3R5bGUtPmF1dG9XcmFwKCkgJiYgc3R5bGUtPmJyZWFrT25s eUFmdGVyV2hpdGVTcGFjZSgpKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIHNocmluayB0aGUg Ym94IGFzIG5lZWRlZCB0byBrZWVwIHRoZSBsaW5lIGZyb20gb3ZlcmZsb3dpbmcgdGhlIGF2YWls YWJsZSB3aWR0aAotICAgICAgICAgICAgICAgICAgICB0ZXh0V2lkdGggPSBrTWluKGVmZmVjdGl2 ZVdpZHRoLCBhdmFpbGFibGVXaWR0aCAtIHRvdFdpZHRoICsgc3R5bGUtPmJvcmRlckxlZnRXaWR0 aCgpKTsKKyAgICAgICAgICAgICAgICAgICAgdGV4dFdpZHRoID0ga01pbihlZmZlY3RpdmVXaWR0 aCwgYXZhaWxhYmxlV2lkdGggLSB0b3RXaWR0aCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgfQogICAgICAgICAgICAgci0+Ym94LT5zZXRXaWR0aCh0ZXh0V2lkdGgpOwpJbmRleDog V2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAJKHJldmlzaW9uIDEyMTE0 KQorKysgV2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEyNyw3ICsxMjcsMTIgQEAKICAgICBpbnQgc2VsSGVpZ2h0ID0gcm9vdEJveC0+ c2VsZWN0aW9uSGVpZ2h0KCk7CiAgICAgY29uc3QgRm9udCAqZiA9IHRleHRPYmotPmh0bWxGb250 KG1fZmlyc3RMaW5lKTsKIAotICAgIHJldHVybiBmLT5zZWxlY3Rpb25SZWN0Rm9yVGV4dCh0eCAr IG1feCwgdHkgKyBzZWxUb3AsIHNlbEhlaWdodCwgdGV4dE9iai0+dGFiV2lkdGgoKSwgdGV4dFBv cygpLCB0ZXh0T2JqLT5zdHItPnMsIHRleHRPYmotPnN0ci0+bCwgbV9zdGFydCwgbV9sZW4sIG1f dG9BZGQsIG1fcmV2ZXJzZWQsIG1fZGlyT3ZlcnJpZGUsIHNQb3MsIGVQb3MpOworICAgIEludFJl Y3QgciA9IGYtPnNlbGVjdGlvblJlY3RGb3JUZXh0KHR4ICsgbV94LCB0eSArIHNlbFRvcCwgc2Vs SGVpZ2h0LCB0ZXh0T2JqLT50YWJXaWR0aCgpLCB0ZXh0UG9zKCksIHRleHRPYmotPnN0ci0+cywg dGV4dE9iai0+c3RyLT5sLCBtX3N0YXJ0LCBtX2xlbiwgbV90b0FkZCwgbV9yZXZlcnNlZCwgbV9k aXJPdmVycmlkZSwgc1BvcywgZVBvcyk7CisgICAgaWYgKHIubGVmdCgpID4gdHggKyBtX3ggKyBt X3dpZHRoKQorICAgICAgICByLnNldFdpZHRoKDApOworICAgIGVsc2UgaWYgKHIucmlnaHQoKSA+ IHR4ICsgbV94ICsgbV93aWR0aCkKKyAgICAgICAgci5zZXRXaWR0aCh0eCArIG1feCArIG1fd2lk dGggLSByLmxlZnQoKSk7CisgICAgcmV0dXJuIHI7CiB9CiAKIHZvaWQgSW5saW5lVGV4dEJveDo6 ZGVsZXRlTGluZShSZW5kZXJBcmVuYSogYXJlbmEpCkBAIC00ODAsNiArNDg1LDcgQEAKICAgICBS b290SW5saW5lQm94KiByID0gcm9vdCgpOwogICAgIGludCB5ID0gci0+c2VsZWN0aW9uVG9wKCk7 CiAgICAgaW50IGggPSByLT5zZWxlY3Rpb25IZWlnaHQoKTsKKyAgICBwLT5hZGRDbGlwKEludFJl Y3QobV94ICsgdHgsIHkgKyB0eSwgbV93aWR0aCwgaCkpOwogICAgIGYtPmRyYXdIaWdobGlnaHRG b3JUZXh0KHAsIG1feCArIHR4LCB5ICsgdHksIGgsIHRleHRPYmplY3QoKS0+dGFiV2lkdGgoKSwg dGV4dFBvcygpLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0T2JqZWN0KCktPnN0 ci0+cywgdGV4dE9iamVjdCgpLT5zdHItPmwsIG1fc3RhcnQsIG1fbGVuLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1fdG9BZGQsIG1fcmV2ZXJzZWQgPyBRUGFpbnRlcjo6UlRMIDogUVBh aW50ZXI6OkxUUiwgbV9kaXJPdmVycmlkZSB8fCBzdHlsZS0+dmlzdWFsbHlPcmRlcmVkKCksIHNQ b3MsIGVQb3MsIGMpOwpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMTE0KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAwNi0wMS0jIyAgTWl0eiBQZXR0ZWwgIDxv cGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQv d2hpdGVzcGFjZS9wcmUtd3JhcC1vdmVyZmxvdy1zZWxlY3Rpb24uaHRtbAorICAgICAgICAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBraHRtbC9yZW5k ZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6CisgICAgICAgIChraHRtbDo6SW5saW5lVGV4dEJveDo6 c2VsZWN0aW9uUmVjdCk6IENsaXAgc2VsZWN0aW9uIHJlY3QgdG8gdGhlIHRleHQgYm94CisgICAg ICAgIChraHRtbDo6SW5saW5lVGV4dEJveDo6cGFpbnRTZWxlY3Rpb24pOiBDbGlwIHNlbGVjdGlv biBwYWludGluZyB0byB0aGUgdGV4dCBib3guCisgICAgICAgICoga2h0bWwvcmVuZGVyaW5nL2Jp ZGkuY3BwOgorICAgICAgICAoa2h0bWw6OlJlbmRlckJsb2NrOjpjb21wdXRlSG9yaXpvbnRhbFBv c2l0aW9uc0ZvckxpbmUpOgorCiAyMDA2LTAxLTE1ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBIeWF0dC4K