6501 2006-01-12 01:44:35 -0800 Merge KParts::BrowserInterface with KParts::BrowserExtension 2006-01-12 02:07:52 -0800 1 1 1 Unclassified WebKit Frames 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 28279 0 andersca 2006-01-12 01:44:35 -0800 We should do this and get rid of KPartsBrowserInterface altogether 28280 1 5614 andersca 2006-01-12 01:59:01 -0800 Created attachment 5614 Patch 5614 2006-01-12 01:59:01 -0800 2006-01-12 02:04:11 -0800 Patch webcore-browserinterface.txt text/plain 20657 andersca SW5kZXg6IGtodG1sL3htbC94bWxfdG9rZW5pemVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBraHRtbC94 bWwveG1sX3Rva2VuaXplci5jcHAJKHJldmlzaW9uIDEyMDE3KQorKysga2h0bWwveG1sL3htbF90 b2tlbml6ZXIuY3BwCShhcmJldHNrb3BpYSkKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRlICJG cmFtZS5oIgogI2luY2x1ZGUgPGtkZWJ1Zy5oPgogI2luY2x1ZGUgPGtsb2NhbGUuaD4KKyNpbmNs dWRlIDxxdmFyaWFudC5oPgogCiAjaW5jbHVkZSA8bGlieG1sL3BhcnNlci5oPgogI2luY2x1ZGUg PGxpYnhtbC9wYXJzZXJJbnRlcm5hbHMuaD4KSW5kZXg6IGtodG1sL2VjbWEva2pzX3dpbmRvdy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0ga2h0bWwvZWNtYS9ranNfd2luZG93LmNwcAkocmV2aXNpb24gMTIw MTcpCisrKyBraHRtbC9lY21hL2tqc193aW5kb3cuY3BwCShhcmJldHNrb3BpYSkKQEAgLTI0OTgs MTkgKzI0OTgsMTAgQEAgSlNWYWx1ZSAqSGlzdG9yeTo6Z2V0VmFsdWVQcm9wZXJ0eShFeGVjUwog ICBjYXNlIExlbmd0aDoKICAgewogICAgIEtQYXJ0czo6QnJvd3NlckV4dGVuc2lvbiAqZXh0ID0g bV9mcmFtZS0+YnJvd3NlckV4dGVuc2lvbigpOwotICAgIGlmICggIWV4dCApCisgICAgaWYgKCFl eHQpCiAgICAgICByZXR1cm4ganNOdW1iZXIoMCk7CiAKLSAgICBLUGFydHM6OkJyb3dzZXJJbnRl cmZhY2UgKmlmYWNlID0gZXh0LT5icm93c2VySW50ZXJmYWNlKCk7Ci0gICAgaWYgKCAhaWZhY2Ug KQotICAgICAgcmV0dXJuIGpzTnVtYmVyKDApOwotCi0gICAgUVZhcmlhbnQgbGVuZ3RoID0gaWZh Y2UtPnByb3BlcnR5KCAiaGlzdG9yeUxlbmd0aCIgKTsKLQotICAgIGlmICggbGVuZ3RoLnR5cGUo KSAhPSBRVmFyaWFudDo6VUludCApCi0gICAgICByZXR1cm4ganNOdW1iZXIoMCk7Ci0KLSAgICBy ZXR1cm4ganNOdW1iZXIoIGxlbmd0aC50b1VJbnQoKSApOworICAgIHJldHVybiBqc051bWJlcihl eHQtPmdldEhpc3RvcnlMZW5ndGgoKSk7CiAgIH0KICAgZGVmYXVsdDoKICAgICBrZFdhcm5pbmco KSA8PCAiVW5oYW5kbGVkIHRva2VuIGluIEhpc3Rvcnk6OmdldFZhbHVlUHJvcGVydHkgOiAiIDw8 IHRva2VuIDw8IGVuZGw7CkluZGV4OiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lv biAxMjAxNykKKysrIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkoYXJiZXRza29w aWEpCkBAIC04Myw3ICs4Myw2IEBACiAJCTY1QkYwMjQwMDk3NDgxOTAwMEM0MzE5NiAvKiBLV1FL SFRNTFBhcnRCcm93c2VyRXh0ZW5zaW9uLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNjVCRjAyMzcwOTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtIVE1MUGFy dEJyb3dzZXJFeHRlbnNpb24ubW0gKi87IH07CiAJCTY1QkYwMjQxMDk3NDgxOTAwMEM0MzE5NiAv KiBLV1FLSFRNTFZpZXcuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNjVCRjAyMzgwOTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtIVE1MVmlldy5jcHAgKi87 IH07CiAJCTY1QkYwMjQyMDk3NDgxOTAwMEM0MzE5NiAvKiBLV1FLUGFydHNCcm93c2VyRXh0ZW5z aW9uLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2NUJG MDIzOTA5NzQ4MTkwMDBDNDMxOTYgLyogS1dRS1BhcnRzQnJvd3NlckV4dGVuc2lvbi5oICovOyB9 OwotCQk2NUJGMDI0MzA5NzQ4MTkwMDBDNDMxOTYgLyogS1dRS1BhcnRzQnJvd3NlckludGVyZmFj ZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDY1QkYw MjNBMDk3NDgxOTAwMEM0MzE5NiAvKiBLV1FLUGFydHNCcm93c2VySW50ZXJmYWNlLm1tICovOyB9 OwogCQk2NUJGMDI0NDA5NzQ4MTkwMDBDNDMxOTYgLyogTWFjRnJhbWUuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDY1QkYwMjNCMDk3NDgxOTAwMEM0MzE5 NiAvKiBNYWNGcmFtZS5oICovOyB9OwogCQk2NUJGMDI0NTA5NzQ4MTkwMDBDNDMxOTYgLyogTWFj RnJhbWUubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2 NUJGMDIzQzA5NzQ4MTkwMDBDNDMxOTYgLyogTWFjRnJhbWUubW0gKi87IH07CiAJCTY1QkYwMjQ2 MDk3NDgxOTAwMEM0MzE5NiAvKiBXZWJDb3JlQnJpZGdlLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2NUJGMDIzRDA5NzQ4MTkwMDBDNDMxOTYgLyogV2Vi Q29yZUJyaWRnZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07 IH07CkBAIC0yMTQsNyArMjEzLDYgQEAKIAkJOTNGMTk5NTUwODI0NUU1OTAwMUU5QUJDIC8qIEtX UUtKb2IuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY1 ODc4NjRBMDJERTNBOUEwMUVBNDEyMiAvKiBLV1FLSm9iLmggKi87IH07CiAJCTkzRjE5OTU2MDgy NDVFNTkwMDFFOUFCQyAvKiBLV1FLSm9iQ2xhc3Nlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjU4Nzg2NEIwMkRFM0E5QTAxRUE0MTIyIC8qIEtXUUtK b2JDbGFzc2VzLmggKi87IH07CiAJCTkzRjE5OTVCMDgyNDVFNTkwMDFFOUFCQyAvKiBLV1FLTG9j YWxlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNTg3 ODVGQTAyREUzODIwMDFFQTQxMjIgLyogS1dRS0xvY2FsZS5oICovOyB9OwotCQk5M0YxOTk1RDA4 MjQ1RTU5MDAxRTlBQkMgLyogS1dRS1BhcnRzQnJvd3NlckludGVyZmFjZS5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjU4Nzg2NjgwMkRFM0IzMjAxRUE0 MTIyIC8qIEtXUUtQYXJ0c0Jyb3dzZXJJbnRlcmZhY2UuaCAqLzsgfTsKIAkJOTNGMTk5NUUwODI0 NUU1OTAwMUU5QUJDIC8qIEtXUUtQYXJ0c0V2ZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNTg3ODY2OTAyREUzQjMyMDFFQTQxMjIgLyogS1dRS1Bh cnRzRXZlbnQuaCAqLzsgfTsKIAkJOTNGMTk5NjAwODI0NUU1OTAwMUU5QUJDIC8qIEtXUUtQYXJ0 c0hpc3RvcnlQcm92aWRlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gRjU4Nzg2NkIwMkRFM0IzMjAxRUE0MTIyIC8qIEtXUUtQYXJ0c0hpc3RvcnlQcm92 aWRlci5oICovOyB9OwogCQk5M0YxOTk2MzA4MjQ1RTU5MDAxRTlBQkMgLyogS1dRS1NTTEtleUdl bi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjU4Nzg2 NjIwMkRFM0IxMTAxRUE0MTIyIC8qIEtXUUtTU0xLZXlHZW4uaCAqLzsgfTsKQEAgLTgxMSw3ICs4 MDksNiBAQAogCQlBODhBRDE5QTA5NTI0ODBBMDAxREQxOTYgLyogS1dRS0pvYi5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjU4Nzg2NEEwMkRFM0E5QTAx RUE0MTIyIC8qIEtXUUtKb2IuaCAqLzsgfTsKIAkJQTg4QUQxOUIwOTUyNDgwQTAwMUREMTk2IC8q IEtXUUtKb2JDbGFzc2VzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSBGNTg3ODY0QjAyREUzQTlBMDFFQTQxMjIgLyogS1dRS0pvYkNsYXNzZXMuaCAqLzsg fTsKIAkJQTg4QUQxOUYwOTUyNDgwQTAwMUREMTk2IC8qIEtXUUtMb2NhbGUuaCBpbiBIZWFkZXJz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY1ODc4NUZBMDJERTM4MjAwMUVB NDEyMiAvKiBLV1FLTG9jYWxlLmggKi87IH07Ci0JCUE4OEFEMUExMDk1MjQ4MEEwMDFERDE5NiAv KiBLV1FLUGFydHNCcm93c2VySW50ZXJmYWNlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBGNTg3ODY2ODAyREUzQjMyMDFFQTQxMjIgLyogS1dRS1BhcnRz QnJvd3NlckludGVyZmFjZS5oICovOyB9OwogCQlBODhBRDFBMjA5NTI0ODBBMDAxREQxOTYgLyog S1dRS1BhcnRzRXZlbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEY1ODc4NjY5MDJERTNCMzIwMUVBNDEyMiAvKiBLV1FLUGFydHNFdmVudC5oICovOyB9 OwogCQlBODhBRDFBMzA5NTI0ODBBMDAxREQxOTYgLyogS1dRS1BhcnRzSGlzdG9yeVByb3ZpZGVy LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNTg3ODY2 QjAyREUzQjMyMDFFQTQxMjIgLyogS1dRS1BhcnRzSGlzdG9yeVByb3ZpZGVyLmggKi87IH07CiAJ CUE4OEFEMUE1MDk1MjQ4MEEwMDFERDE5NiAvKiBLV1FLU1NMS2V5R2VuLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNTg3ODY2MjAyREUzQjExMDFFQTQx MjIgLyogS1dRS1NTTEtleUdlbi5oICovOyB9OwpAQCAtMTc4MCw3ICsxNzc3LDYgQEAKIAkJNjVC RjAyMzcwOTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtIVE1MUGFydEJyb3dzZXJFeHRlbnNpb24ubW0g Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gS1dRS0hUTUxQYXJ0QnJv d3NlckV4dGVuc2lvbi5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNjVCRjAyMzgw OTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtIVE1MVmlldy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gS1dRS0hUTUxWaWV3LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNjVCRjAyMzkwOTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtQYXJ0c0Jyb3dzZXJFeHRl bnNpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEtXUUtQYXJ0c0Jyb3dz ZXJFeHRlbnNpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJNjVCRjAyM0EwOTc0 ODE5MDAwQzQzMTk2IC8qIEtXUUtQYXJ0c0Jyb3dzZXJJbnRlcmZhY2UubW0gKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gS1dRS1BhcnRzQnJvd3NlckludGVyZmFjZS5t bTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNjVCRjAyM0IwOTc0ODE5MDAwQzQzMTk2 IC8qIE1hY0ZyYW1lLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBNYWNGcmFt ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk2NUJGMDIzQzA5NzQ4MTkwMDBDNDMx OTYgLyogTWFjRnJhbWUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRo ID0gTWFjRnJhbWUubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTY1QkYwMjNEMDk3 NDgxOTAwMEM0MzE5NiAvKiBXZWJDb3JlQnJpZGdlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBXZWJDb3JlQnJpZGdlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBA IC0yNzQ2LDcgKzI3NDIsNiBAQAogCQlGNTg3ODY0QjAyREUzQTlBMDFFQTQxMjIgLyogS1dRS0pv YkNsYXNzZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAz MDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gS1dRS0pvYkNsYXNzZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGgg PSA4OyB1c2VzVGFicyA9IDA7IH07CiAJCUY1ODc4NjREMDJERTNBOUEwMUVBNDEyMiAvKiBLV1FL SW1hZ2VJTy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDMw OyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBLV1FLSW1hZ2VJTy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0aCA9IDg7 IHVzZXNUYWJzID0gMDsgfTsKIAkJRjU4Nzg2NjIwMkRFM0IxMTAxRUE0MTIyIC8qIEtXUUtTU0xL ZXlHZW4uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsg aW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gS1dRS1NTTEtleUdlbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0aCA9IDg7 IHVzZXNUYWJzID0gMDsgfTsKLQkJRjU4Nzg2NjgwMkRFM0IzMjAxRUE0MTIyIC8qIEtXUUtQYXJ0 c0Jyb3dzZXJJbnRlcmZhY2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSAzMDsgaW5kZW50V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gS1dRS1BhcnRzQnJvd3NlckludGVyZmFjZS5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKIAkJRjU4Nzg2NjkwMkRF M0IzMjAxRUE0MTIyIC8qIEtXUUtQYXJ0c0V2ZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEtXUUtQYXJ0c0V2ZW50Lmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwogCQlGNTg3ODY2QjAy REUzQjMyMDFFQTQxMjIgLyogS1dRS1BhcnRzSGlzdG9yeVByb3ZpZGVyLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGluZGVudFdpZHRoID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEtXUUtQYXJ0c0hpc3RvcnlQ cm92aWRlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJz ID0gMDsgfTsKIAkJRjU4Nzg2NzYwMkRFM0I4NjAxRUE0MTIyIC8qIEtXUUFwcGxpY2F0aW9uLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGluZGVudFdp ZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbGluZUVuZGluZyA9 IDA7IHBhdGggPSBLV1FBcHBsaWNhdGlvbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJX aWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKQEAgLTI5NTAsNyArMjk0NSw2IEBACiAJCQkJNjVC RjAyMzcwOTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtIVE1MUGFydEJyb3dzZXJFeHRlbnNpb24ubW0g Ki8sCiAJCQkJNjVCRjAyMzgwOTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtIVE1MVmlldy5jcHAgKi8s CiAJCQkJNjVCRjAyMzkwOTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtQYXJ0c0Jyb3dzZXJFeHRlbnNp b24uaCAqLywKLQkJCQk2NUJGMDIzQTA5NzQ4MTkwMDBDNDMxOTYgLyogS1dRS1BhcnRzQnJvd3Nl ckludGVyZmFjZS5tbSAqLywKIAkJCQk2NUJGMDIzQjA5NzQ4MTkwMDBDNDMxOTYgLyogTWFjRnJh bWUuaCAqLywKIAkJCQk2NUJGMDIzQzA5NzQ4MTkwMDBDNDMxOTYgLyogTWFjRnJhbWUubW0gKi8s CiAJCQkJNjVCRjAyM0QwOTc0ODE5MDAwQzQzMTk2IC8qIFdlYkNvcmVCcmlkZ2UuaCAqLywKQEAg LTQyMjEsNyArNDIxNSw2IEBACiAJCUY1ODc4Njc1MDJERTNCMzMwMUVBNDEyMiAvKiBrcGFydHMg Ki8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAotCQkJCUY1ODc4NjY4 MDJERTNCMzIwMUVBNDEyMiAvKiBLV1FLUGFydHNCcm93c2VySW50ZXJmYWNlLmggKi8sCiAJCQkJ RjU4Nzg2NjkwMkRFM0IzMjAxRUE0MTIyIC8qIEtXUUtQYXJ0c0V2ZW50LmggKi8sCiAJCQkJRjU4 Nzg1MDgwMkRFMzc1OTAxRUE0MTIyIC8qIEtXUUtQYXJ0c0V2ZW50LmNwcCAqLywKIAkJCQlGNTg3 ODY2QjAyREUzQjMyMDFFQTQxMjIgLyogS1dRS1BhcnRzSGlzdG9yeVByb3ZpZGVyLmggKi8sCkBA IC00NDg0LDcgKzQ0NzcsNiBAQAogCQkJCTkzRjE5OTU1MDgyNDVFNTkwMDFFOUFCQyAvKiBLV1FL Sm9iLmggaW4gSGVhZGVycyAqLywKIAkJCQk5M0YxOTk1NjA4MjQ1RTU5MDAxRTlBQkMgLyogS1dR S0pvYkNsYXNzZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCTkzRjE5OTVCMDgyNDVFNTkwMDFFOUFC QyAvKiBLV1FLTG9jYWxlLmggaW4gSGVhZGVycyAqLywKLQkJCQk5M0YxOTk1RDA4MjQ1RTU5MDAx RTlBQkMgLyogS1dRS1BhcnRzQnJvd3NlckludGVyZmFjZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJ OTNGMTk5NUUwODI0NUU1OTAwMUU5QUJDIC8qIEtXUUtQYXJ0c0V2ZW50LmggaW4gSGVhZGVycyAq LywKIAkJCQk5M0YxOTk2MDA4MjQ1RTU5MDAxRTlBQkMgLyogS1dRS1BhcnRzSGlzdG9yeVByb3Zp ZGVyLmggaW4gSGVhZGVycyAqLywKIAkJCQk5M0YxOTk2MzA4MjQ1RTU5MDAxRTlBQkMgLyogS1dR S1NTTEtleUdlbi5oIGluIEhlYWRlcnMgKi8sCkBAIC01MDA4LDcgKzUwMDAsNiBAQAogCQkJCUE4 OEFEMTlBMDk1MjQ4MEEwMDFERDE5NiAvKiBLV1FLSm9iLmggaW4gSGVhZGVycyAqLywKIAkJCQlB ODhBRDE5QjA5NTI0ODBBMDAxREQxOTYgLyogS1dRS0pvYkNsYXNzZXMuaCBpbiBIZWFkZXJzICov LAogCQkJCUE4OEFEMTlGMDk1MjQ4MEEwMDFERDE5NiAvKiBLV1FLTG9jYWxlLmggaW4gSGVhZGVy cyAqLywKLQkJCQlBODhBRDFBMTA5NTI0ODBBMDAxREQxOTYgLyogS1dRS1BhcnRzQnJvd3Nlcklu dGVyZmFjZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQTg4QUQxQTIwOTUyNDgwQTAwMUREMTk2IC8q IEtXUUtQYXJ0c0V2ZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQlBODhBRDFBMzA5NTI0ODBBMDAx REQxOTYgLyogS1dRS1BhcnRzSGlzdG9yeVByb3ZpZGVyLmggaW4gSGVhZGVycyAqLywKIAkJCQlB ODhBRDFBNTA5NTI0ODBBMDAxREQxOTYgLyogS1dRS1NTTEtleUdlbi5oIGluIEhlYWRlcnMgKi8s CkBAIC02NzUxLDcgKzY3NDIsNiBAQAogCQkJCTY1QkYwMjJFMDk3NDgxNjMwMEM0MzE5NiAvKiBG cmFtZS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk2NUJGMDI0MDA5NzQ4MTkwMDBDNDMxOTYgLyog S1dRS0hUTUxQYXJ0QnJvd3NlckV4dGVuc2lvbi5tbSBpbiBTb3VyY2VzICovLAogCQkJCTY1QkYw MjQxMDk3NDgxOTAwMEM0MzE5NiAvKiBLV1FLSFRNTFZpZXcuY3BwIGluIFNvdXJjZXMgKi8sCi0J CQkJNjVCRjAyNDMwOTc0ODE5MDAwQzQzMTk2IC8qIEtXUUtQYXJ0c0Jyb3dzZXJJbnRlcmZhY2Uu bW0gaW4gU291cmNlcyAqLywKIAkJCQk2NUJGMDI0NTA5NzQ4MTkwMDBDNDMxOTYgLyogTWFjRnJh bWUubW0gaW4gU291cmNlcyAqLywKIAkJCQk2NUJGMDI0NzA5NzQ4MTkwMDBDNDMxOTYgLyogV2Vi Q29yZUJyaWRnZS5tbSBpbiBTb3VyY2VzICovLAogCQkJCUZBRTA0MThDMDk3NTk2OTQwMDA1NDBC RSAvKiBSZW5kZXJTVkdJbWFnZS5jcHAgaW4gU291cmNlcyAqLywKSW5kZXg6IENoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDE3KQorKysgQ2hhbmdlTG9nCShh cmJldHNrb3BpYSkKQEAgLTEsMyArMSwzMSBAQAorMjAwNi0wMS0xMiAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAbWFjLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dp P2lkPTY1MDEKKyAgICAgICAgLSBNZXJnZSBLUGFydHM6OkJyb3dzZXJJbnRlcmZhY2Ugd2l0aCBL UGFydHM6OkJyb3dzZXJFeHRlbnNpb24uCisgICAgICAgIAorICAgICAgICAqIEZvcndhcmRpbmdI ZWFkZXJzL2twYXJ0cy9icm93c2VyaW50ZXJmYWNlLmg6IFJlbW92ZWQuCisgICAgICAgICogYnJp ZGdlL21hYy9LV1FLUGFydHNCcm93c2VySW50ZXJmYWNlLm1tOiBSZW1vdmVkLgorICAgICAgICAq IGt3cS9LV1FLUGFydHNCcm93c2VySW50ZXJmYWNlLmg6IFJlbW92ZWQuCisKKyAgICAgICAgKiBX ZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogYnJpZGdlL21hYy9L V1FLSFRNTFBhcnRCcm93c2VyRXh0ZW5zaW9uLmg6CisgICAgICAgICogYnJpZGdlL21hYy9LV1FL SFRNTFBhcnRCcm93c2VyRXh0ZW5zaW9uLm1tOgorICAgICAgICAoS0hUTUxQYXJ0QnJvd3NlckV4 dGVuc2lvbjo6S0hUTUxQYXJ0QnJvd3NlckV4dGVuc2lvbik6CisgICAgICAgIChLSFRNTFBhcnRC cm93c2VyRXh0ZW5zaW9uOjpnZXRIaXN0b3J5TGVuZ3RoKToKKyAgICAgICAgKEtIVE1MUGFydEJy b3dzZXJFeHRlbnNpb246OmdvQmFja09yRm9yd2FyZCk6ICAgICAgICAKKyAgICAgICAgKiBicmlk Z2UvbWFjL0tXUUtQYXJ0c0Jyb3dzZXJFeHRlbnNpb24uaDoKKyAgICAgICAgKEtQYXJ0czo6QnJv d3NlckV4dGVuc2lvbjo6QnJvd3NlckV4dGVuc2lvbik6CisgICAgICAgICoga2h0bWwvZWNtYS9r anNfd2luZG93LmNwcDoKKyAgICAgICAgKEtKUzo6SGlzdG9yeTo6Z2V0VmFsdWVQcm9wZXJ0eSk6 CisgICAgICAgICoga2h0bWwveG1sL3htbF90b2tlbml6ZXIuY3BwOgorICAgICAgICAqIHBhZ2Uv RnJhbWUuY3BwOgorICAgICAgICAoRnJhbWU6OnNsb3RSZWRpcmVjdCk6CisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICBBZGQgZ2V0SGlzdG9yeUxlbmd0aCBhbmQgZ29CYWNr T3JGb3J3YXJkIHRvIEJyb3dzZXJFeHRlbnNpb24gYW5kCisgICAgICAgIHVzZSB0aGVtLgorCiAy MDA2LTAxLTEyICBFcmljIFNlaWRlbCAgPGVzZWlkZWxAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1 aWxkIGZpeCwgZmlsZXMgbWlzc2luZyBmcm9tIHByZXZpb3VzIDxpbWFnZT4gY29tbWl0OgpJbmRl eDogYnJpZGdlL21hYy9LV1FLSFRNTFBhcnRCcm93c2VyRXh0ZW5zaW9uLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gYnJpZGdlL21hYy9LV1FLSFRNTFBhcnRCcm93c2VyRXh0ZW5zaW9uLmgJKHJldmlzaW9uIDEy MDE3KQorKysgYnJpZGdlL21hYy9LV1FLSFRNTFBhcnRCcm93c2VyRXh0ZW5zaW9uLmgJKGFyYmV0 c2tvcGlhKQpAQCAtMjQsMTcgKzI0LDE0IEBACiAgKi8KIAogI2luY2x1ZGUgIktXUUtQYXJ0c0Jy b3dzZXJFeHRlbnNpb24uaCIKLSNpbmNsdWRlICJLV1FLUGFydHNCcm93c2VySW50ZXJmYWNlLmgi CiAKLWNsYXNzIFFXaWRnZXQ7CiBjbGFzcyBGcmFtZTsKK2NsYXNzIE1hY0ZyYW1lOwogCiBjbGFz cyBLSFRNTFBhcnRCcm93c2VyRXh0ZW5zaW9uIDogcHVibGljIEtQYXJ0czo6QnJvd3NlckV4dGVu c2lvbiB7CiBwdWJsaWM6CiAgICAgS0hUTUxQYXJ0QnJvd3NlckV4dGVuc2lvbihGcmFtZSAqKTsK ICAgICAKLSAgICB2aXJ0dWFsIEtQYXJ0czo6QnJvd3NlckludGVyZmFjZSAqYnJvd3NlckludGVy ZmFjZSgpIHsgcmV0dXJuICZfYnJvd3NlckludGVyZmFjZTsgfQotCiAgICAgdmlydHVhbCB2b2lk IG9wZW5VUkxSZXF1ZXN0KGNvbnN0IEtVUkwgJiwgCiAJCQkJY29uc3QgS1BhcnRzOjpVUkxBcmdz ICZhcmdzID0gS1BhcnRzOjpVUkxBcmdzKCkpOwogICAgIHZpcnR1YWwgdm9pZCBvcGVuVVJMTm90 aWZ5KCk7CkBAIC00OSw2ICs0Niw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0SWNv blVSTChjb25zdCBLVVJMICZ1cmwpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRUeXBlZEljb25VUkwo Y29uc3QgS1VSTCAmdXJsLCBjb25zdCBRU3RyaW5nICZ0eXBlKTsKIAorICAgIHZpcnR1YWwgaW50 IGdldEhpc3RvcnlMZW5ndGgoKTsKKyAgICB2aXJ0dWFsIHZvaWQgZ29CYWNrT3JGb3J3YXJkKGlu dCBkaXN0YW5jZSk7CisKICAgICBib29sIGNhblJ1bk1vZGFsKCk7CiAgICAgYm9vbCBjYW5SdW5N b2RhbE5vdygpOwogICAgIHZvaWQgcnVuTW9kYWwoKTsKQEAgLTYwLDUgKzYwLDQgQEAgcHJpdmF0 ZToKIAkJCSAgT2JqZWN0Q29udGVudHMgKipwYXJ0KTsKIAogICAgICBNYWNGcmFtZSAqbV9mcmFt ZTsKLSAgICAgS1BhcnRzOjpCcm93c2VySW50ZXJmYWNlIF9icm93c2VySW50ZXJmYWNlOwogfTsK SW5kZXg6IGJyaWRnZS9tYWMvS1dRS0hUTUxQYXJ0QnJvd3NlckV4dGVuc2lvbi5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBicmlkZ2UvbWFjL0tXUUtIVE1MUGFydEJyb3dzZXJFeHRlbnNpb24ubW0JKHJldmlz aW9uIDEyMDE3KQorKysgYnJpZGdlL21hYy9LV1FLSFRNTFBhcnRCcm93c2VyRXh0ZW5zaW9uLm1t CShhcmJldHNrb3BpYSkKQEAgLTMyLDcgKzMyLDcgQEAKICNpbXBvcnQgIk1hY0ZyYW1lLmgiCiAK IEtIVE1MUGFydEJyb3dzZXJFeHRlbnNpb246OktIVE1MUGFydEJyb3dzZXJFeHRlbnNpb24oRnJh bWUgKmZyYW1lKQotICAgIDogbV9mcmFtZShNYWMoZnJhbWUpKSwgX2Jyb3dzZXJJbnRlcmZhY2Uo bV9mcmFtZSkKKyAgICA6IG1fZnJhbWUoTWFjKGZyYW1lKSkKIHsKIH0KIApAQCAtMTgwLDYgKzE4 MCwxOCBAQCB2b2lkIEtIVE1MUGFydEJyb3dzZXJFeHRlbnNpb246OnNldFR5cGVkCiAgICAgS1dR X1VOQkxPQ0tfRVhDRVBUSU9OUzsKIH0KIAoraW50IEtIVE1MUGFydEJyb3dzZXJFeHRlbnNpb246 OmdldEhpc3RvcnlMZW5ndGgoKQoreworICAgIHJldHVybiBbbV9mcmFtZS0+YnJpZGdlKCkgaGlz dG9yeUxlbmd0aF07Cit9CisKK3ZvaWQgS0hUTUxQYXJ0QnJvd3NlckV4dGVuc2lvbjo6Z29CYWNr T3JGb3J3YXJkKGludCBkaXN0YW5jZSkKK3sKKyAgICBLV1FfQkxPQ0tfRVhDRVBUSU9OUzsKKyAg ICBbbV9mcmFtZS0+YnJpZGdlKCkgZ29CYWNrT3JGb3J3YXJkOmRpc3RhbmNlXTsKKyAgICBLV1Ff VU5CTE9DS19FWENFUFRJT05TOworfQorCiBib29sIEtIVE1MUGFydEJyb3dzZXJFeHRlbnNpb246 OmNhblJ1bk1vZGFsKCkKIHsKICAgICBLV1FfQkxPQ0tfRVhDRVBUSU9OUzsKSW5kZXg6IGJyaWRn ZS9tYWMvS1dRS1BhcnRzQnJvd3NlckludGVyZmFjZS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBicmlkZ2Uv bWFjL0tXUUtQYXJ0c0Jyb3dzZXJJbnRlcmZhY2UubW0JKHJldmlzaW9uIDEyMDE3KQorKysgYnJp ZGdlL21hYy9LV1FLUGFydHNCcm93c2VySW50ZXJmYWNlLm1tCShhcmJldHNrb3BpYSkKQEAgLTEs NjAgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAwMyBBcHBsZSBDb21wdXRlciwgSW5j LiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwot ICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCi0gKiBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFRIRQotICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8g RVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4gT1IKLSAqIENPTlRSSUJVVE9SUyBCRSBM SUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAotICog RVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLAotICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNF UzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCi0gKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCi0gKiBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCi0gKi8KLQotI2luY2x1ZGUgImNvbmZpZy5oIgotI2lt cG9ydCAiS1dRS1BhcnRzQnJvd3NlckludGVyZmFjZS5oIgotCi0jaW1wb3J0IDxreG1sY29yZS9B c3NlcnRpb25zLmg+Ci0jaW1wb3J0ICJLV1FFeGNlcHRpb25zLmgiCi0jaW1wb3J0ICJNYWNGcmFt ZS5oIgotI2ltcG9ydCAiV2ViQ29yZUJyaWRnZS5oIgotCi1uYW1lc3BhY2UgS1BhcnRzIHsKLQot UVZhcmlhbnQgQnJvd3NlckludGVyZmFjZTo6cHJvcGVydHkoY29uc3QgY2hhciAqbmFtZSkgY29u c3QKLXsKLSAgICBpZiAoc3RyY21wKG5hbWUsICJoaXN0b3J5TGVuZ3RoIikgPT0gMCkgewotICAg ICAgICByZXR1cm4gUVZhcmlhbnQoKHVpbnQpW21fZnJhbWUtPmJyaWRnZSgpIGhpc3RvcnlMZW5n dGhdKTsKLSAgICB9Ci0gICAgRVJST1IoInByb3BlcnR5ICVzIG5vdCBpbXBsZW1lbnRlZCIsIG5h bWUpOwotICAgIHJldHVybiBRVmFyaWFudCgpOwotfQotCi12b2lkIEJyb3dzZXJJbnRlcmZhY2U6 OmNhbGxNZXRob2QoY29uc3QgY2hhciAqbmFtZSwgY29uc3QgUVZhcmlhbnQgJmFyZ3VtZW50KQot ewotICAgIGlmIChzdHJjbXAobmFtZSwgImdvSGlzdG9yeShpbnQpIikgPT0gMCkgewotICAgICAg ICBpbnQgZGlzdGFuY2UgPSBhcmd1bWVudC50b0ludCgpOwotCUtXUV9CTE9DS19FWENFUFRJT05T OwotCVttX2ZyYW1lLT5icmlkZ2UoKSBnb0JhY2tPckZvcndhcmQ6ZGlzdGFuY2VdOwotCUtXUV9V TkJMT0NLX0VYQ0VQVElPTlM7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgRVJST1IoIm1l dGhvZCAlcyBub3QgaW1wbGVtZW50ZWQiLCBuYW1lKTsKLX0KLQotfSAvLyBuYW1lc3BhY2UgS1Bh cnRzCi0KLQotCkluZGV4OiBicmlkZ2UvbWFjL0tXUUtQYXJ0c0Jyb3dzZXJFeHRlbnNpb24uaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBicmlkZ2UvbWFjL0tXUUtQYXJ0c0Jyb3dzZXJFeHRlbnNpb24uaAkocmV2 aXNpb24gMTIwMTcpCisrKyBicmlkZ2UvbWFjL0tXUUtQYXJ0c0Jyb3dzZXJFeHRlbnNpb24uaAko YXJiZXRza29waWEpCkBAIC0zMSw4ICszMSw3IEBACiAjaW5jbHVkZSAiS1dRUG9pbnRBcnJheS5o IgogCiAjaW5jbHVkZSAiS1dRS1VSTC5oIgotCi0jaW5jbHVkZSAiS1dRS1BhcnRzQnJvd3Nlcklu dGVyZmFjZS5oIgorI2luY2x1ZGUgIktXUU9iamVjdC5oIgogCiAjaW5jbHVkZSAiZm9ybWRhdGEu aCIKIApAQCAtOTIsNyArOTEsNiBAQCBzdHJ1Y3QgV2luZG93QXJncyB7CiBjbGFzcyBCcm93c2Vy RXh0ZW5zaW9uIDogcHVibGljIFFPYmplY3QgewogcHVibGljOgogICAgIEJyb3dzZXJFeHRlbnNp b24oKSB7IH0KLSAgICB2aXJ0dWFsIEJyb3dzZXJJbnRlcmZhY2UgKmJyb3dzZXJJbnRlcmZhY2Uo KSA9IDA7CiAgICAgCiAgICAgdmlydHVhbCB2b2lkIG9wZW5VUkxSZXF1ZXN0KGNvbnN0IEtVUkwg JiwgY29uc3QgVVJMQXJncyAmYXJncyA9IFVSTEFyZ3MoKSkgPSAwOwogICAgIHZpcnR1YWwgdm9p ZCBvcGVuVVJMTm90aWZ5KCkgPSAwOwpAQCAtMTA4LDYgKzEwNiw5IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgc2V0SWNvblVSTChjb25zdCBLVVJMICZ1cmwpID0gMDsKICAgICB2aXJ0dWFs IHZvaWQgc2V0VHlwZWRJY29uVVJMKGNvbnN0IEtVUkwgJnVybCwgY29uc3QgUVN0cmluZyAmdHlw ZSkgPSAwOwogICAgIAorICAgIHZpcnR1YWwgaW50IGdldEhpc3RvcnlMZW5ndGgoKSA9IDA7Cisg ICAgdmlydHVhbCB2b2lkIGdvQmFja09yRm9yd2FyZChpbnQgZGlzdGFuY2UpID0gMDsKKyAgICAK ICAgICB2b2lkIHNldFVSTEFyZ3MoY29uc3QgVVJMQXJncyAmYXJncykgeyBtX2FyZ3MgPSBhcmdz OyB9CiAgICAgVVJMQXJncyB1cmxBcmdzKCkgY29uc3QgeyByZXR1cm4gbV9hcmdzOyB9CiAKSW5k ZXg6IEZvcndhcmRpbmdIZWFkZXJzL2twYXJ0cy9icm93c2VyaW50ZXJmYWNlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gRm9yd2FyZGluZ0hlYWRlcnMva3BhcnRzL2Jyb3dzZXJpbnRlcmZhY2UuaAkocmV2aXNp b24gMTIwMTcpCisrKyBGb3J3YXJkaW5nSGVhZGVycy9rcGFydHMvYnJvd3NlcmludGVyZmFjZS5o CShhcmJldHNrb3BpYSkKQEAgLTEgKzAsMCBAQAotI2ltcG9ydCAiS1dRS1BhcnRzQnJvd3Nlcklu dGVyZmFjZS5oIgpJbmRleDoga3dxL0tXUUtQYXJ0c0Jyb3dzZXJJbnRlcmZhY2UuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBrd3EvS1dRS1BhcnRzQnJvd3NlckludGVyZmFjZS5oCShyZXZpc2lvbiAxMjAxNykK KysrIGt3cS9LV1FLUGFydHNCcm93c2VySW50ZXJmYWNlLmgJKGFyYmV0c2tvcGlhKQpAQCAtMSw1 MCArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDAzIEFwcGxlIENvbXB1dGVyLCBJbmMu ICBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0g KiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0 YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMg cHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMg UFJPVklERUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJUycnIEFORCBBTlkKLSAqIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywgVEhFCi0gKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgotICogQ09OVFJJQlVUT1JTIEJFIExJ QUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCi0gKiBF WEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sCi0gKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VT OyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKLSAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQ VElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKLSAqIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKLSAqLwotCi0jaWZuZGVmIEJST1dTRVJJTlRFUkZBQ0Vf SF8KLSNkZWZpbmUgQlJPV1NFUklOVEVSRkFDRV9IXwotCi0jaW5jbHVkZSAiS1dRT2JqZWN0Lmgi Ci0jaW5jbHVkZSAiS1dRVmFyaWFudC5oIgotCi1jbGFzcyBNYWNGcmFtZTsKLQotbmFtZXNwYWNl IEtQYXJ0cyB7Ci0KLWNsYXNzIEJyb3dzZXJJbnRlcmZhY2UgOiBwdWJsaWMgUU9iamVjdCB7Ci1w dWJsaWM6Ci0gICAgQnJvd3NlckludGVyZmFjZShNYWNGcmFtZSAqZnJhbWUpIDogbV9mcmFtZShm cmFtZSkgeyB9Ci0gICAgCi0gICAgUVZhcmlhbnQgcHJvcGVydHkoY29uc3QgY2hhciAqbmFtZSkg Y29uc3Q7Ci0gICAgdm9pZCBjYWxsTWV0aG9kKGNvbnN0IGNoYXIgKm5hbWUsIGNvbnN0IFFWYXJp YW50ICZhcmd1bWVudCk7Ci0gICAgCi0KLXByaXZhdGU6Ci0gICAgTWFjRnJhbWUgKm1fZnJhbWU7 Ci19OwotCi19IC8vIG5hbWVzcGFjZSBLUGFydHMKLQotI2VuZGlmCkluZGV4OiBwYWdlL0ZyYW1l Vmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAxMjAx NykKKysrIHBhZ2UvRnJhbWVWaWV3LmNwcAkoYXJiZXRza29waWEpCkBAIC01MSw2ICs1MSw3IEBA CiAKICNpbmNsdWRlIDxxcGFpbnRlci5oPgogI2luY2x1ZGUgPHFwYWludGRldmljZW1ldHJpY3Mu aD4KKyNpbmNsdWRlIDxxdmFyaWFudC5oPgogCiAjaW5jbHVkZSA8a2ltYWdlaW8uaD4KICNpbmNs dWRlIDxhc3NlcnQuaD4KSW5kZXg6IHBhZ2UvRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBhZ2Uv RnJhbWUuY3BwCShyZXZpc2lvbiAxMjAxNykKKysrIHBhZ2UvRnJhbWUuY3BwCShhcmJldHNrb3Bp YSkKQEAgLTkzLDggKzkzLDYgQEAgdXNpbmcgbmFtZXNwYWNlIEtKUzsKIHVzaW5nIG5hbWVzcGFj ZSBET006OkV2ZW50TmFtZXM7CiB1c2luZyBuYW1lc3BhY2Uga2h0bWw7CiAKLXVzaW5nIEtQYXJ0 czo6QnJvd3NlckludGVyZmFjZTsKLQogY29uc3QgaW50IENBUkVUX0JMSU5LX0ZSRVFVRU5DWSA9 IDUwMDsKIAogbmFtZXNwYWNlIGtodG1sIHsKQEAgLTExOTYsOSArMTE5NCw3IEBAIHZvaWQgRnJh bWU6OnNsb3RSZWRpcmVjdCgpCiAgICAgICAgICAgICBvcGVuVVJMKCB1cmwoKSApOyAvLy8gIyMg bmVlZCBhcmdzLnJlbG9hZD10cnVlPwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGlmIChk LT5tX2V4dGVuc2lvbikgewotICAgICAgICAgICAgICAgIEJyb3dzZXJJbnRlcmZhY2UgKmludGVy ZmFjZSA9IGQtPm1fZXh0ZW5zaW9uLT5icm93c2VySW50ZXJmYWNlKCk7Ci0gICAgICAgICAgICAg ICAgaWYgKGludGVyZmFjZSkKLSAgICAgICAgICAgICAgICAgICAgaW50ZXJmYWNlLT5jYWxsTWV0 aG9kKCAiZ29IaXN0b3J5KGludCkiLCBkLT5tX3NjaGVkdWxlZEhpc3RvcnlOYXZpZ2F0aW9uU3Rl cHMgKTsKKyAgICAgICAgICAgICAgICBkLT5tX2V4dGVuc2lvbi0+Z29CYWNrT3JGb3J3YXJkKGQt Pm1fc2NoZWR1bGVkSGlzdG9yeU5hdmlnYXRpb25TdGVwcyk7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KICAgICAgICAgcmV0dXJuOwo=