40624 2010-06-15 08:28:05 -0700 [Qt] Build fix for Qt minimal after r61121 2010-06-15 09:10:54 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 yael webkit-unassigned ossy webkit-ews oldest_to_newest 238393 0 yael 2010-06-15 08:28:05 -0700 [Qt] Build fix for Qt minimal after r61121 238397 1 58782 yael 2010-06-15 08:32:25 -0700 Created attachment 58782 Patch build fix I am in the process of compiling this patch, so I don't know yet if it will compile. Since my machine is slow and this is blocking the commit queue, I want to take advantage of the faster build bots. 238399 2 webkit-ews 2010-06-15 08:42:10 -0700 Attachment 58782 did not build on qt: Build output: http://webkit-commit-queue.appspot.com/results/3283174 238402 3 ossy 2010-06-15 08:47:26 -0700 1.( please remove unnecessary #endif from WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp:356 2.) namespace WebCore is inside #if ENABLE(NOTIFICATIONS) -> it is incorrect 3.) After 1.) and 2.) fixed: implementation of NotificationPresenterClientQt::NotificationPresenterClientQt() cause build error, because 'NotificationPresenterClientQt' has not been declared 238403 4 58782 ossy 2010-06-15 08:48:51 -0700 Comment on attachment 58782 Patch build fix r- -ed now, because it is incomplete now 238405 5 58783 yael 2010-06-15 08:54:09 -0700 Created attachment 58783 Patch, V2 238408 6 ossy 2010-06-15 09:02:17 -0700 (In reply to comment #5) > Created an attachment (id=58783) [details] > Patch, V2 Now LGTM. I can't give you an r+, because I'm not a reviewer, but it is a buildfix, so it doesn't need a review, just commit it as an unreviewed buildfix. Or you can ask a rubber stamp on #qtwebkit. 238413 7 yael 2010-06-15 09:10:54 -0700 Committed r61187: <http://trac.webkit.org/changeset/61187> 58782 2010-06-15 08:32:25 -0700 2010-06-15 08:54:09 -0700 Patch build fix 40624.patch text/plain 4282 yael SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjExODYpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDYtMTUgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQnVpbGQgZml4IGZvciBRdCBtaW5pbWFsIGFmdGVyIHI2MTEyMQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA2MjQKKworICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjpOb3RpZmljYXRpb25JY29u V3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6Y2xv c2UpOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI6OnRpdGxlKToK KyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjptZXNzYWdlKToKKyAg ICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjppY29uRGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6bm90aWZpY2F0aW9uQ2xvc2Vk KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRR dC5oOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI6On5Ob3RpZmlj YXRpb25JY29uV3JhcHBlcik6CisKIDIwMTAtMDYtMTQgIExhc3psbyBHb21ib3MgIDxsYXN6bG8u MS5nb21ib3NAbm9raWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIFN5bWJpYW4gYnVpbGQg Zml4LgpJbmRleDogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRl ckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90 aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuY3BwCShyZXZpc2lvbiA2MTE4NikKKysrIFdlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTYxLDUxICs2MSw2NyBAQCBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGll bnRRdCogTm90aWZpY2F0CiAgICAgcmV0dXJuIHNfbm90aWZpY2F0aW9uUHJlc2VudGVyOwogfQog CisjZW5kaWYKKwogTm90aWZpY2F0aW9uSWNvbldyYXBwZXI6Ok5vdGlmaWNhdGlvbkljb25XcmFw cGVyKCkKICAgICA6IG1fY2xvc2VUaW1lcih0aGlzLCAmTm90aWZpY2F0aW9uSWNvbldyYXBwZXI6 OmNsb3NlKQogeworI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQorCiAjaWZuZGVmIFFUX05PX1NZ U1RFTVRSQVlJQ09OCiAgICAgbV9ub3RpZmljYXRpb25JY29uID0gMDsKICNlbmRpZgogICAgIG1f cHJlc2VudGVyID0gMDsKLX0KLQotTm90aWZpY2F0aW9uSWNvbldyYXBwZXI6On5Ob3RpZmljYXRp b25JY29uV3JhcHBlcigpCi17CisjZW5kaWYKIH0KIAogdm9pZCBOb3RpZmljYXRpb25JY29uV3Jh cHBlcjo6Y2xvc2UoVGltZXI8Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI+KikKIHsKKyNpZiBFTkFC TEUoTk9USUZJQ0FUSU9OUykKICAgICBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6bm90 aWZpY2F0aW9uUHJlc2VudGVyKCktPmNhbmNlbCh0aGlzKTsKKyNlbmRpZgogfQogCiBjb25zdCBR U3RyaW5nIE5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjp0aXRsZSgpIGNvbnN0CiB7CisjaWYgRU5B QkxFKE5PVElGSUNBVElPTlMpCiAgICAgTm90aWZpY2F0aW9uKiBub3RpZmljYXRpb24gPSBOb3Rp ZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6bm90aWZpY2F0aW9uUHJlc2VudGVyKCktPm5vdGlm aWNhdGlvbkZvcldyYXBwZXIodGhpcyk7CiAgICAgaWYgKG5vdGlmaWNhdGlvbikKICAgICAgICAg cmV0dXJuIG5vdGlmaWNhdGlvbi0+Y29udGVudHMoKS50aXRsZSgpOworI2VuZGlmCiAgICAgcmV0 dXJuIFFTdHJpbmcoKTsKIH0KIAogY29uc3QgUVN0cmluZyBOb3RpZmljYXRpb25JY29uV3JhcHBl cjo6bWVzc2FnZSgpIGNvbnN0CiB7CisjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCiAgICAgTm90 aWZpY2F0aW9uKiBub3RpZmljYXRpb24gPSBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6 bm90aWZpY2F0aW9uUHJlc2VudGVyKCktPm5vdGlmaWNhdGlvbkZvcldyYXBwZXIodGhpcyk7CiAg ICAgaWYgKG5vdGlmaWNhdGlvbikKICAgICAgICAgcmV0dXJuIG5vdGlmaWNhdGlvbi0+Y29udGVu dHMoKS5ib2R5KCk7CisjZW5kaWYKICAgICByZXR1cm4gUVN0cmluZygpOwogfQogCiBjb25zdCBR Qnl0ZUFycmF5IE5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjppY29uRGF0YSgpIGNvbnN0CiB7Ci0g ICAgTm90aWZpY2F0aW9uKiBub3RpZmljYXRpb24gPSBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGll bnRRdDo6bm90aWZpY2F0aW9uUHJlc2VudGVyKCktPm5vdGlmaWNhdGlvbkZvcldyYXBwZXIodGhp cyk7CiAgICAgUUJ5dGVBcnJheSBpY29uRGF0YTsKKyNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykK KyAgICBOb3RpZmljYXRpb24qIG5vdGlmaWNhdGlvbiA9IE5vdGlmaWNhdGlvblByZXNlbnRlckNs aWVudFF0Ojpub3RpZmljYXRpb25QcmVzZW50ZXIoKS0+bm90aWZpY2F0aW9uRm9yV3JhcHBlcih0 aGlzKTsKICAgICBpZiAobm90aWZpY2F0aW9uKSB7CiAgICAgICAgIGlmIChub3RpZmljYXRpb24t Pmljb25EYXRhKCkpCiAgICAgICAgICAgICBpY29uRGF0YSA9IFFCeXRlQXJyYXk6OmZyb21SYXdE YXRhKG5vdGlmaWNhdGlvbi0+aWNvbkRhdGEoKS0+ZGF0YSgpLCBub3RpZmljYXRpb24tPmljb25E YXRhKCktPnNpemUoKSk7CiAgICAgfQorI2VuZGlmCiAgICAgcmV0dXJuIGljb25EYXRhOwogfQog Cit2b2lkIE5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjpub3RpZmljYXRpb25DbG9zZWQoKQorewor I2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQorICAgIE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVu dFF0Ojpub3RpZmljYXRpb25QcmVzZW50ZXIoKS0+Y2FuY2VsKHRoaXMpOworI2VuZGlmCit9CisK IE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0OjpOb3RpZmljYXRpb25QcmVzZW50ZXJDbGll bnRRdCgpIDogbV9jbGllbnRDb3VudCgwKQogewogfQpAQCAtMTI3LDExICsxNDMsNiBAQCB2b2lk IE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0OjpyZW1vCiAgICAgfQogfQogCi12b2lkIE5v dGlmaWNhdGlvbkljb25XcmFwcGVyOjpub3RpZmljYXRpb25DbG9zZWQoKQotewotICAgIE5vdGlm aWNhdGlvblByZXNlbnRlckNsaWVudFF0Ojpub3RpZmljYXRpb25QcmVzZW50ZXIoKS0+Y2FuY2Vs KHRoaXMpOwotfQotCiBib29sIE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0OjpzaG93KE5v dGlmaWNhdGlvbiogbm90aWZpY2F0aW9uKQogewogICAgIC8vIEZJWE1FOiB3b3JrZXJzIGJhc2Vk IG5vdGlmaWNhdGlvbnMgYXJlIG5vdCBzdXBwb3J0ZWQgeWV0LgpJbmRleDogV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0 LmgJKHJldmlzaW9uIDYxMTg2KQorKysgV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNh dGlvblByZXNlbnRlckNsaWVudFF0LmgJKHdvcmtpbmcgY29weSkKQEAgLTUxLDcgKzUxLDcgQEAg Y2xhc3MgTm90aWZpY2F0aW9uSWNvbldyYXBwZXIgOiBwdWJsaWMgUQogICAgIFFfT0JKRUNUCiBw dWJsaWM6CiAgICAgTm90aWZpY2F0aW9uSWNvbldyYXBwZXIoKTsKLSAgICB+Tm90aWZpY2F0aW9u SWNvbldyYXBwZXIoKTsKKyAgICB+Tm90aWZpY2F0aW9uSWNvbldyYXBwZXIoKSB7fQogCiAgICAg dm9pZCBjbG9zZSgpOwogICAgIHZvaWQgY2xvc2UoVGltZXI8Tm90aWZpY2F0aW9uSWNvbldyYXBw ZXI+Kik7Cg== 58783 2010-06-15 08:54:09 -0700 2010-06-15 09:07:40 -0700 Patch, V2 40624.patch text/plain 4681 yael SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjExODYpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDYtMTUgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQnVpbGQgZml4IGZvciBRdCBtaW5pbWFsIGFmdGVyIHI2MTEyMQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA2MjQKKworICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjpOb3RpZmljYXRpb25JY29u V3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6Y2xv c2UpOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI6OnRpdGxlKToK KyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjptZXNzYWdlKToKKyAg ICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjppY29uRGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25JY29uV3JhcHBlcjo6bm90aWZpY2F0aW9uQ2xvc2Vk KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRR dC5oOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uSWNvbldyYXBwZXI6On5Ob3RpZmlj YXRpb25JY29uV3JhcHBlcik6CisKIDIwMTAtMDYtMTQgIExhc3psbyBHb21ib3MgIDxsYXN6bG8u MS5nb21ib3NAbm9raWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIFN5bWJpYW4gYnVpbGQg Zml4LgpJbmRleDogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRl ckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90 aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuY3BwCShyZXZpc2lvbiA2MTE4NikKKysrIFdlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQyLDEwICs0MiwxMCBAQAogI2luY2x1ZGUgInF3ZWJraXRnbG9iYWwu aCIKICNpbmNsdWRlIDxRdEd1aT4KIAotI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQotCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKKyNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKKwogY29uc3QgZG91 YmxlIG5vdGlmaWNhdGlvblRpbWVvdXQgPSAxMC4wOwogCiBib29sIE5vdGlmaWNhdGlvblByZXNl bnRlckNsaWVudFF0OjpkdW1wTm90aWZpY2F0aW9uID0gZmFsc2U7CkBAIC02MSw1MSArNjEsNjkg QEAgTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQqIE5vdGlmaWNhdAogICAgIHJldHVybiBz X25vdGlmaWNhdGlvblByZXNlbnRlcjsKIH0KIAorI2VuZGlmCisKIE5vdGlmaWNhdGlvbkljb25X cmFwcGVyOjpOb3RpZmljYXRpb25JY29uV3JhcHBlcigpCiAgICAgOiBtX2Nsb3NlVGltZXIodGhp cywgJk5vdGlmaWNhdGlvbkljb25XcmFwcGVyOjpjbG9zZSkKIHsKKyNpZiBFTkFCTEUoTk9USUZJ Q0FUSU9OUykKKwogI2lmbmRlZiBRVF9OT19TWVNURU1UUkFZSUNPTgogICAgIG1fbm90aWZpY2F0 aW9uSWNvbiA9IDA7CiAjZW5kaWYKICAgICBtX3ByZXNlbnRlciA9IDA7Ci19Ci0KLU5vdGlmaWNh dGlvbkljb25XcmFwcGVyOjp+Tm90aWZpY2F0aW9uSWNvbldyYXBwZXIoKQoteworI2VuZGlmCiB9 CiAKIHZvaWQgTm90aWZpY2F0aW9uSWNvbldyYXBwZXI6OmNsb3NlKFRpbWVyPE5vdGlmaWNhdGlv bkljb25XcmFwcGVyPiopCiB7CisjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCiAgICAgTm90aWZp Y2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6Om5vdGlmaWNhdGlvblByZXNlbnRlcigpLT5jYW5jZWwo dGhpcyk7CisjZW5kaWYKIH0KIAogY29uc3QgUVN0cmluZyBOb3RpZmljYXRpb25JY29uV3JhcHBl cjo6dGl0bGUoKSBjb25zdAogeworI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQogICAgIE5vdGlm aWNhdGlvbiogbm90aWZpY2F0aW9uID0gTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6Om5v dGlmaWNhdGlvblByZXNlbnRlcigpLT5ub3RpZmljYXRpb25Gb3JXcmFwcGVyKHRoaXMpOwogICAg IGlmIChub3RpZmljYXRpb24pCiAgICAgICAgIHJldHVybiBub3RpZmljYXRpb24tPmNvbnRlbnRz KCkudGl0bGUoKTsKKyNlbmRpZgogICAgIHJldHVybiBRU3RyaW5nKCk7CiB9CiAKIGNvbnN0IFFT dHJpbmcgTm90aWZpY2F0aW9uSWNvbldyYXBwZXI6Om1lc3NhZ2UoKSBjb25zdAogeworI2lmIEVO QUJMRShOT1RJRklDQVRJT05TKQogICAgIE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uID0gTm90 aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6Om5vdGlmaWNhdGlvblByZXNlbnRlcigpLT5ub3Rp ZmljYXRpb25Gb3JXcmFwcGVyKHRoaXMpOwogICAgIGlmIChub3RpZmljYXRpb24pCiAgICAgICAg IHJldHVybiBub3RpZmljYXRpb24tPmNvbnRlbnRzKCkuYm9keSgpOworI2VuZGlmCiAgICAgcmV0 dXJuIFFTdHJpbmcoKTsKIH0KIAogY29uc3QgUUJ5dGVBcnJheSBOb3RpZmljYXRpb25JY29uV3Jh cHBlcjo6aWNvbkRhdGEoKSBjb25zdAogewotICAgIE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9u ID0gTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6Om5vdGlmaWNhdGlvblByZXNlbnRlcigp LT5ub3RpZmljYXRpb25Gb3JXcmFwcGVyKHRoaXMpOwogICAgIFFCeXRlQXJyYXkgaWNvbkRhdGE7 CisjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCisgICAgTm90aWZpY2F0aW9uKiBub3RpZmljYXRp b24gPSBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6bm90aWZpY2F0aW9uUHJlc2VudGVy KCktPm5vdGlmaWNhdGlvbkZvcldyYXBwZXIodGhpcyk7CiAgICAgaWYgKG5vdGlmaWNhdGlvbikg ewogICAgICAgICBpZiAobm90aWZpY2F0aW9uLT5pY29uRGF0YSgpKQogICAgICAgICAgICAgaWNv bkRhdGEgPSBRQnl0ZUFycmF5Ojpmcm9tUmF3RGF0YShub3RpZmljYXRpb24tPmljb25EYXRhKCkt PmRhdGEoKSwgbm90aWZpY2F0aW9uLT5pY29uRGF0YSgpLT5zaXplKCkpOwogICAgIH0KKyNlbmRp ZgogICAgIHJldHVybiBpY29uRGF0YTsKIH0KIAordm9pZCBOb3RpZmljYXRpb25JY29uV3JhcHBl cjo6bm90aWZpY2F0aW9uQ2xvc2VkKCkKK3sKKyNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKKyAg ICBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6bm90aWZpY2F0aW9uUHJlc2VudGVyKCkt PmNhbmNlbCh0aGlzKTsKKyNlbmRpZgorfQorCisjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCisK IE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0OjpOb3RpZmljYXRpb25QcmVzZW50ZXJDbGll bnRRdCgpIDogbV9jbGllbnRDb3VudCgwKQogewogfQpAQCAtMTI3LDExICsxNDUsNiBAQCB2b2lk IE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0OjpyZW1vCiAgICAgfQogfQogCi12b2lkIE5v dGlmaWNhdGlvbkljb25XcmFwcGVyOjpub3RpZmljYXRpb25DbG9zZWQoKQotewotICAgIE5vdGlm aWNhdGlvblByZXNlbnRlckNsaWVudFF0Ojpub3RpZmljYXRpb25QcmVzZW50ZXIoKS0+Y2FuY2Vs KHRoaXMpOwotfQotCiBib29sIE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0OjpzaG93KE5v dGlmaWNhdGlvbiogbm90aWZpY2F0aW9uKQogewogICAgIC8vIEZJWE1FOiB3b3JrZXJzIGJhc2Vk IG5vdGlmaWNhdGlvbnMgYXJlIG5vdCBzdXBwb3J0ZWQgeWV0LgpAQCAtMzQxLDUgKzM1NCw2IEBA IHZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OmR1bXAKICAgICB9CiB9CiAKLX0K ICNlbmRpZiAvLyBFTkFCTEUoTk9USUZJQ0FUSU9OUykKK30KKwpJbmRleDogV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0 LmgJKHJldmlzaW9uIDYxMTg2KQorKysgV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNh dGlvblByZXNlbnRlckNsaWVudFF0LmgJKHdvcmtpbmcgY29weSkKQEAgLTUxLDcgKzUxLDcgQEAg Y2xhc3MgTm90aWZpY2F0aW9uSWNvbldyYXBwZXIgOiBwdWJsaWMgUQogICAgIFFfT0JKRUNUCiBw dWJsaWM6CiAgICAgTm90aWZpY2F0aW9uSWNvbldyYXBwZXIoKTsKLSAgICB+Tm90aWZpY2F0aW9u SWNvbldyYXBwZXIoKTsKKyAgICB+Tm90aWZpY2F0aW9uSWNvbldyYXBwZXIoKSB7fQogCiAgICAg dm9pZCBjbG9zZSgpOwogICAgIHZvaWQgY2xvc2UoVGltZXI8Tm90aWZpY2F0aW9uSWNvbldyYXBw ZXI+Kik7Cg==