152775 2007-11-23 13:48:28 +0000 Tabs cannot be closed using the close tab button 2008-01-29 18:31:19 +0000 1 1 2 Applications konqueror tabbing 4.0 unspecified Linux RESOLVED FIXED NOR major --- 1 alex-berger konqueror-bugs-null amantia apaku charlysnews kde lex.lists maksim vinzent.steinberg 20 oldest_to_newest 557532 0 alex-berger 2007-11-23 13:48:28 +0000 Version: 3.96.1 (KDE 4.0 >= 20071120) (using KDE 3.96.1 (KDE 4.0 >= 20071120), compiled sources) Compiler: gcc OS: Linux (x86_64) release 2.6.22-14-generic In konqueror's settings I have selected "Show close button instead of website icon". The website icons are then replaced with the close button, so far everything went alright. But pressing the button does not close the corresponding tab. Using the Key shortcut CTRL-W works as does right clicking on the tab and choosing the context menu entry "close tab". So it looks as if only the close buttons are not working. 557602 1 maksim 2007-11-23 18:50:17 +0000 Confirm. Also the setting doesn't apply immediately. 558777 2 maksim 2007-11-28 19:58:10 +0000 *** Bug 153065 has been marked as a duplicate of this bug. *** 558779 3 maksim 2007-11-28 19:58:53 +0000 *** Bug 151158 has been marked as a duplicate of this bug. *** 560554 4 pino 2007-12-05 17:51:44 +0000 *** Bug 153496 has been marked as a duplicate of this bug. *** 561530 5 pino 2007-12-09 15:23:02 +0000 *** Bug 153718 has been marked as a duplicate of this bug. *** 562927 6 pino 2007-12-13 16:44:59 +0000 *** Bug 153974 has been marked as a duplicate of this bug. *** 567064 7 22764 terwou 2007-12-29 22:35:21 +0000 Created attachment 22764 patch needs review 571114 8 maksim 2008-01-14 04:03:11 +0000 *** Bug 155709 has been marked as a duplicate of this bug. *** 572976 9 lex.lists 2008-01-19 07:33:42 +0000 That config option has no effect in kde 4.0 what so ever. 572988 10 amantia 2008-01-19 09:41:12 +0000 I fixed yesterday in trunk, might be backported to 4.0.x as well. 576384 11 felix.leimbach 2008-01-29 17:45:02 +0000 A backport to 4.0.x would be great as it trips people who use tabs extensively and don't want to open tabs before closing it. Thank you. 576391 12 tommi.tervo 2008-01-29 18:31:19 +0000 It's backported to 4.0 branch http://lists.kde.org/?l=kde-commits&m=120160002223449&w=2 22764 2007-12-29 22:35:21 +0000 2007-12-29 22:35:21 +0000 patch portclosebuttonontabs.patch text/plain 10195 terwou SW5kZXg6IGtkZWxpYnMva2RldWkvd2lkZ2V0cy9rdGFiYmFyLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2Rl bGlicy9rZGV1aS93aWRnZXRzL2t0YWJiYXIuaAkocmV2aXNpb24gNzUyNzIzKQorKysga2RlbGli cy9rZGV1aS93aWRnZXRzL2t0YWJiYXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTIyLDExICsxMjIs OSBAQAogICAgIHZpcnR1YWwgdm9pZCBkcm9wRXZlbnQoIFFEcm9wRXZlbnQgKmV2ZW50ICk7CiAK ICAgcHJvdGVjdGVkIFFfU0xPVFM6Ci0gICAgLy92aXJ0dWFsIHZvaWQgY2xvc2VCdXR0b25DbGlj a2VkKCk7Ci0gICAgLy92aXJ0dWFsIHZvaWQgZW5hYmxlQ2xvc2VCdXR0b24oKTsKKyAgICB2aXJ0 dWFsIHZvaWQgY2xvc2VCdXR0b25DbGlja2VkKCk7CisgICAgdmlydHVhbCB2b2lkIGVuYWJsZUNs b3NlQnV0dG9uKCk7CiAgICAgdmlydHVhbCB2b2lkIGFjdGl2YXRlRHJhZ1N3aXRjaFRhYigpOwot Ci0gIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgdGFiTGF5b3V0Q2hhbmdlKCk7CiAKICAg cHJpdmF0ZToKSW5kZXg6IGtkZWxpYnMva2RldWkvd2lkZ2V0cy9rdGFid2lkZ2V0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBrZGVsaWJzL2tkZXVpL3dpZGdldHMva3RhYndpZGdldC5jcHAJKHJldmlzaW9u IDc1MjcyMykKKysrIGtkZWxpYnMva2RldWkvd2lkZ2V0cy9rdGFid2lkZ2V0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTUxLDYgKzU1MSw3IEBACiB7CiAgIFFUYWJXaWRnZXQ6OnJlc2l6ZUV2ZW50 KCBldmVudCApOwogICBkLT5yZXNpemVUYWJzKCk7CisgIGVtaXQgcmVzaXplZCgpOwogfQogCiB2 b2lkIEtUYWJXaWRnZXQ6OnRhYkluc2VydGVkKCBpbnQgaWR4ICkKSW5kZXg6IGtkZWxpYnMva2Rl dWkvd2lkZ2V0cy9rdGFiYmFyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrZGVsaWJzL2tkZXVpL3dpZGdl dHMva3RhYmJhci5jcHAJKHJldmlzaW9uIDc1MjcyMykKKysrIGtkZWxpYnMva2RldWkvd2lkZ2V0 cy9rdGFiYmFyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksOCArMjksOSBAQAogI2luY2x1ZGUg PFF0R3VpL1FTdHlsZT4KIAogI2luY2x1ZGUgPGtnbG9iYWxzZXR0aW5ncy5oPgotI2luY2x1ZGUg PGtpY29ubG9hZGVyLmg+CisjaW5jbHVkZSA8a2ljb24uaD4KICNpbmNsdWRlIDxrbG9jYWxlLmg+ CisjaW5jbHVkZSA8a3N0eWxlLmg+CiAKIGNsYXNzIEtUYWJCYXI6OlByaXZhdGUKIHsKQEAgLTM4 LDExICszOSwxMSBAQAogICAgIFByaXZhdGUoKQogICAgICAgOiBtUmVvcmRlclN0YXJ0VGFiKCAt MSApLAogICAgICAgICBtUmVvcmRlclByZXZpb3VzVGFiKCAtMSApLAotICAgICAgICAvLyBtSG92 ZXJDbG9zZUJ1dHRvblRhYiggMCApLAorICAgICAgICBtSG92ZXJDbG9zZUJ1dHRvblRhYiggLTEg KSwKICAgICAgICAgbURyYWdTd2l0Y2hUYWIoIC0xICksCi0gICAgICAgIC8vIG1Ib3ZlckNsb3Nl QnV0dG9uKCAwICksCi0gICAgICAgIC8vIG1Ib3ZlckNsb3NlQnV0dG9uRW5hYmxlZCggZmFsc2Ug KSwKLSAgICAgICAgLy8gbUhvdmVyQ2xvc2VCdXR0b25EZWxheWVkKCB0cnVlICksCisgICAgICAg IG1Ib3ZlckNsb3NlQnV0dG9uKCAwICksCisgICAgICAgIG1Ib3ZlckNsb3NlQnV0dG9uRW5hYmxl ZCggZmFsc2UgKSwKKyAgICAgICAgbUhvdmVyQ2xvc2VCdXR0b25EZWxheWVkKCB0cnVlICksCiAg ICAgICAgIG1UYWJSZW9yZGVyaW5nRW5hYmxlZCggZmFsc2UgKSwKICAgICAgICAgbVRhYkNsb3Nl QWN0aXZhdGVQcmV2aW91cyggZmFsc2UgKQogICAgIHsKQEAgLTUxLDE0ICs1MiwxNCBAQAogICAg IFFQb2ludCBtRHJhZ1N0YXJ0OwogICAgIGludCBtUmVvcmRlclN0YXJ0VGFiOwogICAgIGludCBt UmVvcmRlclByZXZpb3VzVGFiOworICAgIGludCBtSG92ZXJDbG9zZUJ1dHRvblRhYjsKICAgICBp bnQgbURyYWdTd2l0Y2hUYWI7Ci0gICAgLy9RVGFiICptSG92ZXJDbG9zZUJ1dHRvblRhYiwgKm1E cmFnU3dpdGNoVGFiOwotICAgIC8vUVB1c2hCdXR0b24gKm1Ib3ZlckNsb3NlQnV0dG9uOwotICAg IC8vUVRpbWVyIG1FbmFibGVDbG9zZUJ1dHRvblRpbWVyOworICAgIFFQdXNoQnV0dG9uICptSG92 ZXJDbG9zZUJ1dHRvbjsKKyAgICBRVGltZXIgKm1FbmFibGVDbG9zZUJ1dHRvblRpbWVyOwogICAg IFFUaW1lciAqbUFjdGl2YXRlRHJhZ1N3aXRjaFRhYlRpbWVyOwogCi0gICAgLy9ib29sIG1Ib3Zl ckNsb3NlQnV0dG9uRW5hYmxlZDsKLSAgICAvL2Jvb2wgbUhvdmVyQ2xvc2VCdXR0b25EZWxheWVk OworICAgIGJvb2wgbUhvdmVyQ2xvc2VCdXR0b25FbmFibGVkIDogMTsKKyAgICBib29sIG1Ib3Zl ckNsb3NlQnV0dG9uRGVsYXllZCA6IDE7CiAgICAgYm9vbCBtVGFiUmVvcmRlcmluZ0VuYWJsZWQg OiAxOwogICAgIGJvb2wgbVRhYkNsb3NlQWN0aXZhdGVQcmV2aW91cyA6IDE7CiAKQEAgLTcxLDE0 ICs3MiwxNSBAQAogICBzZXRBY2NlcHREcm9wcyggdHJ1ZSApOwogICBzZXRNb3VzZVRyYWNraW5n KCB0cnVlICk7CiAKLSAgLy9kLT5tRW5hYmxlQ2xvc2VCdXR0b25UaW1lciA9IG5ldyBRVGltZXIo IHRoaXMgKTsKLSAgLy9jb25uZWN0KCBkLT5tRW5hYmxlQ2xvc2VCdXR0b25UaW1lciwgU0lHTkFM KCB0aW1lb3V0KCkgKSwgU0xPVCggZW5hYmxlQ2xvc2VCdXR0b24oKSApICk7CisgIGQtPm1FbmFi bGVDbG9zZUJ1dHRvblRpbWVyID0gbmV3IFFUaW1lciggdGhpcyApOworICBkLT5tRW5hYmxlQ2xv c2VCdXR0b25UaW1lci0+c2V0U2luZ2xlU2hvdCggdHJ1ZSApOworICBjb25uZWN0KCBkLT5tRW5h YmxlQ2xvc2VCdXR0b25UaW1lciwgU0lHTkFMKCB0aW1lb3V0KCkgKSwgU0xPVCggZW5hYmxlQ2xv c2VCdXR0b24oKSApICk7CiAKICAgZC0+bUFjdGl2YXRlRHJhZ1N3aXRjaFRhYlRpbWVyID0gbmV3 IFFUaW1lciggdGhpcyApOwogICBkLT5tQWN0aXZhdGVEcmFnU3dpdGNoVGFiVGltZXItPnNldFNp bmdsZVNob3QoIHRydWUgKTsKICAgY29ubmVjdCggZC0+bUFjdGl2YXRlRHJhZ1N3aXRjaFRhYlRp bWVyLCBTSUdOQUwoIHRpbWVvdXQoKSApLCBTTE9UKCBhY3RpdmF0ZURyYWdTd2l0Y2hUYWIoKSAp ICk7CiAKLSAgLy9jb25uZWN0KCB0aGlzLCBTSUdOQUwoIGxheW91dENoYW5nZWQoKSApLCBTTE9U KCBvbkxheW91dENoYW5nZSgpICkgKTsKKyAgY29ubmVjdCggcGFyZW50LCBTSUdOQUwoIHJlc2l6 ZWQoKSApLCBTTE9UKCB0YWJMYXlvdXRDaGFuZ2UoKSApICk7CiB9CiAKIEtUYWJCYXI6On5LVGFi QmFyKCkKQEAgLTEwNCw3ICsxMDYsNyBAQAogdm9pZCBLVGFiQmFyOjptb3VzZVByZXNzRXZlbnQo IFFNb3VzZUV2ZW50ICpldmVudCApCiB7CiAgIGlmICggZXZlbnQtPmJ1dHRvbigpID09IFF0OjpM ZWZ0QnV0dG9uICkgewotICAgIC8vZC0+bUVuYWJsZUNsb3NlQnV0dG9uVGltZXItPnN0b3AoKTsK KyAgICAgZC0+bUVuYWJsZUNsb3NlQnV0dG9uVGltZXItPnN0b3AoKTsKICAgICBkLT5tRHJhZ1N0 YXJ0ID0gZXZlbnQtPnBvcygpOwogICB9IGVsc2UgaWYoIGV2ZW50LT5idXR0b24oKSA9PSBRdDo6 UmlnaHRCdXR0b24gKSB7CiAgICAgaW50IHRhYiA9IHNlbGVjdFRhYiggZXZlbnQtPnBvcygpICk7 CkBAIC0xMjMsOSArMTI1LDkgQEAKIHsKICAgaWYgKCBldmVudC0+YnV0dG9ucygpID09IFF0OjpM ZWZ0QnV0dG9uICkgewogICAgIGludCB0YWIgPSBzZWxlY3RUYWIoIGV2ZW50LT5wb3MoKSApOwot ICAgIGlmICggZC0+bURyYWdTd2l0Y2hUYWIgJiYgdGFiICE9IGQtPm1EcmFnU3dpdGNoVGFiICkg eworICAgIGlmICggZC0+bURyYWdTd2l0Y2hUYWIgIT0gLTEgJiYgdGFiICE9IGQtPm1EcmFnU3dp dGNoVGFiICkgewogICAgICAgZC0+bUFjdGl2YXRlRHJhZ1N3aXRjaFRhYlRpbWVyLT5zdG9wKCk7 Ci0gICAgICBkLT5tRHJhZ1N3aXRjaFRhYiA9IDA7CisgICAgICBkLT5tRHJhZ1N3aXRjaFRhYiA9 IC0xOwogICAgIH0KIAogICAgIGludCBkZWxheSA9IEtHbG9iYWxTZXR0aW5nczo6ZG5kRXZlbnRE ZWxheSgpOwpAQCAtMTY3LDI3ICsxNjksMjcgQEAKICAgICB9CiAgIH0KIAotICAvKmlmICggZC0+ bUhvdmVyQ2xvc2VCdXR0b25FbmFibGVkICYmIGQtPm1SZW9yZGVyU3RhcnRUYWIgPT0gLTEgKSB7 Ci0gICAgICBRVGFiICp0ID0gc2VsZWN0VGFiKCBldmVudC0+cG9zKCkgKTsKLSAgICAgIGlmICgg dCAmJiB0LT5pY29uU2V0KCkgJiYgdC0+aXNFbmFibGVkKCkgKSB7Ci0gICAgICAgIFFQaXhtYXAg cGl4bWFwID0gdC0+aWNvblNldCgpLT5waXhtYXAoIFFJY29uOjpTbWFsbCwgUUljb246Ok5vcm1h bCApOwotICAgICAgICBRUmVjdCByZWN0KCAwLCAwLCBwaXhtYXAud2lkdGgoKSArIDQsIHBpeG1h cC5oZWlnaHQoKSArNCk7Ci0KKyAgaWYgKCBkLT5tSG92ZXJDbG9zZUJ1dHRvbkVuYWJsZWQgJiYg ZC0+bVJlb3JkZXJTdGFydFRhYiA9PSAtMSApIHsKKyAgICBpbnQgdGFiID0gc2VsZWN0VGFiKCBl dmVudC0+cG9zKCkgKTsKKyAgICBpZiAoIHRhYiAhPSAtMSAmJiAhdGFiSWNvbiggdGFiICkuaXNO dWxsKCkgJiYgaXNUYWJFbmFibGVkKCB0YWIgKSApIHsKKyAgICAgICAgUVBpeG1hcCBwaXhtYXAg PSB0YWJJY29uKCB0YWIgKS5waXhtYXAoIDE2LCBRSWNvbjo6Tm9ybWFsICk7CisgICAgICAgIFFS ZWN0IHJlY3QoIDAsIDAsIHBpeG1hcC53aWR0aCgpLCBwaXhtYXAuaGVpZ2h0KCkgKTsKICAgICAg ICAgaW50IHhvZmYgPSAwLCB5b2ZmID0gMDsKLSAgICAgICAgLy8gVGhlIGFkZGl0aW9uYWwgb2Zm c2V0cyB3ZXJlIGZvdW5kIGJ5IHRyeSBhbmQgZXJyb3IsIFRPRE86IGZpbmQgdGhlIHJhdGlvbmFs IGJlaGluZCB0aGVtCi0gICAgICAgIGlmICggdCA9PSB0YWIoIGN1cnJlbnRUYWIoKSApICkgewot ICAgICAgICAgICAgeG9mZiA9IHN0eWxlKCkucGl4ZWxNZXRyaWMoIFFTdHlsZTo6UE1fVGFiQmFy VGFiU2hpZnRIb3Jpem9udGFsLCB0aGlzICkgKyAzOwotICAgICAgICAgICAgeW9mZiA9IHN0eWxl KCkucGl4ZWxNZXRyaWMoIFFTdHlsZTo6UE1fVGFiQmFyVGFiU2hpZnRWZXJ0aWNhbCwgdGhpcyAp IC0gNDsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHhvZmYgPSA3OwotICAgICAgICAg ICAgeW9mZiA9IDA7CisgICAgICAgIGlmICggdGFiICE9IGN1cnJlbnRJbmRleCgpICkgeworICAg ICAgICAgICAgeG9mZiA9IHN0eWxlKCktPnBpeGVsTWV0cmljKCBRU3R5bGU6OlBNX1RhYkJhclRh YlNoaWZ0SG9yaXpvbnRhbCwgMCwgdGhpcyApIC8gMjsKKyAgICAgICAgICAgIHlvZmYgPSBzdHls ZSgpLT5waXhlbE1ldHJpYyggUVN0eWxlOjpQTV9UYWJCYXJUYWJTaGlmdFZlcnRpY2FsLCAwLCB0 aGlzICkgLyAyOwogICAgICAgICB9CiAKLSAgICAgICAgcmVjdC5tb3ZlTGVmdCggdC0+cmVjdCgp LmxlZnQoKSArIDIgKyB4b2ZmICk7Ci0gICAgICAgIHJlY3QubW92ZVRvcCggdC0+cmVjdCgpLmNl bnRlcigpLnkoKSAtIHBpeG1hcC5oZWlnaHQoKSAvIDIgKyB5b2ZmICk7CisgICAgICAgIEtTdHls ZSAqa3N0eWxlID0gcW9iamVjdF9jYXN0PEtTdHlsZSAqPiggc3R5bGUoKSApOworICAgICAgICBp ZiAoIGtzdHlsZSApCisgICAgICAgICAgICByZWN0Lm1vdmVMZWZ0KCB0YWJSZWN0KCB0YWIgKS5s ZWZ0KCkgKyBzdHlsZSgpLT5waXhlbE1ldHJpYyggUVN0eWxlOjpQTV9UYWJCYXJUYWJPdmVybGFw LCAwLCB0aGlzICkgKiAyICsgc3R5bGUoKS0+cGl4ZWxNZXRyaWMoIFFTdHlsZTo6UE1fVGFiQmFy QmFzZU92ZXJsYXAsIDAsIHRoaXMgKSAqIDIgKyB4b2ZmKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgcmVjdC5tb3ZlTGVmdCggdGFiUmVjdCggdGFiICkubGVmdCgpICsgIHN0eWxlKCktPnBp eGVsTWV0cmljKCBRU3R5bGU6OlBNX1RhYkJhclRhYk92ZXJsYXAsIDAsIHRoaXMgKSAqIDIgKyB4 b2ZmKTsKKworICAgICAgICByZWN0Lm1vdmVUb3AoIHRhYlJlY3QoIHRhYiApLmNlbnRlcigpLnko KSAtIHBpeG1hcC5oZWlnaHQoKSAvIDIgKyB5b2ZmICk7CiAgICAgICAgIGlmICggcmVjdC5jb250 YWlucyggZXZlbnQtPnBvcygpICkgKSB7CiAgICAgICAgICAgaWYgKCBkLT5tSG92ZXJDbG9zZUJ1 dHRvbiApIHsKLSAgICAgICAgICAgIGlmICggZC0+bUhvdmVyQ2xvc2VCdXR0b25UYWIgPT0gdCAp CisgICAgICAgICAgICBpZiAoIGQtPm1Ib3ZlckNsb3NlQnV0dG9uVGFiID09IHRhYiApCiAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIGQtPm1FbmFibGVDbG9zZUJ1dHRvblRpbWVy LT5zdG9wKCk7CiAgICAgICAgICAgICBkLT5tSG92ZXJDbG9zZUJ1dHRvbi0+ZGVsZXRlTGF0ZXIo KTsKQEAgLTE5NSwxNyArMTk3LDE2IEBACiAgICAgICAgICAgfQogCiAgICAgICAgICAgZC0+bUhv dmVyQ2xvc2VCdXR0b24gPSBuZXcgUVB1c2hCdXR0b24oIHRoaXMgKTsKLSAgICAgICAgICBkLT5t SG92ZXJDbG9zZUJ1dHRvbi0+c2V0SWNvbiggS0dsb2JhbDo6aWNvbkxvYWRlcigpLT5sb2FkSWNv blNldCggIndpbmRvdy1jbG9zZSIsIEtJY29uTG9hZGVyOjpUb29sYmFyLCBLSWNvbkxvYWRlcjo6 U2l6ZVNtYWxsICkgKTsKKyAgICAgICAgICBkLT5tSG92ZXJDbG9zZUJ1dHRvbi0+c2V0SWNvbigg S0ljb24oICJ3aW5kb3ctY2xvc2UiICkgKTsKICAgICAgICAgICBkLT5tSG92ZXJDbG9zZUJ1dHRv bi0+c2V0R2VvbWV0cnkoIHJlY3QgKTsKICAgICAgICAgICBkLT5tSG92ZXJDbG9zZUJ1dHRvbi0+ c2V0VG9vbFRpcCggaTE4biggIkNsb3NlIHRoaXMgdGFiIiApICk7Ci0gICAgICAgICAgZC0+bUhv dmVyQ2xvc2VCdXR0b24tPnNldEZsYXQoIHRydWUgKTsKICAgICAgICAgICBkLT5tSG92ZXJDbG9z ZUJ1dHRvbi0+c2hvdygpOwogICAgICAgICAgIGlmICggZC0+bUhvdmVyQ2xvc2VCdXR0b25EZWxh eWVkICkgewogICAgICAgICAgICAgZC0+bUhvdmVyQ2xvc2VCdXR0b24tPnNldEVuYWJsZWQoIGZh bHNlICk7Ci0gICAgICAgICAgICBkLT5tRW5hYmxlQ2xvc2VCdXR0b25UaW1lci0+c3RhcnQoIFFB cHBsaWNhdGlvbjo6ZG91YmxlQ2xpY2tJbnRlcnZhbCgpLCB0cnVlICk7CisgICAgICAgICAgICBk LT5tRW5hYmxlQ2xvc2VCdXR0b25UaW1lci0+c3RhcnQoIFFBcHBsaWNhdGlvbjo6ZG91YmxlQ2xp Y2tJbnRlcnZhbCgpICk7CiAgICAgICAgICAgfQogCi0gICAgICAgICAgZC0+bUhvdmVyQ2xvc2VC dXR0b25UYWIgPSB0OworICAgICAgICAgIGQtPm1Ib3ZlckNsb3NlQnV0dG9uVGFiID0gdGFiOwog ICAgICAgICAgIGNvbm5lY3QoIGQtPm1Ib3ZlckNsb3NlQnV0dG9uLCBTSUdOQUwoIGNsaWNrZWQo KSApLCBTTE9UKCBjbG9zZUJ1dHRvbkNsaWNrZWQoKSApICk7CiAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CkBAIC0yMTYsMTcgKzIxNywxNSBAQAogICAgICAgICBkLT5tSG92ZXJDbG9zZUJ1 dHRvbi0+ZGVsZXRlTGF0ZXIoKTsKICAgICAgICAgZC0+bUhvdmVyQ2xvc2VCdXR0b24gPSAwOwog ICAgICAgfQotICB9Ki8KKyAgfQogCiAgIFFUYWJCYXI6Om1vdXNlTW92ZUV2ZW50KCBldmVudCAp OwogfQogCi0vKgogdm9pZCBLVGFiQmFyOjplbmFibGVDbG9zZUJ1dHRvbigpCiB7CiAgIGQtPm1I b3ZlckNsb3NlQnV0dG9uLT5zZXRFbmFibGVkKCB0cnVlICk7CiB9Ci0qLwogCiB2b2lkIEtUYWJC YXI6OmFjdGl2YXRlRHJhZ1N3aXRjaFRhYigpCiB7CkBAIC0yMzQsNyArMjMzLDcgQEAKICAgaWYg KCB0YWIgIT0gLTEgJiYgZC0+bURyYWdTd2l0Y2hUYWIgPT0gdGFiICkKICAgICBzZXRDdXJyZW50 SW5kZXgoIGQtPm1EcmFnU3dpdGNoVGFiICk7CiAKLSAgZC0+bURyYWdTd2l0Y2hUYWIgPSAwOwor ICBkLT5tRHJhZ1N3aXRjaFRhYiA9IC0xOwogfQogCiB2b2lkIEtUYWJCYXI6Om1vdXNlUmVsZWFz ZUV2ZW50KCBRTW91c2VFdmVudCAqZXZlbnQgKQpAQCAtMjg5LDcgKzI4OCw3IEBACiAgIGludCB0 YWIgPSBzZWxlY3RUYWIoIGV2ZW50LT5wb3MoKSApOwogICBpZiAoIHRhYiAhPSAtMSApIHsKICAg ICBkLT5tQWN0aXZhdGVEcmFnU3dpdGNoVGFiVGltZXItPnN0b3AoKTsKLSAgICBkLT5tRHJhZ1N3 aXRjaFRhYiA9IDA7CisgICAgZC0+bURyYWdTd2l0Y2hUYWIgPSAtMTsKICAgICBlbWl0IHJlY2Vp dmVkRHJvcEV2ZW50KCB0YWIgLCBldmVudCApOwogICAgIHJldHVybjsKICAgfQpAQCAtMzI3LDU3 ICszMjYsNDIgQEAKICAgZC0+bVRhYkNsb3NlQWN0aXZhdGVQcmV2aW91cyA9IG9uOwogfQogCi0v Kgogdm9pZCBLVGFiQmFyOjpjbG9zZUJ1dHRvbkNsaWNrZWQoKQogewotICBlbWl0IGNsb3NlUmVx dWVzdCggaW5kZXhPZiggZC0+bUhvdmVyQ2xvc2VCdXR0b25UYWItPmlkZW50aWZpZXIoKSApICk7 CisgIGVtaXQgY2xvc2VSZXF1ZXN0KCBkLT5tSG92ZXJDbG9zZUJ1dHRvblRhYiApOwogfQotKi8K IAotdm9pZCBLVGFiQmFyOjpzZXRIb3ZlckNsb3NlQnV0dG9uKCBib29sIC8qYnV0dG9uKi8gKQor dm9pZCBLVGFiQmFyOjpzZXRIb3ZlckNsb3NlQnV0dG9uKCBib29sIGJ1dHRvbiApCiB7Ci0gIC8v IEtERTQgcG9ydGluZzogZGlzYWJsZWQKLSAgcmV0dXJuOwotCi0vKgogICBkLT5tSG92ZXJDbG9z ZUJ1dHRvbkVuYWJsZWQgPSBidXR0b247CiAgIGlmICggIWJ1dHRvbiApCiAgICAgdGFiTGF5b3V0 Q2hhbmdlKCk7Ci0qLworCiB9CiAKIGJvb2wgS1RhYkJhcjo6aG92ZXJDbG9zZUJ1dHRvbigpIGNv bnN0CiB7Ci0gIC8vIEtERTQgcG9ydGluZzogZGlzYWJsZWQKLSAgcmV0dXJuIGZhbHNlOwotCi0g IC8vcmV0dXJuIGQtPm1Ib3ZlckNsb3NlQnV0dG9uRW5hYmxlZDsKKyAgcmV0dXJuIGQtPm1Ib3Zl ckNsb3NlQnV0dG9uRW5hYmxlZDsKIH0KIAotdm9pZCBLVGFiQmFyOjpzZXRIb3ZlckNsb3NlQnV0 dG9uRGVsYXllZCggYm9vbCAvKmRlbGF5ZWQqLyApCit2b2lkIEtUYWJCYXI6OnNldEhvdmVyQ2xv c2VCdXR0b25EZWxheWVkKCBib29sIGRlbGF5ZWQgKQogewotICAvLyBLREU0IHBvcnRpbmc6IGRp c2FibGVkCi0gIHJldHVybjsKLQotICAvL2QtPm1Ib3ZlckNsb3NlQnV0dG9uRGVsYXllZCA9IGRl bGF5ZWQ7CisgIGQtPm1Ib3ZlckNsb3NlQnV0dG9uRGVsYXllZCA9IGRlbGF5ZWQ7CiB9CiAKIGJv b2wgS1RhYkJhcjo6aG92ZXJDbG9zZUJ1dHRvbkRlbGF5ZWQoKSBjb25zdAogewotICAvLyBLREU0 IHBvcnRpbmc6IGRpc2FibGVkCi0gIHJldHVybiBmYWxzZTsKLQotICAvL3JldHVybiBkLT5tSG92 ZXJDbG9zZUJ1dHRvbkRlbGF5ZWQ7CisgIHJldHVybiBkLT5tSG92ZXJDbG9zZUJ1dHRvbkRlbGF5 ZWQ7CiB9CiAKIHZvaWQgS1RhYkJhcjo6dGFiTGF5b3V0Q2hhbmdlKCkKIHsKLSAgLy9kLT5tRW5h YmxlQ2xvc2VCdXR0b25UaW1lci0+c3RvcCgpOwotICAvL2RlbGV0ZSBkLT5tSG92ZXJDbG9zZUJ1 dHRvbjsKLSAgLy9kLT5tSG92ZXJDbG9zZUJ1dHRvbiA9IDA7Ci0gIC8vZC0+bUhvdmVyQ2xvc2VC dXR0b25UYWIgPSAwOworICBkLT5tRW5hYmxlQ2xvc2VCdXR0b25UaW1lci0+c3RvcCgpOworICBk ZWxldGUgZC0+bUhvdmVyQ2xvc2VCdXR0b247CisgIGQtPm1Ib3ZlckNsb3NlQnV0dG9uID0gMDsK KyAgZC0+bUhvdmVyQ2xvc2VCdXR0b25UYWIgPSAtMTsKICAgZC0+bUFjdGl2YXRlRHJhZ1N3aXRj aFRhYlRpbWVyLT5zdG9wKCk7Ci0gIGQtPm1EcmFnU3dpdGNoVGFiID0gMDsKKyAgZC0+bURyYWdT d2l0Y2hUYWIgPSAtMTsKIH0KIAogaW50IEtUYWJCYXI6OnNlbGVjdFRhYiggY29uc3QgUVBvaW50 ICZwb3MgKSBjb25zdApJbmRleDoga2RlbGlicy9rZGV1aS93aWRnZXRzL2t0YWJ3aWRnZXQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBrZGVsaWJzL2tkZXVpL3dpZGdldHMva3RhYndpZGdldC5oCShyZXZpc2lv biA3NTI3MjMpCisrKyBrZGVsaWJzL2tkZXVpL3dpZGdldHMva3RhYndpZGdldC5oCSh3b3JraW5n IGNvcHkpCkBAIC0yODAsNiArMjgwLDggQEAKICAgICAgKi8KICAgICB2b2lkIGNsb3NlUmVxdWVz dCggUVdpZGdldCAqICk7CiAKKyAgICB2b2lkIHJlc2l6ZWQoKTsKKwogICBwcm90ZWN0ZWQ6CiAg ICAgdmlydHVhbCB2b2lkIG1vdXNlRG91YmxlQ2xpY2tFdmVudCggUU1vdXNlRXZlbnQqICk7CiAg ICAgdmlydHVhbCB2b2lkIG1vdXNlUHJlc3NFdmVudCggUU1vdXNlRXZlbnQqICk7Cg==