50737 2010-12-09 00:38:16 -0800 Implement "Use Selection for Find" in WebKit2 2010-12-09 10:08:14 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mjs mjs eric oldest_to_newest 319313 0 mjs 2010-12-09 00:38:16 -0800 Implement "Use Selection for Find" in WebKit2 319314 1 76022 mjs 2010-12-09 00:48:01 -0800 Created attachment 76022 Patch 319315 2 76022 sam 2010-12-09 00:52:53 -0800 Comment on attachment 76022 Patch Does it makes sense to move WebKit1 over to using this as well? 319324 3 mjs 2010-12-09 01:27:23 -0800 (In reply to comment #2) > Does it makes sense to move WebKit1 over to using this as well? I thought about it, but I'm not sure that would simplify the WebKit Classic implementation overall. It doesn't benefit much from being able to reuse editor command machinery, which in the WebKit2 case handles the magic of asynchronous menu validation. 319328 4 76024 mjs 2010-12-09 01:40:26 -0800 Created attachment 76024 Patch 319330 5 76024 mitz 2010-12-09 01:46:00 -0800 Comment on attachment 76024 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76024&action=review r=me if you change enabledCopy to enabledTake… > WebCore/editing/EditorCommand.cpp:1510 > + { "TakeFindStringFromSelection", { executeTakeFindStringFromSelection, supportedFromMenuOrKeyBinding, enabledCopy, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } }, I think you meant to use enabledTakeFindFromSelection here, not enabledCopy. > WebCore/editing/mac/EditorMac.mm:200 > + systemBeep(); Not sure it’s better to call the cross-platform function here, since this is Mac code, and you can just NSBeep() without incurring the #import cost. > WebCore/editing/mac/EditorMac.mm:204 > + NSString* nsSelectedText = m_frame->displayStringModifiedByEncoding(selectedText()); Misplaced star. 319337 6 76026 mjs 2010-12-09 02:12:09 -0800 Created attachment 76026 Patch 319352 7 eric 2010-12-09 02:34:09 -0800 Attachment 76024 did not build on mac: Build output: http://queues.webkit.org/results/6955005 319446 8 76026 mitz 2010-12-09 07:08:31 -0800 Comment on attachment 76026 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76026&action=review > WebCore/editing/mac/EditorMac.mm:204 > + NSString* nsSelectedText = m_frame->displayStringModifiedByEncoding(selectedText()); Should be NSString *nsSelectedText 319540 9 mjs 2010-12-09 10:08:14 -0800 Committed r73621: <http://trac.webkit.org/changeset/73621> 76022 2010-12-09 00:48:01 -0800 2010-12-09 01:40:12 -0800 Patch bug-50737-20101209004757.patch text/plain 6246 mjs SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzU5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTAtMTItMDkgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ bXBsZW1lbnQgIlVzZSBTZWxlY3Rpb24gZm9yIEZpbmQiIGluIFdlYktpdDIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNzM3CisKKyAgICAgICAgSW1w bGVtZW50IGEgVGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uIGVkaXRvciBjb21tYW5kLiBUaGlz IGlzCisgICAgICAgIHVzZWQgc29sZWx5IHRvIGltcGxlbWVudCB0aGUgIlVzZSBTZWxlY3Rpb24g Zm9yIEZpbmQiIG1lbnUgY29tbWFuZAorICAgICAgICBvbiBNYWMsIGFuZCBpcyBub3QgbWFkZSBh dmFpbGFibGUgdG8gc2NyaXB0LiBPbiBXZWJLaXQyLCBpdCBpcworICAgICAgICB2ZXJ5IGNvbnZl bmllbnQgdG8gcmV1c2UgdGhlIGVkaXRpbmcgbWFjaGluZXJ5IHNpbmNlIHRoaXMgY29tbWFuZAor ICAgICAgICBpcyB2ZXJ5IHNpbWlsYXIgdG8gQ29weS4KKworICAgICAgICAqIGVkaXRpbmcvRWRp dG9yLmg6CisgICAgICAgICogZWRpdGluZy9FZGl0b3JDb21tYW5kLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmV4ZWN1dGVUYWtlRmluZFN0cmluZ0Zyb21TZWxlY3Rpb24pOiBDYWxsIHRvIGEgbWFj LW9ubHkgRWRpdG9yIGZ1bmN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29tbWFuZE1h cCk6IEFkZCAiVGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uIiBjb21tYW5kLgorICAgICAgICAq IGVkaXRpbmcvbWFjL0VkaXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNhbkNvcHlFeGNs dWRpbmdTdGFuZGFsb25lSW1hZ2VzKTogSGVscGVyIGZ1bmN0aW9uOyB3ZSBjYW4ndCB1c2UgRWRp dG9yOjpjYW5Db3B5CisgICAgICAgIHNpbmNlIGl0IHdvdWxkIG1ha2Ugbm8gc2Vuc2UgdG8gZW5h YmxlICJVc2UgU2VsZWN0aW9uIGZvciBGaW5kIiB3aGVuIHZpZXdpbmcgYSBzdGFuZGFsb25lIGlt YWdlCisgICAgICAgIGRvY3VtZW50LgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjp0YWtlRmlu ZFN0cmluZ0Zyb21TZWxlY3Rpb24pOiBJbXBsZW1lbnQgYnkgY29weWluZyB0aGUgc2VsZWN0ZWQg dGV4dAorICAgICAgICB0byB0aGUgc3BlY2lhbCBGaW5kIHBhc3RlYm9hcmQuCisKIDIwMTAtMTIt MDggIEVyaWsgQXJ2aWRzc29uICA8YXJ2QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9FZGl0b3IuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJKHJldmlzaW9uIDczNTgzKQorKysgV2Vi Q29yZS9lZGl0aW5nL0VkaXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNjQsNiArMzY0LDcgQEAg cHVibGljOgogI2lmIFBMQVRGT1JNKE1BQykKICAgICBOU0RpY3Rpb25hcnkqIGZvbnRBdHRyaWJ1 dGVzRm9yU2VsZWN0aW9uU3RhcnQoKSBjb25zdDsKICAgICBOU1dyaXRpbmdEaXJlY3Rpb24gYmFz ZVdyaXRpbmdEaXJlY3Rpb25Gb3JTZWxlY3Rpb25TdGFydCgpIGNvbnN0OworICAgIHZvaWQgdGFr ZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uKCk7CiAjZW5kaWYKIAogICAgIGJvb2wgc2VsZWN0aW9u U3RhcnRIYXNTcGVsbGluZ01hcmtlckZvcihpbnQgZnJvbSwgaW50IGxlbmd0aCkgY29uc3Q7Cklu ZGV4OiBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9lZGl0aW5nL0VkaXRvckNvbW1hbmQuY3BwCShyZXZpc2lvbiA3MzU4MykKKysrIFdlYkNv cmUvZWRpdGluZy9FZGl0b3JDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAxMSw2ICsx MDExLDE0IEBAIHN0YXRpYyBib29sIGV4ZWN1dGVTd2FwV2l0aE1hcmsoRnJhbWUqIGYKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIAorI2lmIFBMQVRGT1JNKE1BQykKK3N0YXRpYyBib29sIGV4ZWN1dGVU YWtlRmluZFN0cmluZ0Zyb21TZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBFdmVudCosIEVkaXRvckNv bW1hbmRTb3VyY2UsIGNvbnN0IFN0cmluZyYpCit7CisgICAgZnJhbWUtPmVkaXRvcigpLT50YWtl RmluZFN0cmluZ0Zyb21TZWxlY3Rpb24oKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKyNlbmRpZgor CiBzdGF0aWMgYm9vbCBleGVjdXRlVG9nZ2xlQm9sZChGcmFtZSogZnJhbWUsIEV2ZW50KiwgRWRp dG9yQ29tbWFuZFNvdXJjZSBzb3VyY2UsIGNvbnN0IFN0cmluZyYpCiB7CiAgICAgcmV0dXJuIGV4 ZWN1dGVUb2dnbGVTdHlsZShmcmFtZSwgc291cmNlLCBFZGl0QWN0aW9uQ2hhbmdlQXR0cmlidXRl cywgQ1NTUHJvcGVydHlGb250V2VpZ2h0LCAibm9ybWFsIiwgImJvbGQiKTsKQEAgLTE0OTEsNiAr MTQ5OSw5IEBAIHN0YXRpYyBjb25zdCBDb21tYW5kTWFwJiBjcmVhdGVDb21tYW5kTWEKICAgICAg ICAgeyAiU3Vic2NyaXB0IiwgeyBleGVjdXRlU3Vic2NyaXB0LCBzdXBwb3J0ZWQsIGVuYWJsZWRJ blJpY2hseUVkaXRhYmxlVGV4dCwgc3RhdGVTdWJzY3JpcHQsIHZhbHVlTnVsbCwgbm90VGV4dElu c2VydGlvbiwgZG9Ob3RBbGxvd0V4ZWN1dGlvbldoZW5EaXNhYmxlZCB9IH0sCiAgICAgICAgIHsg IlN1cGVyc2NyaXB0IiwgeyBleGVjdXRlU3VwZXJzY3JpcHQsIHN1cHBvcnRlZCwgZW5hYmxlZElu UmljaGx5RWRpdGFibGVUZXh0LCBzdGF0ZVN1cGVyc2NyaXB0LCB2YWx1ZU51bGwsIG5vdFRleHRJ bnNlcnRpb24sIGRvTm90QWxsb3dFeGVjdXRpb25XaGVuRGlzYWJsZWQgfSB9LAogICAgICAgICB7 ICJTd2FwV2l0aE1hcmsiLCB7IGV4ZWN1dGVTd2FwV2l0aE1hcmssIHN1cHBvcnRlZEZyb21NZW51 T3JLZXlCaW5kaW5nLCBlbmFibGVkVmlzaWJsZVNlbGVjdGlvbkFuZE1hcmssIHN0YXRlTm9uZSwg dmFsdWVOdWxsLCBub3RUZXh0SW5zZXJ0aW9uLCBkb05vdEFsbG93RXhlY3V0aW9uV2hlbkRpc2Fi bGVkIH0gfSwKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgIHsgIlRha2VGaW5kU3RyaW5nRnJv bVNlbGVjdGlvbiIsIHsgZXhlY3V0ZVRha2VGaW5kU3RyaW5nRnJvbVNlbGVjdGlvbiwgc3VwcG9y dGVkRnJvbU1lbnVPcktleUJpbmRpbmcsIGVuYWJsZWRDb3B5LCBzdGF0ZU5vbmUsIHZhbHVlTnVs bCwgbm90VGV4dEluc2VydGlvbiwgZG9Ob3RBbGxvd0V4ZWN1dGlvbldoZW5EaXNhYmxlZCB9IH0s CisjZW5kaWYKICAgICAgICAgeyAiVG9nZ2xlQm9sZCIsIHsgZXhlY3V0ZVRvZ2dsZUJvbGQsIHN1 cHBvcnRlZEZyb21NZW51T3JLZXlCaW5kaW5nLCBlbmFibGVkSW5SaWNobHlFZGl0YWJsZVRleHQs IHN0YXRlQm9sZCwgdmFsdWVOdWxsLCBub3RUZXh0SW5zZXJ0aW9uLCBkb05vdEFsbG93RXhlY3V0 aW9uV2hlbkRpc2FibGVkIH0gfSwKICAgICAgICAgeyAiVG9nZ2xlSXRhbGljIiwgeyBleGVjdXRl VG9nZ2xlSXRhbGljLCBzdXBwb3J0ZWRGcm9tTWVudU9yS2V5QmluZGluZywgZW5hYmxlZEluUmlj aGx5RWRpdGFibGVUZXh0LCBzdGF0ZUl0YWxpYywgdmFsdWVOdWxsLCBub3RUZXh0SW5zZXJ0aW9u LCBkb05vdEFsbG93RXhlY3V0aW9uV2hlbkRpc2FibGVkIH0gfSwKICAgICAgICAgeyAiVG9nZ2xl VW5kZXJsaW5lIiwgeyBleGVjdXRlVW5kZXJsaW5lLCBzdXBwb3J0ZWRGcm9tTWVudU9yS2V5Qmlu ZGluZywgZW5hYmxlZEluUmljaGx5RWRpdGFibGVUZXh0LCBzdGF0ZVVuZGVybGluZSwgdmFsdWVO dWxsLCBub3RUZXh0SW5zZXJ0aW9uLCBkb05vdEFsbG93RXhlY3V0aW9uV2hlbkRpc2FibGVkIH0g fSwKSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCShyZXZpc2lvbiA3MzU4MykKKysrIFdl YkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICsz Nyw3IEBACiAjaW1wb3J0ICJQYXN0ZWJvYXJkLmgiCiAjaW1wb3J0ICJSZW5kZXJCbG9jay5oIgog I2ltcG9ydCAiUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmgiCisjaW1wb3J0ICJTb3VuZC5oIgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE4Nyw0ICsxODgsMjUgQEAgTlNXcml0aW5nRGly ZWN0aW9uIEVkaXRvcjo6YmFzZVdyaXRpbmdEaQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKKwor c3RhdGljIGJvb2wgY2FuQ29weUV4Y2x1ZGluZ1N0YW5kYWxvbmVJbWFnZXMoRnJhbWUqIGZyYW1l KQoreworICAgIFNlbGVjdGlvbkNvbnRyb2xsZXIqIHNlbGVjdGlvbiA9IGZyYW1lLT5zZWxlY3Rp b24oKTsKKyAgICByZXR1cm4gc2VsZWN0aW9uLT5pc1JhbmdlKCkgJiYgIXNlbGVjdGlvbi0+aXNJ blBhc3N3b3JkRmllbGQoKTsKK30KKwordm9pZCBFZGl0b3I6OnRha2VGaW5kU3RyaW5nRnJvbVNl bGVjdGlvbigpCit7CisgICAgaWYgKCFjYW5Db3B5RXhjbHVkaW5nU3RhbmRhbG9uZUltYWdlcyht X2ZyYW1lKSkgeworICAgICAgICBzeXN0ZW1CZWVwKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICBOU1N0cmluZyogbnNTZWxlY3RlZFRleHQgPSBtX2ZyYW1lLT5kaXNwbGF5U3RyaW5n TW9kaWZpZWRCeUVuY29kaW5nKHNlbGVjdGVkVGV4dCgpKTsKKworICAgIE5TUGFzdGVib2FyZCAq ZmluZFBhc3RlYm9hcmQgPSBbTlNQYXN0ZWJvYXJkIHBhc3RlYm9hcmRXaXRoTmFtZTpOU0ZpbmRQ Ym9hcmRdOworICAgIFtmaW5kUGFzdGVib2FyZCBkZWNsYXJlVHlwZXM6W05TQXJyYXkgYXJyYXlX aXRoT2JqZWN0Ok5TU3RyaW5nUGJvYXJkVHlwZV0gb3duZXI6bmlsXTsKKyAgICBbZmluZFBhc3Rl Ym9hcmQgc2V0U3RyaW5nOm5zU2VsZWN0ZWRUZXh0IGZvclR5cGU6TlNTdHJpbmdQYm9hcmRUeXBl XTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViS2l0Mi9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDczNTk2KQorKysgV2Vi S2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0xMi0w OSAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCAiVXNlIFNlbGVjdGlvbiBm b3IgRmluZCIgaW4gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTA3MzcKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bTogQWRkIHN1cHBvcnQgZm9yIHRoZSB0YWtlRmluZFN0cmluZ0Zyb21TZWxlY3Rpb246CisgICAg ICAgIHNlbGVjdG9yIGFzIGEgY29tbWFuZC4KKwogMjAxMC0xMi0wOCAgU2FtIFdlaW5pZyAgPHNh bUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5ICJFcnJvciIgR2Fy ZW4uCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gNzM1ODMp CisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpA QCAtMjczLDYgKzI3Myw3IEBAIFdFQkNPUkVfQ09NTUFORChwYXN0ZSkKIFdFQkNPUkVfQ09NTUFO RChkZWxldGUpCiBXRUJDT1JFX0NPTU1BTkQocGFzdGVBc1BsYWluVGV4dCkKIFdFQkNPUkVfQ09N TUFORChzZWxlY3RBbGwpCitXRUJDT1JFX0NPTU1BTkQodGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0 aW9uKQogCiAjdW5kZWYgV0VCQ09SRV9DT01NQU5ECiAK 76024 2010-12-09 01:40:26 -0800 2010-12-09 02:12:00 -0800 Patch bug-50737-20101209014022.patch text/plain 6801 mjs SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzU5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMTItMDkgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ bXBsZW1lbnQgIlVzZSBTZWxlY3Rpb24gZm9yIEZpbmQiIGluIFdlYktpdDIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNzM3CisKKyAgICAgICAgSW1w bGVtZW50IGEgVGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uIGVkaXRvciBjb21tYW5kLiBUaGlz IGlzCisgICAgICAgIHVzZWQgc29sZWx5IHRvIGltcGxlbWVudCB0aGUgIlVzZSBTZWxlY3Rpb24g Zm9yIEZpbmQiIG1lbnUgY29tbWFuZAorICAgICAgICBvbiBNYWMsIGFuZCBpcyBub3QgbWFkZSBh dmFpbGFibGUgdG8gc2NyaXB0LiBPbiBXZWJLaXQyLCBpdCBpcworICAgICAgICB2ZXJ5IGNvbnZl bmllbnQgdG8gcmV1c2UgdGhlIGVkaXRpbmcgbWFjaGluZXJ5IHNpbmNlIHRoaXMgY29tbWFuZAor ICAgICAgICBpcyB2ZXJ5IHNpbWlsYXIgdG8gQ29weS4KKworICAgICAgICAqIGVkaXRpbmcvRWRp dG9yLmg6CisgICAgICAgICogZWRpdGluZy9FZGl0b3JDb21tYW5kLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmV4ZWN1dGVUYWtlRmluZFN0cmluZ0Zyb21TZWxlY3Rpb24pOiBDYWxsIHRvIGEgbWFj LW9ubHkgRWRpdG9yIGZ1bmN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6ZW5hYmxlZFRha2VGaW5k U3RyaW5nRnJvbVNlbGVjdGlvbik6IENoZWNrIHVzaW5nIEVkaXRvcjo6Y2FuQ29weUV4Y2x1ZGlu Z1N0YW5kYWxvbmVJbWFnZQorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29tbWFuZE1hcCk6IEFk ZCAiVGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uIiBjb21tYW5kLgorICAgICAgICAqIGVkaXRp bmcvbWFjL0VkaXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6Y2FuQ29weUV4 Y2x1ZGluZ1N0YW5kYWxvbmVJbWFnZXMpOiBIZWxwZXIgZnVuY3Rpb247IHdlIGNhbid0IHVzZSBF ZGl0b3I6OmNhbkNvcHkKKyAgICAgICAgc2luY2UgaXQgd291bGQgbWFrZSBubyBzZW5zZSB0byBl bmFibGUgIlVzZSBTZWxlY3Rpb24gZm9yIEZpbmQiIHdoZW4gdmlld2luZyBhIHN0YW5kYWxvbmUg aW1hZ2UKKyAgICAgICAgZG9jdW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnRha2VG aW5kU3RyaW5nRnJvbVNlbGVjdGlvbik6IEltcGxlbWVudCBieSBjb3B5aW5nIHRoZSBzZWxlY3Rl ZCB0ZXh0CisgICAgICAgIHRvIHRoZSBzcGVjaWFsIEZpbmQgcGFzdGVib2FyZC4KKwogMjAxMC0x Mi0wOCAgRXJpayBBcnZpZHNzb24gIDxhcnZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9FZGl0b3IuaAkocmV2aXNpb24gNzM1ODMpCisrKyBX ZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2NCw2ICszNjQsOCBA QCBwdWJsaWM6CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIE5TRGljdGlvbmFyeSogZm9udEF0dHJp YnV0ZXNGb3JTZWxlY3Rpb25TdGFydCgpIGNvbnN0OwogICAgIE5TV3JpdGluZ0RpcmVjdGlvbiBi YXNlV3JpdGluZ0RpcmVjdGlvbkZvclNlbGVjdGlvblN0YXJ0KCkgY29uc3Q7CisgICAgYm9vbCBj YW5Db3B5RXhjbHVkaW5nU3RhbmRhbG9uZUltYWdlcygpOworICAgIHZvaWQgdGFrZUZpbmRTdHJp bmdGcm9tU2VsZWN0aW9uKCk7CiAjZW5kaWYKIAogICAgIGJvb2wgc2VsZWN0aW9uU3RhcnRIYXNT cGVsbGluZ01hcmtlckZvcihpbnQgZnJvbSwgaW50IGxlbmd0aCkgY29uc3Q7CkluZGV4OiBXZWJD b3JlL2VkaXRpbmcvRWRpdG9yQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0 aW5nL0VkaXRvckNvbW1hbmQuY3BwCShyZXZpc2lvbiA3MzU4MykKKysrIFdlYkNvcmUvZWRpdGlu Zy9FZGl0b3JDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAxMSw2ICsxMDExLDE0IEBA IHN0YXRpYyBib29sIGV4ZWN1dGVTd2FwV2l0aE1hcmsoRnJhbWUqIGYKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAorI2lmIFBMQVRGT1JNKE1BQykKK3N0YXRpYyBib29sIGV4ZWN1dGVUYWtlRmluZFN0 cmluZ0Zyb21TZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBFdmVudCosIEVkaXRvckNvbW1hbmRTb3Vy Y2UsIGNvbnN0IFN0cmluZyYpCit7CisgICAgZnJhbWUtPmVkaXRvcigpLT50YWtlRmluZFN0cmlu Z0Zyb21TZWxlY3Rpb24oKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKyNlbmRpZgorCiBzdGF0aWMg Ym9vbCBleGVjdXRlVG9nZ2xlQm9sZChGcmFtZSogZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFu ZFNvdXJjZSBzb3VyY2UsIGNvbnN0IFN0cmluZyYpCiB7CiAgICAgcmV0dXJuIGV4ZWN1dGVUb2dn bGVTdHlsZShmcmFtZSwgc291cmNlLCBFZGl0QWN0aW9uQ2hhbmdlQXR0cmlidXRlcywgQ1NTUHJv cGVydHlGb250V2VpZ2h0LCAibm9ybWFsIiwgImJvbGQiKTsKQEAgLTEyMjksNiArMTIzNywxMyBA QCBzdGF0aWMgYm9vbCBlbmFibGVkUmVkbyhGcmFtZSogZnJhbWUsIEV2CiAgICAgcmV0dXJuIGZy YW1lLT5lZGl0b3IoKS0+Y2FuUmVkbygpOwogfQogCisjaWYgUExBVEZPUk0oTUFDKQorc3RhdGlj IGJvb2wgZW5hYmxlZFRha2VGaW5kU3RyaW5nRnJvbVNlbGVjdGlvbihGcmFtZSogZnJhbWUsIEV2 ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSkKK3sKKyAgICByZXR1cm4gZnJhbWUtPmVkaXRvcigp LT5jYW5Db3B5RXhjbHVkaW5nU3RhbmRhbG9uZUltYWdlcygpOworfQorI2VuZGlmCisKIHN0YXRp YyBib29sIGVuYWJsZWRVbmRvKEZyYW1lKiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JDb21tYW5kU291 cmNlKQogewogICAgIHJldHVybiBmcmFtZS0+ZWRpdG9yKCktPmNhblVuZG8oKTsKQEAgLTE0OTEs NiArMTUwNiw5IEBAIHN0YXRpYyBjb25zdCBDb21tYW5kTWFwJiBjcmVhdGVDb21tYW5kTWEKICAg ICAgICAgeyAiU3Vic2NyaXB0IiwgeyBleGVjdXRlU3Vic2NyaXB0LCBzdXBwb3J0ZWQsIGVuYWJs ZWRJblJpY2hseUVkaXRhYmxlVGV4dCwgc3RhdGVTdWJzY3JpcHQsIHZhbHVlTnVsbCwgbm90VGV4 dEluc2VydGlvbiwgZG9Ob3RBbGxvd0V4ZWN1dGlvbldoZW5EaXNhYmxlZCB9IH0sCiAgICAgICAg IHsgIlN1cGVyc2NyaXB0IiwgeyBleGVjdXRlU3VwZXJzY3JpcHQsIHN1cHBvcnRlZCwgZW5hYmxl ZEluUmljaGx5RWRpdGFibGVUZXh0LCBzdGF0ZVN1cGVyc2NyaXB0LCB2YWx1ZU51bGwsIG5vdFRl eHRJbnNlcnRpb24sIGRvTm90QWxsb3dFeGVjdXRpb25XaGVuRGlzYWJsZWQgfSB9LAogICAgICAg ICB7ICJTd2FwV2l0aE1hcmsiLCB7IGV4ZWN1dGVTd2FwV2l0aE1hcmssIHN1cHBvcnRlZEZyb21N ZW51T3JLZXlCaW5kaW5nLCBlbmFibGVkVmlzaWJsZVNlbGVjdGlvbkFuZE1hcmssIHN0YXRlTm9u ZSwgdmFsdWVOdWxsLCBub3RUZXh0SW5zZXJ0aW9uLCBkb05vdEFsbG93RXhlY3V0aW9uV2hlbkRp c2FibGVkIH0gfSwKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgIHsgIlRha2VGaW5kU3RyaW5n RnJvbVNlbGVjdGlvbiIsIHsgZXhlY3V0ZVRha2VGaW5kU3RyaW5nRnJvbVNlbGVjdGlvbiwgc3Vw cG9ydGVkRnJvbU1lbnVPcktleUJpbmRpbmcsIGVuYWJsZWRDb3B5LCBzdGF0ZU5vbmUsIHZhbHVl TnVsbCwgbm90VGV4dEluc2VydGlvbiwgZG9Ob3RBbGxvd0V4ZWN1dGlvbldoZW5EaXNhYmxlZCB9 IH0sCisjZW5kaWYKICAgICAgICAgeyAiVG9nZ2xlQm9sZCIsIHsgZXhlY3V0ZVRvZ2dsZUJvbGQs IHN1cHBvcnRlZEZyb21NZW51T3JLZXlCaW5kaW5nLCBlbmFibGVkSW5SaWNobHlFZGl0YWJsZVRl eHQsIHN0YXRlQm9sZCwgdmFsdWVOdWxsLCBub3RUZXh0SW5zZXJ0aW9uLCBkb05vdEFsbG93RXhl Y3V0aW9uV2hlbkRpc2FibGVkIH0gfSwKICAgICAgICAgeyAiVG9nZ2xlSXRhbGljIiwgeyBleGVj dXRlVG9nZ2xlSXRhbGljLCBzdXBwb3J0ZWRGcm9tTWVudU9yS2V5QmluZGluZywgZW5hYmxlZElu UmljaGx5RWRpdGFibGVUZXh0LCBzdGF0ZUl0YWxpYywgdmFsdWVOdWxsLCBub3RUZXh0SW5zZXJ0 aW9uLCBkb05vdEFsbG93RXhlY3V0aW9uV2hlbkRpc2FibGVkIH0gfSwKICAgICAgICAgeyAiVG9n Z2xlVW5kZXJsaW5lIiwgeyBleGVjdXRlVW5kZXJsaW5lLCBzdXBwb3J0ZWRGcm9tTWVudU9yS2V5 QmluZGluZywgZW5hYmxlZEluUmljaGx5RWRpdGFibGVUZXh0LCBzdGF0ZVVuZGVybGluZSwgdmFs dWVOdWxsLCBub3RUZXh0SW5zZXJ0aW9uLCBkb05vdEFsbG93RXhlY3V0aW9uV2hlbkRpc2FibGVk IH0gfSwKSW5kZXg6IFdlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCShyZXZpc2lvbiA3MzU4MykKKysr IFdlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2 ICszNyw3IEBACiAjaW1wb3J0ICJQYXN0ZWJvYXJkLmgiCiAjaW1wb3J0ICJSZW5kZXJCbG9jay5o IgogI2ltcG9ydCAiUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmgiCisjaW1wb3J0ICJTb3VuZC5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE4Nyw0ICsxODgsMjQgQEAgTlNXcml0aW5n RGlyZWN0aW9uIEVkaXRvcjo6YmFzZVdyaXRpbmdEaQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAK K2Jvb2wgRWRpdG9yOjpjYW5Db3B5RXhjbHVkaW5nU3RhbmRhbG9uZUltYWdlcygpCit7CisgICAg U2VsZWN0aW9uQ29udHJvbGxlciogc2VsZWN0aW9uID0gbV9mcmFtZS0+c2VsZWN0aW9uKCk7Cisg ICAgcmV0dXJuIHNlbGVjdGlvbi0+aXNSYW5nZSgpICYmICFzZWxlY3Rpb24tPmlzSW5QYXNzd29y ZEZpZWxkKCk7Cit9CisKK3ZvaWQgRWRpdG9yOjp0YWtlRmluZFN0cmluZ0Zyb21TZWxlY3Rpb24o KQoreworICAgIGlmICghY2FuQ29weUV4Y2x1ZGluZ1N0YW5kYWxvbmVJbWFnZXMoKSkgeworICAg ICAgICBzeXN0ZW1CZWVwKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBOU1N0cmlu ZyogbnNTZWxlY3RlZFRleHQgPSBtX2ZyYW1lLT5kaXNwbGF5U3RyaW5nTW9kaWZpZWRCeUVuY29k aW5nKHNlbGVjdGVkVGV4dCgpKTsKKworICAgIE5TUGFzdGVib2FyZCAqZmluZFBhc3RlYm9hcmQg PSBbTlNQYXN0ZWJvYXJkIHBhc3RlYm9hcmRXaXRoTmFtZTpOU0ZpbmRQYm9hcmRdOworICAgIFtm aW5kUGFzdGVib2FyZCBkZWNsYXJlVHlwZXM6W05TQXJyYXkgYXJyYXlXaXRoT2JqZWN0Ok5TU3Ry aW5nUGJvYXJkVHlwZV0gb3duZXI6bmlsXTsKKyAgICBbZmluZFBhc3RlYm9hcmQgc2V0U3RyaW5n Om5zU2VsZWN0ZWRUZXh0IGZvclR5cGU6TlNTdHJpbmdQYm9hcmRUeXBlXTsKK30KKwogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDczNTk2KQorKysgV2ViS2l0Mi9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0xMi0wOSAgTWFjaWVqIFN0YWNo b3dpYWsgIDxtanNAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEltcGxlbWVudCAiVXNlIFNlbGVjdGlvbiBmb3IgRmluZCIgaW4gV2Vi S2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA3 MzcKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbTogQWRkIHN1cHBvcnQg Zm9yIHRoZSB0YWtlRmluZFN0cmluZ0Zyb21TZWxlY3Rpb246CisgICAgICAgIHNlbGVjdG9yIGFz IGEgY29tbWFuZC4KKwogMjAxMC0xMi0wOCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5ICJFcnJvciIgR2FyZW4uCkluZGV4OiBXZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gNzM1ODMpCisrKyBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjczLDYgKzI3Myw3 IEBAIFdFQkNPUkVfQ09NTUFORChwYXN0ZSkKIFdFQkNPUkVfQ09NTUFORChkZWxldGUpCiBXRUJD T1JFX0NPTU1BTkQocGFzdGVBc1BsYWluVGV4dCkKIFdFQkNPUkVfQ09NTUFORChzZWxlY3RBbGwp CitXRUJDT1JFX0NPTU1BTkQodGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uKQogCiAjdW5kZWYg V0VCQ09SRV9DT01NQU5ECiAK 76026 2010-12-09 02:12:09 -0800 2010-12-09 07:08:31 -0800 Patch bug-50737-20101209021205.patch text/plain 6824 mjs SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzU5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMTItMDkgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ bXBsZW1lbnQgIlVzZSBTZWxlY3Rpb24gZm9yIEZpbmQiIGluIFdlYktpdDIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNzM3CisKKyAgICAgICAgSW1w bGVtZW50IGEgVGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uIGVkaXRvciBjb21tYW5kLiBUaGlz IGlzCisgICAgICAgIHVzZWQgc29sZWx5IHRvIGltcGxlbWVudCB0aGUgIlVzZSBTZWxlY3Rpb24g Zm9yIEZpbmQiIG1lbnUgY29tbWFuZAorICAgICAgICBvbiBNYWMsIGFuZCBpcyBub3QgbWFkZSBh dmFpbGFibGUgdG8gc2NyaXB0LiBPbiBXZWJLaXQyLCBpdCBpcworICAgICAgICB2ZXJ5IGNvbnZl bmllbnQgdG8gcmV1c2UgdGhlIGVkaXRpbmcgbWFjaGluZXJ5IHNpbmNlIHRoaXMgY29tbWFuZAor ICAgICAgICBpcyB2ZXJ5IHNpbWlsYXIgdG8gQ29weS4KKworICAgICAgICAqIGVkaXRpbmcvRWRp dG9yLmg6CisgICAgICAgICogZWRpdGluZy9FZGl0b3JDb21tYW5kLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmV4ZWN1dGVUYWtlRmluZFN0cmluZ0Zyb21TZWxlY3Rpb24pOiBDYWxsIHRvIGEgbWFj LW9ubHkgRWRpdG9yIGZ1bmN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6ZW5hYmxlZFRha2VGaW5k U3RyaW5nRnJvbVNlbGVjdGlvbik6IENoZWNrIHVzaW5nIEVkaXRvcjo6Y2FuQ29weUV4Y2x1ZGlu Z1N0YW5kYWxvbmVJbWFnZQorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQ29tbWFuZE1hcCk6IEFk ZCAiVGFrZUZpbmRTdHJpbmdGcm9tU2VsZWN0aW9uIiBjb21tYW5kLgorICAgICAgICAqIGVkaXRp bmcvbWFjL0VkaXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6Y2FuQ29weUV4 Y2x1ZGluZ1N0YW5kYWxvbmVJbWFnZXMpOiBIZWxwZXIgZnVuY3Rpb247IHdlIGNhbid0IHVzZSBF ZGl0b3I6OmNhbkNvcHkKKyAgICAgICAgc2luY2UgaXQgd291bGQgbWFrZSBubyBzZW5zZSB0byBl bmFibGUgIlVzZSBTZWxlY3Rpb24gZm9yIEZpbmQiIHdoZW4gdmlld2luZyBhIHN0YW5kYWxvbmUg aW1hZ2UKKyAgICAgICAgZG9jdW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnRha2VG aW5kU3RyaW5nRnJvbVNlbGVjdGlvbik6IEltcGxlbWVudCBieSBjb3B5aW5nIHRoZSBzZWxlY3Rl ZCB0ZXh0CisgICAgICAgIHRvIHRoZSBzcGVjaWFsIEZpbmQgcGFzdGVib2FyZC4KKwogMjAxMC0x Mi0wOCAgRXJpayBBcnZpZHNzb24gIDxhcnZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9FZGl0b3IuaAkocmV2aXNpb24gNzM1ODMpCisrKyBX ZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2NCw2ICszNjQsOCBA QCBwdWJsaWM6CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIE5TRGljdGlvbmFyeSogZm9udEF0dHJp YnV0ZXNGb3JTZWxlY3Rpb25TdGFydCgpIGNvbnN0OwogICAgIE5TV3JpdGluZ0RpcmVjdGlvbiBi YXNlV3JpdGluZ0RpcmVjdGlvbkZvclNlbGVjdGlvblN0YXJ0KCkgY29uc3Q7CisgICAgYm9vbCBj YW5Db3B5RXhjbHVkaW5nU3RhbmRhbG9uZUltYWdlcygpOworICAgIHZvaWQgdGFrZUZpbmRTdHJp bmdGcm9tU2VsZWN0aW9uKCk7CiAjZW5kaWYKIAogICAgIGJvb2wgc2VsZWN0aW9uU3RhcnRIYXNT cGVsbGluZ01hcmtlckZvcihpbnQgZnJvbSwgaW50IGxlbmd0aCkgY29uc3Q7CkluZGV4OiBXZWJD b3JlL2VkaXRpbmcvRWRpdG9yQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0 aW5nL0VkaXRvckNvbW1hbmQuY3BwCShyZXZpc2lvbiA3MzU4MykKKysrIFdlYkNvcmUvZWRpdGlu Zy9FZGl0b3JDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAxMSw2ICsxMDExLDE0IEBA IHN0YXRpYyBib29sIGV4ZWN1dGVTd2FwV2l0aE1hcmsoRnJhbWUqIGYKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAorI2lmIFBMQVRGT1JNKE1BQykKK3N0YXRpYyBib29sIGV4ZWN1dGVUYWtlRmluZFN0 cmluZ0Zyb21TZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBFdmVudCosIEVkaXRvckNvbW1hbmRTb3Vy Y2UsIGNvbnN0IFN0cmluZyYpCit7CisgICAgZnJhbWUtPmVkaXRvcigpLT50YWtlRmluZFN0cmlu Z0Zyb21TZWxlY3Rpb24oKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKyNlbmRpZgorCiBzdGF0aWMg Ym9vbCBleGVjdXRlVG9nZ2xlQm9sZChGcmFtZSogZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFu ZFNvdXJjZSBzb3VyY2UsIGNvbnN0IFN0cmluZyYpCiB7CiAgICAgcmV0dXJuIGV4ZWN1dGVUb2dn bGVTdHlsZShmcmFtZSwgc291cmNlLCBFZGl0QWN0aW9uQ2hhbmdlQXR0cmlidXRlcywgQ1NTUHJv cGVydHlGb250V2VpZ2h0LCAibm9ybWFsIiwgImJvbGQiKTsKQEAgLTEyMjksNiArMTIzNywxMyBA QCBzdGF0aWMgYm9vbCBlbmFibGVkUmVkbyhGcmFtZSogZnJhbWUsIEV2CiAgICAgcmV0dXJuIGZy YW1lLT5lZGl0b3IoKS0+Y2FuUmVkbygpOwogfQogCisjaWYgUExBVEZPUk0oTUFDKQorc3RhdGlj IGJvb2wgZW5hYmxlZFRha2VGaW5kU3RyaW5nRnJvbVNlbGVjdGlvbihGcmFtZSogZnJhbWUsIEV2 ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSkKK3sKKyAgICByZXR1cm4gZnJhbWUtPmVkaXRvcigp LT5jYW5Db3B5RXhjbHVkaW5nU3RhbmRhbG9uZUltYWdlcygpOworfQorI2VuZGlmCisKIHN0YXRp YyBib29sIGVuYWJsZWRVbmRvKEZyYW1lKiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JDb21tYW5kU291 cmNlKQogewogICAgIHJldHVybiBmcmFtZS0+ZWRpdG9yKCktPmNhblVuZG8oKTsKQEAgLTE0OTEs NiArMTUwNiw5IEBAIHN0YXRpYyBjb25zdCBDb21tYW5kTWFwJiBjcmVhdGVDb21tYW5kTWEKICAg ICAgICAgeyAiU3Vic2NyaXB0IiwgeyBleGVjdXRlU3Vic2NyaXB0LCBzdXBwb3J0ZWQsIGVuYWJs ZWRJblJpY2hseUVkaXRhYmxlVGV4dCwgc3RhdGVTdWJzY3JpcHQsIHZhbHVlTnVsbCwgbm90VGV4 dEluc2VydGlvbiwgZG9Ob3RBbGxvd0V4ZWN1dGlvbldoZW5EaXNhYmxlZCB9IH0sCiAgICAgICAg IHsgIlN1cGVyc2NyaXB0IiwgeyBleGVjdXRlU3VwZXJzY3JpcHQsIHN1cHBvcnRlZCwgZW5hYmxl ZEluUmljaGx5RWRpdGFibGVUZXh0LCBzdGF0ZVN1cGVyc2NyaXB0LCB2YWx1ZU51bGwsIG5vdFRl eHRJbnNlcnRpb24sIGRvTm90QWxsb3dFeGVjdXRpb25XaGVuRGlzYWJsZWQgfSB9LAogICAgICAg ICB7ICJTd2FwV2l0aE1hcmsiLCB7IGV4ZWN1dGVTd2FwV2l0aE1hcmssIHN1cHBvcnRlZEZyb21N ZW51T3JLZXlCaW5kaW5nLCBlbmFibGVkVmlzaWJsZVNlbGVjdGlvbkFuZE1hcmssIHN0YXRlTm9u ZSwgdmFsdWVOdWxsLCBub3RUZXh0SW5zZXJ0aW9uLCBkb05vdEFsbG93RXhlY3V0aW9uV2hlbkRp c2FibGVkIH0gfSwKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgIHsgIlRha2VGaW5kU3RyaW5n RnJvbVNlbGVjdGlvbiIsIHsgZXhlY3V0ZVRha2VGaW5kU3RyaW5nRnJvbVNlbGVjdGlvbiwgc3Vw cG9ydGVkRnJvbU1lbnVPcktleUJpbmRpbmcsIGVuYWJsZWRUYWtlRmluZFN0cmluZ0Zyb21TZWxl Y3Rpb24sIHN0YXRlTm9uZSwgdmFsdWVOdWxsLCBub3RUZXh0SW5zZXJ0aW9uLCBkb05vdEFsbG93 RXhlY3V0aW9uV2hlbkRpc2FibGVkIH0gfSwKKyNlbmRpZgogICAgICAgICB7ICJUb2dnbGVCb2xk IiwgeyBleGVjdXRlVG9nZ2xlQm9sZCwgc3VwcG9ydGVkRnJvbU1lbnVPcktleUJpbmRpbmcsIGVu YWJsZWRJblJpY2hseUVkaXRhYmxlVGV4dCwgc3RhdGVCb2xkLCB2YWx1ZU51bGwsIG5vdFRleHRJ bnNlcnRpb24sIGRvTm90QWxsb3dFeGVjdXRpb25XaGVuRGlzYWJsZWQgfSB9LAogICAgICAgICB7 ICJUb2dnbGVJdGFsaWMiLCB7IGV4ZWN1dGVUb2dnbGVJdGFsaWMsIHN1cHBvcnRlZEZyb21NZW51 T3JLZXlCaW5kaW5nLCBlbmFibGVkSW5SaWNobHlFZGl0YWJsZVRleHQsIHN0YXRlSXRhbGljLCB2 YWx1ZU51bGwsIG5vdFRleHRJbnNlcnRpb24sIGRvTm90QWxsb3dFeGVjdXRpb25XaGVuRGlzYWJs ZWQgfSB9LAogICAgICAgICB7ICJUb2dnbGVVbmRlcmxpbmUiLCB7IGV4ZWN1dGVVbmRlcmxpbmUs IHN1cHBvcnRlZEZyb21NZW51T3JLZXlCaW5kaW5nLCBlbmFibGVkSW5SaWNobHlFZGl0YWJsZVRl eHQsIHN0YXRlVW5kZXJsaW5lLCB2YWx1ZU51bGwsIG5vdFRleHRJbnNlcnRpb24sIGRvTm90QWxs b3dFeGVjdXRpb25XaGVuRGlzYWJsZWQgfSB9LApJbmRleDogV2ViQ29yZS9lZGl0aW5nL21hYy9F ZGl0b3JNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JNYWMu bW0JKHJldmlzaW9uIDczNTgzKQorKysgV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDcgQEAKICNpbXBvcnQgIlBhc3RlYm9hcmQuaCIK ICNpbXBvcnQgIlJlbmRlckJsb2NrLmgiCiAjaW1wb3J0ICJSdW50aW1lQXBwbGljYXRpb25DaGVj a3MuaCIKKyNpbXBvcnQgIlNvdW5kLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMTg3 LDQgKzE4OCwyNCBAQCBOU1dyaXRpbmdEaXJlY3Rpb24gRWRpdG9yOjpiYXNlV3JpdGluZ0RpCiAg ICAgcmV0dXJuIHJlc3VsdDsKIH0KIAorYm9vbCBFZGl0b3I6OmNhbkNvcHlFeGNsdWRpbmdTdGFu ZGFsb25lSW1hZ2VzKCkKK3sKKyAgICBTZWxlY3Rpb25Db250cm9sbGVyKiBzZWxlY3Rpb24gPSBt X2ZyYW1lLT5zZWxlY3Rpb24oKTsKKyAgICByZXR1cm4gc2VsZWN0aW9uLT5pc1JhbmdlKCkgJiYg IXNlbGVjdGlvbi0+aXNJblBhc3N3b3JkRmllbGQoKTsKK30KKwordm9pZCBFZGl0b3I6OnRha2VG aW5kU3RyaW5nRnJvbVNlbGVjdGlvbigpCit7CisgICAgaWYgKCFjYW5Db3B5RXhjbHVkaW5nU3Rh bmRhbG9uZUltYWdlcygpKSB7CisgICAgICAgIHN5c3RlbUJlZXAoKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIE5TU3RyaW5nKiBuc1NlbGVjdGVkVGV4dCA9IG1fZnJhbWUtPmRpc3Bs YXlTdHJpbmdNb2RpZmllZEJ5RW5jb2Rpbmcoc2VsZWN0ZWRUZXh0KCkpOworCisgICAgTlNQYXN0 ZWJvYXJkICpmaW5kUGFzdGVib2FyZCA9IFtOU1Bhc3RlYm9hcmQgcGFzdGVib2FyZFdpdGhOYW1l Ok5TRmluZFBib2FyZF07CisgICAgW2ZpbmRQYXN0ZWJvYXJkIGRlY2xhcmVUeXBlczpbTlNBcnJh eSBhcnJheVdpdGhPYmplY3Q6TlNTdHJpbmdQYm9hcmRUeXBlXSBvd25lcjpuaWxdOworICAgIFtm aW5kUGFzdGVib2FyZCBzZXRTdHJpbmc6bnNTZWxlY3RlZFRleHQgZm9yVHlwZTpOU1N0cmluZ1Bi b2FyZFR5cGVdOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJLaXQyL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gNzM1OTYp CisrKyBXZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisy MDEwLTEyLTA5ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50ICJVc2UgU2Vs ZWN0aW9uIGZvciBGaW5kIiBpbiBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01MDczNworCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMv V0tWaWV3Lm1tOiBBZGQgc3VwcG9ydCBmb3IgdGhlIHRha2VGaW5kU3RyaW5nRnJvbVNlbGVjdGlv bjoKKyAgICAgICAgc2VsZWN0b3IgYXMgYSBjb21tYW5kLgorCiAyMDEwLTEyLTA4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgIkVy cm9yIiBHYXJlbi4KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZpc2lv biA3MzU4MykKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5n IGNvcHkpCkBAIC0yNzMsNiArMjczLDcgQEAgV0VCQ09SRV9DT01NQU5EKHBhc3RlKQogV0VCQ09S RV9DT01NQU5EKGRlbGV0ZSkKIFdFQkNPUkVfQ09NTUFORChwYXN0ZUFzUGxhaW5UZXh0KQogV0VC Q09SRV9DT01NQU5EKHNlbGVjdEFsbCkKK1dFQkNPUkVfQ09NTUFORCh0YWtlRmluZFN0cmluZ0Zy b21TZWxlY3Rpb24pCiAKICN1bmRlZiBXRUJDT1JFX0NPTU1BTkQKIAo=