201976 2019-09-19 04:18:10 -0700 [Win][MiniBrowser] Use _com_ptr_t methods instead of calling QueryInterface explictly 2019-09-19 20:21:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii achristensen bfulgham don.olmstead pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1572314 0 fujii 2019-09-19 04:18:10 -0700 [Win][MiniBrowser] Use _com_ptr_t methods instead of calling QueryInterface explictly 1572315 1 379119 fujii 2019-09-19 04:28:41 -0700 Created attachment 379119 Patch 1572617 2 379119 bfulgham 2019-09-19 20:15:36 -0700 Comment on attachment 379119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379119&action=review > Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h:59 > +_COM_SMARTPTR_TYPEDEF(IWebViewPrivate3, IID_IWebViewPrivate3); Nice! 1572619 3 379119 fujii 2019-09-19 20:20:21 -0700 Comment on attachment 379119 Patch Clearing flags on attachment: 379119 Committed r250117: <https://trac.webkit.org/changeset/250117> 1572620 4 fujii 2019-09-19 20:20:24 -0700 All reviewed patches have been landed. Closing bug. 1572621 5 webkit-bug-importer 2019-09-19 20:21:16 -0700 <rdar://problem/55546007> 379119 2019-09-19 04:28:41 -0700 2019-09-19 20:20:21 -0700 Patch bug-201976-20190919202840.patch text/plain 18311 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmUzOTMwZTgwYmIwY2NkZDBkM2U0YTY3MDYzZmFiMDQ2 OTg4ZDRjYi4uMGIwOTdjMTFkMzJhMDFhMzE3MDAxYjUyOWUzZmU2ZDI5MDA5ZTVmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQw IEBACisyMDE5LTA5LTE5ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBVc2UgX2NvbV9wdHJfdCBtZXRob2RzIGlu c3RlYWQgb2YgY2FsbGluZyBRdWVyeUludGVyZmFjZSBleHBsaWN0bHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTk3NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGNvbnNpc3RzIG9m IHRocmVlIHJlZmFjdG9yaW5nczoKKyAgICAgICAgMS4gUmVwbGFjZWQgZXhwbGljaXQgUXVlcnlJ bnRlcmZhY2Ugd2l0aCBfY29tX3B0cl90IG1ldGhvZHMKKyAgICAgICAgMi4gUmVwbGFjZWQgdHlw ZWRlZiB3aXRoIF9DT01fU01BUlRQVFJfVFlQRURFRiBtYWNybworICAgICAgICAzLiBSZXBsYWNl ZCBXZWJDb3JlJ3MgQ09NUHRyIHdpdGggX2NvbV9wdHJfdCBiZWNhdXNlIGl0IGlzIG5vdCBhIHB1 YmxpYyBXZWJLaXQgQVBJCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJX ZWJIb3N0LmNwcDoKKyAgICAgICAgKE1pbmlCcm93c2VyV2ViSG9zdDo6ZGlkRmlyc3RMYXlvdXRJ bkZyYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJX ZWJIb3N0Lmg6CisgICAgICAgIChNaW5pQnJvd3NlcldlYkhvc3Q6OmRpZEZpcnN0TGF5b3V0SW5G cmFtZSk6CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1ByaW50V2ViVUlEZWxlZ2F0ZS5jcHA6 CisgICAgICAgIChnZXRIYW5kbGVGcm9tV2ViVmlldyk6CisgICAgICAgIChQcmludFdlYlVJRGVs ZWdhdGU6OndlYlZpZXdQcmludGluZ01hcmdpblJlY3QpOgorICAgICAgICAoUHJpbnRXZWJVSURl bGVnYXRlOjpydW5Nb2RhbCk6CisgICAgICAgIChQcmludFdlYlVJRGVsZWdhdGU6OmNyZWF0ZU1v ZGFsRGlhbG9nKToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3Nl cldpbmRvdy5jcHA6CisgICAgICAgIChXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93Ojppbml0KToK KyAgICAgICAgKFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnNldFRvRGVmYXVsdFByZWZlcmVu Y2VzKToKKyAgICAgICAgKFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnNob3dMYXN0VmlzaXRl ZFNpdGVzKToKKyAgICAgICAgKFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnJlbG9hZCk6Cisg ICAgICAgIChXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93OjpyZXNldFpvb20pOgorICAgICAgICAo V2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6em9vbUluKToKKyAgICAgICAgKFdlYktpdExlZ2Fj eUJyb3dzZXJXaW5kb3c6Onpvb21PdXQpOgorICAgICAgICAoV2ViS2l0TGVnYWN5QnJvd3Nlcldp bmRvdzo6c2hvd0xheWVyVHJlZSk6CisgICAgICAgIChXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93 OjpwcmludCk6CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJX aW5kb3cuaDoKKyAgICAgICAgKFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnByaXZhdGVQcmVm ZXJlbmNlcyk6CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dpbk1haW4uY3BwOgorICAgICAg ICAod1dpbk1haW4pOgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9zdGRhZnguaDoKKwogMjAx OS0wOS0xNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAg ICAgICBbV2luXVtNaW5pQnJvd3Nlcl0gUmVtb3ZlIHVudXNlZCBET01EZWZhdWx0SW1wbC5jcHAK ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuY3Bw IGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5jcHAKaW5kZXggMTY1 MWE2ZmU2ZGYxZjFhMDQzZjkyYmVlOTJjNDU3NTNjYWQwODUwYS4uNWIxMjk1Y2IyYTNmNDhlMjk1 NGE4MWYxMzE2MjdiOWUzNGFkY2NmYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2lu L01pbmlCcm93c2VyV2ViSG9zdC5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlC cm93c2VyV2ViSG9zdC5jcHAKQEAgLTMyLDggKzMyLDYgQEAKICNpbmNsdWRlICJXZWJLaXRMZWdh Y3lCcm93c2VyV2luZG93LmgiCiAjaW5jbHVkZSA8V2ViS2l0TGVnYWN5L1dlYktpdC5oPgogCi10 eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJEYXRhU291cmNlLCAmX191dWlkb2YoSVdl YkRhdGFTb3VyY2UpPj4gSVdlYkRhdGFTb3VyY2VQdHI7Ci0KIEhSRVNVTFQgTWluaUJyb3dzZXJX ZWJIb3N0OjpkaWRDb21taXRMb2FkRm9yRnJhbWUoX0luX29wdF8gSVdlYlZpZXcqIHdlYlZpZXcs IF9Jbl9vcHRfIElXZWJGcmFtZSogZnJhbWUpCiB7CiAgICAgcmV0dXJuIGRpZENoYW5nZUxvY2F0 aW9uV2l0aGluUGFnZUZvckZyYW1lKHdlYlZpZXcsIGZyYW1lKTsKQEAgLTE0OSwxOCArMTQ3LDYg QEAgSFJFU1VMVCBNaW5pQnJvd3NlcldlYkhvc3Q6OmRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZy YW1lKF9Jbl9vcHRfIElXZWJWaWV3KiBzZW4KICAgICByZXR1cm4gU19PSzsKIH0KIAotSFJFU1VM VCBNaW5pQnJvd3NlcldlYkhvc3Q6OmRpZEZpcnN0TGF5b3V0SW5GcmFtZShfSW5fb3B0XyBJV2Vi VmlldyosIF9Jbl9vcHRfIElXZWJGcmFtZSogZnJhbWUpCi17Ci0gICAgaWYgKCFmcmFtZSkKLSAg ICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKLQotICAgIElXZWJGcmFtZTJQdHIgZnJhbWUyOwotICAg IGlmIChGQUlMRUQoZnJhbWUtPlF1ZXJ5SW50ZXJmYWNlKCZmcmFtZTIuR2V0SW50ZXJmYWNlUHRy KCkpKSkKLSAgICAgICAgcmV0dXJuIFNfT0s7Ci0KLSAgICByZXR1cm4gU19PSzsKLX0KLQogSFJF U1VMVCBNaW5pQnJvd3NlcldlYkhvc3Q6Om9uTm90aWZ5KF9Jbl9vcHRfIElXZWJOb3RpZmljYXRp b24qIG5vdGlmaWNhdGlvbikKIHsKICAgICBfYnN0cl90IG5hbWU7CmRpZmYgLS1naXQgYS9Ub29s cy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmggYi9Ub29scy9NaW5pQnJvd3Nl ci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmgKaW5kZXggZmNjZDQwYzg0YzU0NDFkMzhjYzJlOThk MzBhNTEyOTFkOGIyZDk5Mi4uNzY5ODVhMzEzZThkMzU5Mjg2M2E4NzU3ZWM5NzM0Mzc3Mzg5N2Yw MCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5o CisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuaApAQCAtNjAs NyArNjAsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBJV2ViRnJhbWVMb2FkRGVsZWdhdGVQcml2YXRl CiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIGRpZEZpbmlzaERvY3VtZW50 TG9hZEZvckZyYW1lKF9Jbl9vcHRfIElXZWJWaWV3KiBzZW5kZXIsIF9Jbl9vcHRfIElXZWJGcmFt ZSopIHsgcmV0dXJuIFNfT0s7IH0KLSAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZ UEUgZGlkRmlyc3RMYXlvdXRJbkZyYW1lKF9Jbl9vcHRfIElXZWJWaWV3KiBzZW5kZXIsIF9Jbl9v cHRfIElXZWJGcmFtZSopOworICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBk aWRGaXJzdExheW91dEluRnJhbWUoX0luX29wdF8gSVdlYlZpZXcqIHNlbmRlciwgX0luX29wdF8g SVdlYkZyYW1lKikgeyByZXR1cm4gU19PSzsgfQogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRI T0RDQUxMVFlQRSBkaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZShfSW5fb3B0XyBJV2ViVmll dyosIF9Jbl9vcHRfIElXZWJGcmFtZSopOwogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RD QUxMVFlQRSBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRJbkZyYW1lKF9Jbl9vcHRfIElX ZWJWaWV3KiBzZW5kZXIsIF9Jbl9vcHRfIElXZWJGcmFtZSopICB7IHJldHVybiBTX09LOyB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QcmludFdlYlVJRGVsZWdhdGUuY3Bw IGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1ByaW50V2ViVUlEZWxlZ2F0ZS5jcHAKaW5kZXggMzI4 ZWI4OGUyOWQwYTI0ZmM1NzMxOWUyZjI4MGJkZDRkZDNiYjNlZi4uM2M1OGM0ODUxNTAxOWUwYTM3 MDgwY2ViYjkyZjQ1NzIyMjQ3NTcxZSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2lu L1ByaW50V2ViVUlEZWxlZ2F0ZS5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1ByaW50 V2ViVUlEZWxlZ2F0ZS5jcHAKQEAgLTMwLDcgKzMwLDYgQEAKICNpbmNsdWRlICJDb21tb24uaCIK ICNpbmNsdWRlICJNYWluV2luZG93LmgiCiAjaW5jbHVkZSAiV2ViS2l0TGVnYWN5QnJvd3Nlcldp bmRvdy5oIgotI2luY2x1ZGUgPFdlYkNvcmUvQ09NUHRyLmg+CiAjaW5jbHVkZSA8V2ViS2l0TGVn YWN5L1dlYktpdENPTUFQSS5oPgogI2luY2x1ZGUgPGNvbWlwLmg+CiAjaW5jbHVkZSA8Y29tbWN0 cmwuaD4KQEAgLTg3LDEzICs4NiwxMiBAQCBIUkVTVUxUIFByaW50V2ViVUlEZWxlZ2F0ZTo6Y3Jl YXRlV2ViVmlld1dpdGhSZXF1ZXN0KF9Jbl9vcHRfIElXZWJWaWV3KiwgX0luX29wdAogCiBzdGF0 aWMgSFdORCBnZXRIYW5kbGVGcm9tV2ViVmlldyhJV2ViVmlldyogd2ViVmlldykKIHsKLSAgICBD T01QdHI8SVdlYlZpZXdQcml2YXRlMj4gd2ViVmlld1ByaXZhdGU7Ci0gICAgSFJFU1VMVCBociA9 IHdlYlZpZXctPlF1ZXJ5SW50ZXJmYWNlKCZ3ZWJWaWV3UHJpdmF0ZSk7Ci0gICAgaWYgKEZBSUxF RChocikpCisgICAgSVdlYlZpZXdQcml2YXRlMlB0ciB3ZWJWaWV3UHJpdmF0ZSh3ZWJWaWV3KTsK KyAgICBpZiAoIXdlYlZpZXdQcml2YXRlKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAg IEhXTkQgd2ViVmlld1dpbmRvdyA9IG51bGxwdHI7Ci0gICAgaHIgPSB3ZWJWaWV3UHJpdmF0ZS0+ dmlld1dpbmRvdygmd2ViVmlld1dpbmRvdyk7CisgICAgSFJFU1VMVCBociA9IHdlYlZpZXdQcml2 YXRlLT52aWV3V2luZG93KCZ3ZWJWaWV3V2luZG93KTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAKQEAgLTE3MSw4ICsxNjksOCBAQCBIUkVTVUxUIFByaW50 V2ViVUlEZWxlZ2F0ZTo6d2ViVmlld1ByaW50aW5nTWFyZ2luUmVjdChfSW5fb3B0XyBJV2ViVmll dyogdmlldywgXwogICAgIGlmIChGQUlMRUQodmlldy0+bWFpbkZyYW1lKCZtYWluRnJhbWUuR2V0 SW50ZXJmYWNlUHRyKCkpKSkKICAgICAgICAgcmV0dXJuIEVfRkFJTDsKIAotICAgIElXZWJGcmFt ZVByaXZhdGVQdHIgcHJpdmF0ZUZyYW1lOwotICAgIGlmIChGQUlMRUQobWFpbkZyYW1lLT5RdWVy eUludGVyZmFjZSgmcHJpdmF0ZUZyYW1lLkdldEludGVyZmFjZVB0cigpKSkpCisgICAgSVdlYkZy YW1lUHJpdmF0ZVB0ciBwcml2YXRlRnJhbWUobWFpbkZyYW1lKTsKKyAgICBpZiAoIXByaXZhdGVG cmFtZSkKICAgICAgICAgcmV0dXJuIEVfRkFJTDsKIAogICAgIHByaXZhdGVGcmFtZS0+ZnJhbWVC b3VuZHMocmVjdCk7CkBAIC0yOTUsNyArMjkzLDcgQEAgSFJFU1VMVCBQcmludFdlYlVJRGVsZWdh dGU6OmNhblJ1bk1vZGFsKF9Jbl9vcHRfIElXZWJWaWV3KiwgX091dF8gQk9PTCogY2FuUnVuQm8K IAogSFJFU1VMVCBQcmludFdlYlVJRGVsZWdhdGU6OnJ1bk1vZGFsKF9Jbl9vcHRfIElXZWJWaWV3 KiB3ZWJWaWV3KQogewotICAgIENPTVB0cjxJV2ViVmlldz4gcHJvdGVjdG9yKHdlYlZpZXcpOwor ICAgIElXZWJWaWV3UHRyIHByb3RlY3Rvcih3ZWJWaWV3KTsKIAogICAgIGF1dG8gbW9kYWxEaWFs b2dPd25lciA9IDo6R2V0V2luZG93KG1fbW9kYWxEaWFsb2dQYXJlbnQsIEdXX09XTkVSKTsKICAg ICBhdXRvIHRvcExldmVsUGFyZW50ID0gOjpHZXRBbmNlc3Rvcihtb2RhbERpYWxvZ093bmVyLCBH QV9ST09UKTsKQEAgLTMyNCw3ICszMjIsNyBAQCBIUkVTVUxUIFByaW50V2ViVUlEZWxlZ2F0ZTo6 Y3JlYXRlTW9kYWxEaWFsb2coX0luX29wdF8gSVdlYlZpZXcqIHNlbmRlciwgX0luX29wdAogICAg IGlmICghbmV3V2ViVmlldykKICAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKICAgICAKLSAgICBD T01QdHI8SVdlYlZpZXc+IHdlYlZpZXc7CisgICAgSVdlYlZpZXdQdHIgd2ViVmlldzsKICAgICBI UkVTVUxUIGhyID0gV2ViS2l0Q3JlYXRlSW5zdGFuY2UoQ0xTSURfV2ViVmlldywgMCwgSUlEX0lX ZWJWaWV3LCAodm9pZCoqKSZ3ZWJWaWV3KTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAg cmV0dXJuIGhyOwpAQCAtMzQwLDE0ICszMzgsMTQgQEAgSFJFU1VMVCBQcmludFdlYlVJRGVsZWdh dGU6OmNyZWF0ZU1vZGFsRGlhbG9nKF9Jbl9vcHRfIElXZWJWaWV3KiBzZW5kZXIsIF9Jbl9vcHQK ICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAgcmV0dXJuIGhyOwogCi0gICAgQ09NUHRyPElX ZWJVSURlbGVnYXRlPiB1aURlbGVnYXRlOworICAgIElXZWJVSURlbGVnYXRlUHRyIHVpRGVsZWdh dGU7CiAgICAgaHIgPSBzZW5kZXItPnVpRGVsZWdhdGUoJnVpRGVsZWdhdGUpOwogICAgIGlmIChG QUlMRUQoaHIpKQogICAgICAgICByZXR1cm4gaHI7CiAKLSAgICB3ZWJWaWV3LT5zZXRVSURlbGVn YXRlKHVpRGVsZWdhdGUuZ2V0KCkpOworICAgIHdlYlZpZXctPnNldFVJRGVsZWdhdGUodWlEZWxl Z2F0ZSk7CiAKLSAgICAqbmV3V2ViVmlldyA9IHdlYlZpZXcubGVha1JlZigpOworICAgICpuZXdX ZWJWaWV3ID0gd2ViVmlldy5EZXRhY2goKTsKIAogICAgIHJldHVybiBTX09LOwogfQpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3Bw IGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwCmlu ZGV4IGE3ODUyOThiYWI3ZmNhZGQ4NmZkZGFiMjIyMjRjODUwOGVmMjY4ZjEuLmY4MWE5YmUzOWYz ZjZkODhhNWJhM2E0MThhZjVkNWU4NGM4ZmMxNDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93 c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5pQnJv d3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5jcHAKQEAgLTgwLDggKzgwLDggQEAg SFJFU1VMVCBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93Ojppbml0KCkKICAgICBpZiAoRkFJTEVE KGhyKSkKICAgICAgICAgcmV0dXJuIGhyOwogCi0gICAgaHIgPSBtX3dlYlZpZXctPlF1ZXJ5SW50 ZXJmYWNlKElJRF9JV2ViVmlld1ByaXZhdGUyLCByZWludGVycHJldF9jYXN0PHZvaWQqKj4oJm1f d2ViVmlld1ByaXZhdGUuR2V0SW50ZXJmYWNlUHRyKCkpKTsKLSAgICBpZiAoRkFJTEVEKGhyKSkK KyAgICBtX3dlYlZpZXdQcml2YXRlID0gbV93ZWJWaWV3OworICAgIGlmICghbV93ZWJWaWV3UHJp dmF0ZSkKICAgICAgICAgcmV0dXJuIGhyOwogCiAgICAgaHIgPSBXZWJLaXRDcmVhdGVJbnN0YW5j ZShDTFNJRF9XZWJIaXN0b3J5LCAwLCBfX3V1aWRvZihtX3dlYkhpc3RvcnkpLCByZWludGVycHJl dF9jYXN0PHZvaWQqKj4oJm1fd2ViSGlzdG9yeS5HZXRJbnRlcmZhY2VQdHIoKSkpOwpAQCAtMjc4 LDggKzI3OCw4IEBAIGJvb2wgV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6c2VlZEluaXRpYWxE ZWZhdWx0UHJlZmVyZW5jZXMoKQogCiBib29sIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnNl dFRvRGVmYXVsdFByZWZlcmVuY2VzKCkKIHsKLSAgICBIUkVTVUxUIGhyID0gbV9zdGFuZGFyZFBy ZWZlcmVuY2VzLT5RdWVyeUludGVyZmFjZShJSURfSVdlYlByZWZlcmVuY2VzUHJpdmF0ZSwgcmVp bnRlcnByZXRfY2FzdDx2b2lkKio+KCZtX3ByZWZzUHJpdmF0ZS5HZXRJbnRlcmZhY2VQdHIoKSkp OwotICAgIGlmICghU1VDQ0VFREVEKGhyKSkKKyAgICBtX3ByZWZzUHJpdmF0ZSA9IG1fc3RhbmRh cmRQcmVmZXJlbmNlczsKKyAgICBpZiAoIW1fcHJlZnNQcml2YXRlKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICNpZiBVU0UoQ0cpCkBAIC0zMjQsNyArMzI0LDcgQEAgdm9pZCBXZWJLaXRMZWdh Y3lCcm93c2VyV2luZG93OjpzaG93TGFzdFZpc2l0ZWRTaXRlcyhJV2ViVmlldyYgd2ViVmlldykK IHsKICAgICBITUVOVSBtZW51ID0gOjpHZXRNZW51KG1faE1haW5XbmQpOwogCi0gICAgX2NvbV9w dHJfdDxfY29tX0lJSUQ8SVdlYkJhY2tGb3J3YXJkTGlzdCwgJl9fdXVpZG9mKElXZWJCYWNrRm9y d2FyZExpc3QpPj4gYmFja0ZvcndhcmRMaXN0OworICAgIElXZWJCYWNrRm9yd2FyZExpc3RQdHIg YmFja0ZvcndhcmRMaXN0OwogICAgIEhSRVNVTFQgaHIgPSB3ZWJWaWV3LmJhY2tGb3J3YXJkTGlz dCgmYmFja0ZvcndhcmRMaXN0LkdldEludGVyZmFjZVB0cigpKTsKICAgICBpZiAoRkFJTEVEKGhy KSkKICAgICAgICAgcmV0dXJuOwpAQCAtMzU5LDkgKzM1OSw4IEBAIHZvaWQgV2ViS2l0TGVnYWN5 QnJvd3NlcldpbmRvdzo6c2hvd0xhc3RWaXNpdGVkU2l0ZXMoSVdlYlZpZXcmIHdlYlZpZXcpCiAg ICAgaWYgKEZBSUxFRChocikpCiAgICAgICAgIHJldHVybjsKIAotICAgIF9jb21fcHRyX3Q8X2Nv bV9JSUlEPElXZWJIaXN0b3J5UHJpdmF0ZSwgJl9fdXVpZG9mKElXZWJIaXN0b3J5UHJpdmF0ZSk+ PiB3ZWJIaXN0b3J5OwotICAgIGhyID0gbV93ZWJIaXN0b3J5LT5RdWVyeUludGVyZmFjZShJSURf SVdlYkhpc3RvcnlQcml2YXRlLCByZWludGVycHJldF9jYXN0PHZvaWQqKj4oJndlYkhpc3Rvcnku R2V0SW50ZXJmYWNlUHRyKCkpKTsKLSAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICBJV2ViSGlzdG9y eVByaXZhdGVQdHIgd2ViSGlzdG9yeShtX3dlYkhpc3RvcnkpOworICAgIGlmICghd2ViSGlzdG9y eSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaW50IHRvdGFsTGlzdENvdW50ID0gMDsKQEAgLTUw NiwxMiArNTA1LDEwIEBAIF9ic3RyX3QgV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6dXNlckFn ZW50KCkKICAgICByZXR1cm4gdXNlckFnZW50OwogfQogCi10eXBlZGVmIF9jb21fcHRyX3Q8X2Nv bV9JSUlEPElXZWJJQkFjdGlvbnMsICZfX3V1aWRvZihJV2ViSUJBY3Rpb25zKT4+IElXZWJJQkFj dGlvbnNQdHI7Ci0KIHZvaWQgV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6cmVsb2FkKCkKIHsK LSAgICBJV2ViSUJBY3Rpb25zUHRyIHdlYkFjdGlvbnM7Ci0gICAgaWYgKEZBSUxFRChtX3dlYlZp ZXctPlF1ZXJ5SW50ZXJmYWNlKElJRF9JV2ViSUJBY3Rpb25zLCByZWludGVycHJldF9jYXN0PHZv aWQqKj4oJndlYkFjdGlvbnMuR2V0SW50ZXJmYWNlUHRyKCkpKSkpCisgICAgSVdlYklCQWN0aW9u c1B0ciB3ZWJBY3Rpb25zKG1fd2ViVmlldyk7CisgICAgaWYgKCF3ZWJBY3Rpb25zKQogICAgICAg ICByZXR1cm47CiAKICAgICB3ZWJBY3Rpb25zLT5yZWxvYWQobnVsbHB0cik7CkBAIC01MTksOCAr NTE2LDggQEAgdm9pZCBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93OjpyZWxvYWQoKQogCiB2b2lk IFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnJlc2V0Wm9vbSgpCiB7Ci0gICAgSVdlYklCQWN0 aW9uc1B0ciB3ZWJBY3Rpb25zOwotICAgIGlmIChGQUlMRUQobV93ZWJWaWV3LT5RdWVyeUludGVy ZmFjZShJSURfSVdlYklCQWN0aW9ucywgcmVpbnRlcnByZXRfY2FzdDx2b2lkKio+KCZ3ZWJBY3Rp b25zLkdldEludGVyZmFjZVB0cigpKSkpKQorICAgIElXZWJJQkFjdGlvbnNQdHIgd2ViQWN0aW9u cyhtX3dlYlZpZXcpOworICAgIGlmICghd2ViQWN0aW9ucykKICAgICAgICAgcmV0dXJuOwogCiAg ICAgd2ViQWN0aW9ucy0+cmVzZXRQYWdlWm9vbShudWxscHRyKTsKQEAgLTUyOCw4ICs1MjUsOCBA QCB2b2lkIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnJlc2V0Wm9vbSgpCiAKIHZvaWQgV2Vi S2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6em9vbUluKCkKIHsKLSAgICBJV2ViSUJBY3Rpb25zUHRy IHdlYkFjdGlvbnM7Ci0gICAgaWYgKEZBSUxFRChtX3dlYlZpZXctPlF1ZXJ5SW50ZXJmYWNlKElJ RF9JV2ViSUJBY3Rpb25zLCByZWludGVycHJldF9jYXN0PHZvaWQqKj4oJndlYkFjdGlvbnMuR2V0 SW50ZXJmYWNlUHRyKCkpKSkpCisgICAgSVdlYklCQWN0aW9uc1B0ciB3ZWJBY3Rpb25zKG1fd2Vi Vmlldyk7CisgICAgaWYgKCF3ZWJBY3Rpb25zKQogICAgICAgICByZXR1cm47CiAKICAgICB3ZWJB Y3Rpb25zLT56b29tUGFnZUluKG51bGxwdHIpOwpAQCAtNTM3LDE5ICs1MzQsMTcgQEAgdm9pZCBX ZWJLaXRMZWdhY3lCcm93c2VyV2luZG93Ojp6b29tSW4oKQogCiB2b2lkIFdlYktpdExlZ2FjeUJy b3dzZXJXaW5kb3c6Onpvb21PdXQoKQogewotICAgIElXZWJJQkFjdGlvbnNQdHIgd2ViQWN0aW9u czsKLSAgICBpZiAoRkFJTEVEKG1fd2ViVmlldy0+UXVlcnlJbnRlcmZhY2UoSUlEX0lXZWJJQkFj dGlvbnMsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmd2ViQWN0aW9ucy5HZXRJbnRlcmZhY2VQ dHIoKSkpKSkKKyAgICBJV2ViSUJBY3Rpb25zUHRyIHdlYkFjdGlvbnMobV93ZWJWaWV3KTsKKyAg ICBpZiAoIXdlYkFjdGlvbnMpCiAgICAgICAgIHJldHVybjsKIAogICAgIHdlYkFjdGlvbnMtPnpv b21QYWdlT3V0KG51bGxwdHIpOwogfQogCi10eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElX ZWJWaWV3UHJpdmF0ZTMsICZfX3V1aWRvZihJV2ViVmlld1ByaXZhdGUzKT4+IElXZWJWaWV3UHJp dmF0ZTNQdHI7Ci0KIHZvaWQgV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6c2hvd0xheWVyVHJl ZSgpCiB7Ci0gICAgSVdlYlZpZXdQcml2YXRlM1B0ciB3ZWJWaWV3UHJpdmF0ZTsKLSAgICBpZiAo RkFJTEVEKG1fd2ViVmlldy0+UXVlcnlJbnRlcmZhY2UoSUlEX0lXZWJWaWV3UHJpdmF0ZTMsIHJl aW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmd2ViVmlld1ByaXZhdGUuR2V0SW50ZXJmYWNlUHRyKCkp KSkpCisgICAgSVdlYlZpZXdQcml2YXRlM1B0ciB3ZWJWaWV3UHJpdmF0ZShtX3dlYlZpZXcpOwor ICAgIGlmICghd2ViVmlld1ByaXZhdGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIE91dHB1dERl YnVnU3RyaW5nKEwiQ1VSUkVOVCBUUkVFOlxuIik7CkBAIC02MDksOCArNjA0LDggQEAgdm9pZCBX ZWJLaXRMZWdhY3lCcm93c2VyV2luZG93OjpwcmludCgpCiAgICAgaWYgKCFmcmFtZSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgSVdlYkZyYW1lUHJpdmF0ZVB0ciBmcmFtZVByaXZhdGU7Ci0gICAg aWYgKEZBSUxFRChmcmFtZS0+UXVlcnlJbnRlcmZhY2UoJmZyYW1lUHJpdmF0ZS5HZXRJbnRlcmZh Y2VQdHIoKSkpKQorICAgIElXZWJGcmFtZVByaXZhdGVQdHIgZnJhbWVQcml2YXRlKGZyYW1lKTsK KyAgICBpZiAoIWZyYW1lUHJpdmF0ZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZnJhbWVQcml2 YXRlLT5zZXRJblByaW50aW5nTW9kZShUUlVFLCBwcmludERDKTsKQEAgLTY0OCw4ICs2NDMsNiBA QCBzdGF0aWMgdm9pZCBzZXRXaW5kb3dUZXh0KEhXTkQgZGlhbG9nLCBVSU5UIGZpZWxkLCBVSU5U IHZhbHVlKQogICAgIHNldFdpbmRvd1RleHQoZGlhbG9nLCBmaWVsZCwgX2JzdHJfdCh2YWx1ZVN0 ci51dGY4KCkuZGF0YSgpKSk7CiB9CiAKLXR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVBy b3BlcnR5QmFnLCAmX191dWlkb2YoSVByb3BlcnR5QmFnKT4+IElQcm9wZXJ0eUJhZ1B0cjsKLQog c3RhdGljIHZvaWQgc2V0V2luZG93VGV4dChIV05EIGRpYWxvZywgVUlOVCBmaWVsZCwgSVByb3Bl cnR5QmFnUHRyIHN0YXRpc3RpY3MsIGNvbnN0IF9ic3RyX3QmIGtleSkKIHsKICAgICBfdmFyaWFu dF90IHZhcjsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lC cm93c2VyV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3Nl cldpbmRvdy5oCmluZGV4IGViMTc3ODZjNTY1YzE4ZTU3OWY4M2FkNzY5MmNmYTlkM2Y1NmY0ZmYu LmY4NGU1Y2RlMGJhYWEwOGRhYjFmYzc3NzcxZTRhNjJhMDhhNWRmNzggMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmgKKysrIGIvVG9v bHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuaApAQCAtMzEsMjcg KzMxLDMyIEBACiAjaW5jbHVkZSA8dmVjdG9yPgogI2luY2x1ZGUgPHd0Zi9SZWYuaD4KIAotdHlw ZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJVW5rbm93biwgJl9fdXVpZG9mKElVbmtub3duKT4+ IElVbmtub3duUHRyOwotdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViRnJhbWUsICZf X3V1aWRvZihJV2ViRnJhbWUpPj4gSVdlYkZyYW1lUHRyOwotdHlwZWRlZiBfY29tX3B0cl90PF9j b21fSUlJRDxJV2ViRnJhbWUyLCAmX191dWlkb2YoSVdlYkZyYW1lMik+PiBJV2ViRnJhbWUyUHRy OwotdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViVmlldywgJl9fdXVpZG9mKElXZWJW aWV3KT4+IElXZWJWaWV3UHRyOwotdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViVmll d1ByaXZhdGUyLCAmX191dWlkb2YoSVdlYlZpZXdQcml2YXRlMik+PiBJV2ViVmlld1ByaXZhdGVQ dHI7Ci10eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJGcmFtZUxvYWREZWxlZ2F0ZSwg Jl9fdXVpZG9mKElXZWJGcmFtZUxvYWREZWxlZ2F0ZSk+PiBJV2ViRnJhbWVMb2FkRGVsZWdhdGVQ dHI7Ci10eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJIaXN0b3J5LCAmX191dWlkb2Yo SVdlYkhpc3RvcnkpPj4gSVdlYkhpc3RvcnlQdHI7Ci10eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9J SUlEPElXZWJIaXN0b3J5SXRlbSwgJl9fdXVpZG9mKElXZWJIaXN0b3J5SXRlbSk+PiBJV2ViSGlz dG9yeUl0ZW1QdHI7Ci10eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJQcmVmZXJlbmNl cywgJl9fdXVpZG9mKElXZWJQcmVmZXJlbmNlcyk+PiBJV2ViUHJlZmVyZW5jZXNQdHI7Ci10eXBl ZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJQcmVmZXJlbmNlc1ByaXZhdGUzLCAmX191dWlk b2YoSVdlYlByZWZlcmVuY2VzUHJpdmF0ZTMpPj4gSVdlYlByZWZlcmVuY2VzUHJpdmF0ZVB0cjsK LXR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdlYlVJRGVsZWdhdGUsICZfX3V1aWRvZihJ V2ViVUlEZWxlZ2F0ZSk+PiBJV2ViVUlEZWxlZ2F0ZVB0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxf Y29tX0lJSUQ8SUFjY2Vzc2liaWxpdHlEZWxlZ2F0ZSwgJl9fdXVpZG9mKElBY2Nlc3NpYmlsaXR5 RGVsZWdhdGUpPj4gSUFjY2Vzc2liaWxpdHlEZWxlZ2F0ZVB0cjsKLXR5cGVkZWYgX2NvbV9wdHJf dDxfY29tX0lJSUQ8SVdlYkluc3BlY3RvciwgJl9fdXVpZG9mKElXZWJJbnNwZWN0b3IpPj4gSVdl Ykluc3BlY3RvclB0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdlYkNvcmVTdGF0 aXN0aWNzLCAmX191dWlkb2YoSVdlYkNvcmVTdGF0aXN0aWNzKT4+IElXZWJDb3JlU3RhdGlzdGlj c1B0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdlYkNhY2hlLCAmX191dWlkb2Yo SVdlYkNhY2hlKT4+IElXZWJDYWNoZVB0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8 SVdlYlJlc291cmNlTG9hZERlbGVnYXRlLCAmX191dWlkb2YoSVdlYlJlc291cmNlTG9hZERlbGVn YXRlKT4+IElXZWJSZXNvdXJjZUxvYWREZWxlZ2F0ZVB0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxf Y29tX0lJSUQ8SVdlYkRvd25sb2FkRGVsZWdhdGUsICZfX3V1aWRvZihJV2ViRG93bmxvYWREZWxl Z2F0ZSk+PiBJV2ViRG93bmxvYWREZWxlZ2F0ZVB0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxfY29t X0lJSUQ8SVdlYkZyYW1lUHJpdmF0ZSwgJl9fdXVpZG9mKElXZWJGcmFtZVByaXZhdGUpPj4gSVdl YkZyYW1lUHJpdmF0ZVB0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdlYk11dGFi bGVVUkxSZXF1ZXN0LCAmX191dWlkb2YoSVdlYk11dGFibGVVUkxSZXF1ZXN0KT4+IElXZWJNdXRh YmxlVVJMUmVxdWVzdFB0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdlYk5vdGlm aWNhdGlvbk9ic2VydmVyLCAmX191dWlkb2YoSVdlYk5vdGlmaWNhdGlvbk9ic2VydmVyKT4+IElX ZWJOb3RpZmljYXRpb25PYnNlcnZlclB0cjsKLXR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8 SVdlYk5vdGlmaWNhdGlvbkNlbnRlciwgJl9fdXVpZG9mKElXZWJOb3RpZmljYXRpb25DZW50ZXIp Pj4gSVdlYk5vdGlmaWNhdGlvbkNlbnRlclB0cjsKK19DT01fU01BUlRQVFJfVFlQRURFRihJQWNj ZXNzaWJpbGl0eURlbGVnYXRlLCBJSURfSUFjY2Vzc2liaWxpdHlEZWxlZ2F0ZSk7CitfQ09NX1NN QVJUUFRSX1RZUEVERUYoSVdlYkJhY2tGb3J3YXJkTGlzdCwgSUlEX0lXZWJCYWNrRm9yd2FyZExp c3QpOworX0NPTV9TTUFSVFBUUl9UWVBFREVGKElXZWJDYWNoZSwgSUlEX0lXZWJDYWNoZSk7Citf Q09NX1NNQVJUUFRSX1RZUEVERUYoSVdlYkNvcmVTdGF0aXN0aWNzLCBJSURfSVdlYkNvcmVTdGF0 aXN0aWNzKTsKK19DT01fU01BUlRQVFJfVFlQRURFRihJV2ViRGF0YVNvdXJjZSwgSUlEX0lXZWJE YXRhU291cmNlKTsKK19DT01fU01BUlRQVFJfVFlQRURFRihJV2ViRG93bmxvYWREZWxlZ2F0ZSwg SUlEX0lXZWJEb3dubG9hZERlbGVnYXRlKTsKK19DT01fU01BUlRQVFJfVFlQRURFRihJV2ViRnJh bWUsIElJRF9JV2ViRnJhbWUpOworX0NPTV9TTUFSVFBUUl9UWVBFREVGKElXZWJGcmFtZTIsIElJ RF9JV2ViRnJhbWUyKTsKK19DT01fU01BUlRQVFJfVFlQRURFRihJV2ViRnJhbWVMb2FkRGVsZWdh dGUsIElJRF9JV2ViRnJhbWVMb2FkRGVsZWdhdGUpOworX0NPTV9TTUFSVFBUUl9UWVBFREVGKElX ZWJGcmFtZVByaXZhdGUsIElJRF9JV2ViRnJhbWVQcml2YXRlKTsKK19DT01fU01BUlRQVFJfVFlQ RURFRihJV2ViSGlzdG9yeSwgSUlEX0lXZWJIaXN0b3J5KTsKK19DT01fU01BUlRQVFJfVFlQRURF RihJV2ViSGlzdG9yeUl0ZW0sIElJRF9JV2ViSGlzdG9yeUl0ZW0pOworX0NPTV9TTUFSVFBUUl9U WVBFREVGKElXZWJIaXN0b3J5UHJpdmF0ZSwgSUlEX0lXZWJIaXN0b3J5UHJpdmF0ZSk7CitfQ09N X1NNQVJUUFRSX1RZUEVERUYoSVdlYklCQWN0aW9ucywgSUlEX0lXZWJJQkFjdGlvbnMpOworX0NP TV9TTUFSVFBUUl9UWVBFREVGKElXZWJJbnNwZWN0b3IsIElJRF9JV2ViSW5zcGVjdG9yKTsKK19D T01fU01BUlRQVFJfVFlQRURFRihJV2ViS2l0TWVzc2FnZUxvb3AsIElJRF9JV2ViS2l0TWVzc2Fn ZUxvb3ApOworX0NPTV9TTUFSVFBUUl9UWVBFREVGKElXZWJNdXRhYmxlVVJMUmVxdWVzdCwgSUlE X0lXZWJNdXRhYmxlVVJMUmVxdWVzdCk7CitfQ09NX1NNQVJUUFRSX1RZUEVERUYoSVdlYk5vdGlm aWNhdGlvbkNlbnRlciwgSUlEX0lXZWJOb3RpZmljYXRpb25DZW50ZXIpOworX0NPTV9TTUFSVFBU Ul9UWVBFREVGKElXZWJOb3RpZmljYXRpb25PYnNlcnZlciwgSUlEX0lXZWJOb3RpZmljYXRpb25P YnNlcnZlcik7CitfQ09NX1NNQVJUUFRSX1RZUEVERUYoSVdlYlByZWZlcmVuY2VzLCBJSURfSVdl YlByZWZlcmVuY2VzKTsKK19DT01fU01BUlRQVFJfVFlQRURFRihJV2ViUHJlZmVyZW5jZXNQcml2 YXRlMywgSUlEX0lXZWJQcmVmZXJlbmNlc1ByaXZhdGUzKTsKK19DT01fU01BUlRQVFJfVFlQRURF RihJV2ViUmVzb3VyY2VMb2FkRGVsZWdhdGUsIElJRF9JV2ViUmVzb3VyY2VMb2FkRGVsZWdhdGUp OworX0NPTV9TTUFSVFBUUl9UWVBFREVGKElXZWJVSURlbGVnYXRlLCBJSURfSVdlYlVJRGVsZWdh dGUpOworX0NPTV9TTUFSVFBUUl9UWVBFREVGKElXZWJWaWV3LCBJSURfSVdlYlZpZXcpOworX0NP TV9TTUFSVFBUUl9UWVBFREVGKElXZWJWaWV3UHJpdmF0ZTIsIElJRF9JV2ViVmlld1ByaXZhdGUy KTsKK19DT01fU01BUlRQVFJfVFlQRURFRihJV2ViVmlld1ByaXZhdGUzLCBJSURfSVdlYlZpZXdQ cml2YXRlMyk7CiAKIGNsYXNzIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cgOiBwdWJsaWMgQnJv d3NlcldpbmRvdyB7CiBwdWJsaWM6CkBAIC04NCw3ICs4OSw3IEBAIHByaXZhdGU6CiAgICAgSFJF U1VMVCBzZXREb3dubG9hZERlbGVnYXRlKElXZWJEb3dubG9hZERlbGVnYXRlUHRyKTsKIAogICAg IElXZWJQcmVmZXJlbmNlc1B0ciBzdGFuZGFyZFByZWZlcmVuY2VzKCkgeyByZXR1cm4gbV9zdGFu ZGFyZFByZWZlcmVuY2VzOyAgfQotICAgIElXZWJQcmVmZXJlbmNlc1ByaXZhdGVQdHIgcHJpdmF0 ZVByZWZlcmVuY2VzKCkgeyByZXR1cm4gbV9wcmVmc1ByaXZhdGU7IH0KKyAgICBJV2ViUHJlZmVy ZW5jZXNQcml2YXRlM1B0ciBwcml2YXRlUHJlZmVyZW5jZXMoKSB7IHJldHVybiBtX3ByZWZzUHJp dmF0ZTsgfQogICAgIElXZWJGcmFtZVB0ciBtYWluRnJhbWUoKTsKICAgICBJV2ViQ29yZVN0YXRp c3RpY3NQdHIgc3RhdGlzdGljcygpIHsgcmV0dXJuIG1fc3RhdGlzdGljczsgfQogICAgIElXZWJD YWNoZVB0ciB3ZWJDYWNoZSgpIHsgcmV0dXJuIG1fd2ViQ2FjaGU7ICB9CkBAIC0xMTksMTIgKzEy NCwxMiBAQCBwcml2YXRlOgogICAgIHN0ZDo6dmVjdG9yPElXZWJIaXN0b3J5SXRlbVB0cj4gbV9o aXN0b3J5SXRlbXM7CiAKICAgICBJV2ViVmlld1B0ciBtX3dlYlZpZXc7Ci0gICAgSVdlYlZpZXdQ cml2YXRlUHRyIG1fd2ViVmlld1ByaXZhdGU7CisgICAgSVdlYlZpZXdQcml2YXRlMlB0ciBtX3dl YlZpZXdQcml2YXRlOwogCiAgICAgSVdlYkhpc3RvcnlQdHIgbV93ZWJIaXN0b3J5OwogICAgIElX ZWJJbnNwZWN0b3JQdHIgbV9pbnNwZWN0b3I7CiAgICAgSVdlYlByZWZlcmVuY2VzUHRyIG1fc3Rh bmRhcmRQcmVmZXJlbmNlczsKLSAgICBJV2ViUHJlZmVyZW5jZXNQcml2YXRlUHRyIG1fcHJlZnNQ cml2YXRlOworICAgIElXZWJQcmVmZXJlbmNlc1ByaXZhdGUzUHRyIG1fcHJlZnNQcml2YXRlOwog ICAgIElXZWJOb3RpZmljYXRpb25DZW50ZXJQdHIgbV9kZWZhdWx0Tm90aWZpY2F0aW9uQ2VudGVy OwogICAgIElXZWJOb3RpZmljYXRpb25PYnNlcnZlclB0ciBtX25vdGlmaWNhdGlvbk9ic2VydmVy OwogCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAgYi9Ub29s cy9NaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAKaW5kZXggMmQ1ZTM2NjUyYjlhNDg0YWYzZjFl OTY1NGM4ZjhkNzk0OTg0NTk3Ny4uY2I0YWM4ZjMwN2M2NWVjOWU4ZmI3ZjNiMmZkZTBjOGM4OTQy NTRmZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dpbk1haW4uY3BwCisrKyBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcApAQCAtOTUsNyArOTUsNyBAQCBpbnQg V0lOQVBJIHdXaW5NYWluKF9Jbl8gSElOU1RBTkNFIGhJbnN0YW5jZSwgX0luX29wdF8gSElOU1RB TkNFIGhQcmV2SW5zdGFuY2UsCiAKICAgICAvLyBNYWluIG1lc3NhZ2UgbG9vcDoKICAgICBfX3Ry eSB7Ci0gICAgICAgIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJLaXRNZXNzYWdlTG9vcCwgJl9f dXVpZG9mKElXZWJLaXRNZXNzYWdlTG9vcCk+PiBtZXNzYWdlTG9vcDsKKyAgICAgICAgSVdlYktp dE1lc3NhZ2VMb29wUHRyIG1lc3NhZ2VMb29wOwogCiAgICAgICAgIGhyID0gV2ViS2l0Q3JlYXRl SW5zdGFuY2UoQ0xTSURfV2ViS2l0TWVzc2FnZUxvb3AsIDAsIElJRF9JV2ViS2l0TWVzc2FnZUxv b3AsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmbWVzc2FnZUxvb3AuR2V0SW50ZXJmYWNlUHRy KCkpKTsKICAgICAgICAgaWYgKEZBSUxFRChocikpCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci93aW4vc3RkYWZ4LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vc3RkYWZ4LmgKaW5kZXgg MDRmMGEzZjhmNjk5ODE4NTQ0ZDA4MzExNzhkOWQ3ZmFkYjdlOWU5YS4uMWFlZDI0NDVlNGUwMGRm YzliOGZhOGJlZjIyMzZlMTlhYTE3ZmMyNyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv d2luL3N0ZGFmeC5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9zdGRhZnguaApAQCAtNDIs NiArNDIsNyBAQAogI2VuZGlmCiAKICNpbmNsdWRlIDxhc3NlcnQuaD4KKyNpbmNsdWRlIDxjb21k ZWYuaD4KICNpbmNsdWRlIDxjb21pcC5oPgogI2luY2x1ZGUgPGNvbW1jdHJsLmg+CiAjaW5jbHVk ZSA8Y29tbWRsZy5oPgo=