102209 2012-11-14 04:03:23 -0800 [EFL][WK2] Fix tooltip bugs in MiniBrowser. 2013-01-02 20:49:09 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bw80.lee bw80.lee gyuyoung.kim jussi.kukkonen lucas.de.marchi ryuan.choi tmpsantos webkit.review.bot oldest_to_newest 766727 0 bw80.lee 2012-11-14 04:03:23 -0800 1. There is no delay on displaying tooltip. 2. There are elementary error messages when tooltip is created. ERR<17980>:elementary elm_label.c:400 elm_label_add() could not add 0x1ca3890 as sub object of 0x1cf9810 766736 1 174126 bw80.lee 2012-11-14 04:20:03 -0800 Created attachment 174126 Patch 770267 2 174126 ryuan.choi 2012-11-18 18:32:13 -0800 Comment on attachment 174126 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=174126&action=review > Tools/MiniBrowser/efl/main.c:916 > + window->tooltip_timer = ecore_timer_add(1, on_tooltip_show, window); Can I know the reason we should have delay and why it is 1? Can we use ecore_idle_add? 770297 3 bw80.lee 2012-11-18 20:05:19 -0800 (In reply to comment #2) > (From update of attachment 174126 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=174126&action=review > > > Tools/MiniBrowser/efl/main.c:916 > > + window->tooltip_timer = ecore_timer_add(1, on_tooltip_show, window); > > Can I know the reason we should have delay and why it is 1? > > Can we use ecore_idle_add? Because all the other browsers behave like this. Currently, MiniBrowser always shows the tooltip window when the mouse pointer is over a html element. But most browsers show tooltip when mouse pointer stays on an element for some time. (I think application can set the delay, and MiniBrowser uses 1 second for the delay in this patch.) When we use ecore_idle_add() for this, there can be a problem with below issues. 1. elm object tooltip should not be set to the ewk_view but to other elm_object such as elm_window. (setting tooltip to the ewk_view makes elm error messages while using MiniBrowser) 2. When elm_object_tooltip_show is called, tooltip window is displayed at the current pointer position. Problem is that, if there is no delay or use ecore_idle_add(), the tooltip window will be mostly displayed at the edge of the html element that has tooltip. 775714 4 tmpsantos 2012-11-26 11:34:52 -0800 What about this patch? This tooltip is really annoying. :) 776363 5 bw80.lee 2012-11-26 22:44:06 -0800 (In reply to comment #4) > What about this patch? This tooltip is really annoying. :) I made a patch to remove the error messages from MiniBrowser. But ryuan pointed that, there are some another bugs with this patch. (I think it is about the behavior of tooltip itself) To implement the tooltip behavior like common browsers, checking mouse event is required in MiniBrowser. Because most browsers show the tooltip window when mouse pointer is staying over an object for some time, and hide tooltip window when mouse pointer starts to move. (elm tooltip doesn't monitor mouse event to show or hide) Is it better to do those with this patch? I think that might be ok to apply this first and fix the tooltip behavior itself later. (because the current tooltip always returns error messages and follows the mouse pointer) Please let me know your opinions :) 796189 6 180490 bw80.lee 2012-12-21 01:23:59 -0800 Created attachment 180490 Patch 796191 7 bw80.lee 2012-12-21 01:28:02 -0800 I uploaded new patch to apply ryuan's opinion. Now, MiniBrowser checks mouse events to show/hide tooltip. I re-open the review flag because the patch is changed. 796197 8 180490 buildbot 2012-12-21 01:51:04 -0800 Comment on attachment 180490 Patch Attachment 180490 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/15464236 New failing tests: svg/as-image/img-relative-height.html 797191 9 bw80.lee 2012-12-25 17:33:07 -0800 (In reply to comment #8) > (From update of attachment 180490 [details]) > Attachment 180490 [details] did not pass mac-ews (mac): > Output: http://queues.webkit.org/results/15464236 > > New failing tests: > svg/as-image/img-relative-height.html This is false alarm because the patch only touched main.c of EFL MiniBrowser. 797568 10 bw80.lee 2012-12-27 08:14:12 -0800 ryuan, Could you look the patch again? 797572 11 180490 cdumez 2012-12-27 08:21:18 -0800 Comment on attachment 180490 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180490&action=review > Tools/MiniBrowser/efl/main.c:32 > +static const int TOOLTIP_DELAY_SECONDS = 1.0; int and 1.0 are somewhat conflicting > Tools/MiniBrowser/efl/main.c:83 > + Eina_Bool show; "is_shown" or "shown" for consistency with "activated" ? 797708 12 bw80.lee 2012-12-27 16:57:52 -0800 (In reply to comment #11) > (From update of attachment 180490 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=180490&action=review > > > Tools/MiniBrowser/efl/main.c:32 > > +static const int TOOLTIP_DELAY_SECONDS = 1.0; > > int and 1.0 are somewhat conflicting Oops, Thanks! > > > Tools/MiniBrowser/efl/main.c:83 > > + Eina_Bool show; > > "is_shown" or "shown" for consistency with "activated" ? Ok, it'll be better. Will apply it. 797710 13 180831 bw80.lee 2012-12-27 17:11:24 -0800 Created attachment 180831 Patch 797763 14 180831 cdumez 2012-12-27 22:20:06 -0800 Comment on attachment 180831 Patch LGTM. 798512 15 ryuan.choi 2013-01-01 17:58:14 -0800 (In reply to comment #10) > ryuan, Could you look the patch again? LGTM now. 798596 16 180831 jussi.kukkonen 2013-01-02 03:09:53 -0800 Comment on attachment 180831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180831&action=review > Tools/MiniBrowser/efl/main.c:225 > +static void > +on_mouse_move(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info) > +{ > + window_tooltip_update((Browser_Window *)user_data); > +} Am I correct that on every mouse move event this adds a new ecore timer? What should happen is that the existing timer should be reset to TOOLTIP_DELAY_SECONDS. 798602 17 180831 bw80.lee 2013-01-02 03:20:08 -0800 Comment on attachment 180831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180831&action=review >> Tools/MiniBrowser/efl/main.c:225 >> +} > > Am I correct that on every mouse move event this adds a new ecore timer? > > What should happen is that the existing timer should be reset to TOOLTIP_DELAY_SECONDS. If there is an existing timer and user moves mouse again, the previous timer will be removed and new timer will be created with the TOOLTIP_DELAY_SECONDS. I think this is the 'reset' mechanism that you asked. (is it correct?) 798645 18 jussi.kukkonen 2013-01-02 06:45:22 -0800 (In reply to comment #17) > If there is an existing timer and user moves mouse again, the previous timer will be removed and new timer will be created with the TOOLTIP_DELAY_SECONDS. > I think this is the 'reset' mechanism that you asked. (is it correct?) You are correct, sorry: I missed the window_tooltip_hide() call. 799219 19 180831 webkit.review.bot 2013-01-02 20:49:04 -0800 Comment on attachment 180831 Patch Clearing flags on attachment: 180831 Committed r138697: <http://trac.webkit.org/changeset/138697> 799220 20 webkit.review.bot 2013-01-02 20:49:09 -0800 All reviewed patches have been landed. Closing bug. 174126 2012-11-14 04:20:03 -0800 2012-12-21 01:23:53 -0800 Patch bug-102209-20121114211803.patch text/plain 3817 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NTg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzlkNGMwZTBiNTk4YmRkNGUzMWUzYTJhNTc4ODVhMzY1 NjU1NzlmNy4uZjEyOWE3N2U1NGU5ZWVhYWFjMTM2MDExOWI4ODdlZjUzMWU4OGM3NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMw IEBACiAyMDEyLTExLTE0ICBCeXVuZ3dvbyBMZWUgIDxidzgwLmxlZUBzYW1zdW5nLmNvbT4KIAor ICAgICAgICBbRUZMXVtXSzJdIEZpeCB0b29sdGlwIGJ1Z3MgaW4gTWluaUJyb3dzZXIuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIyMDkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXQgdG9vbHRpcCBv biB0aGUgZWxtX3dpbmRvdyBpbnN0ZWFkIG9mIGV3a192aWV3LCBhbmQgYWRkIGRlbGF5IHRvCisg ICAgICAgIHNob3cgdGhlIHRvb2x0aXAgd2luZG93LgorCisgICAgICAgIFNldHRpbmcgdG9vbHRp cCBvbiB0aGUgZXdrX3ZpZXcgbWFrZXMgZWxlbWVudGFyeSBlcnJvciBtZXNzYWdlIGJlY2F1c2UK KyAgICAgICAgZXdrX3ZpZXcgaXMgbm90IGFuIGVsZW1lbnRhcnkgd2lkZ2V0LiBUbyByZW1vdmUg dGhlIGVycm9yIG1lc3NhZ2UsCisgICAgICAgIHRvb2x0aXAgc2hvdWxkIGJlIHNldCBvbiB0aGUg ZWxtX3dpbmRvdy4KKworICAgICAgICBBbmQgZWxtX3Rvb2x0aXAgd2lkZ2V0IGRvZXNuJ3QgaGF2 ZSBkZWxheSwgc28gTWluaUJyb3dzZXIgc2hvdWxkIHNldAorICAgICAgICBzb21lIGRlbGF5IHRv IHNob3cgdGhlIHdpZGdldCB3aGVuIGl0IHJlY2VpdmVzICJ0b29sdGlwLHRleHQsc2V0IiBzaWdu YWwuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAoX0Jyb3dz ZXJfV2luZG93KToKKyAgICAgICAgKHdpbmRvd19mcmVlKToKKyAgICAgICAgKG9uX3Rvb2x0aXBf c2hvdyk6CisgICAgICAgIChvbl90b29sdGlwX3RleHRfc2V0KToKKyAgICAgICAgKG9uX3Rvb2x0 aXBfdGV4dF91bnNldCk6CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToKKworMjAxMi0xMS0xNCAg Qnl1bmd3b28gTGVlICA8Ync4MC5sZWVAc2Ftc3VuZy5jb20+CisKICAgICAgICAgW0VGTF1bV0sy XSBSZW5hbWUgdmFyaWFibGVzLCBzdHJ1Y3R1cmVzIGFuZCBmdW5jdGlvbnMgb2YgdGhlIE1pbmlC cm93c2VyLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAxNTE3CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29s cy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDkyZDNmMmZmOWYzZTQyNmNhNWE4OTcxMzEw YTM4NDU2NmEwNGM4N2QuLjhkNmQ3ZjcyNTNlYjJlZGU0NjEyN2Y0MzMxZjhmYTBmZGY0OWU3ZmEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWlu aUJyb3dzZXIvZWZsL21haW4uYwpAQCAtNTksNiArNTksNyBAQCB0eXBlZGVmIHN0cnVjdCBfQnJv d3Nlcl9XaW5kb3cgewogICAgIEV2YXNfT2JqZWN0ICp1cmxfYmFyOwogICAgIEV2YXNfT2JqZWN0 ICpiYWNrX2J1dHRvbjsKICAgICBFdmFzX09iamVjdCAqZm9yd2FyZF9idXR0b247CisgICAgRWNv cmVfVGltZXIgKnRvb2x0aXBfdGltZXI7CiB9IEJyb3dzZXJfV2luZG93OwogCiB0eXBlZGVmIHN0 cnVjdCBfRmlsZV9TZWxlY3Rvcl9EYXRhIHsKQEAgLTE0NCw2ICsxNDUsMTAgQEAgc3RhdGljIHZv aWQgd2luZG93X2ZyZWUoQnJvd3Nlcl9XaW5kb3cgKndpbmRvdykKICAgICBldmFzX29iamVjdF9k ZWwod2luZG93LT5ld2tfdmlldyk7CiAgICAgLyogVGhlIGVsbV93aW4gd2lsbCB0YWtlIGNhcmUg b2YgZnJlZWluZyBpdHMgY2hpbGRyZW4gKi8KICAgICBldmFzX29iamVjdF9kZWwod2luZG93LT5l bG1fd2luZG93KTsKKyAgICAKKyAgICBpZiAod2luZG93LT50b29sdGlwX3RpbWVyKQorICAgICAg ICBlY29yZV90aW1lcl9kZWwod2luZG93LT50b29sdGlwX3RpbWVyKTsKKwogICAgIGZyZWUod2lu ZG93KTsKIH0KIApAQCAtODkwLDE0ICs4OTUsMjUgQEAgb25fYXV0aGVudGljYXRpb25fcmVxdWVz dCh2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAg ICAgZXZhc19vYmplY3Rfc2hvdyhhdXRoX3BvcHVwKTsKIH0KIAorc3RhdGljIEVpbmFfQm9vbAor b25fdG9vbHRpcF9zaG93KHZvaWQgKnVzZXJfZGF0YSkKK3sKKyAgICBCcm93c2VyX1dpbmRvdyAq d2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9kYXRhOworICAgIHdpbmRvdy0+dG9vbHRp cF90aW1lciA9IE5VTEw7CisgICAgZWxtX29iamVjdF90b29sdGlwX3Nob3cod2luZG93LT5lbG1f d2luZG93KTsKKyAgICByZXR1cm4gRUNPUkVfQ0FMTEJBQ0tfQ0FOQ0VMOworfQorCiBzdGF0aWMg dm9pZAogb25fdG9vbHRpcF90ZXh0X3NldCh2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICpv YmosIHZvaWQgKmV2ZW50X2luZm8pCiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IChC cm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKICAgICBjb25zdCBjaGFyICptZXNzYWdlID0gKGNv bnN0IGNoYXIqKWV2ZW50X2luZm87CiAKLSAgICBlbG1fb2JqZWN0X3Rvb2x0aXBfdGV4dF9zZXQo d2luZG93LT5ld2tfdmlldywgbWVzc2FnZSk7Ci0gICAgZWxtX29iamVjdF90b29sdGlwX3Nob3co d2luZG93LT5ld2tfdmlldyk7CisgICAgZWxtX29iamVjdF90b29sdGlwX3RleHRfc2V0KHdpbmRv dy0+ZWxtX3dpbmRvdywgbWVzc2FnZSk7CisgICAgaWYgKHdpbmRvdy0+dG9vbHRpcF90aW1lcikK KyAgICAgICAgZWNvcmVfdGltZXJfZGVsKHdpbmRvdy0+dG9vbHRpcF90aW1lcik7CisgICAgd2lu ZG93LT50b29sdGlwX3RpbWVyID0gZWNvcmVfdGltZXJfYWRkKDEsIG9uX3Rvb2x0aXBfc2hvdywg d2luZG93KTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTkwNSw3ICs5MjEsMTEgQEAgb25fdG9vbHRp cF90ZXh0X3Vuc2V0KHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZl bnRfaW5mbykKIHsKICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93 ICopdXNlcl9kYXRhOwogCi0gICAgZWxtX29iamVjdF90b29sdGlwX3Vuc2V0KHdpbmRvdy0+ZXdr X3ZpZXcpOworICAgIGlmICh3aW5kb3ctPnRvb2x0aXBfdGltZXIpIHsKKyAgICAgICAgZWNvcmVf dGltZXJfZGVsKHdpbmRvdy0+dG9vbHRpcF90aW1lcik7CisgICAgICAgIHdpbmRvdy0+dG9vbHRp cF90aW1lciA9IE5VTEw7CisgICAgfQorICAgIGVsbV9vYmplY3RfdG9vbHRpcF91bnNldCh3aW5k b3ctPmVsbV93aW5kb3cpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtOTQ2LDYgKzk2Niw5IEBAIHN0 YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwsIGludCB3 aWR0aCwgaW50IGhlaWdodCkKICAgICAgICAgcmV0dXJuIE5VTEw7CiAgICAgfQogCisgICAgLyog SW5pdGlhbGl6ZSB0b29sdGlwIHRpbWVyICovCisgICAgd2luZG93LT50b29sdGlwX3RpbWVyID0g TlVMTDsKKwogICAgIC8qIENyZWF0ZSB3aW5kb3cgKi8KICAgICB3aW5kb3ctPmVsbV93aW5kb3cg PSBlbG1fd2luX2FkZChOVUxMLCAibWluaWJyb3dzZXItd2luZG93IiwgRUxNX1dJTl9CQVNJQyk7 CiAgICAgZWxtX3dpbl90aXRsZV9zZXQod2luZG93LT5lbG1fd2luZG93LCBBUFBfTkFNRSk7Cg== 180490 2012-12-21 01:23:59 -0800 2012-12-27 17:11:18 -0800 Patch bug-102209-20121221182115.patch text/plain 7096 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MzQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGE5N2NjYWI1ZWVkN2VmOGJmOTZjNWVlODU4ZTM0MDM3 Mjk2MmY0NS4uOWUzYThkMGVlMTlhM2IyODNhYWUzYzdlNDVkZGE3ZTUzZGUwNDRmZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQz IEBACisyMDEyLTEyLTIxICBCeXVuZ3dvbyBMZWUgIDxidzgwLmxlZUBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbRUZMXVtXSzJdIEZpeCB0b29sdGlwIGJ1Z3MgaW4gTWluaUJyb3dzZXIuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIyMDkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXQgdG9vbHRpcCBv biB0aGUgZWxtX3dpbmRvdyBpbnN0ZWFkIG9mIGV3a192aWV3LCBhbmQgYWRkIGRlbGF5IHRvCisg ICAgICAgIHNob3cgdGhlIHRvb2x0aXAgd2luZG93LgorCisgICAgICAgIFNldHRpbmcgdG9vbHRp cCBvbiB0aGUgZXdrX3ZpZXcgbWFrZXMgZWxlbWVudGFyeSBlcnJvciBtZXNzYWdlIGJlY2F1c2UK KyAgICAgICAgZXdrX3ZpZXcgaXMgbm90IGFuIGVsZW1lbnRhcnkgd2lkZ2V0LiBUbyByZW1vdmUg dGhlIGVycm9yIG1lc3NhZ2UsCisgICAgICAgIHRvb2x0aXAgc2hvdWxkIGJlIHNldCBvbiB0aGUg ZWxtX3dpbmRvdy4KKworICAgICAgICBNb3N0IGJyb3dzZXJzIHNob3cgdGhlIHRvb2x0aXAgYWZ0 ZXIgYSBtb3VzZSBwb2ludGVyIHN0YXlzIG9uIGFuCisgICAgICAgIGVsZW1lbnQgb2JqZWN0IHRo YXQgaGFzIHRvb2x0aXAgdGV4dC4KKyAgICAgICAgQnV0IGVsbV90b29sdGlwIHdpZGdldCBpdHNl bGYgZG9lc24ndCBoYXZlIGRlbGF5IG9yIGhhbmRsZSBtb3VzZQorICAgICAgICBldmVudHMgdG8g c2hvdy9oaWRlLgorCisgICAgICAgIFNvIGFkZGl0aW9uYWwgY29kZXMgYXJlIGFkZGVkIHRvIHNo b3cvaGlkZSB0b29sdGlwIHdpZGdldCBhbG9uZyB3aXRoCisgICAgICAgIG1vdXNlIGV2ZW50cy4K KyAgICAgICAgICAxKSBXaGVuIGEgbW91c2UgcG9pbnRlciBzdGF5cyBmb3IgYSBzZWNvbmQgb24g YW4gZWxlbWVudCB3aGljaCBoYXMKKyAgICAgICAgICAgICB0b29sdGlwIHRleHQsIHRoZW4gdG9v bHRpcCB3aWRnZXQgaXMgZGlzcGxheWVkLgorICAgICAgICAgIDIpIFdoZW4gYSBtb3VzZSBwb2lu dGVyIGlzIG1vdmVkIG9yIG91dCBvZiBld2tfdmlldywgaGlkZSB0aGUgdG9vbHRpcAorICAgICAg ICAgICAgIHdpZGdldC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisgICAg ICAgIChfVG9vbHRpcF9JbmZvcm1hdGlvbik6CisgICAgICAgIChfQnJvd3Nlcl9XaW5kb3cpOgor ICAgICAgICAob25fdG9vbHRpcF9zaG93KToKKyAgICAgICAgKHdpbmRvd190b29sdGlwX2hpZGUp OgorICAgICAgICAod2luZG93X3Rvb2x0aXBfdXBkYXRlKToKKyAgICAgICAgKG9uX21vdXNlX2lu KToKKyAgICAgICAgKG9uX21vdXNlX21vdmUpOgorICAgICAgICAob25fbW91c2Vfb3V0KToKKyAg ICAgICAgKHdpbmRvd19mcmVlKToKKyAgICAgICAgKG9uX3Rvb2x0aXBfdGV4dF9zZXQpOgorICAg ICAgICAob25fdG9vbHRpcF90ZXh0X3Vuc2V0KToKKyAgICAgICAgKHdpbmRvd19jcmVhdGUpOgor CiAyMDEyLTEyLTIwICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAg ICAgICBbRUZMXSBCdWlsZCBicmVhayB3aXRoIGxhdGVzdCBFRkwgbGlicmFyaWVzLgpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2Vm bC9tYWluLmMKaW5kZXggYTZmZTgyZWZiYmEwODYzODQ5OTQ4ZTUwOTQwMmE2ZjY2YzNmM2RkMC4u Y2QwMjU1NDQxMjI3OWE0NTBhMmQ2ZGYxMWI3MjIyNTFkMmYzMjE0YSAxMDA2NDQKLS0tIGEvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFp bi5jCkBAIC0yOSw2ICsyOSw3IEBAIHN0YXRpYyBjb25zdCBjaGFyIERFRkFVTFRfVVJMW10gPSAi aHR0cDovL3d3dy5nb29nbGUuY29tLyI7CiBzdGF0aWMgY29uc3QgY2hhciBBUFBfTkFNRVtdID0g IkVGTCBNaW5pQnJvd3NlciI7CiBzdGF0aWMgY29uc3QgaW50IFRPT0xfQkFSX0lDT05fU0laRSA9 IDI0Owogc3RhdGljIGNvbnN0IGludCBUT09MX0JBUl9CVVRUT05fU0laRSA9IDMyOworc3RhdGlj IGNvbnN0IGludCBUT09MVElQX0RFTEFZX1NFQ09ORFMgPSAxLjA7CiAKICNkZWZpbmUgaW5mbyhm b3JtYXQsIGFyZ3MuLi4pICAgICAgIFwKICAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKQEAgLTc1LDYgKzc2LDEzIEBAIHN0YXRpYyBFd2tfVmlld19TbWFydF9DbGFzcyAqbWlu aUJyb3dzZXJWaWV3U21hcnRDbGFzcygpCiAgICAgcmV0dXJuICZld2tWaWV3Q2xhc3M7CiB9CiAK K3R5cGVkZWYgc3RydWN0IF9Ub29sdGlwX0luZm9ybWF0aW9uIHsKKyAgICBFY29yZV9UaW1lciAq c2hvd190aW1lcjsKKyAgICBFaW5hX0Jvb2wgYWN0aXZhdGVkOworICAgIEVpbmFfQm9vbCB0ZXh0 X3NldDsKKyAgICBFaW5hX0Jvb2wgc2hvdzsKK30gVG9vbHRpcF9JbmZvcm1hdGlvbjsKKwogdHlw ZWRlZiBzdHJ1Y3QgX0Jyb3dzZXJfV2luZG93IHsKICAgICBFdmFzX09iamVjdCAqZWxtX3dpbmRv dzsKICAgICBFdmFzX09iamVjdCAqZXdrX3ZpZXc7CkBAIC04Miw2ICs5MCw3IEBAIHR5cGVkZWYg c3RydWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAgRXZhc19PYmplY3QgKmJhY2tfYnV0dG9uOwog ICAgIEV2YXNfT2JqZWN0ICpmb3J3YXJkX2J1dHRvbjsKICAgICBpbnQgY3VycmVudF96b29tX2xl dmVsOyAKKyAgICBUb29sdGlwX0luZm9ybWF0aW9uIHRvb2x0aXA7CiB9IEJyb3dzZXJfV2luZG93 OwogCiB0eXBlZGVmIHN0cnVjdCBfRmlsZV9TZWxlY3Rvcl9EYXRhIHsKQEAgLTE2NiwxMSArMTc1 LDc3IEBAIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2ZpbmRfd2l0aF9ld2tfdmlldyhF dmFzX09iamVjdCAqZXdrX3ZpZXcpCiAgICAgcmV0dXJuIE5VTEw7CiB9CiAKK3N0YXRpYyBFaW5h X0Jvb2wKK29uX3Rvb2x0aXBfc2hvdyh2b2lkICp1c2VyX2RhdGEpCit7CisgICAgQnJvd3Nlcl9X aW5kb3cgKndpbmRvdyA9IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKKworICAgIHdpbmRv dy0+dG9vbHRpcC5zaG93X3RpbWVyID0gTlVMTDsKKyAgICBlbG1fb2JqZWN0X3Rvb2x0aXBfc2hv dyh3aW5kb3ctPmVsbV93aW5kb3cpOworICAgIHdpbmRvdy0+dG9vbHRpcC5zaG93ID0gRUlOQV9U UlVFOworICAgIHJldHVybiBFQ09SRV9DQUxMQkFDS19DQU5DRUw7Cit9CisKK3N0YXRpYyB2b2lk Cit3aW5kb3dfdG9vbHRpcF9oaWRlKEJyb3dzZXJfV2luZG93ICp3aW5kb3cpCit7CisgICAgaWYg KHdpbmRvdy0+dG9vbHRpcC5zaG93X3RpbWVyKSB7CisgICAgICAgIGVjb3JlX3RpbWVyX2RlbCh3 aW5kb3ctPnRvb2x0aXAuc2hvd190aW1lcik7CisgICAgICAgIHdpbmRvdy0+dG9vbHRpcC5zaG93 X3RpbWVyID0gTlVMTDsKKyAgICB9CisKKyAgICBpZiAod2luZG93LT50b29sdGlwLnNob3cpIHsK KyAgICAgICAgZWxtX29iamVjdF90b29sdGlwX2hpZGUod2luZG93LT5lbG1fd2luZG93KTsKKyAg ICAgICAgd2luZG93LT50b29sdGlwLnNob3cgPSBFSU5BX0ZBTFNFOworICAgIH0KK30KKworc3Rh dGljIHZvaWQKK3dpbmRvd190b29sdGlwX3VwZGF0ZShCcm93c2VyX1dpbmRvdyAqd2luZG93KQor eworICAgIHdpbmRvd190b29sdGlwX2hpZGUod2luZG93KTsKKworICAgIGlmICh3aW5kb3ctPnRv b2x0aXAuYWN0aXZhdGVkICYmIHdpbmRvdy0+dG9vbHRpcC50ZXh0X3NldCkKKyAgICAgICAgd2lu ZG93LT50b29sdGlwLnNob3dfdGltZXIgPSBlY29yZV90aW1lcl9hZGQoVE9PTFRJUF9ERUxBWV9T RUNPTkRTLCBvbl90b29sdGlwX3Nob3csIHdpbmRvdyk7Cit9CisKK3N0YXRpYyB2b2lkCitvbl9t b3VzZV9pbih2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywg dm9pZCAqZXZlbnRfaW5mbykKK3sKKyAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dz ZXJfV2luZG93ICopdXNlcl9kYXRhOworCisgICAgd2luZG93LT50b29sdGlwLmFjdGl2YXRlZCA9 IEVJTkFfVFJVRTsKKyAgICB3aW5kb3dfdG9vbHRpcF91cGRhdGUod2luZG93KTsKK30KKworc3Rh dGljIHZvaWQKK29uX21vdXNlX21vdmUodm9pZCAqdXNlcl9kYXRhLCBFdmFzICplLCBFdmFzX09i amVjdCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCit7CisgICAgd2luZG93X3Rvb2x0aXBf dXBkYXRlKChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YSk7Cit9CisKK3N0YXRpYyB2b2lkCitv bl9tb3VzZV9vdXQodm9pZCAqdXNlcl9kYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqZXdrX3Zp ZXcsIHZvaWQgKmV2ZW50X2luZm8pCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IChC cm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKKworICAgIHdpbmRvdy0+dG9vbHRpcC5hY3RpdmF0 ZWQgPSBFSU5BX0ZBTFNFOworICAgIHdpbmRvd190b29sdGlwX3VwZGF0ZSh3aW5kb3cpOworfQor CiBzdGF0aWMgdm9pZCB3aW5kb3dfZnJlZShCcm93c2VyX1dpbmRvdyAqd2luZG93KQogeworICAg IGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2RlbCh3aW5kb3ctPmV3a192aWV3LCBFVkFTX0NB TExCQUNLX01PVVNFX0lOLCBvbl9tb3VzZV9pbik7CisgICAgZXZhc19vYmplY3RfZXZlbnRfY2Fs bGJhY2tfZGVsKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0VfT1VULCBvbl9t b3VzZV9vdXQpOworICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2RlbCh3aW5kb3ctPmV3 a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX01PVkUsIG9uX21vdXNlX21vdmUpOworCiAgICAg ZXZhc19vYmplY3RfZGVsKHdpbmRvdy0+ZXdrX3ZpZXcpOwogICAgIC8qIFRoZSBlbG1fd2luIHdp bGwgdGFrZSBjYXJlIG9mIGZyZWVpbmcgaXRzIGNoaWxkcmVuICovCiAgICAgZXZhc19vYmplY3Rf ZGVsKHdpbmRvdy0+ZWxtX3dpbmRvdyk7CisKKyAgICBpZiAod2luZG93LT50b29sdGlwLnNob3df dGltZXIpCisgICAgICAgIGVjb3JlX3RpbWVyX2RlbCh3aW5kb3ctPnRvb2x0aXAuc2hvd190aW1l cik7CisKICAgICBmcmVlKHdpbmRvdyk7CiB9CiAKQEAgLTk1NCw4ICsxMDI5LDkgQEAgb25fdG9v bHRpcF90ZXh0X3NldCh2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2 ZW50X2luZm8pCiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IChCcm93c2VyX1dpbmRvdyAq KXVzZXJfZGF0YTsKICAgICBjb25zdCBjaGFyICptZXNzYWdlID0gKGNvbnN0IGNoYXIqKWV2ZW50 X2luZm87CiAKLSAgICBlbG1fb2JqZWN0X3Rvb2x0aXBfdGV4dF9zZXQod2luZG93LT5ld2tfdmll dywgbWVzc2FnZSk7Ci0gICAgZWxtX29iamVjdF90b29sdGlwX3Nob3cod2luZG93LT5ld2tfdmll dyk7CisgICAgZWxtX29iamVjdF90b29sdGlwX3RleHRfc2V0KHdpbmRvdy0+ZWxtX3dpbmRvdywg bWVzc2FnZSk7CisgICAgd2luZG93LT50b29sdGlwLnRleHRfc2V0ID0gRUlOQV9UUlVFOworICAg IHdpbmRvd190b29sdGlwX3VwZGF0ZSh3aW5kb3cpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtOTYz LDcgKzEwMzksOSBAQCBvbl90b29sdGlwX3RleHRfdW5zZXQodm9pZCAqdXNlcl9kYXRhLCBFdmFz X09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogewogICAgIEJyb3dzZXJfV2luZG93ICp3 aW5kb3cgPSAoQnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7CiAKLSAgICBlbG1fb2JqZWN0X3Rv b2x0aXBfdW5zZXQod2luZG93LT5ld2tfdmlldyk7CisgICAgd2luZG93X3Rvb2x0aXBfaGlkZSh3 aW5kb3cpOworICAgIGVsbV9vYmplY3RfdG9vbHRpcF91bnNldCh3aW5kb3ctPmVsbV93aW5kb3cp OworICAgIHdpbmRvdy0+dG9vbHRpcC50ZXh0X3NldCA9IEVJTkFfRkFMU0U7CiB9CiAKIHN0YXRp YyB2b2lkCkBAIC0xMDA0LDYgKzEwODIsMTIgQEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5k b3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHcKICAg ICAgICAgcmV0dXJuIE5VTEw7CiAgICAgfQogCisgICAgLyogSW5pdGlhbGl6ZSB0b29sdGlwIGlu Zm9ybWF0aW9uICovCisgICAgd2luZG93LT50b29sdGlwLnNob3dfdGltZXIgPSBOVUxMOworICAg IHdpbmRvdy0+dG9vbHRpcC5hY3RpdmF0ZWQgPSBFSU5BX0ZBTFNFOworICAgIHdpbmRvdy0+dG9v bHRpcC50ZXh0X3NldCA9IEVJTkFfRkFMU0U7CisgICAgd2luZG93LT50b29sdGlwLnNob3cgPSBF SU5BX0ZBTFNFOworCiAgICAgLyogQ3JlYXRlIHdpbmRvdyAqLwogICAgIHdpbmRvdy0+ZWxtX3dp bmRvdyA9IGVsbV93aW5fYWRkKE5VTEwsICJtaW5pYnJvd3Nlci13aW5kb3ciLCBFTE1fV0lOX0JB U0lDKTsKICAgICBlbG1fd2luX3RpdGxlX3NldCh3aW5kb3ctPmVsbV93aW5kb3csIEFQUF9OQU1F KTsKQEAgLTExNDYsNiArMTIzMCwxMCBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19j cmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgdwogCiAgICAg dmlld19mb2N1c19zZXQod2luZG93LCBFSU5BX1RSVUUpOwogCisgICAgZXZhc19vYmplY3RfZXZl bnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0VfSU4s IG9uX21vdXNlX2luLCB3aW5kb3cpOworICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2Fk ZCh3aW5kb3ctPmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX09VVCwgb25fbW91c2Vfb3V0 LCB3aW5kb3cpOworICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZCh3aW5kb3ctPmV3 a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX01PVkUsIG9uX21vdXNlX21vdmUsIHdpbmRvdyk7 CisKICAgICByZXR1cm4gd2luZG93OwogfQogCg== 180831 2012-12-27 17:11:24 -0800 2013-01-02 20:49:04 -0800 Patch bug-102209-20121228100835.patch text/plain 7110 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2Y0MGRiNmU0ODI5MDNiMjEzNDNlMjE5NjEyZjM0Zjcx ZjgxN2IxNS4uNjgyMmVmY2M3MmIyMmIyZmM2YzEyYTRkZTExZmUzYjAyN2FjZTY2ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQz IEBACisyMDEyLTEyLTI1ICBCeXVuZ3dvbyBMZWUgIDxidzgwLmxlZUBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbRUZMXVtXSzJdIEZpeCB0b29sdGlwIGJ1Z3MgaW4gTWluaUJyb3dzZXIuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIyMDkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXQgdG9vbHRpcCBv biB0aGUgZWxtX3dpbmRvdyBpbnN0ZWFkIG9mIGV3a192aWV3LCBhbmQgYWRkIGRlbGF5IHRvCisg ICAgICAgIHNob3cgdGhlIHRvb2x0aXAgd2luZG93LgorCisgICAgICAgIFNldHRpbmcgdG9vbHRp cCBvbiB0aGUgZXdrX3ZpZXcgbWFrZXMgZWxlbWVudGFyeSBlcnJvciBtZXNzYWdlIGJlY2F1c2UK KyAgICAgICAgZXdrX3ZpZXcgaXMgbm90IGFuIGVsZW1lbnRhcnkgd2lkZ2V0LiBUbyByZW1vdmUg dGhlIGVycm9yIG1lc3NhZ2UsCisgICAgICAgIHRvb2x0aXAgc2hvdWxkIGJlIHNldCBvbiB0aGUg ZWxtX3dpbmRvdy4KKworICAgICAgICBNb3N0IGJyb3dzZXJzIHNob3cgdGhlIHRvb2x0aXAgYWZ0 ZXIgYSBtb3VzZSBwb2ludGVyIHN0YXlzIG9uIGFuCisgICAgICAgIGVsZW1lbnQgb2JqZWN0IHRo YXQgaGFzIHRvb2x0aXAgdGV4dC4KKyAgICAgICAgQnV0IGVsbV90b29sdGlwIHdpZGdldCBpdHNl bGYgZG9lc24ndCBoYXZlIGRlbGF5IG9yIGhhbmRsZSBtb3VzZQorICAgICAgICBldmVudHMgdG8g c2hvdy9oaWRlLgorCisgICAgICAgIFNvIGFkZGl0aW9uYWwgY29kZXMgYXJlIGFkZGVkIHRvIHNo b3cvaGlkZSB0b29sdGlwIHdpZGdldCBhbG9uZyB3aXRoCisgICAgICAgIG1vdXNlIGV2ZW50cy4K KyAgICAgICAgICAxKSBXaGVuIGEgbW91c2UgcG9pbnRlciBzdGF5cyBmb3IgYSBzZWNvbmQgb24g YW4gZWxlbWVudCB3aGljaCBoYXMKKyAgICAgICAgICAgICB0b29sdGlwIHRleHQsIHRoZW4gdG9v bHRpcCB3aWRnZXQgaXMgZGlzcGxheWVkLgorICAgICAgICAgIDIpIFdoZW4gYSBtb3VzZSBwb2lu dGVyIGlzIG1vdmVkIG9yIG91dCBvZiBld2tfdmlldywgaGlkZSB0aGUgdG9vbHRpcAorICAgICAg ICAgICAgIHdpZGdldC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisgICAg ICAgIChfVG9vbHRpcF9JbmZvcm1hdGlvbik6CisgICAgICAgIChfQnJvd3Nlcl9XaW5kb3cpOgor ICAgICAgICAob25fdG9vbHRpcF9zaG93KToKKyAgICAgICAgKHdpbmRvd190b29sdGlwX2hpZGUp OgorICAgICAgICAod2luZG93X3Rvb2x0aXBfdXBkYXRlKToKKyAgICAgICAgKG9uX21vdXNlX2lu KToKKyAgICAgICAgKG9uX21vdXNlX21vdmUpOgorICAgICAgICAob25fbW91c2Vfb3V0KToKKyAg ICAgICAgKHdpbmRvd19mcmVlKToKKyAgICAgICAgKG9uX3Rvb2x0aXBfdGV4dF9zZXQpOgorICAg ICAgICAob25fdG9vbHRpcF90ZXh0X3Vuc2V0KToKKyAgICAgICAgKHdpbmRvd19jcmVhdGUpOgor CiAyMDEyLTEyLTI1ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5j b20+CiAKICAgICAgICAgW0VGTF1bV0syXSBSZWZhY3RvciBzbmFwc2hvdCB0YWtpbmcgY29kZQpk aWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93 c2VyL2VmbC9tYWluLmMKaW5kZXggYTZmZTgyZWZiYmEwODYzODQ5OTQ4ZTUwOTQwMmE2ZjY2YzNm M2RkMC4uMzljMDQ0OTA5OGQxMmYwMWU4MjI4ZWUyZDc4NTlkNmYzMmMzYjU3MCAxMDA2NDQKLS0t IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9l ZmwvbWFpbi5jCkBAIC0yOSw2ICsyOSw3IEBAIHN0YXRpYyBjb25zdCBjaGFyIERFRkFVTFRfVVJM W10gPSAiaHR0cDovL3d3dy5nb29nbGUuY29tLyI7CiBzdGF0aWMgY29uc3QgY2hhciBBUFBfTkFN RVtdID0gIkVGTCBNaW5pQnJvd3NlciI7CiBzdGF0aWMgY29uc3QgaW50IFRPT0xfQkFSX0lDT05f U0laRSA9IDI0Owogc3RhdGljIGNvbnN0IGludCBUT09MX0JBUl9CVVRUT05fU0laRSA9IDMyOwor c3RhdGljIGNvbnN0IGRvdWJsZSBUT09MVElQX0RFTEFZX1NFQ09ORFMgPSAxLjA7CiAKICNkZWZp bmUgaW5mbyhmb3JtYXQsIGFyZ3MuLi4pICAgICAgIFwKICAgICBkbyB7ICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFwKQEAgLTc1LDYgKzc2LDEzIEBAIHN0YXRpYyBFd2tfVmlld19TbWFydF9D bGFzcyAqbWluaUJyb3dzZXJWaWV3U21hcnRDbGFzcygpCiAgICAgcmV0dXJuICZld2tWaWV3Q2xh c3M7CiB9CiAKK3R5cGVkZWYgc3RydWN0IF9Ub29sdGlwX0luZm9ybWF0aW9uIHsKKyAgICBFY29y ZV9UaW1lciAqc2hvd190aW1lcjsKKyAgICBFaW5hX0Jvb2wgYWN0aXZhdGVkOworICAgIEVpbmFf Qm9vbCB0ZXh0X3NldDsKKyAgICBFaW5hX0Jvb2wgc2hvd247Cit9IFRvb2x0aXBfSW5mb3JtYXRp b247CisKIHR5cGVkZWYgc3RydWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAgRXZhc19PYmplY3Qg KmVsbV93aW5kb3c7CiAgICAgRXZhc19PYmplY3QgKmV3a192aWV3OwpAQCAtODIsNiArOTAsNyBA QCB0eXBlZGVmIHN0cnVjdCBfQnJvd3Nlcl9XaW5kb3cgewogICAgIEV2YXNfT2JqZWN0ICpiYWNr X2J1dHRvbjsKICAgICBFdmFzX09iamVjdCAqZm9yd2FyZF9idXR0b247CiAgICAgaW50IGN1cnJl bnRfem9vbV9sZXZlbDsgCisgICAgVG9vbHRpcF9JbmZvcm1hdGlvbiB0b29sdGlwOwogfSBCcm93 c2VyX1dpbmRvdzsKIAogdHlwZWRlZiBzdHJ1Y3QgX0ZpbGVfU2VsZWN0b3JfRGF0YSB7CkBAIC0x NjYsMTEgKzE3NSw3NyBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19maW5kX3dpdGhf ZXdrX3ZpZXcoRXZhc19PYmplY3QgKmV3a192aWV3KQogICAgIHJldHVybiBOVUxMOwogfQogCitz dGF0aWMgRWluYV9Cb29sCitvbl90b29sdGlwX3Nob3codm9pZCAqdXNlcl9kYXRhKQoreworICAg IEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSAoQnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7CisK KyAgICB3aW5kb3ctPnRvb2x0aXAuc2hvd190aW1lciA9IE5VTEw7CisgICAgZWxtX29iamVjdF90 b29sdGlwX3Nob3cod2luZG93LT5lbG1fd2luZG93KTsKKyAgICB3aW5kb3ctPnRvb2x0aXAuc2hv d24gPSBFSU5BX1RSVUU7CisgICAgcmV0dXJuIEVDT1JFX0NBTExCQUNLX0NBTkNFTDsKK30KKwor c3RhdGljIHZvaWQKK3dpbmRvd190b29sdGlwX2hpZGUoQnJvd3Nlcl9XaW5kb3cgKndpbmRvdykK K3sKKyAgICBpZiAod2luZG93LT50b29sdGlwLnNob3dfdGltZXIpIHsKKyAgICAgICAgZWNvcmVf dGltZXJfZGVsKHdpbmRvdy0+dG9vbHRpcC5zaG93X3RpbWVyKTsKKyAgICAgICAgd2luZG93LT50 b29sdGlwLnNob3dfdGltZXIgPSBOVUxMOworICAgIH0KKworICAgIGlmICh3aW5kb3ctPnRvb2x0 aXAuc2hvd24pIHsKKyAgICAgICAgZWxtX29iamVjdF90b29sdGlwX2hpZGUod2luZG93LT5lbG1f d2luZG93KTsKKyAgICAgICAgd2luZG93LT50b29sdGlwLnNob3duID0gRUlOQV9GQUxTRTsKKyAg ICB9Cit9CisKK3N0YXRpYyB2b2lkCit3aW5kb3dfdG9vbHRpcF91cGRhdGUoQnJvd3Nlcl9XaW5k b3cgKndpbmRvdykKK3sKKyAgICB3aW5kb3dfdG9vbHRpcF9oaWRlKHdpbmRvdyk7CisKKyAgICBp ZiAod2luZG93LT50b29sdGlwLmFjdGl2YXRlZCAmJiB3aW5kb3ctPnRvb2x0aXAudGV4dF9zZXQp CisgICAgICAgIHdpbmRvdy0+dG9vbHRpcC5zaG93X3RpbWVyID0gZWNvcmVfdGltZXJfYWRkKFRP T0xUSVBfREVMQVlfU0VDT05EUywgb25fdG9vbHRpcF9zaG93LCB3aW5kb3cpOworfQorCitzdGF0 aWMgdm9pZAorb25fbW91c2VfaW4odm9pZCAqdXNlcl9kYXRhLCBFdmFzICplLCBFdmFzX09iamVj dCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndp bmRvdyA9IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKKworICAgIHdpbmRvdy0+dG9vbHRp cC5hY3RpdmF0ZWQgPSBFSU5BX1RSVUU7CisgICAgd2luZG93X3Rvb2x0aXBfdXBkYXRlKHdpbmRv dyk7Cit9CisKK3N0YXRpYyB2b2lkCitvbl9tb3VzZV9tb3ZlKHZvaWQgKnVzZXJfZGF0YSwgRXZh cyAqZSwgRXZhc19PYmplY3QgKmV3a192aWV3LCB2b2lkICpldmVudF9pbmZvKQoreworICAgIHdp bmRvd190b29sdGlwX3VwZGF0ZSgoQnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGEpOworfQorCitz dGF0aWMgdm9pZAorb25fbW91c2Vfb3V0KHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19P YmplY3QgKmV3a192aWV3LCB2b2lkICpldmVudF9pbmZvKQoreworICAgIEJyb3dzZXJfV2luZG93 ICp3aW5kb3cgPSAoQnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7CisKKyAgICB3aW5kb3ctPnRv b2x0aXAuYWN0aXZhdGVkID0gRUlOQV9GQUxTRTsKKyAgICB3aW5kb3dfdG9vbHRpcF91cGRhdGUo d2luZG93KTsKK30KKwogc3RhdGljIHZvaWQgd2luZG93X2ZyZWUoQnJvd3Nlcl9XaW5kb3cgKndp bmRvdykKIHsKKyAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19kZWwod2luZG93LT5ld2tf dmlldywgRVZBU19DQUxMQkFDS19NT1VTRV9JTiwgb25fbW91c2VfaW4pOworICAgIGV2YXNfb2Jq ZWN0X2V2ZW50X2NhbGxiYWNrX2RlbCh3aW5kb3ctPmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01P VVNFX09VVCwgb25fbW91c2Vfb3V0KTsKKyAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19k ZWwod2luZG93LT5ld2tfdmlldywgRVZBU19DQUxMQkFDS19NT1VTRV9NT1ZFLCBvbl9tb3VzZV9t b3ZlKTsKKwogICAgIGV2YXNfb2JqZWN0X2RlbCh3aW5kb3ctPmV3a192aWV3KTsKICAgICAvKiBU aGUgZWxtX3dpbiB3aWxsIHRha2UgY2FyZSBvZiBmcmVlaW5nIGl0cyBjaGlsZHJlbiAqLwogICAg IGV2YXNfb2JqZWN0X2RlbCh3aW5kb3ctPmVsbV93aW5kb3cpOworCisgICAgaWYgKHdpbmRvdy0+ dG9vbHRpcC5zaG93X3RpbWVyKQorICAgICAgICBlY29yZV90aW1lcl9kZWwod2luZG93LT50b29s dGlwLnNob3dfdGltZXIpOworCiAgICAgZnJlZSh3aW5kb3cpOwogfQogCkBAIC05NTQsOCArMTAy OSw5IEBAIG9uX3Rvb2x0aXBfdGV4dF9zZXQodm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAq b2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSAoQnJv d3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7CiAgICAgY29uc3QgY2hhciAqbWVzc2FnZSA9IChjb25z dCBjaGFyKilldmVudF9pbmZvOwogCi0gICAgZWxtX29iamVjdF90b29sdGlwX3RleHRfc2V0KHdp bmRvdy0+ZXdrX3ZpZXcsIG1lc3NhZ2UpOwotICAgIGVsbV9vYmplY3RfdG9vbHRpcF9zaG93KHdp bmRvdy0+ZXdrX3ZpZXcpOworICAgIGVsbV9vYmplY3RfdG9vbHRpcF90ZXh0X3NldCh3aW5kb3ct PmVsbV93aW5kb3csIG1lc3NhZ2UpOworICAgIHdpbmRvdy0+dG9vbHRpcC50ZXh0X3NldCA9IEVJ TkFfVFJVRTsKKyAgICB3aW5kb3dfdG9vbHRpcF91cGRhdGUod2luZG93KTsKIH0KIAogc3RhdGlj IHZvaWQKQEAgLTk2Myw3ICsxMDM5LDkgQEAgb25fdG9vbHRpcF90ZXh0X3Vuc2V0KHZvaWQgKnVz ZXJfZGF0YSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKIHsKICAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9kYXRhOwogCi0gICAg ZWxtX29iamVjdF90b29sdGlwX3Vuc2V0KHdpbmRvdy0+ZXdrX3ZpZXcpOworICAgIHdpbmRvd190 b29sdGlwX2hpZGUod2luZG93KTsKKyAgICBlbG1fb2JqZWN0X3Rvb2x0aXBfdW5zZXQod2luZG93 LT5lbG1fd2luZG93KTsKKyAgICB3aW5kb3ctPnRvb2x0aXAudGV4dF9zZXQgPSBFSU5BX0ZBTFNF OwogfQogCiBzdGF0aWMgdm9pZApAQCAtMTAwNCw2ICsxMDgyLDEyIEBAIHN0YXRpYyBCcm93c2Vy X1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFyICp1 cmwsIGludCB3CiAgICAgICAgIHJldHVybiBOVUxMOwogICAgIH0KIAorICAgIC8qIEluaXRpYWxp emUgdG9vbHRpcCBpbmZvcm1hdGlvbiAqLworICAgIHdpbmRvdy0+dG9vbHRpcC5zaG93X3RpbWVy ID0gTlVMTDsKKyAgICB3aW5kb3ctPnRvb2x0aXAuYWN0aXZhdGVkID0gRUlOQV9GQUxTRTsKKyAg ICB3aW5kb3ctPnRvb2x0aXAudGV4dF9zZXQgPSBFSU5BX0ZBTFNFOworICAgIHdpbmRvdy0+dG9v bHRpcC5zaG93biA9IEVJTkFfRkFMU0U7CisKICAgICAvKiBDcmVhdGUgd2luZG93ICovCiAgICAg d2luZG93LT5lbG1fd2luZG93ID0gZWxtX3dpbl9hZGQoTlVMTCwgIm1pbmlicm93c2VyLXdpbmRv dyIsIEVMTV9XSU5fQkFTSUMpOwogICAgIGVsbV93aW5fdGl0bGVfc2V0KHdpbmRvdy0+ZWxtX3dp bmRvdywgQVBQX05BTUUpOwpAQCAtMTE0Niw2ICsxMjMwLDEwIEBAIHN0YXRpYyBCcm93c2VyX1dp bmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFyICp1cmws IGludCB3CiAKICAgICB2aWV3X2ZvY3VzX3NldCh3aW5kb3csIEVJTkFfVFJVRSk7CiAKKyAgICBl dmFzX29iamVjdF9ldmVudF9jYWxsYmFja19hZGQod2luZG93LT5ld2tfdmlldywgRVZBU19DQUxM QkFDS19NT1VTRV9JTiwgb25fbW91c2VfaW4sIHdpbmRvdyk7CisgICAgZXZhc19vYmplY3RfZXZl bnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0VfT1VU LCBvbl9tb3VzZV9vdXQsIHdpbmRvdyk7CisgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tf YWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0VfTU9WRSwgb25fbW91c2Vf bW92ZSwgd2luZG93KTsKKwogICAgIHJldHVybiB3aW5kb3c7CiB9CiAK