49748 2010-11-18 10:42:36 -0800 [Qt] Compile with QT_NO_SCRIPT 2011-01-28 19:32:31 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED DUPLICATE 52469 P2 Normal --- 0 smagnuso webkit-unassigned benjamin hausmann kent.hansen laszlo.gombos webkit-ews oldest_to_newest 310942 0 smagnuso 2010-11-18 10:42:36 -0800 I don't need QtScript so I'm compiling without it. QtWebKit, however, depends upon QtScript for an enum in the addJavaScriptObjectToWindow. I submitted: http://qt.gitorious.org/qt/qt/merge_requests/930 to Qt to move the enum into QtCore so that QtScript isn't necesary. This is the WebKit side using the new enum. 310948 1 74257 smagnuso 2010-11-18 10:44:28 -0800 Created attachment 74257 Patch 310970 2 webkit-ews 2010-11-18 11:03:12 -0800 Attachment 74257 did not build on qt: Build output: http://queues.webkit.org/results/6247027 311506 3 74257 laszlo.gombos 2010-11-19 08:54:03 -0800 Comment on attachment 74257 Patch I do not think we can accept changes (with no proper build guards) that are relying on an unapproved/unreleased version of Qt API. We might be able to revisit this after the underlying Qt API is released. In addition we have plans to unify the QtScript engine with the engine used by QtWebKit. Once these plans realize maintaining the QT_NO_SCRIPT configuration for QtWebKit will no longer make sense. Can you perhaps maintain these changes on your private branch instead of upstreaming them to the trunk ? r- as with our current processing, this commit would break the build. 341961 4 benjamin 2011-01-28 19:32:31 -0800 *** This bug has been marked as a duplicate of bug 52469 *** 74257 2010-11-18 10:44:28 -0800 2010-11-19 08:54:03 -0800 Patch bug-49748-20101118105006.patch text/plain 10611 smagnuso ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWE4N2U5ZTA2NjZhODliNWYxMjFjMDM0MzFlNTA1OTJlZWZlYzkzMy4uNDBhODJiNWRiMmMxNDlh ZTk1OTE0ZmZkYzk3Yjk5NDFjNjVlNjljZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNSBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIFtRdF0gQ29tcGlsZSB3aXRoIFFUX05P X1NDUklQVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDk3NDgKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXJRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpjcmVhdGVTY3JpcHRJbnN0YW5jZUZv cldpZGdldCk6CisgICAgICAgICogYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcDoKKyAgICAgICAg KEpTQzo6QmluZGluZ3M6OlF0SW5zdGFuY2U6OlF0SW5zdGFuY2UpOgorICAgICAgICAoSlNDOjpC aW5kaW5nczo6UXRJbnN0YW5jZTo6flF0SW5zdGFuY2UpOgorICAgICAgICAoSlNDOjpCaW5kaW5n czo6UXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZSk6CisgICAgICAgICogYnJpZGdlL3F0L3F0X2lu c3RhbmNlLmg6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpjcmVhdGUpOgor ICAgICAgICAqIGJyaWRnZS9xdC9xdF9ydW50aW1lLmNwcDoKKyAgICAgICAgKEpTQzo6QmluZGlu Z3M6OmNvbnZlcnRRVmFyaWFudFRvVmFsdWUpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRD b25uZWN0aW9uT2JqZWN0OjpleGVjdXRlKToKKworMjAxMC0xMS0xOCAgU2FtIE1hZ251c29uICA8 c21hZ251c29AZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCiAgICAgICAgIFtRdF0gQ29tcGlsZSB3aXRoIFFUX05PX1FVVUlEX1NUUklORy4KICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NzQ1CiAKZGlmZiAt LWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlclF0LmNwcCBiL1dlYkNv cmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlclF0LmNwcAppbmRleCA1NWQ0YmE0MWQyYjNi MjM4NzFkYjY5YjkzMzhiNjJiOTgxMmIyMGZjLi5lOTliY2EwNTcwM2Q1ZDIyMmQ1ZDc5OWFlNWVh YWY0ZDQzMzcxZDYxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRy b2xsZXJRdC5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyUXQu Y3BwCkBAIC01Niw3ICs1Niw3IEBAIFBhc3NSZWZQdHI8SlNDOjpCaW5kaW5nczo6SW5zdGFuY2U+ IFNjcmlwdENvbnRyb2xsZXI6OmNyZWF0ZVNjcmlwdEluc3RhbmNlRm9yV2lkCiAgICAgUVdpZGdl dCogcGxhdGZvcm1XaWRnZXQgPSB3aWRnZXQtPnBsYXRmb3JtV2lkZ2V0KCk7CiAgICAgaWYgKCFw bGF0Zm9ybVdpZGdldCkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgcmV0dXJuIEpTQzo6QmluZGlu Z3M6OlF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2UocGxhdGZvcm1XaWRnZXQsIGJpbmRpbmdSb290 T2JqZWN0KCksIFFTY3JpcHRFbmdpbmU6OlF0T3duZXJzaGlwKTsKKyAgICByZXR1cm4gSlNDOjpC aW5kaW5nczo6UXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShwbGF0Zm9ybVdpZGdldCwgYmluZGlu Z1Jvb3RPYmplY3QoKSwgUXQ6OlZhbHVlT3duZXJzaGlwUXQpOwogfQogCiB9CmRpZmYgLS1naXQg YS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAgYi9XZWJDb3JlL2JyaWRnZS9xdC9x dF9pbnN0YW5jZS5jcHAKaW5kZXggYzJlMmRjZWMxNGU3YjdkNTI1Y2U5ZjViNjhlNmFhZTY5ODM1 NTFlNC4uOGZhYmZjNjIyNDM0YzcyNzkwZTlmZjk5YjUxNjllZThlZDg4YTQ1OSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCisrKyBiL1dlYkNvcmUvYnJpZGdl L3F0L3F0X2luc3RhbmNlLmNwcApAQCAtNzcsNyArNzcsNyBAQCBRdFJ1bnRpbWVPYmplY3Q6OlF0 UnVudGltZU9iamVjdChFeGVjU3RhdGUqIGV4ZWMsIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmpl Y3QsCiB9CiAKIC8vIFF0SW5zdGFuY2UKLVF0SW5zdGFuY2U6OlF0SW5zdGFuY2UoUU9iamVjdCog bywgUGFzc1JlZlB0cjxSb290T2JqZWN0PiByb290T2JqZWN0LCBRU2NyaXB0RW5naW5lOjpWYWx1 ZU93bmVyc2hpcCBvd25lcnNoaXApCitRdEluc3RhbmNlOjpRdEluc3RhbmNlKFFPYmplY3QqIG8s IFBhc3NSZWZQdHI8Um9vdE9iamVjdD4gcm9vdE9iamVjdCwgUXQ6OlZhbHVlT3duZXJzaGlwIG93 bmVyc2hpcCkKICAgICA6IEluc3RhbmNlKHJvb3RPYmplY3QpCiAgICAgLCBtX2NsYXNzKDApCiAg ICAgLCBtX29iamVjdChvKQpAQCAtMTAxLDIwICsxMDEsMjAgQEAgUXRJbnN0YW5jZTo6flF0SW5z dGFuY2UoKQogCiAgICAgaWYgKG1fb2JqZWN0KSB7CiAgICAgICAgIHN3aXRjaCAobV9vd25lcnNo aXApIHsKLSAgICAgICAgY2FzZSBRU2NyaXB0RW5naW5lOjpRdE93bmVyc2hpcDoKKyAgICAgICAg Y2FzZSBRdDo6VmFsdWVPd25lcnNoaXBRdDoKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBj YXNlIFFTY3JpcHRFbmdpbmU6OkF1dG9Pd25lcnNoaXA6CisgICAgICAgIGNhc2UgUXQ6OlZhbHVl T3duZXJzaGlwQXV0bzoKICAgICAgICAgICAgIGlmIChtX29iamVjdC0+cGFyZW50KCkpCiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAvLyBmYWxsIHRocm91Z2ghCi0gICAgICAg IGNhc2UgUVNjcmlwdEVuZ2luZTo6U2NyaXB0T3duZXJzaGlwOgorICAgICAgICBjYXNlIFF0OjpW YWx1ZU93bmVyc2hpcFNjcmlwdDoKICAgICAgICAgICAgIGRlbGV0ZSBtX29iamVjdDsKICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQogfQogCi1QYXNzUmVmUHRyPFF0SW5zdGFu Y2U+IFF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2UoUU9iamVjdCogbywgUGFzc1JlZlB0cjxSb290 T2JqZWN0PiByb290T2JqZWN0LCBRU2NyaXB0RW5naW5lOjpWYWx1ZU93bmVyc2hpcCBvd25lcnNo aXApCitQYXNzUmVmUHRyPFF0SW5zdGFuY2U+IFF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2UoUU9i amVjdCogbywgUGFzc1JlZlB0cjxSb290T2JqZWN0PiByb290T2JqZWN0LCBRdDo6VmFsdWVPd25l cnNoaXAgb3duZXJzaGlwKQogewogICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25zT25s eSk7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmggYi9XZWJD b3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5oCmluZGV4IGRkMjRhOTIyZWY0NTBmMTcyM2ExODM0 ZWY4OTFjZmYwYTU4NmQ0OWYuLmU4ZDY4OWRjMWY1MGNmYWU1NTE0OTYyN2MxOWIzMDFiOTE3MjBk MzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmgKKysrIGIvV2Vi Q29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuaApAQCAtMjIsNyArMjIsNiBAQAogCiAjaW5jbHVk ZSAiQnJpZGdlLmgiCiAjaW5jbHVkZSAicnVudGltZV9yb290LmgiCi0jaW5jbHVkZSA8UXRTY3Jp cHQvcXNjcmlwdGVuZ2luZS5oPgogI2luY2x1ZGUgPHFoYXNoLmg+CiAjaW5jbHVkZSA8cXBvaW50 ZXIuaD4KICNpbmNsdWRlIDxxc2V0Lmg+CkBAIC02Miw3ICs2MSw3IEBAIHB1YmxpYzoKICAgICBR T2JqZWN0KiBnZXRPYmplY3QoKSBjb25zdCB7IHJldHVybiBtX29iamVjdDsgfQogICAgIFFPYmpl Y3QqIGhhc2hLZXkoKSBjb25zdCB7IHJldHVybiBtX2hhc2hrZXk7IH0KIAotICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFF0SW5zdGFuY2U+IGdldFF0SW5zdGFuY2UoUU9iamVjdCosIFBhc3NSZWZQdHI8 Um9vdE9iamVjdD4sIFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlwIG93bmVyc2hpcCk7Cisg ICAgc3RhdGljIFBhc3NSZWZQdHI8UXRJbnN0YW5jZT4gZ2V0UXRJbnN0YW5jZShRT2JqZWN0Kiwg UGFzc1JlZlB0cjxSb290T2JqZWN0PiwgUXQ6OlZhbHVlT3duZXJzaGlwIG93bmVyc2hpcCk7CiAK ICAgICB2aXJ0dWFsIGJvb2wgZ2V0T3duUHJvcGVydHlTbG90KEpTT2JqZWN0KiwgRXhlY1N0YXRl KiwgY29uc3QgSWRlbnRpZmllciYsIFByb3BlcnR5U2xvdCYpOwogICAgIHZpcnR1YWwgdm9pZCBw dXQoSlNPYmplY3QqLCBFeGVjU3RhdGUqLCBjb25zdCBJZGVudGlmaWVyJiwgSlNWYWx1ZSwgUHV0 UHJvcGVydHlTbG90Jik7CkBAIC03MiwyMSArNzEsMjEgQEAgcHVibGljOgogICAgIHN0YXRpYyBR dEluc3RhbmNlKiBnZXRJbnN0YW5jZShKU09iamVjdCopOwogCiBwcml2YXRlOgotICAgIHN0YXRp YyBQYXNzUmVmUHRyPFF0SW5zdGFuY2U+IGNyZWF0ZShRT2JqZWN0ICppbnN0YW5jZSwgUGFzc1Jl ZlB0cjxSb290T2JqZWN0PiByb290T2JqZWN0LCBRU2NyaXB0RW5naW5lOjpWYWx1ZU93bmVyc2hp cCBvd25lcnNoaXApCisgICAgc3RhdGljIFBhc3NSZWZQdHI8UXRJbnN0YW5jZT4gY3JlYXRlKFFP YmplY3QgKmluc3RhbmNlLCBQYXNzUmVmUHRyPFJvb3RPYmplY3Q+IHJvb3RPYmplY3QsIFF0OjpW YWx1ZU93bmVyc2hpcCBvd25lcnNoaXApCiAgICAgewogICAgICAgICByZXR1cm4gYWRvcHRSZWYo bmV3IFF0SW5zdGFuY2UoaW5zdGFuY2UsIHJvb3RPYmplY3QsIG93bmVyc2hpcCkpOwogICAgIH0K IAogICAgIGZyaWVuZCBjbGFzcyBRdENsYXNzOwogICAgIGZyaWVuZCBjbGFzcyBRdEZpZWxkOwot ICAgIFF0SW5zdGFuY2UoUU9iamVjdCosIFBhc3NSZWZQdHI8Um9vdE9iamVjdD4sIFFTY3JpcHRF bmdpbmU6OlZhbHVlT3duZXJzaGlwIG93bmVyc2hpcCk7IC8vIEZhY3RvcnkgcHJvZHVjZWQgb25s eS4uCisgICAgUXRJbnN0YW5jZShRT2JqZWN0KiwgUGFzc1JlZlB0cjxSb290T2JqZWN0PiwgUXQ6 OlZhbHVlT3duZXJzaGlwIG93bmVyc2hpcCk7IC8vIEZhY3RvcnkgcHJvZHVjZWQgb25seS4uCiAg ICAgbXV0YWJsZSBRdENsYXNzKiBtX2NsYXNzOwogICAgIFFQb2ludGVyPFFPYmplY3Q+IG1fb2Jq ZWN0OwogICAgIFFPYmplY3QqIG1faGFzaGtleTsKICAgICBtdXRhYmxlIFFIYXNoPFFCeXRlQXJy YXksIEpTT2JqZWN0Kj4gbV9tZXRob2RzOwogICAgIG11dGFibGUgUUhhc2g8UVN0cmluZywgUXRG aWVsZCo+IG1fZmllbGRzOwogICAgIG11dGFibGUgUXRSdW50aW1lTWV0YU1ldGhvZCogbV9kZWZh dWx0TWV0aG9kOwotICAgIFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlwIG1fb3duZXJzaGlw OworICAgIFF0OjpWYWx1ZU93bmVyc2hpcCBtX293bmVyc2hpcDsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIEJpbmRpbmdzCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmNw cCBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCmluZGV4IDY1OTViODQyMWE0YTJj N2E2NDYwNTIyNzE0MDMxMTczYTUyNjA1MjcuLjVlMjMwY2NlMmEwYWM3OWM2ODFiNmFlNTJjYTE0 ODg1ZTlkZmRmODcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3Bw CisrKyBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCkBAIC04ODEsNyArODgxLDcg QEAgSlNWYWx1ZSBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgUGFzc1Jl ZlB0cjxSb290T2JqZWN0PiByb290LCBjb24KICAgICAgICAgUU9iamVjdCogb2JqID0gdmFyaWFu dC52YWx1ZTxRT2JqZWN0Kj4oKTsKICAgICAgICAgaWYgKCFvYmopCiAgICAgICAgICAgICByZXR1 cm4ganNOdWxsKCk7Ci0gICAgICAgIHJldHVybiBRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKG9i aiwgcm9vdCwgUVNjcmlwdEVuZ2luZTo6UXRPd25lcnNoaXApLT5jcmVhdGVSdW50aW1lT2JqZWN0 KGV4ZWMpOworICAgICAgICByZXR1cm4gUXRJbnN0YW5jZTo6Z2V0UXRJbnN0YW5jZShvYmosIHJv b3QsIFF0OjpWYWx1ZU93bmVyc2hpcFF0KS0+Y3JlYXRlUnVudGltZU9iamVjdChleGVjKTsKICAg ICB9CiAKICAgICBpZiAoUXRQaXhtYXBJbnN0YW5jZTo6Y2FuSGFuZGxlKHN0YXRpY19jYXN0PFFN ZXRhVHlwZTo6VHlwZT4odmFyaWFudC50eXBlKCkpKSkKQEAgLTE4MDIsNyArMTgwMiw3IEBAIHZv aWQgUXRDb25uZWN0aW9uT2JqZWN0OjpleGVjdXRlKHZvaWQgKiphcmd2KQogICAgICAgICAgICAg ICAgICAgICBpZiAobV9mdW5jT2JqZWN0LT5pbmhlcml0cygmSlNGdW5jdGlvbjo6aW5mbykpIHsK ICAgICAgICAgICAgICAgICAgICAgICAgIGZpbXAgPSBzdGF0aWNfY2FzdDxKU0Z1bmN0aW9uKj4o bV9mdW5jT2JqZWN0LmdldCgpKTsKIAotICAgICAgICAgICAgICAgICAgICAgICAgSlNPYmplY3Qq IHF0X3NlbmRlciA9IFF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2Uoc2VuZGVyKCksIHJvLCBRU2Ny aXB0RW5naW5lOjpRdE93bmVyc2hpcCktPmNyZWF0ZVJ1bnRpbWVPYmplY3QoZXhlYyk7CisgICAg ICAgICAgICAgICAgICAgICAgICBKU09iamVjdCogcXRfc2VuZGVyID0gUXRJbnN0YW5jZTo6Z2V0 UXRJbnN0YW5jZShzZW5kZXIoKSwgcm8sIFF0OjpWYWx1ZU93bmVyc2hpcFF0KS0+Y3JlYXRlUnVu dGltZU9iamVjdChleGVjKTsKICAgICAgICAgICAgICAgICAgICAgICAgIEpTT2JqZWN0KiB3cmFw cGVyID0gbmV3IChleGVjKSBKU09iamVjdChKU09iamVjdDo6Y3JlYXRlU3RydWN0dXJlKGpzTnVs bCgpKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBQdXRQcm9wZXJ0eVNsb3Qgc2xvdDsKICAg ICAgICAgICAgICAgICAgICAgICAgIHdyYXBwZXItPnB1dChleGVjLCBJZGVudGlmaWVyKGV4ZWMs ICJfX3F0X3NlbmRlcl9fIiksIHF0X3NlbmRlciwgc2xvdCk7CmRpZmYgLS1naXQgYS9XZWJLaXQv cXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKaW5kZXgg ZWI3YTg1ZmNiYjNhMDQyNWIzNDMyYmUyYjMyZDNmNTllODA4Mjg0Zi4uNDNlNjFmYjI5YjBmN2Fj NDMzODY3NjI0ZjcwZmFlNGRjYTkzZTg1OCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vi ZnJhbWUuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApAQCAtNTE5LDExICs1 MTksMTEgQEAgUVdlYkZyYW1lOjp+UVdlYkZyYW1lKCkKICovCiB2b2lkIFFXZWJGcmFtZTo6YWRk VG9KYXZhU2NyaXB0V2luZG93T2JqZWN0KGNvbnN0IFFTdHJpbmcgJm5hbWUsIFFPYmplY3QgKm9i amVjdCkKIHsKLSAgICBhZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QobmFtZSwgb2JqZWN0LCBR U2NyaXB0RW5naW5lOjpRdE93bmVyc2hpcCk7CisgICAgYWRkVG9KYXZhU2NyaXB0V2luZG93T2Jq ZWN0KG5hbWUsIG9iamVjdCwgUXQ6OlZhbHVlT3duZXJzaGlwUXQpOwogfQogCiAvKiEKLSAgICBc Zm4gdm9pZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25zdCBRU3Ry aW5nICZuYW1lLCBRT2JqZWN0ICpvYmplY3QsIFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlw IG93bikKKyAgICBcZm4gdm9pZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVj dChjb25zdCBRU3RyaW5nICZuYW1lLCBRT2JqZWN0ICpvYmplY3QsIFF0OjpWYWx1ZU93bmVyc2hp cCBvd24pCiAgICAgXG92ZXJsb2FkCiAKICAgICBNYWtlIFxhIG9iamVjdCBhdmFpbGFibGUgdW5k ZXIgXGEgbmFtZSBmcm9tIHdpdGhpbiB0aGUgZnJhbWUncyBKYXZhU2NyaXB0CkBAIC01NDEsNyAr NTQxLDcgQEAgdm9pZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25z dCBRU3RyaW5nICZuYW1lLCBRT2JqZWN0ICpvYmplY3QKIAogICAgIFRoZSBvd25lcnNoaXAgb2Yg XGEgb2JqZWN0IGlzIHNwZWNpZmllZCB1c2luZyBcYSBvd24uCiAqLwotdm9pZCBRV2ViRnJhbWU6 OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25zdCBRU3RyaW5nICZuYW1lLCBRT2JqZWN0 ICpvYmplY3QsIFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlwIG93bmVyc2hpcCkKK3ZvaWQg UVdlYkZyYW1lOjphZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QoY29uc3QgUVN0cmluZyAmbmFt ZSwgUU9iamVjdCAqb2JqZWN0LCBRdDo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKQogewogICAg IGlmICghcGFnZSgpLT5zZXR0aW5ncygpLT50ZXN0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6SmF2 YXNjcmlwdEVuYWJsZWQpKQogICAgICAgICByZXR1cm47CkBAIC01NDksNyArNTQ5LDcgQEAgdm9p ZCBRV2ViRnJhbWU6OmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25zdCBRU3RyaW5nICZu YW1lLCBRT2JqZWN0ICpvYmplY3QKICAgICBKU0M6OkpTTG9jayBsb2NrKEpTQzo6U2lsZW5jZUFz c2VydGlvbnNPbmx5KTsKICAgICBKU0RPTVdpbmRvdyogd2luZG93ID0gdG9KU0RPTVdpbmRvdyhk LT5mcmFtZSwgbWFpblRocmVhZE5vcm1hbFdvcmxkKCkpOwogICAgIEpTQzo6QmluZGluZ3M6OlJv b3RPYmplY3QqIHJvb3Q7Ci0gICAgaWYgKG93bmVyc2hpcCA9PSBRU2NyaXB0RW5naW5lOjpRdE93 bmVyc2hpcCkKKyAgICBpZiAob3duZXJzaGlwID09IFF0OjpWYWx1ZU93bmVyc2hpcFF0KQogICAg ICAgICByb290ID0gZC0+ZnJhbWUtPnNjcmlwdCgpLT5jYWNoZWFibGVCaW5kaW5nUm9vdE9iamVj dCgpOwogICAgIGVsc2UKICAgICAgICAgcm9vdCA9IGQtPmZyYW1lLT5zY3JpcHQoKS0+YmluZGlu Z1Jvb3RPYmplY3QoKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmggYi9X ZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCmluZGV4IGE1OThhNTYxYjQwYTExMTk0MDFhM2YxMDdi ODJiY2VmNDU2OTI3MWMuLjUwODlhMzZlNTMzZjhiOTcwOWZlNWJiODZiZWIxNTY5NGZiN2Y1YWQg MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKKysrIGIvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuaApAQCAtMjUsNyArMjUsOSBAQAogI2luY2x1ZGUgPFF0Q29yZS9xdXJsLmg+ CiAjaW5jbHVkZSA8UXRDb3JlL3F2YXJpYW50Lmg+CiAjaW5jbHVkZSA8UXRHdWkvcWljb24uaD4K LSNpbmNsdWRlIDxRdFNjcmlwdC9xc2NyaXB0ZW5naW5lLmg+CisjaWZuZGVmIFFUX05PX1NDUklQ VAorIyBpbmNsdWRlIDxRdFNjcmlwdC9xc2NyaXB0ZW5naW5lLmg+CisjZW5kaWYKICNpbmNsdWRl IDxRdE5ldHdvcmsvcW5ldHdvcmthY2Nlc3NtYW5hZ2VyLmg+CiAjaW5jbHVkZSAicXdlYmtpdGds b2JhbC5oIgogCkBAIC0xMzEsNyArMTMzLDEzIEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENvbnRl bnQoY29uc3QgUUJ5dGVBcnJheSAmZGF0YSwgY29uc3QgUVN0cmluZyAmbWltZVR5cGUgPSBRU3Ry aW5nKCksIGNvbnN0IFFVcmwgJmJhc2VVcmwgPSBRVXJsKCkpOwogCiAgICAgdm9pZCBhZGRUb0ph dmFTY3JpcHRXaW5kb3dPYmplY3QoY29uc3QgUVN0cmluZyAmbmFtZSwgUU9iamVjdCAqb2JqZWN0 KTsKLSAgICB2b2lkIGFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdChjb25zdCBRU3RyaW5nICZu YW1lLCBRT2JqZWN0ICpvYmplY3QsIFFTY3JpcHRFbmdpbmU6OlZhbHVlT3duZXJzaGlwIG93bmVy c2hpcCk7CisgICAgdm9pZCBhZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QoY29uc3QgUVN0cmlu ZyAmbmFtZSwgUU9iamVjdCAqb2JqZWN0LCBRdDo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKTsK KyNpZm5kZWYgUVRfTk9fU0NSSVBUCisgICAgaW5saW5lIHZvaWQgYWRkVG9KYXZhU2NyaXB0V2lu ZG93T2JqZWN0KGNvbnN0IFFTdHJpbmcgJm5hbWUsIFFPYmplY3QgKm9iamVjdCwgUVNjcmlwdEVu Z2luZTo6VmFsdWVPd25lcnNoaXAgb3duZXJzaGlwKQorICAgIHsKKyAgICAgICAgYWRkVG9KYXZh U2NyaXB0V2luZG93T2JqZWN0KG5hbWUsIG9iamVjdCwgKFF0OjpWYWx1ZU93bmVyc2hpcClvd25l cnNoaXApOworICAgIH0KKyNlbmRpZgogICAgIFFTdHJpbmcgdG9IdG1sKCkgY29uc3Q7CiAgICAg UVN0cmluZyB0b1BsYWluVGV4dCgpIGNvbnN0OwogICAgIFFTdHJpbmcgcmVuZGVyVHJlZUR1bXAo KSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hh bmdlTG9nCmluZGV4IDRhOTE4YTlhODg0NjNmODJlNmVlOTJiYTQ3NTI2ZDdjNTk3M2MyYTMuLjYw MzY3NTE5Y2Q5ODIxOWRmNjEzMjk5MGYyM2Y2ZjEzY2QzNTVlZDMgMTAwNjQ0Ci0tLSBhL1dlYktp dC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDEwLTExLTE4ICBTYW0gTWFnbnVzb24gIDxzbWFnbnVzb0BnbWFpbC5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCBhIHNob3J0IGRl c2NyaXB0aW9uIGFuZCBidWcgVVJMIChPT1BTISkKKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUu Y3BwOgorICAgICAgICAoUVdlYkZyYW1lOjphZGRUb0phdmFTY3JpcHRXaW5kb3dPYmplY3QpOgor ICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoKKwogMjAxMC0xMS0xNiAgU2ltb24gSGF1c21hbm4g IDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVh cyBLbGluZy4K