53000 2011-01-24 02:48:36 -0800 [Qt] Regroup MiniBrowser's menubar and add open file action 2011-01-24 03:54:21 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 zoltan zoltan oldest_to_newest 338919 0 79907 zoltan 2011-01-24 02:48:36 -0800 Created attachment 79907 proposed patch Add File and Develop menu to MiniBrowser's menubar and add open file action to File menu. 338920 1 79908 zoltan 2011-01-24 02:49:51 -0800 Created attachment 79908 proposed patch, bug number included 79907 2011-01-24 02:48:36 -0800 2011-01-24 02:49:51 -0800 proposed patch mb.patch text/plain 4780 zoltan ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2Mzc2 MjY0Li4zOWE4MDJhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDEtMjQgIFpvbHRhbiBIb3J2YXRoICA8em9s dGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKwor ICAgICAgICBbUXRdIFJlZ3JvdXAgTWluaUJyb3dzZXIncyBtZW51YmFyIGFuZCBhZGQgb3BlbiBm aWxlIGFjdGlvbgorCisgICAgICAgIEFkZCBGaWxlIGFuZCBEZXZlbG9wIG1lbnUgdG8gTWluaUJy b3dzZXIncyBtZW51YmFyIGFuZCBhZGQgb3BlbiBmaWxlIGFjdGlvbiB0byBGaWxlIG1lbnUuCisK KyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcDoKKyAgICAgICAgKEJy b3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3cpOgorICAgICAgICAoQnJvd3NlcldpbmRvdzo6b3Bl bkZpbGUpOgorICAgICAgICAoQnJvd3NlcldpbmRvdzo6fkJyb3dzZXJXaW5kb3cpOgorICAgICAg ICAqIE1pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaDoKKwogMjAxMS0wMS0yMiAgR2VvZmZy ZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBC ZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93 LmNwcCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwCmluZGV4IGM2M2M5 ZDYuLmMzN2QzNmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5k b3cuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwCkBAIC00 MCwyMiArNDAsMjUgQEAgQnJvd3NlcldpbmRvdzo6QnJvd3NlcldpbmRvdyhRV0tDb250ZXh0KiBj b250ZXh0KQogewogICAgIHNldEF0dHJpYnV0ZShRdDo6V0FfRGVsZXRlT25DbG9zZSk7CiAKLSAg ICBtX21lbnUgPSBuZXcgUU1lbnVCYXIoKTsKLSAgICBtX2Jyb3dzZXIgPSBuZXcgQnJvd3NlclZp ZXcoYmFja2luZ1N0b3JlVHlwZUZvck5ld1dpbmRvdywgY29udGV4dCk7Ci0gICAgbV9hZGRyZXNz QmFyID0gbmV3IFFMaW5lRWRpdCgpOworICAgIFFNZW51KiBmaWxlTWVudSA9IG1lbnVCYXIoKS0+ YWRkTWVudSgiJkZpbGUiKTsKKyAgICBmaWxlTWVudS0+YWRkQWN0aW9uKCJOZXcgV2luZG93Iiwg dGhpcywgU0xPVChuZXdXaW5kb3coKSksIFFLZXlTZXF1ZW5jZTo6TmV3KTsKKyAgICBmaWxlTWVu dS0+YWRkQWN0aW9uKCJPcGVuIEZpbGUiLCB0aGlzLCBTTE9UKG9wZW5GaWxlKCkpLCBRS2V5U2Vx dWVuY2U6Ok9wZW4pOworICAgIGZpbGVNZW51LT5hZGRTZXBhcmF0b3IoKTsKKyAgICBmaWxlTWVu dS0+YWRkQWN0aW9uKCJRdWl0IiwgdGhpcywgU0xPVChjbG9zZSgpKSk7CiAKLSAgICBtX21lbnUt PmFkZEFjdGlvbigiTmV3IFdpbmRvdyIsIHRoaXMsIFNMT1QobmV3V2luZG93KCkpKTsKLSAgICBt X21lbnUtPmFkZEFjdGlvbigiQ2hhbmdlIFVzZXIgQWdlbnQiLCB0aGlzLCBTTE9UKHNob3dVc2Vy QWdlbnREaWFsb2coKSkpOworICAgIFFNZW51KiB0b29sc01lbnUgPSBtZW51QmFyKCktPmFkZE1l bnUoIiZEZXZlbG9wIik7CisgICAgdG9vbHNNZW51LT5hZGRBY3Rpb24oIkNoYW5nZSBVc2VyIEFn ZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlhbG9nKCkpKTsKIAotICAgIG1fbWVudS0+ YWRkU2VwYXJhdG9yKCk7Ci0gICAgbV9tZW51LT5hZGRBY3Rpb24oIlF1aXQiLCB0aGlzLCBTTE9U KGNsb3NlKCkpKTsKKyAgICBtX2Jyb3dzZXIgPSBuZXcgQnJvd3NlclZpZXcoYmFja2luZ1N0b3Jl VHlwZUZvck5ld1dpbmRvdywgY29udGV4dCk7CisgICAgY29ubmVjdChtX2Jyb3dzZXItPnZpZXco KSwgU0lHTkFMKGxvYWRQcm9ncmVzcyhpbnQpKSwgU0xPVChsb2FkUHJvZ3Jlc3MoaW50KSkpOwor ICAgIGNvbm5lY3QobV9icm93c2VyLT52aWV3KCksIFNJR05BTCh0aXRsZUNoYW5nZWQoY29uc3Qg UVN0cmluZyYpKSwgU0xPVCh0aXRsZUNoYW5nZWQoY29uc3QgUVN0cmluZyYpKSk7CisgICAgY29u bmVjdChtX2Jyb3dzZXItPnZpZXcoKSwgU0lHTkFMKHVybENoYW5nZWQoY29uc3QgUVVybCYpKSwg U0xPVCh1cmxDaGFuZ2VkKGNvbnN0IFFVcmwmKSkpOwogCisgICAgdGhpcy0+c2V0Q2VudHJhbFdp ZGdldChtX2Jyb3dzZXIpOwogICAgIG1fYnJvd3Nlci0+c2V0Rm9jdXMoUXQ6Ok90aGVyRm9jdXNS ZWFzb24pOwogCisgICAgbV9hZGRyZXNzQmFyID0gbmV3IFFMaW5lRWRpdCgpOwogICAgIGNvbm5l Y3QobV9hZGRyZXNzQmFyLCBTSUdOQUwocmV0dXJuUHJlc3NlZCgpKSwgU0xPVChjaGFuZ2VMb2Nh dGlvbigpKSk7Ci0gICAgY29ubmVjdChtX2Jyb3dzZXItPnZpZXcoKSwgU0lHTkFMKGxvYWRQcm9n cmVzcyhpbnQpKSwgU0xPVChsb2FkUHJvZ3Jlc3MoaW50KSkpOwotICAgIGNvbm5lY3QobV9icm93 c2VyLT52aWV3KCksIFNJR05BTCh0aXRsZUNoYW5nZWQoY29uc3QgUVN0cmluZyYpKSwgU0xPVCh0 aXRsZUNoYW5nZWQoY29uc3QgUVN0cmluZyYpKSk7Ci0gICAgY29ubmVjdChtX2Jyb3dzZXItPnZp ZXcoKSwgU0lHTkFMKHVybENoYW5nZWQoY29uc3QgUVVybCYpKSwgU0xPVCh1cmxDaGFuZ2VkKGNv bnN0IFFVcmwmKSkpOwogCiAgICAgUVRvb2xCYXIqIGJhciA9IGFkZFRvb2xCYXIoIk5hdmlnYXRp b24iKTsKICAgICBiYXItPmFkZEFjdGlvbihwYWdlKCktPmFjdGlvbihRV0tQYWdlOjpCYWNrKSk7 CkBAIC02NCwxMSArNjcsNiBAQCBCcm93c2VyV2luZG93OjpCcm93c2VyV2luZG93KFFXS0NvbnRl eHQqIGNvbnRleHQpCiAgICAgYmFyLT5hZGRBY3Rpb24ocGFnZSgpLT5hY3Rpb24oUVdLUGFnZTo6 U3RvcCkpOwogICAgIGJhci0+YWRkV2lkZ2V0KG1fYWRkcmVzc0Jhcik7CiAKLSAgICB0aGlzLT5z ZXRNZW51QmFyKG1fbWVudSk7Ci0gICAgdGhpcy0+c2V0Q2VudHJhbFdpZGdldChtX2Jyb3dzZXIp OwotCi0gICAgbV9icm93c2VyLT5zZXRGb2N1cyhRdDo6T3RoZXJGb2N1c1JlYXNvbik7Ci0KICAg ICBRU2hvcnRjdXQqIHNlbGVjdEFkZHJlc3NCYXIgPSBuZXcgUVNob3J0Y3V0KFF0OjpDVFJMIHwg UXQ6OktleV9MLCB0aGlzKTsKICAgICBjb25uZWN0KHNlbGVjdEFkZHJlc3NCYXIsIFNJR05BTChh Y3RpdmF0ZWQoKSksIHRoaXMsIFNMT1Qob3BlbkxvY2F0aW9uKCkpKTsKIApAQCAtMTM3LDYgKzEz NSwyNCBAQCB2b2lkIEJyb3dzZXJXaW5kb3c6OnVybENoYW5nZWQoY29uc3QgUVVybCYgdXJsKQog ICAgIG1fYWRkcmVzc0Jhci0+c2V0VGV4dCh1cmwudG9TdHJpbmcoKSk7CiB9CiAKK3ZvaWQgQnJv d3NlcldpbmRvdzo6b3BlbkZpbGUoKQoreworI2lmbmRlZiBRVF9OT19GSUxFRElBTE9HCisgICAg c3RhdGljIGNvbnN0IFFTdHJpbmcgZmlsdGVyKCJIVE1MIEZpbGVzICgqLmh0bSAqLmh0bWwgKi54 aHRtbCk7O1RleHQgRmlsZXMgKCoudHh0KTs7SW1hZ2UgRmlsZXMgKCouZ2lmICouanBnICoucG5n KTs7U1ZHIEZpbGVzICgqLnN2Zyk7O0FsbCBGaWxlcyAoKikiKTsKKworICAgIFFGaWxlRGlhbG9n IGZpbGVEaWFsb2codGhpcywgdHIoIk9wZW4iKSwgUVN0cmluZygpLCBmaWx0ZXIpOworICAgIGZp bGVEaWFsb2cuc2V0QWNjZXB0TW9kZShRRmlsZURpYWxvZzo6QWNjZXB0T3Blbik7CisgICAgZmls ZURpYWxvZy5zZXRGaWxlTW9kZShRRmlsZURpYWxvZzo6RXhpc3RpbmdGaWxlKTsKKyAgICBmaWxl RGlhbG9nLnNldE9wdGlvbnMoUUZpbGVEaWFsb2c6OlJlYWRPbmx5KTsKKworICAgIGlmIChmaWxl RGlhbG9nLmV4ZWMoKSkgeworICAgICAgICBRU3RyaW5nIHNlbGVjdGVkRmlsZSA9IGZpbGVEaWFs b2cuc2VsZWN0ZWRGaWxlcygpWzBdOworICAgICAgICBpZiAoIXNlbGVjdGVkRmlsZS5pc0VtcHR5 KCkpCisgICAgICAgICAgICBsb2FkKHNlbGVjdGVkRmlsZSk7CisgICAgfQorI2VuZGlmCit9CisK IHZvaWQgQnJvd3NlcldpbmRvdzo6dXBkYXRlVXNlckFnZW50TGlzdCgpCiB7CiAgICAgUUZpbGUg ZmlsZSgiOi91c2VyYWdlbnRsaXN0LnR4dCIpOwpAQCAtMTg5LDUgKzIwNSw0IEBAIEJyb3dzZXJX aW5kb3c6On5Ccm93c2VyV2luZG93KCkKIHsKICAgICBkZWxldGUgbV9hZGRyZXNzQmFyOwogICAg IGRlbGV0ZSBtX2Jyb3dzZXI7Ci0gICAgZGVsZXRlIG1fbWVudTsKIH0KZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0 L0Jyb3dzZXJXaW5kb3cuaAppbmRleCBmOTg0MzA5Li4yYTA0YWE4IDEwMDY0NAotLS0gYS9Ub29s cy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIv cXQvQnJvd3NlcldpbmRvdy5oCkBAIC01NSwxMyArNTUsMTMgQEAgcHJvdGVjdGVkIHNsb3RzOgog ICAgIHZvaWQgbG9hZFByb2dyZXNzKGludCBwcm9ncmVzcyk7CiAgICAgdm9pZCB0aXRsZUNoYW5n ZWQoY29uc3QgUVN0cmluZyYpOwogICAgIHZvaWQgdXJsQ2hhbmdlZChjb25zdCBRVXJsJik7Cisg ICAgdm9pZCBvcGVuRmlsZSgpOwogICAgIHZvaWQgc2hvd1VzZXJBZ2VudERpYWxvZygpOwogCiBw cml2YXRlOgogICAgIHZvaWQgdXBkYXRlVXNlckFnZW50TGlzdCgpOwogCiAgICAgQnJvd3NlclZp ZXcqIG1fYnJvd3NlcjsKLSAgICBRTWVudUJhciogbV9tZW51OwogICAgIFFMaW5lRWRpdCogbV9h ZGRyZXNzQmFyOwogICAgIFFTdHJpbmdMaXN0IG1fdXNlckFnZW50TGlzdDsKIH07Cg== 79908 2011-01-24 02:49:51 -0800 2011-01-24 03:45:54 -0800 proposed patch, bug number included mb.patch text/plain 4835 zoltan ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2Mzc2 MjY0Li5lODY2ZWRiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDEtMjQgIFpvbHRhbiBIb3J2YXRoICA8em9s dGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKwor ICAgICAgICBbUXRdIFJlZ3JvdXAgTWluaUJyb3dzZXIncyBtZW51YmFyIGFuZCBhZGQgb3BlbiBm aWxlIGFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTMwMDAKKworICAgICAgICBBZGQgRmlsZSBhbmQgRGV2ZWxvcCBtZW51IHRvIE1pbmlCcm93 c2VyJ3MgbWVudWJhciBhbmQgYWRkIG9wZW4gZmlsZSBhY3Rpb24gdG8gRmlsZSBtZW51LgorCisg ICAgICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHA6CisgICAgICAgIChCcm93 c2VyV2luZG93OjpCcm93c2VyV2luZG93KToKKyAgICAgICAgKEJyb3dzZXJXaW5kb3c6Om9wZW5G aWxlKToKKyAgICAgICAgKEJyb3dzZXJXaW5kb3c6On5Ccm93c2VyV2luZG93KToKKyAgICAgICAg KiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93Lmg6CisKIDIwMTEtMDEtMjIgIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVy bnN0ZWluLgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5j cHAgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcAppbmRleCBjNjNjOWQ2 Li5jMzdkMzZlIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93 LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcApAQCAtNDAs MjIgKzQwLDI1IEBAIEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3coUVdLQ29udGV4dCogY29u dGV4dCkKIHsKICAgICBzZXRBdHRyaWJ1dGUoUXQ6OldBX0RlbGV0ZU9uQ2xvc2UpOwogCi0gICAg bV9tZW51ID0gbmV3IFFNZW51QmFyKCk7Ci0gICAgbV9icm93c2VyID0gbmV3IEJyb3dzZXJWaWV3 KGJhY2tpbmdTdG9yZVR5cGVGb3JOZXdXaW5kb3csIGNvbnRleHQpOwotICAgIG1fYWRkcmVzc0Jh ciA9IG5ldyBRTGluZUVkaXQoKTsKKyAgICBRTWVudSogZmlsZU1lbnUgPSBtZW51QmFyKCktPmFk ZE1lbnUoIiZGaWxlIik7CisgICAgZmlsZU1lbnUtPmFkZEFjdGlvbigiTmV3IFdpbmRvdyIsIHRo aXMsIFNMT1QobmV3V2luZG93KCkpLCBRS2V5U2VxdWVuY2U6Ok5ldyk7CisgICAgZmlsZU1lbnUt PmFkZEFjdGlvbigiT3BlbiBGaWxlIiwgdGhpcywgU0xPVChvcGVuRmlsZSgpKSwgUUtleVNlcXVl bmNlOjpPcGVuKTsKKyAgICBmaWxlTWVudS0+YWRkU2VwYXJhdG9yKCk7CisgICAgZmlsZU1lbnUt PmFkZEFjdGlvbigiUXVpdCIsIHRoaXMsIFNMT1QoY2xvc2UoKSkpOwogCi0gICAgbV9tZW51LT5h ZGRBY3Rpb24oIk5ldyBXaW5kb3ciLCB0aGlzLCBTTE9UKG5ld1dpbmRvdygpKSk7Ci0gICAgbV9t ZW51LT5hZGRBY3Rpb24oIkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFn ZW50RGlhbG9nKCkpKTsKKyAgICBRTWVudSogdG9vbHNNZW51ID0gbWVudUJhcigpLT5hZGRNZW51 KCImRGV2ZWxvcCIpOworICAgIHRvb2xzTWVudS0+YWRkQWN0aW9uKCJDaGFuZ2UgVXNlciBBZ2Vu dCIsIHRoaXMsIFNMT1Qoc2hvd1VzZXJBZ2VudERpYWxvZygpKSk7CiAKLSAgICBtX21lbnUtPmFk ZFNlcGFyYXRvcigpOwotICAgIG1fbWVudS0+YWRkQWN0aW9uKCJRdWl0IiwgdGhpcywgU0xPVChj bG9zZSgpKSk7CisgICAgbV9icm93c2VyID0gbmV3IEJyb3dzZXJWaWV3KGJhY2tpbmdTdG9yZVR5 cGVGb3JOZXdXaW5kb3csIGNvbnRleHQpOworICAgIGNvbm5lY3QobV9icm93c2VyLT52aWV3KCks IFNJR05BTChsb2FkUHJvZ3Jlc3MoaW50KSksIFNMT1QobG9hZFByb2dyZXNzKGludCkpKTsKKyAg ICBjb25uZWN0KG1fYnJvd3Nlci0+dmlldygpLCBTSUdOQUwodGl0bGVDaGFuZ2VkKGNvbnN0IFFT dHJpbmcmKSksIFNMT1QodGl0bGVDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKSkpOworICAgIGNvbm5l Y3QobV9icm93c2VyLT52aWV3KCksIFNJR05BTCh1cmxDaGFuZ2VkKGNvbnN0IFFVcmwmKSksIFNM T1QodXJsQ2hhbmdlZChjb25zdCBRVXJsJikpKTsKIAorICAgIHRoaXMtPnNldENlbnRyYWxXaWRn ZXQobV9icm93c2VyKTsKICAgICBtX2Jyb3dzZXItPnNldEZvY3VzKFF0OjpPdGhlckZvY3VzUmVh c29uKTsKIAorICAgIG1fYWRkcmVzc0JhciA9IG5ldyBRTGluZUVkaXQoKTsKICAgICBjb25uZWN0 KG1fYWRkcmVzc0JhciwgU0lHTkFMKHJldHVyblByZXNzZWQoKSksIFNMT1QoY2hhbmdlTG9jYXRp b24oKSkpOwotICAgIGNvbm5lY3QobV9icm93c2VyLT52aWV3KCksIFNJR05BTChsb2FkUHJvZ3Jl c3MoaW50KSksIFNMT1QobG9hZFByb2dyZXNzKGludCkpKTsKLSAgICBjb25uZWN0KG1fYnJvd3Nl ci0+dmlldygpLCBTSUdOQUwodGl0bGVDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKSksIFNMT1QodGl0 bGVDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKSkpOwotICAgIGNvbm5lY3QobV9icm93c2VyLT52aWV3 KCksIFNJR05BTCh1cmxDaGFuZ2VkKGNvbnN0IFFVcmwmKSksIFNMT1QodXJsQ2hhbmdlZChjb25z dCBRVXJsJikpKTsKIAogICAgIFFUb29sQmFyKiBiYXIgPSBhZGRUb29sQmFyKCJOYXZpZ2F0aW9u Iik7CiAgICAgYmFyLT5hZGRBY3Rpb24ocGFnZSgpLT5hY3Rpb24oUVdLUGFnZTo6QmFjaykpOwpA QCAtNjQsMTEgKzY3LDYgQEAgQnJvd3NlcldpbmRvdzo6QnJvd3NlcldpbmRvdyhRV0tDb250ZXh0 KiBjb250ZXh0KQogICAgIGJhci0+YWRkQWN0aW9uKHBhZ2UoKS0+YWN0aW9uKFFXS1BhZ2U6OlN0 b3ApKTsKICAgICBiYXItPmFkZFdpZGdldChtX2FkZHJlc3NCYXIpOwogCi0gICAgdGhpcy0+c2V0 TWVudUJhcihtX21lbnUpOwotICAgIHRoaXMtPnNldENlbnRyYWxXaWRnZXQobV9icm93c2VyKTsK LQotICAgIG1fYnJvd3Nlci0+c2V0Rm9jdXMoUXQ6Ok90aGVyRm9jdXNSZWFzb24pOwotCiAgICAg UVNob3J0Y3V0KiBzZWxlY3RBZGRyZXNzQmFyID0gbmV3IFFTaG9ydGN1dChRdDo6Q1RSTCB8IFF0 OjpLZXlfTCwgdGhpcyk7CiAgICAgY29ubmVjdChzZWxlY3RBZGRyZXNzQmFyLCBTSUdOQUwoYWN0 aXZhdGVkKCkpLCB0aGlzLCBTTE9UKG9wZW5Mb2NhdGlvbigpKSk7CiAKQEAgLTEzNyw2ICsxMzUs MjQgQEAgdm9pZCBCcm93c2VyV2luZG93Ojp1cmxDaGFuZ2VkKGNvbnN0IFFVcmwmIHVybCkKICAg ICBtX2FkZHJlc3NCYXItPnNldFRleHQodXJsLnRvU3RyaW5nKCkpOwogfQogCit2b2lkIEJyb3dz ZXJXaW5kb3c6Om9wZW5GaWxlKCkKK3sKKyNpZm5kZWYgUVRfTk9fRklMRURJQUxPRworICAgIHN0 YXRpYyBjb25zdCBRU3RyaW5nIGZpbHRlcigiSFRNTCBGaWxlcyAoKi5odG0gKi5odG1sICoueGh0 bWwpOztUZXh0IEZpbGVzICgqLnR4dCk7O0ltYWdlIEZpbGVzICgqLmdpZiAqLmpwZyAqLnBuZyk7 O1NWRyBGaWxlcyAoKi5zdmcpOztBbGwgRmlsZXMgKCopIik7CisKKyAgICBRRmlsZURpYWxvZyBm aWxlRGlhbG9nKHRoaXMsIHRyKCJPcGVuIiksIFFTdHJpbmcoKSwgZmlsdGVyKTsKKyAgICBmaWxl RGlhbG9nLnNldEFjY2VwdE1vZGUoUUZpbGVEaWFsb2c6OkFjY2VwdE9wZW4pOworICAgIGZpbGVE aWFsb2cuc2V0RmlsZU1vZGUoUUZpbGVEaWFsb2c6OkV4aXN0aW5nRmlsZSk7CisgICAgZmlsZURp YWxvZy5zZXRPcHRpb25zKFFGaWxlRGlhbG9nOjpSZWFkT25seSk7CisKKyAgICBpZiAoZmlsZURp YWxvZy5leGVjKCkpIHsKKyAgICAgICAgUVN0cmluZyBzZWxlY3RlZEZpbGUgPSBmaWxlRGlhbG9n LnNlbGVjdGVkRmlsZXMoKVswXTsKKyAgICAgICAgaWYgKCFzZWxlY3RlZEZpbGUuaXNFbXB0eSgp KQorICAgICAgICAgICAgbG9hZChzZWxlY3RlZEZpbGUpOworICAgIH0KKyNlbmRpZgorfQorCiB2 b2lkIEJyb3dzZXJXaW5kb3c6OnVwZGF0ZVVzZXJBZ2VudExpc3QoKQogewogICAgIFFGaWxlIGZp bGUoIjovdXNlcmFnZW50bGlzdC50eHQiKTsKQEAgLTE4OSw1ICsyMDUsNCBAQCBCcm93c2VyV2lu ZG93Ojp+QnJvd3NlcldpbmRvdygpCiB7CiAgICAgZGVsZXRlIG1fYWRkcmVzc0JhcjsKICAgICBk ZWxldGUgbV9icm93c2VyOwotICAgIGRlbGV0ZSBtX21lbnU7CiB9CmRpZmYgLS1naXQgYS9Ub29s cy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9C cm93c2VyV2luZG93LmgKaW5kZXggZjk4NDMwOS4uMmEwNGFhOCAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0 L0Jyb3dzZXJXaW5kb3cuaApAQCAtNTUsMTMgKzU1LDEzIEBAIHByb3RlY3RlZCBzbG90czoKICAg ICB2b2lkIGxvYWRQcm9ncmVzcyhpbnQgcHJvZ3Jlc3MpOwogICAgIHZvaWQgdGl0bGVDaGFuZ2Vk KGNvbnN0IFFTdHJpbmcmKTsKICAgICB2b2lkIHVybENoYW5nZWQoY29uc3QgUVVybCYpOworICAg IHZvaWQgb3BlbkZpbGUoKTsKICAgICB2b2lkIHNob3dVc2VyQWdlbnREaWFsb2coKTsKIAogcHJp dmF0ZToKICAgICB2b2lkIHVwZGF0ZVVzZXJBZ2VudExpc3QoKTsKIAogICAgIEJyb3dzZXJWaWV3 KiBtX2Jyb3dzZXI7Ci0gICAgUU1lbnVCYXIqIG1fbWVudTsKICAgICBRTGluZUVkaXQqIG1fYWRk cmVzc0JhcjsKICAgICBRU3RyaW5nTGlzdCBtX3VzZXJBZ2VudExpc3Q7CiB9Owo=