2583 2012-06-12 05:57:23 +0000 disappearing windows when using 'xrender' compositing 2012-09-04 14:18:50 +0000 1 1 6 Yocto Project Subprojects Sato Matchbox svn x86 Multiple RESOLVED FIXED Medium normal Future 1 js ross.burton sgw song.liu tf+bugs.yocto --- --- --- oldest_to_newest 22024 0 566 js 2012-06-12 05:57:23 +0000 Created attachment 566 patch for disappearing windows issue in matchbox Note: We are not using 'sato'. We are using the matchbox-window-manager-2 in our custom image. We are using the 'Xrender' compositing manager. The main window opens a dialog-box-1. dialog-box-1 opens up another dialog-box-2. When opening dialog-box-2, if something had changed in the underlying windows causing the ConfigureNotify to be emitted, the underlying windows are hidden away by matchbox. The window stack looks like this: ==== window stack ===== +-- XID: 4008ef NAME: Alpha keyboard, type 2, layer 0 +-- XID: 4006c9 NAME: Login, type 2, layer 0 XID: 400003 NAME: hmi-ui, type 1, layer 3 ====================== The attached patch fixes this problem. 22151 1 ross.burton 2012-06-13 17:30:10 +0000 I'm somewhat impressed that people are using mb-wm-2... 22152 2 js 2012-06-13 17:46:52 +0000 @ross: Is there a better wm for a "single-application with compositing coolness" usecase? 22153 3 tf+bugs.yocto 2012-06-13 17:47:25 +0000 I don't think that is correct, it likely only works for you because the ConfigureNotify in this case is for stacking change without change to the window geometry. I think mb_wm_comp_mgr_xrender_client_configure_real() needs to check whether the window size has changed; if it has not, the function can short-circuit out, leaving the existing picture alone. If the size has changed, the picture needs to be release *and* recreated (at the moment the picture creation only happens in the _show() method, which is why this does not work). 22154 4 js 2012-06-13 17:54:28 +0000 @tf: Okay. I am a noob to X11. I just traced the execution to see where it was getting screwed. Any pointers on where the original geometry and the new geometry would be? 22155 5 js 2012-06-13 18:29:07 +0000 Looks like the new geometry comes along with the ConfigureNotify event. But this is not propagated beyond 'mb_wm_handle_composite_config_notify' in core/mb-window-manager.c. - Should we propagate this event up to the xrender composite-manager, and check for geometry change there? - Or, should we just check for it in the window-manager.c and not call the comp-manager when there is no geometry change? 22156 6 581 js 2012-06-13 18:40:33 +0000 Created attachment 581 fix for disappearing windows (take-2) 22157 7 js 2012-06-13 18:41:48 +0000 I have attached another patch. This time, I check if geometry has changed before calling the composite-manager's configure_notify handler. Please check and comment. 22158 8 582 js 2012-06-13 18:58:11 +0000 Created attachment 582 fix for disappearing windows (take-3) Fixed a small bug with the previous patch. 22252 9 js 2012-06-17 10:13:51 +0000 The issue shows up again when the dialog box's geometry changes. When a ChangeNotify is raised, the dclient->picture is destroyed but never created again. 22253 10 591 js 2012-06-17 10:15:12 +0000 Created attachment 591 fix for disappearing windows (take-4) This patch drops the dclient->picture and creates it with the changed window when ChangeNotify is raised. 22772 11 js 2012-07-04 04:11:43 +0000 @tf: Please can you have a look at the patch and tell me whether its correct? 24019 12 tf+bugs.yocto 2012-08-14 10:34:32 +0000 (In reply to comment #11) > @tf: Please can you have a look at the patch and tell me whether its correct? the configure_real function really should check whether the window extents/position have changed to avoid doing this unnecessarily. As is, you can get at the bounding box with XFixesFetchRegionAndBounds(), though it would make sense if the configuration geometry was getting passed down into the compositor configure function so it can be compared to old values cached in the MBWMCompMgrDefaultClient struct. (MBWM2 has been more or less unmaintained for 4 years ever since Intel acquired the codebase, and I have not got the spare time to take it on at the moment but our company, sleep(5) ltd, could provide support and further development on commercial basis for anyone needing that.) 24564 13 745 js 2012-08-28 21:51:56 +0000 Created attachment 745 fix for disappearing windows (take-5) 24565 14 js 2012-08-28 21:53:01 +0000 @tf I've attached another patch implementing your suggestions. In this one, the geometry is pushed upto the *configure_real. The *configure_real redraws only when the geometry is changed. 24638 15 song.liu 2012-08-29 20:46:34 +0000 Changed the milestone as this is not really part of the Yocto Project release. 'Future' is not exactly right either, but we don't seem to have a n/a value for target milestone. Thanks for letting me know, Ross! 24788 16 745 tf+bugs.yocto 2012-09-04 09:31:18 +0000 Comment on attachment 745 fix for disappearing windows (take-5) This looks good to me. 24789 17 ross.burton 2012-09-04 09:36:29 +0000 Thanks Tomas, much appreciated. Merged to master 24798 18 js 2012-09-04 14:18:50 +0000 tf & Ross Burton, thanks guys. 566 2012-06-12 05:57:23 +0000 2012-06-13 18:40:33 +0000 patch for disappearing windows issue in matchbox 0002-fixed-disappearing-windows-issue.patch text/plain 1058 js RnJvbSA5Y2VkZjMxNTIwMjNiODZlMTM0YjMxMmNmM2VmMTVjMDFhODE3OTIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgU3RlZXZlIDxqc0BoaXByby5jby5pbj4KRGF0ZTogVHVl LCAxMiBKdW4gMjAxMiAxMDo0MDo0MiArMDUzMApTdWJqZWN0OiBbUEFUQ0ggMi8zXSBmaXhlZCAn ZGlzYXBwZWFyaW5nIHdpbmRvd3MnIGlzc3VlLgoKLS0tCiBtYXRjaGJveC9jb21wLW1nci9tYi13 bS1jb21wLW1nci14cmVuZGVyLmMgfCAgIDEwICsrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1 IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbWF0Y2hib3gvY29t cC1tZ3IvbWItd20tY29tcC1tZ3IteHJlbmRlci5jIGIvbWF0Y2hib3gvY29tcC1tZ3IvbWItd20t Y29tcC1tZ3IteHJlbmRlci5jCmluZGV4IGZlN2Y3NWIuLjBiM2ExNjIgMTAwNjQ0Ci0tLSBhL21h dGNoYm94L2NvbXAtbWdyL21iLXdtLWNvbXAtbWdyLXhyZW5kZXIuYworKysgYi9tYXRjaGJveC9j b21wLW1nci9tYi13bS1jb21wLW1nci14cmVuZGVyLmMKQEAgLTEzMjUsMTEgKzEzMjUsMTEgQEAg bWJfd21fY29tcF9tZ3JfeHJlbmRlcl9jbGllbnRfY29uZmlndXJlX3JlYWwgKE1CV01Db21wTWdy Q2xpZW50ICogY2xpZW50KQogCiAgIGV4dGVudHMgPSBtYl93bV9jb21wX21ncl94cmVuZGVyX2Ns aWVudF9leHRlbnRzIChjbGllbnQpOwogCi0gIGlmIChkY2xpZW50LT5waWN0dXJlKQotICAgIHsK LSAgICAgIFhSZW5kZXJGcmVlUGljdHVyZSAod20tPnhkcHksIGRjbGllbnQtPnBpY3R1cmUpOwot ICAgICAgZGNsaWVudC0+cGljdHVyZSA9IE5vbmU7Ci0gICAgfQorICAvKiBpZiAoZGNsaWVudC0+ cGljdHVyZSkgKi8KKyAgLyogICB7ICovCisgIC8qICAgICBYUmVuZGVyRnJlZVBpY3R1cmUgKHdt LT54ZHB5LCBkY2xpZW50LT5waWN0dXJlKTsgKi8KKyAgLyogICAgIGRjbGllbnQtPnBpY3R1cmUg PSBOb25lOyAqLworICAvKiAgIH0gKi8KIAogICBkYW1hZ2UgPSBYRml4ZXNDcmVhdGVSZWdpb24g KHdtLT54ZHB5LCAwLCAwKTsKIAotLSAKMS43LjEwCgo= 581 2012-06-13 18:40:33 +0000 2012-06-13 18:58:11 +0000 fix for disappearing windows (take-2) 0001-fix-for-issue-2583-disappearing-windows.patch text/plain 1121 js RnJvbSBhOTZiMTJiNjQ4NjY1MWIzOWMwMTgyMTc4MTBlNDFmN2ExYmJlODgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgU3RlZXZlIDxqc0BoaXByby5jby5pbj4KRGF0ZTogVGh1 LCAxNCBKdW4gMjAxMiAwMDowNzo1NSArMDUzMApTdWJqZWN0OiBbUEFUQ0hdIGZpeCBmb3IgaXNz dWU6MjU4MywgZGlzYXBwZWFyaW5nIHdpbmRvd3MKCi0tLQogbWF0Y2hib3gvY29yZS9tYi13aW5k b3ctbWFuYWdlci5jIHwgICAxMCArKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvbWF0Y2hib3gvY29yZS9tYi13aW5k b3ctbWFuYWdlci5jIGIvbWF0Y2hib3gvY29yZS9tYi13aW5kb3ctbWFuYWdlci5jCmluZGV4IDZl MjA5YWMuLjVmYzVhNWUgMTAwNjQ0Ci0tLSBhL21hdGNoYm94L2NvcmUvbWItd2luZG93LW1hbmFn ZXIuYworKysgYi9tYXRjaGJveC9jb3JlL21iLXdpbmRvdy1tYW5hZ2VyLmMKQEAgLTU4Niw3ICs1 ODYsMTUgQEAgbWJfd21faGFuZGxlX2NvbXBvc2l0ZV9jb25maWdfbm90aWZ5IChYQ29uZmlndXJl RXZlbnQgKnhldiwKICAgICAgIGNsaWVudCA9IG1iX3dtX21hbmFnZWRfY2xpZW50X2Zyb21fZnJh bWUgKHdtLCB4ZXYtPndpbmRvdyk7CiAKICAgICAgIGlmIChjbGllbnQpCi0JbWJfd21fY29tcF9t Z3JfY2xpZW50X2NvbmZpZ3VyZSAoY2xpZW50LT5jbV9jbGllbnQpOworICAgICAgICB7CisgICAg ICAgICAgTUJHZW9tZXRyeSBvbGRfZ2VvbTsKKyAgICAgICAgICBtYl93bV9jbGllbnRfZ2V0X2Nv dmVyYWdlIChjbGllbnQsICZvbGRfZ2VvbSk7CisgICAgICAgICAgaWYgKChvbGRfZ2VvbS54ICE9 IHhldi0+eCkgfHwgKG9sZF9nZW9tLnkgIT0geGV2LT55KSB8fAorICAgICAgICAgICAgICAob2xk X2dlb20ud2lkdGggIT0geGV2LT53aWR0aCkgfHwgKG9sZF9nZW9tLndpZHRoICE9IHhldi0+d2lk dGgpKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICBtYl93bV9jb21wX21ncl9jbGllbnRf Y29uZmlndXJlIChjbGllbnQtPmNtX2NsaWVudCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0K ICAgICB9CiAgIHJldHVybiBUcnVlOwogfQotLSAKMS43LjEwCgo= 582 2012-06-13 18:58:11 +0000 2012-06-17 10:15:12 +0000 fix for disappearing windows (take-3) 0001-fix-for-issue-2583-disappearing-windows.patch text/plain 1140 js RnJvbSA1ZTg3ZTU5NjZjYzczMGMxMzNhOWI1MTExYWYxMjA1MWY4ZmY3ZDdhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgU3RlZXZlIDxqc0BoaXByby5jby5pbj4KRGF0ZTogVGh1 LCAxNCBKdW4gMjAxMiAwMDoyNTowMSArMDUzMApTdWJqZWN0OiBbUEFUQ0hdIGZpeCBmb3IgaXNz dWU6MjU4MywgZGlzYXBwZWFyaW5nIHdpbmRvd3MKCi0tLQogbWF0Y2hib3gvY29yZS9tYi13aW5k b3ctbWFuYWdlci5jIHwgICAxMSArKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2Vy dGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9tYXRjaGJveC9jb3JlL21iLXdp bmRvdy1tYW5hZ2VyLmMgYi9tYXRjaGJveC9jb3JlL21iLXdpbmRvdy1tYW5hZ2VyLmMKaW5kZXgg NmUyMDlhYy4uYTE0MjMzZCAxMDA2NDQKLS0tIGEvbWF0Y2hib3gvY29yZS9tYi13aW5kb3ctbWFu YWdlci5jCisrKyBiL21hdGNoYm94L2NvcmUvbWItd2luZG93LW1hbmFnZXIuYwpAQCAtNTg2LDcg KzU4NiwxNiBAQCBtYl93bV9oYW5kbGVfY29tcG9zaXRlX2NvbmZpZ19ub3RpZnkgKFhDb25maWd1 cmVFdmVudCAqeGV2LAogICAgICAgY2xpZW50ID0gbWJfd21fbWFuYWdlZF9jbGllbnRfZnJvbV9m cmFtZSAod20sIHhldi0+d2luZG93KTsKIAogICAgICAgaWYgKGNsaWVudCkKLQltYl93bV9jb21w X21ncl9jbGllbnRfY29uZmlndXJlIChjbGllbnQtPmNtX2NsaWVudCk7CisgICAgICAgIHsKKyAg ICAgICAgICBNQkdlb21ldHJ5IG9sZF9nZW9tOworICAgICAgICAgIG1iX3dtX2NsaWVudF9nZXRf Y292ZXJhZ2UgKGNsaWVudCwgJm9sZF9nZW9tKTsKKyAgICAgICAgICBpZiAoKG9sZF9nZW9tLngg IT0geGV2LT54KSB8fCAob2xkX2dlb20ueSAhPSB4ZXYtPnkpIHx8CisgICAgICAgICAgICAgIChv bGRfZ2VvbS53aWR0aCAhPSB4ZXYtPndpZHRoKSB8fAorICAgICAgICAgICAgICAob2xkX2dlb20u aGVpZ2h0ICE9IHhldi0+aGVpZ2h0KSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgbWJf d21fY29tcF9tZ3JfY2xpZW50X2NvbmZpZ3VyZSAoY2xpZW50LT5jbV9jbGllbnQpOworICAgICAg ICAgICAgfQorICAgICAgICB9CiAgICAgfQogICByZXR1cm4gVHJ1ZTsKIH0KLS0gCjEuNy4xMAoK 591 2012-06-17 10:15:12 +0000 2012-08-28 21:51:56 +0000 fix for disappearing windows (take-4) 0001-fix-for-issue:2583,-disappearing-windows.patch text/plain 1500 js RnJvbSA2OGQyNzY0ZDU1MTY3MzYwYjdjMWJlZDA2ZmY2YjIzOGI4OGM2NGRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgU3RlZXZlIDxqc0BoaXByby5jby5pbj4KRGF0ZTogU3Vu LCAxNyBKdW4gMjAxMiAxNDoyODoxMyArMDUzMApTdWJqZWN0OiBbUEFUQ0hdIGZpeCBmb3IgaXNz dWU6MjU4MywgZGlzYXBwZWFyaW5nIHdpbmRvd3MKCi0tLQogbWF0Y2hib3gvY29tcC1tZ3IvbWIt d20tY29tcC1tZ3IteHJlbmRlci5jIHwgICAxMCArKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwg MTAgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL21hdGNoYm94L2NvbXAtbWdyL21iLXdtLWNv bXAtbWdyLXhyZW5kZXIuYyBiL21hdGNoYm94L2NvbXAtbWdyL21iLXdtLWNvbXAtbWdyLXhyZW5k ZXIuYwppbmRleCBmZTdmNzViLi4xNjU0ODQyIDEwMDY0NAotLS0gYS9tYXRjaGJveC9jb21wLW1n ci9tYi13bS1jb21wLW1nci14cmVuZGVyLmMKKysrIGIvbWF0Y2hib3gvY29tcC1tZ3IvbWItd20t Y29tcC1tZ3IteHJlbmRlci5jCkBAIC0xMzIyLDYgKzEzMjIsNyBAQCBtYl93bV9jb21wX21ncl94 cmVuZGVyX2NsaWVudF9jb25maWd1cmVfcmVhbCAoTUJXTUNvbXBNZ3JDbGllbnQgKiBjbGllbnQp CiAgIE1CV01Db21wTWdyICAgICAgICAgICAgICAqIG1nciAgICAgICA9IHdtLT5jb21wX21ncjsK ICAgWHNlcnZlclJlZ2lvbiAgICAgICAgICAgICAgZGFtYWdlICAgID0gTm9uZTsKICAgWHNlcnZl clJlZ2lvbiAgICAgICAgICAgICAgZXh0ZW50czsKKyAgWFJlbmRlclBpY3R1cmVBdHRyaWJ1dGVz ICAgcGE7CiAKICAgZXh0ZW50cyA9IG1iX3dtX2NvbXBfbWdyX3hyZW5kZXJfY2xpZW50X2V4dGVu dHMgKGNsaWVudCk7CiAKQEAgLTEzMzAsNiArMTMzMSwxNSBAQCBtYl93bV9jb21wX21ncl94cmVu ZGVyX2NsaWVudF9jb25maWd1cmVfcmVhbCAoTUJXTUNvbXBNZ3JDbGllbnQgKiBjbGllbnQpCiAg ICAgICBYUmVuZGVyRnJlZVBpY3R1cmUgKHdtLT54ZHB5LCBkY2xpZW50LT5waWN0dXJlKTsKICAg ICAgIGRjbGllbnQtPnBpY3R1cmUgPSBOb25lOwogICAgIH0KKyAgcGEuc3Vid2luZG93X21vZGUg PSBJbmNsdWRlSW5mZXJpb3JzOworICBkY2xpZW50LT5waWN0dXJlID0gWFJlbmRlckNyZWF0ZVBp Y3R1cmUKKyAgICAod20tPnhkcHksCisgICAgIHdtX2NsaWVudC0+eHdpbl9mcmFtZSA/IHdtX2Ns aWVudC0+eHdpbl9mcmFtZSA6IHdtX2NsaWVudC0+d2luZG93LT54d2luZG93LAorICAgICBjbGll bnQtPmlzX2FyZ2IzMiA/CisgICAgIFhSZW5kZXJGaW5kU3RhbmRhcmRGb3JtYXQgKHdtLT54ZHB5 LCBQaWN0U3RhbmRhcmRBUkdCMzIpCisgICAgIDogWFJlbmRlckZpbmRWaXN1YWxGb3JtYXQgKHdt LT54ZHB5LCB3bV9jbGllbnQtPndpbmRvdy0+dmlzdWFsKSwKKyAgICAgQ1BTdWJ3aW5kb3dNb2Rl LCAmcGEpOworCiAKICAgZGFtYWdlID0gWEZpeGVzQ3JlYXRlUmVnaW9uICh3bS0+eGRweSwgMCwg MCk7CiAKLS0gCjEuNy4xMAoK 745 2012-08-28 21:51:56 +0000 2012-08-28 21:51:56 +0000 fix for disappearing windows (take-5) issue-2583-take-5 text/plain 7438 js RnJvbSAzZTAyYzllZGMwY2FlNzVmNTM1YjkzMTRjY2Q1NTc0OTg2Yzc0OWMwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgU3RlZXZlIDxqc0BoaXByby5jby5pbj4KRGF0ZTogV2Vk LCAyOSBBdWcgMjAxMiAwMzowNzowMCArMDUzMApTdWJqZWN0OiBbUEFUQ0hdIGZpeCBmb3IgaXNz dWU6MjU4MywgZGlzYXBwZWFyaW5nIHdpbmRvd3MKCiAgICBBZGRlZCBzdXBwb3J0IHRvIGhhbmRs ZSBjb25maWd1cmUgcmVhbCBieSBkcmF3aW5nIG9ubHkgd2hlbiBuZWVkZWQgaW4KICAgIGNvbXAt bWFuYWdlci4KLS0tCiBtYXRjaGJveC9jb21wLW1nci9tYi13bS1jb21wLW1nci1jbHV0dGVyLmMg fCAgICA2ICsrKystLQogbWF0Y2hib3gvY29tcC1tZ3IvbWItd20tY29tcC1tZ3IteHJlbmRlci5j IHwgICAyNyArKysrKysrKysrKysrKysrKysrKysrKystLS0KIG1hdGNoYm94L2NvbXAtbWdyL21i LXdtLWNvbXAtbWdyLmMgICAgICAgICB8ICAgIDUgKysrLS0KIG1hdGNoYm94L2NvbXAtbWdyL21i LXdtLWNvbXAtbWdyLmggICAgICAgICB8ICAgIDYgKysrKy0tCiBtYXRjaGJveC9jb3JlL21iLXdp bmRvdy1tYW5hZ2VyLmMgICAgICAgICAgfCAgICA5ICsrKysrKysrLQogbWF0Y2hib3gvY29yZS9t Yi13bS1jbGllbnQtYmFzZS5jICAgICAgICAgIHwgICAgMyArKy0KIDYgZmlsZXMgY2hhbmdlZCwg NDUgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbWF0Y2hib3gv Y29tcC1tZ3IvbWItd20tY29tcC1tZ3ItY2x1dHRlci5jIGIvbWF0Y2hib3gvY29tcC1tZ3IvbWIt d20tY29tcC1tZ3ItY2x1dHRlci5jCmluZGV4IDBmZDU0NzIuLjIxZDcyOGYgMTAwNjQ0Ci0tLSBh L21hdGNoYm94L2NvbXAtbWdyL21iLXdtLWNvbXAtbWdyLWNsdXR0ZXIuYworKysgYi9tYXRjaGJv eC9jb21wLW1nci9tYi13bS1jb21wLW1nci1jbHV0dGVyLmMKQEAgLTgzLDcgKzgzLDggQEAgc3Rh dGljIHZvaWQKIG1iX3dtX2NvbXBfbWdyX2NsdXR0ZXJfY2xpZW50X3JlcGFpcl9yZWFsIChNQldN Q29tcE1nckNsaWVudCAqIGNsaWVudCk7CiAKIHN0YXRpYyB2b2lkCi1tYl93bV9jb21wX21ncl9j bHV0dGVyX2NsaWVudF9jb25maWd1cmVfcmVhbCAoTUJXTUNvbXBNZ3JDbGllbnQgKiBjbGllbnQp OworbWJfd21fY29tcF9tZ3JfY2x1dHRlcl9jbGllbnRfY29uZmlndXJlX3JlYWwgKE1CV01Db21w TWdyQ2xpZW50ICogY2xpZW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIE1CV01HZW9tZXRyeSAqIGdlb21ldHJ5KTsKIAogc3RhdGljIHZvaWQKIG1iX3dt X2NvbXBfbWdyX2NsdXR0ZXJfY2xpZW50X2NsYXNzX2luaXQgKE1CV01PYmplY3RDbGFzcyAqa2xh c3MpCkBAIC03NzIsNyArNzczLDggQEAgbWJfd21fY29tcF9tZ3JfY2x1dHRlcl9jbGllbnRfcmVw YWlyX3JlYWwgKE1CV01Db21wTWdyQ2xpZW50ICogY2xpZW50KQogfQogCiBzdGF0aWMgdm9pZAot bWJfd21fY29tcF9tZ3JfY2x1dHRlcl9jbGllbnRfY29uZmlndXJlX3JlYWwgKE1CV01Db21wTWdy Q2xpZW50ICogY2xpZW50KQorbWJfd21fY29tcF9tZ3JfY2x1dHRlcl9jbGllbnRfY29uZmlndXJl X3JlYWwgKE1CV01Db21wTWdyQ2xpZW50ICogY2xpZW50LAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIE1CV01HZW9tZXRyeSAqIGdlb21ldHJ5KQogewogICBN QldpbmRvd01hbmFnZXJDbGllbnQgICAgKiB3bV9jbGllbnQgPSBjbGllbnQtPndtX2NsaWVudDsK ICAgTUJXTUNvbXBNZ3JDbHV0dGVyQ2xpZW50ICogY2NsaWVudCA9IE1CX1dNX0NPTVBfTUdSX0NM VVRURVJfQ0xJRU5UIChjbGllbnQpOwpkaWZmIC0tZ2l0IGEvbWF0Y2hib3gvY29tcC1tZ3IvbWIt d20tY29tcC1tZ3IteHJlbmRlci5jIGIvbWF0Y2hib3gvY29tcC1tZ3IvbWItd20tY29tcC1tZ3It eHJlbmRlci5jCmluZGV4IGZlN2Y3NWIuLmZjY2IwYjAgMTAwNjQ0Ci0tLSBhL21hdGNoYm94L2Nv bXAtbWdyL21iLXdtLWNvbXAtbWdyLXhyZW5kZXIuYworKysgYi9tYXRjaGJveC9jb21wLW1nci9t Yi13bS1jb21wLW1nci14cmVuZGVyLmMKQEAgLTYwLDcgKzYwLDggQEAgc3RhdGljIHZvaWQKIG1i X3dtX2NvbXBfbWdyX3hyZW5kZXJfY2xpZW50X3JlcGFpcl9yZWFsIChNQldNQ29tcE1nckNsaWVu dCAqIGNsaWVudCk7CiAKIHN0YXRpYyB2b2lkCi1tYl93bV9jb21wX21ncl94cmVuZGVyX2NsaWVu dF9jb25maWd1cmVfcmVhbCAoTUJXTUNvbXBNZ3JDbGllbnQgKiBjbGllbnQpOworbWJfd21fY29t cF9tZ3JfeHJlbmRlcl9jbGllbnRfY29uZmlndXJlX3JlYWwgKE1CV01Db21wTWdyQ2xpZW50ICog Y2xpZW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1C R2VvbWV0cnkgKiBnZW9tZXRyeSk7CiAKIHN0YXRpYyB2b2lkCiBtYl93bV9jb21wX21ncl94cmVu ZGVyX2NsaWVudF9jbGFzc19pbml0IChNQldNT2JqZWN0Q2xhc3MgKmtsYXNzKQpAQCAtMTMxNCw3 ICsxMzE1LDggQEAgbWJfd21fY29tcF9tZ3JfeHJlbmRlcl9jbGllbnRfcmVwYWlyX3JlYWwgKE1C V01Db21wTWdyQ2xpZW50ICogY2xpZW50KQogfQogCiBzdGF0aWMgdm9pZAotbWJfd21fY29tcF9t Z3JfeHJlbmRlcl9jbGllbnRfY29uZmlndXJlX3JlYWwgKE1CV01Db21wTWdyQ2xpZW50ICogY2xp ZW50KQorbWJfd21fY29tcF9tZ3JfeHJlbmRlcl9jbGllbnRfY29uZmlndXJlX3JlYWwgKE1CV01D b21wTWdyQ2xpZW50ICogY2xpZW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIE1CR2VvbWV0cnkgKiBnZW9tZXRyeSkKIHsKICAgTUJXTUNvbXBNZ3JEZWZh dWx0Q2xpZW50ICogZGNsaWVudCAgPSBNQl9XTV9DT01QX01HUl9ERUZBVUxUX0NMSUVOVCAoY2xp ZW50KTsKICAgTUJXaW5kb3dNYW5hZ2VyQ2xpZW50ICAgICogd21fY2xpZW50ID0gY2xpZW50LT53 bV9jbGllbnQ7CkBAIC0xMzIyLDE1ICsxMzI0LDM0IEBAIG1iX3dtX2NvbXBfbWdyX3hyZW5kZXJf Y2xpZW50X2NvbmZpZ3VyZV9yZWFsIChNQldNQ29tcE1nckNsaWVudCAqIGNsaWVudCkKICAgTUJX TUNvbXBNZ3IgICAgICAgICAgICAgICogbWdyICAgICAgID0gd20tPmNvbXBfbWdyOwogICBYc2Vy dmVyUmVnaW9uICAgICAgICAgICAgICBkYW1hZ2UgICAgPSBOb25lOwogICBYc2VydmVyUmVnaW9u ICAgICAgICAgICAgICBleHRlbnRzOworICBNQkdlb21ldHJ5ICAgICAgICAgICAgICAgICBvbGRf Z2VvbTsKKyAgWFJlbmRlclBpY3R1cmVBdHRyaWJ1dGVzICAgcGE7CiAKICAgZXh0ZW50cyA9IG1i X3dtX2NvbXBfbWdyX3hyZW5kZXJfY2xpZW50X2V4dGVudHMgKGNsaWVudCk7CiAKLSAgaWYgKGRj bGllbnQtPnBpY3R1cmUpCisgIG1iX3dtX2NsaWVudF9nZXRfY292ZXJhZ2UgKHdtX2NsaWVudCwg Jm9sZF9nZW9tKTsKKyAgaWYgKChkY2xpZW50LT5waWN0dXJlKSAmJgorICAgICAgKChvbGRfZ2Vv bS54ICE9IGdlb21ldHJ5LT54KSB8fCAob2xkX2dlb20ueSAhPSBnZW9tZXRyeS0+eSkgfHwKKyAg ICAgICAob2xkX2dlb20ud2lkdGggIT0gZ2VvbWV0cnktPndpZHRoKSB8fAorICAgICAgIChvbGRf Z2VvbS5oZWlnaHQgIT0gZ2VvbWV0cnktPmhlaWdodCkpKQogICAgIHsKICAgICAgIFhSZW5kZXJG cmVlUGljdHVyZSAod20tPnhkcHksIGRjbGllbnQtPnBpY3R1cmUpOwogICAgICAgZGNsaWVudC0+ cGljdHVyZSA9IE5vbmU7CiAgICAgfQogCisgIGlmICghZGNsaWVudC0+cGljdHVyZSkKKyAgICB7 CisgICAgICBwYS5zdWJ3aW5kb3dfbW9kZSA9IEluY2x1ZGVJbmZlcmlvcnM7CisgICAgICBkY2xp ZW50LT5waWN0dXJlID0gWFJlbmRlckNyZWF0ZVBpY3R1cmUKKyAgICAgICAgKHdtLT54ZHB5LAor ICAgICAgICAgd21fY2xpZW50LT54d2luX2ZyYW1lID8KKyAgICAgICAgIHdtX2NsaWVudC0+eHdp bl9mcmFtZSA6IHdtX2NsaWVudC0+d2luZG93LT54d2luZG93LAorICAgICAgICAgY2xpZW50LT5p c19hcmdiMzIgPworICAgICAgICAgWFJlbmRlckZpbmRTdGFuZGFyZEZvcm1hdCAod20tPnhkcHks IFBpY3RTdGFuZGFyZEFSR0IzMikKKyAgICAgICAgIDogWFJlbmRlckZpbmRWaXN1YWxGb3JtYXQg KHdtLT54ZHB5LCB3bV9jbGllbnQtPndpbmRvdy0+dmlzdWFsKSwKKyAgICAgICAgIENQU3Vid2lu ZG93TW9kZSwgJnBhKTsKKyAgICB9CisKICAgZGFtYWdlID0gWEZpeGVzQ3JlYXRlUmVnaW9uICh3 bS0+eGRweSwgMCwgMCk7CiAKICAgaWYgKGRjbGllbnQtPmV4dGVudHMpCmRpZmYgLS1naXQgYS9t YXRjaGJveC9jb21wLW1nci9tYi13bS1jb21wLW1nci5jIGIvbWF0Y2hib3gvY29tcC1tZ3IvbWIt d20tY29tcC1tZ3IuYwppbmRleCA2ODA2M2MzLi4xNjAzMDNmIDEwMDY0NAotLS0gYS9tYXRjaGJv eC9jb21wLW1nci9tYi13bS1jb21wLW1nci5jCisrKyBiL21hdGNoYm94L2NvbXAtbWdyL21iLXdt LWNvbXAtbWdyLmMKQEAgLTEzNCw3ICsxMzQsOCBAQCBtYl93bV9jb21wX21ncl9jbGllbnRfc2hv dyAoTUJXTUNvbXBNZ3JDbGllbnQgKiBjbGllbnQpCiB9CiAKIHZvaWQKLW1iX3dtX2NvbXBfbWdy X2NsaWVudF9jb25maWd1cmUgKE1CV01Db21wTWdyQ2xpZW50ICogY2xpZW50KQorbWJfd21fY29t cF9tZ3JfY2xpZW50X2NvbmZpZ3VyZSAoTUJXTUNvbXBNZ3JDbGllbnQgKiBjbGllbnQsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNQkdlb21ldHJ5ICogZ2VvbWV0cnkpCiB7CiAg IE1CV01Db21wTWdyQ2xpZW50Q2xhc3MgKmtsYXNzOwogCkBAIC0xNDQsNyArMTQ1LDcgQEAgbWJf d21fY29tcF9tZ3JfY2xpZW50X2NvbmZpZ3VyZSAoTUJXTUNvbXBNZ3JDbGllbnQgKiBjbGllbnQp CiAgIGtsYXNzID0gTUJfV01fQ09NUF9NR1JfQ0xJRU5UX0NMQVNTIChNQl9XTV9PQkpFQ1RfR0VU X0NMQVNTIChjbGllbnQpKTsKIAogICBNQldNX0FTU0VSVCAoa2xhc3MtPmNvbmZpZ3VyZSAhPSBO VUxMKTsKLSAga2xhc3MtPmNvbmZpZ3VyZSAoY2xpZW50KTsKKyAga2xhc3MtPmNvbmZpZ3VyZSAo Y2xpZW50LCBnZW9tZXRyeSk7CiB9CiAKIHZvaWQKZGlmZiAtLWdpdCBhL21hdGNoYm94L2NvbXAt bWdyL21iLXdtLWNvbXAtbWdyLmggYi9tYXRjaGJveC9jb21wLW1nci9tYi13bS1jb21wLW1nci5o CmluZGV4IDk4ZTljYmQuLjM1YWM4M2QgMTAwNjQ0Ci0tLSBhL21hdGNoYm94L2NvbXAtbWdyL21i LXdtLWNvbXAtbWdyLmgKKysrIGIvbWF0Y2hib3gvY29tcC1tZ3IvbWItd20tY29tcC1tZ3IuaApA QCAtMjIsNiArMjIsNyBAQAogI2RlZmluZSBfSEFWRV9NQl9XTV9DT01QX01HUl9ICiAKICNpbmNs dWRlIDxYMTEvZXh0ZW5zaW9ucy9YZGFtYWdlLmg+CisjaW5jbHVkZSA8bWF0Y2hib3gvY29yZS9t Yi13bS10eXBlcy5oPgogCiAjZGVmaW5lIE1CX1dNX0NPTVBfTUdSKGMpICgoTUJXTUNvbXBNZ3Iq KShjKSkKICNkZWZpbmUgTUJfV01fQ09NUF9NR1JfQ0xBU1MoYykgKChNQldNQ29tcE1nckNsYXNz KikoYykpCkBAIC0xMzcsNyArMTM4LDcgQEAgc3RydWN0IE1CV01Db21wTWdyQ2xpZW50Q2xhc3MK ICAgdm9pZCAoKnNob3cpICAgICAgKE1CV01Db21wTWdyQ2xpZW50ICogY2xpZW50KTsKICAgdm9p ZCAoKmhpZGUpICAgICAgKE1CV01Db21wTWdyQ2xpZW50ICogY2xpZW50KTsKICAgdm9pZCAoKnJl cGFpcikgICAgKE1CV01Db21wTWdyQ2xpZW50ICogY2xpZW50KTsKLSAgdm9pZCAoKmNvbmZpZ3Vy ZSkgKE1CV01Db21wTWdyQ2xpZW50ICogY2xpZW50KTsKKyAgdm9pZCAoKmNvbmZpZ3VyZSkgKE1C V01Db21wTWdyQ2xpZW50ICogY2xpZW50LCBNQkdlb21ldHJ5ICogZ2VvbWV0cnkpOwogfTsKIAog aW50CkBAIC0xNTMsNyArMTU0LDggQEAgdm9pZAogbWJfd21fY29tcF9tZ3JfY2xpZW50X3JlcGFp ciAoTUJXTUNvbXBNZ3JDbGllbnQgKiBjbGllbnQpOwogCiB2b2lkCi1tYl93bV9jb21wX21ncl9j bGllbnRfY29uZmlndXJlIChNQldNQ29tcE1nckNsaWVudCAqIGNsaWVudCk7CittYl93bV9jb21w X21ncl9jbGllbnRfY29uZmlndXJlIChNQldNQ29tcE1nckNsaWVudCAqIGNsaWVudCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1CR2VvbWV0cnkgKiBnZW9tZXRyeSk7CiAKIAog I2VuZGlmCmRpZmYgLS1naXQgYS9tYXRjaGJveC9jb3JlL21iLXdpbmRvdy1tYW5hZ2VyLmMgYi9t YXRjaGJveC9jb3JlL21iLXdpbmRvdy1tYW5hZ2VyLmMKaW5kZXggNmUyMDlhYy4uZjZjMjIzMiAx MDA2NDQKLS0tIGEvbWF0Y2hib3gvY29yZS9tYi13aW5kb3ctbWFuYWdlci5jCisrKyBiL21hdGNo Ym94L2NvcmUvbWItd2luZG93LW1hbmFnZXIuYwpAQCAtNTg2LDcgKzU4NiwxNCBAQCBtYl93bV9o YW5kbGVfY29tcG9zaXRlX2NvbmZpZ19ub3RpZnkgKFhDb25maWd1cmVFdmVudCAqeGV2LAogICAg ICAgY2xpZW50ID0gbWJfd21fbWFuYWdlZF9jbGllbnRfZnJvbV9mcmFtZSAod20sIHhldi0+d2lu ZG93KTsKIAogICAgICAgaWYgKGNsaWVudCkKLQltYl93bV9jb21wX21ncl9jbGllbnRfY29uZmln dXJlIChjbGllbnQtPmNtX2NsaWVudCk7CisgICAgICAgIHsKKyAgICAgICAgICBNQkdlb21ldHJ5 IG5ld19nZW9tZXRyeTsKKyAgICAgICAgICBuZXdfZ2VvbWV0cnkueCA9IHhldi0+eDsKKyAgICAg ICAgICBuZXdfZ2VvbWV0cnkueSA9IHhldi0+eTsKKyAgICAgICAgICBuZXdfZ2VvbWV0cnkud2lk dGggPSB4ZXYtPndpZHRoOworICAgICAgICAgIG5ld19nZW9tZXRyeS5oZWlnaHQgPSB4ZXYtPmhl aWdodDsKKyAgICAgICAgICBtYl93bV9jb21wX21ncl9jbGllbnRfY29uZmlndXJlIChjbGllbnQt PmNtX2NsaWVudCwgJm5ld19nZW9tZXRyeSk7CisgICAgICAgIH0KICAgICB9CiAgIHJldHVybiBU cnVlOwogfQpkaWZmIC0tZ2l0IGEvbWF0Y2hib3gvY29yZS9tYi13bS1jbGllbnQtYmFzZS5jIGIv bWF0Y2hib3gvY29yZS9tYi13bS1jbGllbnQtYmFzZS5jCmluZGV4IDRkYmY3YTcuLjY0NjBiMjIg MTAwNjQ0Ci0tLSBhL21hdGNoYm94L2NvcmUvbWItd20tY2xpZW50LWJhc2UuYworKysgYi9tYXRj aGJveC9jb3JlL21iLXdtLWNsaWVudC1iYXNlLmMKQEAgLTQxMyw3ICs0MTMsOCBAQCBtb3ZlX3Jl c2l6ZV9jbGllbnRfeHdpbiAoTUJXaW5kb3dNYW5hZ2VyQ2xpZW50ICpjbGllbnQsIGludCB4LCBp bnQgeSwgaW50IHcsIGludAogI2lmIEVOQUJMRV9DT01QT1NJVEUKICAgICAgIGlmIChtYl93bV9j b21wX21ncl9lbmFibGVkICh3bS0+Y29tcF9tZ3IpKQogCXsKLQkgIG1iX3dtX2NvbXBfbWdyX2Ns aWVudF9jb25maWd1cmUgKGNsaWVudC0+Y21fY2xpZW50KTsKKwkgIG1iX3dtX2NvbXBfbWdyX2Ns aWVudF9jb25maWd1cmUgKGNsaWVudC0+Y21fY2xpZW50LAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICZjbGllbnQtPndpbmRvdy0+eF9nZW9tZXRyeSk7CiAJfQog I2VuZGlmCiAgICAgfQotLSAKMS43LjEwLjQKCg==