23671 2009-02-01 07:05:35 -0800 PLATFORM(CF) should be set when building for Qt on Darwin 2009-11-02 20:01:25 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Mac Other RESOLVED FIXED Qt P2 Normal --- 29800 1 darin hausmann commit-queue hausmann laszlo.gombos vestbo oldest_to_newest 107889 0 darin 2009-02-01 07:05:35 -0800 We discussed on the mailing list setting PLATFORM(CF) when building for Qt on Darwin. This will change lines like this: #if PLATFORM(CF) || (PLATFORM(QT) && PLATFORM(DARWIN)) to this: #if PLATFORM(CF) And we'll also have to make sure the #if statements are in the right order in any files that check for both CF and QT. 159540 1 42249 laszlo.gombos 2009-10-30 20:29:28 -0700 Created attachment 42249 first try. 159591 2 42249 darin 2009-10-31 15:50:32 -0700 Comment on attachment 42249 first try. > -#if PLATFORM(CF) > +#if PLATFORM(MAC) || PLATFORM(CHROMIUM) > #include "LegacyWebArchive.h" > #endif This will change behavior for Chromium builds that are targeting Windows and Unix, so I think it's incorrect. I'm not an expert on Chromium ifdefs, but I assume that something along the lines of: #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && PLATFORM(DARWIN)) Or: #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && PLATFORM(CF)) would do. Maybe the best way to write it is: #if PLATFORM(CF) && (PLATFORM(MAC) || PLATFORM(CHROMIUM)) Otherwise, the patch looks good. 159737 3 42299 laszlo.gombos 2009-11-01 21:25:41 -0800 Created attachment 42299 2nd try. Thanks Darin for the review. I overlooked the test in ArchiveFactory.cpp - thanks for the correction. Made the change in the patch as last suggested. 159969 4 42299 commit-queue 2009-11-02 19:24:31 -0800 Comment on attachment 42299 2nd try. Clearing flags on attachment: 42299 Committed r50438: <http://trac.webkit.org/changeset/50438> 159970 5 commit-queue 2009-11-02 19:24:36 -0800 All reviewed patches have been landed. Closing bug. 159972 6 mrowe 2009-11-02 19:50:58 -0800 (In reply to comment #2) > (From update of attachment 42249 [details]) > > -#if PLATFORM(CF) > > +#if PLATFORM(MAC) || PLATFORM(CHROMIUM) > > #include "LegacyWebArchive.h" > > #endif > > This will change behavior for Chromium builds that are targeting Windows and > Unix, so I think it's incorrect. > > I'm not an expert on Chromium ifdefs, but I assume that something along the > lines of: > > #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && PLATFORM(DARWIN)) > > Or: > > #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && PLATFORM(CF)) > > would do. Maybe the best way to write it is: > > #if PLATFORM(CF) && (PLATFORM(MAC) || PLATFORM(CHROMIUM)) > > Otherwise, the patch looks good. Making this change disables web archive support on Windows! That’s clearly wrong. 159974 7 mrowe 2009-11-02 20:01:25 -0800 (In reply to comment #6) > Making this change disables web archive support on Windows! That’s clearly > wrong. I fixed this in r50439. 42249 2009-10-30 20:29:28 -0700 2009-11-01 21:25:41 -0800 first try. 23671.patch text/plain 6390 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwMzc3KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTAtMzAgIExhc3psbyBH b21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBMQVRGT1JNKENGKSBzaG91bGQgYmUgc2V0IHdo ZW4gYnVpbGRpbmcgZm9yIFF0IG9uIERhcndpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2NzEKKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOiBU dXJuIG9uIENGIHN1cHBvcnQgaWYgYm90aCBRVCBhbmQgREFSV0lOCisgICAgICAgIHBsYXRmb3Jt cyBhcmUgZGVmaW5lZC4KKwogMjAwOS0xMC0zMCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogSmF2YVNj cmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3Rm L1BsYXRmb3JtLmgJKHJldmlzaW9uIDUwMzUyKQorKysgSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRm b3JtLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4Niw2ICs0ODYsMTAgQEAKICNkZWZpbmUgSEFWRV9Q VEhSRUFEX1JXTE9DSyAxCiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKFFUKSAmJiBQTEFURk9STShE QVJXSU4pCisjZGVmaW5lIFdURl9QTEFURk9STV9DRiAxCisjZW5kaWYKKwogI2lmIFBMQVRGT1JN KElQSE9ORSkKICNkZWZpbmUgRU5BQkxFX0NPTlRFWFRfTUVOVVMgMAogI2RlZmluZSBFTkFCTEVf RFJBR19TVVBQT1JUIDAKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MDM3NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMTAtMzAgIExhc3psbyBHb21ib3Mg IDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFBMQVRGT1JNKENGKSBzaG91bGQgYmUgc2V0IHdoZW4gYnVp bGRpbmcgZm9yIFF0IG9uIERhcndpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM2NzEKKworICAgICAgICAqIFdlYkNvcmUucHJvOiBBZGQgU2hhcmVk QnVmZmVyQ0YuY3BwIGFuZCBTbWFydFJlcGxhY2VDRi5jcHAKKyAgICAgICAgdG8gdGhlIERhcndp biBidWlsZC4KKyAgICAgICAgKiBsb2FkZXIvYXJjaGl2ZS9BcmNoaXZlRmFjdG9yeS5jcHA6IENo YW5nZSB0aGUgc3VwcG9ydCBmb3IgCisgICAgICAgIGxlZ2FjeSBXZWJBcmNoaXZlIGZyb20gYWxs IENGIHBsYXRmb3JtcyB0byBNYWMgYW5kIENocm9taXVtCisgICAgICAgIChXZWJDb3JlOjphcmNo aXZlTUlNRVR5cGVzKToKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0F0b21pY1N0cmluZy5oOiBS ZW1vdmUgUExBVEZPUk0oUVQpICYmCisgICAgICAgIFBMQVRGT1JNKERBUldJTikgdGVzdCBhcyBp dCBpcyByZWR1bmRhbnQgbm93LgorICAgICAgICAqIHBsYXRmb3JtL3RleHQvUGxhdGZvcm1TdHJp bmcuaDogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9TdHJpbmdJbXBsLmg6IERpdHRv LgorICAgICAgICAqIHBsYXRmb3JtL3RleHQvY2YvU3RyaW5nQ0YuY3BwOiBEaXR0by4KKyAgICAg ICAgKiBwbGF0Zm9ybS90ZXh0L2NmL1N0cmluZ0ltcGxDRi5jcHA6IERpdHRvLgorCiAyMDA5LTEw LTMwICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnBybwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL1dlYkNvcmUucHJvCShyZXZpc2lvbiA1MDM1MikKKysrIFdlYkNvcmUvV2Vi Q29yZS5wcm8JKHdvcmtpbmcgY29weSkKQEAgLTI0MjksNyArMjQyOSw5IEBAIFNPVVJDRVMgKz0g XAogICAgIG1hYyB7CiAgICAgICAgIFNPVVJDRVMgKz0gXAogICAgICAgICAgICAgcGxhdGZvcm0v dGV4dC9jZi9TdHJpbmdDRi5jcHAgXAotICAgICAgICAgICAgcGxhdGZvcm0vdGV4dC9jZi9TdHJp bmdJbXBsQ0YuY3BwCisgICAgICAgICAgICBwbGF0Zm9ybS90ZXh0L2NmL1N0cmluZ0ltcGxDRi5j cHAgXAorICAgICAgICAgICAgcGxhdGZvcm0vY2YvU2hhcmVkQnVmZmVyQ0YuY3BwIFwKKyAgICAg ICAgICAgIGVkaXRpbmcvU21hcnRSZXBsYWNlQ0YuY3BwCiAgICAgICAgIExJQlNfUFJJVkFURSAr PSAtZnJhbWV3b3JrIENhcmJvbiAtZnJhbWV3b3JrIEFwcEtpdAogICAgIH0KIApJbmRleDogV2Vi Q29yZS9sb2FkZXIvYXJjaGl2ZS9BcmNoaXZlRmFjdG9yeS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9sb2FkZXIvYXJjaGl2ZS9BcmNoaXZlRmFjdG9yeS5jcHAJKHJldmlzaW9uIDUwMzUyKQor KysgV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9BcmNoaXZlRmFjdG9yeS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI5LDcgKzI5LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJBcmNo aXZlRmFjdG9yeS5oIgogCi0jaWYgUExBVEZPUk0oQ0YpCisjaWYgUExBVEZPUk0oTUFDKSB8fCBQ TEFURk9STShDSFJPTUlVTSkKICNpbmNsdWRlICJMZWdhY3lXZWJBcmNoaXZlLmgiCiAjZW5kaWYK ICNpbmNsdWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCkBAIC01OSw3ICs1OSw3IEBAIHN0YXRpYyBB cmNoaXZlTUlNRVR5cGVzTWFwJiBhcmNoaXZlTUlNRVQKICAgICBpZiAoaW5pdGlhbGl6ZWQpCiAg ICAgICAgIHJldHVybiBtaW1lVHlwZXM7CiAgICAgCi0jaWYgUExBVEZPUk0oQ0YpCisjaWYgUExB VEZPUk0oTUFDKSB8fCBQTEFURk9STShDSFJPTUlVTSkKICAgICBtaW1lVHlwZXMuc2V0KCJhcHBs aWNhdGlvbi94LXdlYmFyY2hpdmUiLCBhcmNoaXZlRmFjdG9yeUNyZWF0ZTxMZWdhY3lXZWJBcmNo aXZlPik7CiAjZW5kaWYKICAgICAgICAgCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3RleHQvQXRv bWljU3RyaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0F0b21pY1N0 cmluZy5oCShyZXZpc2lvbiA1MDM1MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9BdG9taWNT dHJpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsNyArOTYsNyBAQCBwdWJsaWM6CiAKICAgICBz dGF0aWMgdm9pZCByZW1vdmUoU3RyaW5nSW1wbCopOwogICAgIAotI2lmIFBMQVRGT1JNKENGKSB8 fCAoUExBVEZPUk0oUVQpICYmIFBMQVRGT1JNKERBUldJTikpCisjaWYgUExBVEZPUk0oQ0YpCiAg ICAgQXRvbWljU3RyaW5nKENGU3RyaW5nUmVmIHMpIDogIG1fc3RyaW5nKGFkZChTdHJpbmcocyku aW1wbCgpKSkgeyB9CiAgICAgQ0ZTdHJpbmdSZWYgY3JlYXRlQ0ZTdHJpbmcoKSBjb25zdCB7IHJl dHVybiBtX3N0cmluZy5jcmVhdGVDRlN0cmluZygpOyB9CiAjZW5kaWYgICAgCkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL3RleHQvUGxhdGZvcm1TdHJpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL3RleHQvUGxhdGZvcm1TdHJpbmcuaAkocmV2aXNpb24gNTAzNTIpCisrKyBXZWJD b3JlL3BsYXRmb3JtL3RleHQvUGxhdGZvcm1TdHJpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtNDEs NyArNDEsNyBAQAogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNlbmRpZgogCi0jaWYgUExBVEZP Uk0oQ0YpIHx8IChQTEFURk9STShRVCkgJiYgUExBVEZPUk0oREFSV0lOKSkKKyNpZiBQTEFURk9S TShDRikKIHR5cGVkZWYgY29uc3Qgc3RydWN0IF9fQ0ZTdHJpbmcgKiBDRlN0cmluZ1JlZjsKICNl bmRpZgogCkBAIC0yMDYsNyArMjA2LDcgQEAgcHVibGljOgogCiAgICAgU3RyaW5nSW1wbCogaW1w bCgpIGNvbnN0IHsgcmV0dXJuIG1faW1wbC5nZXQoKTsgfQogCi0jaWYgUExBVEZPUk0oQ0YpIHx8 IChQTEFURk9STShRVCkgJiYgUExBVEZPUk0oREFSV0lOKSkKKyNpZiBQTEFURk9STShDRikKICAg ICBTdHJpbmcoQ0ZTdHJpbmdSZWYpOwogICAgIENGU3RyaW5nUmVmIGNyZWF0ZUNGU3RyaW5nKCkg Y29uc3Q7CiAjZW5kaWYKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9TdHJpbmdJbXBsLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1N0cmluZ0ltcGwuaAkocmV2aXNp b24gNTAzNTIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3RleHQvU3RyaW5nSW1wbC5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNyw3ICszNyw3IEBACiAjaW5jbHVkZSA8cnVudGltZS9VU3RyaW5nLmg+CiAj ZW5kaWYKIAotI2lmIFBMQVRGT1JNKENGKSB8fCAoUExBVEZPUk0oUVQpICYmIFBMQVRGT1JNKERB UldJTikpCisjaWYgUExBVEZPUk0oQ0YpCiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBfX0NGU3RyaW5n ICogQ0ZTdHJpbmdSZWY7CiAjZW5kaWYKIApAQCAtMTY4LDcgKzE2OCw3IEBAIHB1YmxpYzoKIAog ICAgIFdURjo6VW5pY29kZTo6RGlyZWN0aW9uIGRlZmF1bHRXcml0aW5nRGlyZWN0aW9uKCk7CiAK LSNpZiBQTEFURk9STShDRikgfHwgKFBMQVRGT1JNKFFUKSAmJiBQTEFURk9STShEQVJXSU4pKQor I2lmIFBMQVRGT1JNKENGKQogICAgIENGU3RyaW5nUmVmIGNyZWF0ZUNGU3RyaW5nKCk7CiAjZW5k aWYKICNpZmRlZiBfX09CSkNfXwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2NmL1N0cmlu Z0NGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3RleHQvY2YvU3RyaW5nQ0Yu Y3BwCShyZXZpc2lvbiA1MDM1MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9jZi9TdHJpbmdD Ri5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxLDcgKzIxLDcgQEAKICNpbmNsdWRlICJjb25maWcu aCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogCi0jaWYgUExBVEZPUk0oQ0YpIHx8IChQ TEFURk9STShRVCkgJiYgUExBVEZPUk0oREFSV0lOKSkKKyNpZiBQTEFURk9STShDRikKIAogI2lu Y2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NvcmVGb3VuZGF0aW9uLmg+CiAKQEAgLTUyLDQgKzUyLDQg QEAgQ0ZTdHJpbmdSZWYgU3RyaW5nOjpjcmVhdGVDRlN0cmluZygpIGNvbgogCiB9CiAKLSNlbmRp ZiAvLyBQTEFURk9STShDRikgfHwgKFBMQVRGT1JNKFFUKSAmJiBQTEFURk9STShEQVJXSU4pKQor I2VuZGlmIC8vIFBMQVRGT1JNKENGKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2NmL1N0 cmluZ0ltcGxDRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2NmL1N0 cmluZ0ltcGxDRi5jcHAJKHJldmlzaW9uIDUwMzUyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L2NmL1N0cmluZ0ltcGxDRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxLDcgKzIxLDcgQEAKICNp bmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJTdHJpbmdJbXBsLmgiCiAKLSNpZiBQTEFURk9S TShDRikgfHwgKFBMQVRGT1JNKFFUKSAmJiBQTEFURk9STShEQVJXSU4pKQorI2lmIFBMQVRGT1JN KENGKQogCiAjaW5jbHVkZSA8Q29yZUZvdW5kYXRpb24vQ29yZUZvdW5kYXRpb24uaD4KICNpbmNs dWRlIDx3dGYvTWFpblRocmVhZC5oPgpAQCAtMTU5LDQgKzE1OSw0IEBAIENGU3RyaW5nUmVmIFN0 cmluZ0ltcGw6OmNyZWF0ZUNGU3RyaW5nKCkKIAogfQogCi0jZW5kaWYgLy8gUExBVEZPUk0oQ0Yp IHx8IChQTEFURk9STShRVCkgJiYgUExBVEZPUk0oREFSV0lOKSkKKyNlbmRpZiAvLyBQTEFURk9S TShDRikK 42299 2009-11-01 21:25:41 -0800 2009-11-02 19:24:30 -0800 2nd try. 23671-2.patch text/plain 6457 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwMzk4KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEtMDEgIExhc3psbyBH b21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBMQVRGT1JNKENGKSBzaG91bGQgYmUgc2V0IHdo ZW4gYnVpbGRpbmcgZm9yIFF0IG9uIERhcndpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2NzEKKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOiBU dXJuIG9uIENGIHN1cHBvcnQgaWYgYm90aCBRVCBhbmQgREFSV0lOCisgICAgICAgIHBsYXRmb3Jt cyBhcmUgZGVmaW5lZC4KKwogMjAwOS0xMC0zMCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogSmF2YVNj cmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3Rm L1BsYXRmb3JtLmgJKHJldmlzaW9uIDUwMzk4KQorKysgSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRm b3JtLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4Niw2ICs0ODYsMTAgQEAKICNkZWZpbmUgSEFWRV9Q VEhSRUFEX1JXTE9DSyAxCiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKFFUKSAmJiBQTEFURk9STShE QVJXSU4pCisjZGVmaW5lIFdURl9QTEFURk9STV9DRiAxCisjZW5kaWYKKwogI2lmIFBMQVRGT1JN KElQSE9ORSkKICNkZWZpbmUgRU5BQkxFX0NPTlRFWFRfTUVOVVMgMAogI2RlZmluZSBFTkFCTEVf RFJBR19TVVBQT1JUIDAKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MDM5OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMTEtMDEgIExhc3psbyBHb21ib3Mg IDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFBMQVRGT1JNKENGKSBzaG91bGQgYmUgc2V0IHdoZW4gYnVp bGRpbmcgZm9yIFF0IG9uIERhcndpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM2NzEKKworICAgICAgICAqIFdlYkNvcmUucHJvOiBBZGQgU2hhcmVk QnVmZmVyQ0YuY3BwIGFuZCBTbWFydFJlcGxhY2VDRi5jcHAKKyAgICAgICAgdG8gdGhlIERhcndp biBidWlsZC4KKyAgICAgICAgKiBsb2FkZXIvYXJjaGl2ZS9BcmNoaXZlRmFjdG9yeS5jcHA6IENo YW5nZSB0aGUgc3VwcG9ydCBmb3IgCisgICAgICAgIGxlZ2FjeSBXZWJBcmNoaXZlIGZyb20gYWxs IENGIHBsYXRmb3JtcyB0byBNYWMgYW5kIENocm9taXVtIAorICAgICAgICBDRiBwbGF0Zm9ybXMu CisgICAgICAgIChXZWJDb3JlOjphcmNoaXZlTUlNRVR5cGVzKToKKyAgICAgICAgKiBwbGF0Zm9y bS90ZXh0L0F0b21pY1N0cmluZy5oOiBSZW1vdmUgUExBVEZPUk0oUVQpICYmCisgICAgICAgIFBM QVRGT1JNKERBUldJTikgdGVzdCBhcyBpdCBpcyByZWR1bmRhbnQgbm93LgorICAgICAgICAqIHBs YXRmb3JtL3RleHQvUGxhdGZvcm1TdHJpbmcuaDogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0v dGV4dC9TdHJpbmdJbXBsLmg6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL3RleHQvY2YvU3Ry aW5nQ0YuY3BwOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L2NmL1N0cmluZ0ltcGxD Ri5jcHA6IERpdHRvLgorCiAyMDA5LTExLTAxICBSb2xhbmQgU3RlaW5lciAgPHJvbGFuZHN0ZWlu ZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vIHJldmlldyAoYnVpbGQgZml4KS4KSW5kZXg6 IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnBybwko cmV2aXNpb24gNTAzOTgpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNvcHkpCkBA IC0yNDM3LDcgKzI0MzcsOSBAQCBTT1VSQ0VTICs9IFwKICAgICBtYWMgewogICAgICAgICBTT1VS Q0VTICs9IFwKICAgICAgICAgICAgIHBsYXRmb3JtL3RleHQvY2YvU3RyaW5nQ0YuY3BwIFwKLSAg ICAgICAgICAgIHBsYXRmb3JtL3RleHQvY2YvU3RyaW5nSW1wbENGLmNwcAorICAgICAgICAgICAg cGxhdGZvcm0vdGV4dC9jZi9TdHJpbmdJbXBsQ0YuY3BwIFwKKyAgICAgICAgICAgIHBsYXRmb3Jt L2NmL1NoYXJlZEJ1ZmZlckNGLmNwcCBcCisgICAgICAgICAgICBlZGl0aW5nL1NtYXJ0UmVwbGFj ZUNGLmNwcAogICAgICAgICBMSUJTX1BSSVZBVEUgKz0gLWZyYW1ld29yayBDYXJib24gLWZyYW1l d29yayBBcHBLaXQKICAgICB9CiAKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL2FyY2hpdmUvQXJjaGl2 ZUZhY3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL2FyY2hpdmUvQXJjaGl2 ZUZhY3RvcnkuY3BwCShyZXZpc2lvbiA1MDM5OCkKKysrIFdlYkNvcmUvbG9hZGVyL2FyY2hpdmUv QXJjaGl2ZUZhY3RvcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiQXJjaGl2ZUZhY3RvcnkuaCIKIAotI2lmIFBMQVRG T1JNKENGKQorI2lmIFBMQVRGT1JNKENGKSAmJiAoUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShD SFJPTUlVTSkpCiAjaW5jbHVkZSAiTGVnYWN5V2ViQXJjaGl2ZS5oIgogI2VuZGlmCiAjaW5jbHVk ZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgpAQCAtNTksNyArNTksNyBAQCBzdGF0aWMgQXJjaGl2ZU1J TUVUeXBlc01hcCYgYXJjaGl2ZU1JTUVUCiAgICAgaWYgKGluaXRpYWxpemVkKQogICAgICAgICBy ZXR1cm4gbWltZVR5cGVzOwogICAgIAotI2lmIFBMQVRGT1JNKENGKQorI2lmIFBMQVRGT1JNKENG KSAmJiAoUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShDSFJPTUlVTSkpCiAgICAgbWltZVR5cGVz LnNldCgiYXBwbGljYXRpb24veC13ZWJhcmNoaXZlIiwgYXJjaGl2ZUZhY3RvcnlDcmVhdGU8TGVn YWN5V2ViQXJjaGl2ZT4pOwogI2VuZGlmCiAgICAgICAgIApJbmRleDogV2ViQ29yZS9wbGF0Zm9y bS90ZXh0L0F0b21pY1N0cmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vdGV4 dC9BdG9taWNTdHJpbmcuaAkocmV2aXNpb24gNTAzOTgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3Rl eHQvQXRvbWljU3RyaW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTk2LDcgKzk2LDcgQEAgcHVibGlj OgogCiAgICAgc3RhdGljIHZvaWQgcmVtb3ZlKFN0cmluZ0ltcGwqKTsKICAgICAKLSNpZiBQTEFU Rk9STShDRikgfHwgKFBMQVRGT1JNKFFUKSAmJiBQTEFURk9STShEQVJXSU4pKQorI2lmIFBMQVRG T1JNKENGKQogICAgIEF0b21pY1N0cmluZyhDRlN0cmluZ1JlZiBzKSA6ICBtX3N0cmluZyhhZGQo U3RyaW5nKHMpLmltcGwoKSkpIHsgfQogICAgIENGU3RyaW5nUmVmIGNyZWF0ZUNGU3RyaW5nKCkg Y29uc3QgeyByZXR1cm4gbV9zdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKTsgfQogI2VuZGlmICAgIApJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1BsYXRmb3JtU3RyaW5nLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1BsYXRmb3JtU3RyaW5nLmgJKHJldmlzaW9uIDUwMzk4 KQorKysgV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1BsYXRmb3JtU3RyaW5nLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQxLDcgKzQxLDcgQEAKICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CiAjZW5kaWYKIAot I2lmIFBMQVRGT1JNKENGKSB8fCAoUExBVEZPUk0oUVQpICYmIFBMQVRGT1JNKERBUldJTikpCisj aWYgUExBVEZPUk0oQ0YpCiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBfX0NGU3RyaW5nICogQ0ZTdHJp bmdSZWY7CiAjZW5kaWYKIApAQCAtMjA2LDcgKzIwNiw3IEBAIHB1YmxpYzoKIAogICAgIFN0cmlu Z0ltcGwqIGltcGwoKSBjb25zdCB7IHJldHVybiBtX2ltcGwuZ2V0KCk7IH0KIAotI2lmIFBMQVRG T1JNKENGKSB8fCAoUExBVEZPUk0oUVQpICYmIFBMQVRGT1JNKERBUldJTikpCisjaWYgUExBVEZP Uk0oQ0YpCiAgICAgU3RyaW5nKENGU3RyaW5nUmVmKTsKICAgICBDRlN0cmluZ1JlZiBjcmVhdGVD RlN0cmluZygpIGNvbnN0OwogI2VuZGlmCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3RleHQvU3Ry aW5nSW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9TdHJpbmdJbXBs LmgJKHJldmlzaW9uIDUwMzk4KQorKysgV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1N0cmluZ0ltcGwu aAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQAogI2luY2x1ZGUgPHJ1bnRpbWUvVVN0 cmluZy5oPgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShDRikgfHwgKFBMQVRGT1JNKFFUKSAmJiBQ TEFURk9STShEQVJXSU4pKQorI2lmIFBMQVRGT1JNKENGKQogdHlwZWRlZiBjb25zdCBzdHJ1Y3Qg X19DRlN0cmluZyAqIENGU3RyaW5nUmVmOwogI2VuZGlmCiAKQEAgLTE2OCw3ICsxNjgsNyBAQCBw dWJsaWM6CiAKICAgICBXVEY6OlVuaWNvZGU6OkRpcmVjdGlvbiBkZWZhdWx0V3JpdGluZ0RpcmVj dGlvbigpOwogCi0jaWYgUExBVEZPUk0oQ0YpIHx8IChQTEFURk9STShRVCkgJiYgUExBVEZPUk0o REFSV0lOKSkKKyNpZiBQTEFURk9STShDRikKICAgICBDRlN0cmluZ1JlZiBjcmVhdGVDRlN0cmlu ZygpOwogI2VuZGlmCiAjaWZkZWYgX19PQkpDX18KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vdGV4 dC9jZi9TdHJpbmdDRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2Nm L1N0cmluZ0NGLmNwcAkocmV2aXNpb24gNTAzOTgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3RleHQv Y2YvU3RyaW5nQ0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMSw3ICsyMSw3IEBACiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKIAotI2lmIFBMQVRGT1JN KENGKSB8fCAoUExBVEZPUk0oUVQpICYmIFBMQVRGT1JNKERBUldJTikpCisjaWYgUExBVEZPUk0o Q0YpCiAKICNpbmNsdWRlIDxDb3JlRm91bmRhdGlvbi9Db3JlRm91bmRhdGlvbi5oPgogCkBAIC01 Miw0ICs1Miw0IEBAIENGU3RyaW5nUmVmIFN0cmluZzo6Y3JlYXRlQ0ZTdHJpbmcoKSBjb24KIAog fQogCi0jZW5kaWYgLy8gUExBVEZPUk0oQ0YpIHx8IChQTEFURk9STShRVCkgJiYgUExBVEZPUk0o REFSV0lOKSkKKyNlbmRpZiAvLyBQTEFURk9STShDRikKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0v dGV4dC9jZi9TdHJpbmdJbXBsQ0YuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v dGV4dC9jZi9TdHJpbmdJbXBsQ0YuY3BwCShyZXZpc2lvbiA1MDM5OCkKKysrIFdlYkNvcmUvcGxh dGZvcm0vdGV4dC9jZi9TdHJpbmdJbXBsQ0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMSw3ICsy MSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU3RyaW5nSW1wbC5oIgogCi0j aWYgUExBVEZPUk0oQ0YpIHx8IChQTEFURk9STShRVCkgJiYgUExBVEZPUk0oREFSV0lOKSkKKyNp ZiBQTEFURk9STShDRikKIAogI2luY2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NvcmVGb3VuZGF0aW9u Lmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4KQEAgLTE1OSw0ICsxNTksNCBAQCBDRlN0 cmluZ1JlZiBTdHJpbmdJbXBsOjpjcmVhdGVDRlN0cmluZygpCiAKIH0KIAotI2VuZGlmIC8vIFBM QVRGT1JNKENGKSB8fCAoUExBVEZPUk0oUVQpICYmIFBMQVRGT1JNKERBUldJTikpCisjZW5kaWYg Ly8gUExBVEZPUk0oQ0YpCg==