81630 2012-03-19 22:17:02 -0700 "Attempt to insert nil value " exception when calling attributed string APIs on content with a custom font 2012-03-20 14:43:22 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 adele adele ap enrica mitz oldest_to_newest 582750 0 adele 2012-03-19 22:17:02 -0700 "Attempt to insert nil value " exception when calling attributed string APIs on content with a custom font 582755 1 132755 adele 2012-03-19 22:21:47 -0700 Created attachment 132755 patch I'm not sure if the way I'm referencing the font in the TestWebKitAPI project file is kosher. If it is not, I can just check in another copy of Ahem. 583174 2 132755 ap 2012-03-20 10:06:08 -0700 Comment on attachment 132755 patch Can this just use a layout test instead? We expose these methods through textInputController in DumpRenderTree. WebKitTestRunner is currently more limited, but it will definitely support this eventually, too. 583204 3 adele 2012-03-20 10:32:09 -0700 I do have a layout test that works in DRT, but since I couldn't get it to work in WebKitTestRunner, even while trying to add the feature to textInputController, I switched to making an API test. I couldn't figure out how to call attributedSubstringForProposedRange from WebKitTestRunner/InjectedBundle/TextInputController.cpp. Do you think that is possible? (In reply to comment #2) > (From update of attachment 132755 [details]) > Can this just use a layout test instead? We expose these methods through textInputController in DumpRenderTree. WebKitTestRunner is currently more limited, but it will definitely support this eventually, too. 583223 4 ap 2012-03-20 10:53:03 -0700 I see, so the issue here is that we need to do the conversion in another process. That won't work with textInputController indeed. If you have attributedSubstringForProposedRange implemented in WTR, I'd encourage you to see if you can land that and unskip some of the tests that are currently skipped in mac-wk2. Patch looks good to me, but I don't know the answer to your question about Ahem. 583238 5 adele 2012-03-20 11:03:16 -0700 (In reply to comment #4) > I see, so the issue here is that we need to do the conversion in another process. That won't work with textInputController indeed. > > If you have attributedSubstringForProposedRange implemented in WTR, I'd encourage you to see if you can land that and unskip some of the tests that are currently skipped in mac-wk2. No, I just have an empty implementation. > > Patch looks good to me, but I don't know the answer to your question about Ahem. 583308 6 mitz 2012-03-20 11:51:40 -0700 (In reply to comment #1) > Created an attachment (id=132755) [details] > patch > > I'm not sure if the way I'm referencing the font in the TestWebKitAPI project file is kosher. If it is not, I can just check in another copy of Ahem. Please give TestWebKitAPI its own copy. 583395 7 132884 adele 2012-03-20 13:14:26 -0700 Created attachment 132884 patch Updated with a new copy of Ahem for TestWebKitAPI 583432 8 adele 2012-03-20 14:06:15 -0700 http://trac.webkit.org/changeset/111436 583437 9 132884 mitz 2012-03-20 14:14:22 -0700 Comment on attachment 132884 patch View in context: https://bugs.webkit.org/attachment.cgi?id=132884&action=review > Tools/TestWebKitAPI/Tests/mac/AttributedString.mm:88 > + EXPECT_TRUE([[attrString string] isEqual:@"Lorem"]); You could have used EXPECT_WK_STREQ here. When it fails, prints the actual string (as opposed to just the fact that it’s not the expected one). 583465 10 132902 adele 2012-03-20 14:35:11 -0700 Created attachment 132902 updated the test 583469 11 132902 mitz 2012-03-20 14:37:18 -0700 Comment on attachment 132902 updated the test View in context: https://bugs.webkit.org/attachment.cgi?id=132902&action=review > Tools/ChangeLog:5 > + Reviewed by . Me! 583478 12 adele 2012-03-20 14:43:22 -0700 That's what I had in there, but I didn't want to be presumptuous :) http://trac.webkit.org/changeset/111443 (In reply to comment #11) > (From update of attachment 132902 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=132902&action=review > > > Tools/ChangeLog:5 > > + Reviewed by . > > Me! 132755 2012-03-19 22:21:47 -0700 2012-03-20 13:14:26 -0700 patch patch_3-19-12-attributed-string.txt text/plain 14118 adele SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTM1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTE5ICBBZGVsZSBQ ZXRlcnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KKworICAgICAgICAiQXR0ZW1wdCB0byBpbnNlcnQg bmlsIHZhbHVlICIgZXhjZXB0aW9uIHdoZW4gY2FsbGluZyBhdHRyaWJ1dGVkIHN0cmluZyBBUElz IG9uIGNvbnRlbnQgd2l0aCBhIGN1c3RvbSBmb250CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTYzMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTA2 NTA2NjA+IAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6IFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0F0dHJpYnV0ZWRTdHJpbmcubW0gCisKKyAg ICAgICAgSWYgY29udGVudCBpcyB1c2luZyBhIGN1c3RvbSBmb250LCB0aGVuIHRoZSBwbGF0Zm9y bSBmb250IHdpbGwgYmUgbmlsIGFuZCBuZWVkcyB0byBiZSBuaWwgY2hlY2tlZC4KKworICAgICAg ICAqIHBsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLm1tOiAoK1tXZWJIVE1MQ29udmVydGVyIGVk aXRpbmdBdHRyaWJ1dGVkU3RyaW5nRnJvbVJhbmdlOl0pOgorCiAyMDEyLTAzLTE5ICBFcmljIFNl aWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggbW9yZSBXVEYgaGVhZGVyIGlu Y2x1ZGUgcGF0aHMgaW4gV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L0hUTUxDb252ZXJ0ZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL0hUTUxDb252ZXJ0ZXIubW0JKHJldmlzaW9uIDExMDY2MikKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjk1LDgg KzE2OTUsOCBAQCArIChOU0F0dHJpYnV0ZWRTdHJpbmcgKillZGl0aW5nQXR0cmlidXRlCiAgICAg ICAgIFJlbmRlclN0eWxlKiBzdHlsZSA9IHJlbmRlcmVyLT5zdHlsZSgpOwogICAgICAgICBpZiAo c3R5bGUtPnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkgJiBVTkRFUkxJTkUpCiAgICAgICAgICAg ICBbYXR0cnMuZ2V0KCkgc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoSW50ZWdlcjpOU1Vu ZGVybGluZVN0eWxlU2luZ2xlXSBmb3JLZXk6TlNVbmRlcmxpbmVTdHlsZUF0dHJpYnV0ZU5hbWVd OwotICAgICAgICBOU0ZvbnQgKmZvbnQgPSBzdHlsZS0+Zm9udCgpLnByaW1hcnlGb250KCktPmdl dE5TRm9udCgpOwotICAgICAgICBbYXR0cnMuZ2V0KCkgc2V0T2JqZWN0OmZvbnQgZm9yS2V5Ok5T Rm9udEF0dHJpYnV0ZU5hbWVdOworICAgICAgICBpZiAoTlNGb250ICpmb250ID0gc3R5bGUtPmZv bnQoKS5wcmltYXJ5Rm9udCgpLT5nZXROU0ZvbnQoKSkKKyAgICAgICAgICAgIFthdHRycy5nZXQo KSBzZXRPYmplY3Q6Zm9udCBmb3JLZXk6TlNGb250QXR0cmlidXRlTmFtZV07CiAgICAgICAgIGlm IChzdHlsZS0+dmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5Q29sb3IpLmFscGhhKCkp CiAgICAgICAgICAgICBbYXR0cnMuZ2V0KCkgc2V0T2JqZWN0Om5zQ29sb3Ioc3R5bGUtPnZpc2l0 ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSkgZm9yS2V5Ok5TRm9yZWdyb3VuZENv bG9yQXR0cmlidXRlTmFtZV07CiAgICAgICAgIGVsc2UKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTM1NCkKKysrIFRvb2xz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTE5ICBB ZGVsZSBQZXRlcnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KKworICAgICAgICAiQXR0ZW1wdCB0byBp bnNlcnQgbmlsIHZhbHVlICIgZXhjZXB0aW9uIHdoZW4gY2FsbGluZyBhdHRyaWJ1dGVkIHN0cmlu ZyBBUElzIG9uIGNvbnRlbnQgd2l0aCBhIGN1c3RvbSBmb250CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTYzMAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMTA2NTA2NjA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvajoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9BdHRyaWJ1dGVkU3RyaW5n Lm1tOiBBZGRlZC4KKyAgICAgICAgKC1bQXR0cmlidXRlZFN0cmluZ1Rlc3Qgd2ViVmlldzpkaWRG aW5pc2hMb2FkRm9yRnJhbWU6XSk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJKToKKyAgICAgICAg KFRlc3RXZWJLaXRBUEk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZSk6CisgICAgICAgIChUZXN0V2Vi S2l0QVBJOjpURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9hdHRyaWJ1 dGVkU3RyaW5nQ3VzdG9tRm9udC5odG1sOiBBZGRlZC4KKwogMjAxMi0wMy0xOSAgSmVzc2llIEJl cmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQ7IHJvbGwgb3V0 IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzExMTMwNyBhbmQgaHR0cDovL3RyYWMu d2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTExMjkzCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rl c3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagko cmV2aXNpb24gMTEwNjYyKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDYgQEAK IAkJOTMwQUQ0MDIxNTA2OThEMDAwNjc5NzBGIC8qIGxvdHMtb2YtdGV4dC5odG1sIGluIENvcHkg UmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzMEFENDAxMTUw Njk4QjMwMDY3OTcwRiAvKiBsb3RzLW9mLXRleHQuaHRtbCAqLzsgfTsKIAkJOTM2MTAwMjkxNERD OTVBNzAwNjEzNzlEIC8qIGxvdHMtb2YtaWZyYW1lcy5odG1sIGluIENvcHkgUmVzb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNjEwMDI4MTREQzk1N0IwMDYxMzc5 RCAvKiBsb3RzLW9mLWlmcmFtZXMuaHRtbCAqLzsgfTsKIAkJOTM5QkE5MTcxNDEwMzQxMjAwMUEw MUJEIC8qIERldmljZVNjYWxlRmFjdG9yT25CYWNrLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM5QkE5MTYxNDEwMzQxMjAwMUEwMUJEIC8qIERldmlj ZVNjYWxlRmFjdG9yT25CYWNrLm1tICovOyB9OwotCQk5M0FGNEVDQjE1MDZGMDM1MDA3RkQ1N0Ug LyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9ySW1hZ2VzLmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzQUY0RUNBMTUwNkYwMzUwMDdG RDU3RSAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JJbWFnZXMuY3BwICovOyB9 OwogCQk5M0FGNEVDRTE1MDZGMDY0MDA3RkQ1N0UgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0Rm9ySW1hZ2VzX0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA5M0FGNEVDRDE1MDZGMDY0MDA3RkQ1N0UgLyogTmV3Rmlyc3RWaXN1 YWxseU5vbkVtcHR5TGF5b3V0Rm9ySW1hZ2VzX0J1bmRsZS5jcHAgKi87IH07CiAJCTkzQUY0RUQw MTUwNkYxMjMwMDdGRDU3RSAvKiBsb3RzLW9mLWltYWdlcy5odG1sIGluIFJlc291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5M0FGNEVDRjE1MDZGMTIzMDA3RkQ1N0Ug LyogbG90cy1vZi1pbWFnZXMuaHRtbCAqLzsgfTsKIAkJOTNBRjRFRDExNTA2RjEzMDAwN0ZENTdF IC8qIGxvdHMtb2YtaW1hZ2VzLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gOTNBRjRFQ0YxNTA2RjEyMzAwN0ZENTdFIC8qIGxvdHMtb2Yt aW1hZ2VzLmh0bWwgKi87IH07CkBAIC01OCw2ICs1Nyw5IEBACiAJCTkzRjdFODZDMTREQzhFNEQw MEM4NEE5OSAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXMuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTNGN0U4NkIxNERDOEU0 RDAwQzg0QTk5IC8qIE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZyYW1lcy5jcHAgKi87 IH07CiAJCTkzRjdFODZGMTREQzhFNUMwMEM4NEE5OSAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXRGcmFtZXNfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDkzRjdFODZFMTREQzhFNUIwMEM4NEE5OSAvKiBOZXdGaXJzdFZpc3Vh bGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXNfQnVuZGxlLmNwcCAqLzsgfTsKIAkJQTdBOTY2REIxNDBF Q0NDODAwNUVGOUI0IC8qIENoZWNrZWRBcml0aG1ldGljT3BlcmF0aW9ucy5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBN0E5NjZEQTE0MEVDQ0M4MDA1 RUY5QjQgLyogQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRpb25zLmNwcCAqLzsgfTsKKwkJQjU1RjEx QTAxNTE2ODM0RjAwOTE1OTE2IC8qIEF0dHJpYnV0ZWRTdHJpbmcubW0gaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCNTVGMTE5RjE1MTY4MzRGMDA5MTU5MTYg LyogQXR0cmlidXRlZFN0cmluZy5tbSAqLzsgfTsKKwkJQjU1RjExQjcxNTE3RDAzMzAwOTE1OTE2 IC8qIGF0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQjU1RjExQjAxNTE3QTJDNDAwOTE1OTE2 IC8qIGF0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwgKi87IH07CisJCUI1NUYxMUI4MTUx N0QwMzMwMDkxNTkxNiAvKiBBaGVtLnR0ZiBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCNTVGMTE5RDE1MTY4MkJEMDA5MTU5MTYgLyogQWhlbS50 dGYgKi87IH07CiAJCUJDMDI5QjE4MTQ4NkFENjQwMDgxN0RBOSAvKiBSZXRhaW5QdHIuY3BwIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkMwMjlCMTYxNDg2 QUQ2NDAwODE3REE5IC8qIFJldGFpblB0ci5jcHAgKi87IH07CiAJCUJDMDI5QjFDMTQ4NkIyNTkw MDgxN0RBOSAvKiBSZXRhaW5QdHIubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBCQzAyOUIxQjE0ODZCMjU5MDA4MTdEQTkgLyogUmV0YWluUHRyLm1tICov OyB9OwogCQlCQzEzMTg4NTExNzExNEI2MDBCNjk3MjcgLyogUGxhdGZvcm1VdGlsaXRpZXNNYWMu bW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzEzMTg4 NDExNzExNEI2MDBCNjk3MjcgLyogUGxhdGZvcm1VdGlsaXRpZXNNYWMubW0gKi87IH07CkBAIC0x NTgsNiArMTYwLDggQEAKIAkJCWRzdFBhdGggPSBUZXN0V2ViS2l0QVBJLnJlc291cmNlczsKIAkJ CWRzdFN1YmZvbGRlclNwZWMgPSA3OwogCQkJZmlsZXMgPSAoCisJCQkJQjU1RjExQjcxNTE3RDAz MzAwOTE1OTE2IC8qIGF0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwgaW4gQ29weSBSZXNv dXJjZXMgKi8sCisJCQkJQjU1RjExQjgxNTE3RDAzMzAwOTE1OTE2IC8qIEFoZW0udHRmIGluIENv cHkgUmVzb3VyY2VzICovLAogCQkJCTM3OTAyOEI5MTRGQUMyNEMwMDdFNkI0MyAvKiBhY2NlcHRz Rmlyc3RNb3VzZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTMzREM4OTEyMTQxOTU1 RkUwMDc0N0VGNyAvKiBzaW1wbGUtaWZyYW1lLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJ CQkJMUE5RTUyQzkxM0U2NUVGNDAwNjkxN0Y1IC8qIDE4LWNoYXJhY3RlcnMuaHRtbCBpbiBDb3B5 IFJlc291cmNlcyAqLywKQEAgLTIzNCw2ICsyMzgsOSBAQAogCQk5M0Y3RTg2QjE0REM4RTREMDBD ODRBOTkgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0RnJhbWVzLmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dEZyYW1lcy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzRjdFODZFMTRE QzhFNUIwMEM4NEE5OSAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXNfQnVu ZGxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ld0ZpcnN0Vmlz dWFsbHlOb25FbXB0eUxheW91dEZyYW1lc19CdW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQlBN0E5NjZEQTE0MEVDQ0M4MDA1RUY5QjQgLyogQ2hlY2tlZEFyaXRobWV0aWNP cGVyYXRpb25zLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IENoZWNr ZWRBcml0aG1ldGljT3BlcmF0aW9ucy5jcHA7IHBhdGggPSBXVEYvQ2hlY2tlZEFyaXRobWV0aWNP cGVyYXRpb25zLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJQjU1RjExOUQxNTE2 ODJCRDAwOTE1OTE2IC8qIEFoZW0udHRmICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxh c3RLbm93bkZpbGVUeXBlID0gZmlsZTsgbmFtZSA9IEFoZW0udHRmOyBwYXRoID0gLi4vLi4vLi4v Li4vTGF5b3V0VGVzdHMvcmVzb3VyY2VzL0FoZW0udHRmOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OworCQlCNTVGMTE5RjE1MTY4MzRGMDA5MTU5MTYgLyogQXR0cmlidXRlZFN0cmluZy5tbSAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEF0dHJpYnV0ZWRTdHJpbmcu bW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUI1NUYxMUIwMTUxN0EyQzQwMDkxNTkx NiAvKiBhdHRyaWJ1dGVkU3RyaW5nQ3VzdG9tRm9udC5odG1sICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IHBhdGggPSBhdHRyaWJ1dGVkU3RyaW5nQ3VzdG9t Rm9udC5odG1sOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQzAyOUIxNjE0ODZBRDY0 MDA4MTdEQTkgLyogUmV0YWluUHRyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IFJldGFpblB0ci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDMDI5 QjFCMTQ4NkIyNTkwMDgxN0RBOSAvKiBSZXRhaW5QdHIubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5vYmpjcHA7IG5hbWUgPSBSZXRhaW5QdHIubW07IHBhdGggPSBXVEYvbnMvUmV0YWluUHRy Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQzEzMTg4MzExNzExNEE4MDBCNjk3 MjcgLyogUGxhdGZvcm1VdGlsaXRpZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gUGxhdGZvcm1VdGlsaXRpZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTU4 Nyw2ICs1OTQsNyBAQAogCQkJY2hpbGRyZW4gPSAoCiAJCQkJQzA3RTZDQjAxM0ZENzM3QzAwMzhC MjJCIC8qIFJlc291cmNlcyAqLywKIAkJCQkzNzkwMjhCNTE0RkFCRDkyMDA3RTZCNDMgLyogQWNj ZXB0c0ZpcnN0TW91c2UubW0gKi8sCisJCQkJQjU1RjExOUYxNTE2ODM0RjAwOTE1OTE2IC8qIEF0 dHJpYnV0ZWRTdHJpbmcubW0gKi8sCiAJCQkJMzdEQzY3OEIxNDBEN0M1MDAwQUJDQ0RCIC8qIERP TVJhbmdlT2ZTdHJpbmcubW0gKi8sCiAJCQkJQzA3RTZDQUUxM0ZENjc2NTAwMzhCMjJCIC8qIER5 bmFtaWNEZXZpY2VTY2FsZUZhY3Rvci5tbSAqLywKIAkJCQkzNzc2QkM2MjE1MDk0NkJDMDA0M0E2 NkQgLyogRGV2aWNlU2NhbGVGYWN0b3JJbkRhc2hib2FyZFJlZ2lvbnMubW0gKi8sCkBAIC02MDMs NiArNjExLDggQEAKIAkJQzA3RTZDQjAxM0ZENzM3QzAwMzhCMjJCIC8qIFJlc291cmNlcyAqLyA9 IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCisJCQkJQjU1RjExQjAxNTE3 QTJDNDAwOTE1OTE2IC8qIGF0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwgKi8sCisJCQkJ QjU1RjExOUQxNTE2ODJCRDAwOTE1OTE2IC8qIEFoZW0udHRmICovLAogCQkJCTM3OTAyOEI4MTRG QUJFNDkwMDdFNkI0MyAvKiBhY2NlcHRzRmlyc3RNb3VzZS5odG1sICovLAogCQkJCUMwN0U2Q0Ix MTNGRDczOEEwMDM4QjIyQiAvKiBkZXZpY2VQaXhlbFJhdGlvLmh0bWwgKi8sCiAJCQkJMzdEQzY3 OEYxNDBEN0QzQTAwQUJDQ0RCIC8qIERPTVJhbmdlT2ZTdHJpbmcuaHRtbCAqLywKQEAgLTgwMCw2 ICs4MTAsNyBAQAogCQkJCUU0OTAyOTY4MTRFMkUzQTQwMDJCRUREMSAvKiBUeXBpbmdTdHlsZUNy YXNoLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMzc5MDI4QjYxNEZBQkQ5MjAwN0U2QjQzIC8qIEFj Y2VwdHNGaXJzdE1vdXNlLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMzc3NkJDNjMxNTA5NDZCQzAw NDNBNjZEIC8qIERldmljZVNjYWxlRmFjdG9ySW5EYXNoYm9hcmRSZWdpb25zLm1tIGluIFNvdXJj ZXMgKi8sCisJCQkJQjU1RjExQTAxNTE2ODM0RjAwOTE1OTE2IC8qIEF0dHJpYnV0ZWRTdHJpbmcu bW0gaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9j ZXNzaW5nID0gMDsKIAkJfTsKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0F0 dHJpYnV0ZWRTdHJpbmcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9tYWMvQXR0cmlidXRlZFN0cmluZy5tbQkocmV2aXNpb24gMCkKKysrIFRvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvbWFjL0F0dHJpYnV0ZWRTdHJpbmcubW0JKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsOTIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0Ogor ICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhl CisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg QVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZF TlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9S CisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgor ICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUGxh dGZvcm1VdGlsaXRpZXMuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVdlYlZpZXcuaCIKKyNpbmNsdWRl IDx3dGYvUmV0YWluUHRyLmg+CisKKworQGludGVyZmFjZSBBdHRyaWJ1dGVkU3RyaW5nVGVzdCA6 IE5TT2JqZWN0IHsKK30KK0BlbmQKKworc3RhdGljIGJvb2wgZGlkRmluaXNoTG9hZDsKKworQGlt cGxlbWVudGF0aW9uIEF0dHJpYnV0ZWRTdHJpbmdUZXN0CisKKy0gKHZvaWQpd2ViVmlldzooV2Vi VmlldyAqKXNlbmRlciBkaWRGaW5pc2hMb2FkRm9yRnJhbWU6KFdlYkZyYW1lICopZnJhbWUKK3sK KyAgICBkaWRGaW5pc2hMb2FkID0gdHJ1ZTsKK30KK0BlbmQKKworbmFtZXNwYWNlIFRlc3RXZWJL aXRBUEkgeworCitzdGF0aWMgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdlUmVmLCBX S0ZyYW1lUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqKQoreworICAgIGRpZEZpbmlzaExvYWQg PSB0cnVlOworfQorCitURVNUKFdlYktpdDEsIEF0dHJpYnV0ZWRTdHJpbmdUZXN0KQoreworICAg IFJldGFpblB0cjxXZWJWaWV3PiB3ZWJWaWV3KEFkb3B0TlMsIFtbV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDEyMCwgMjAwKSBmcmFtZU5hbWU6bmlsIGdyb3Vw TmFtZTpuaWxdKTsKKyAgICBSZXRhaW5QdHI8QXR0cmlidXRlZFN0cmluZ1Rlc3Q+IHRlc3RDb250 cm9sbGVyKEFkb3B0TlMsIFtBdHRyaWJ1dGVkU3RyaW5nVGVzdCBuZXddKTsKKyAgICAKKyAgICB3 ZWJWaWV3LmdldCgpLmZyYW1lTG9hZERlbGVnYXRlID0gdGVzdENvbnRyb2xsZXIuZ2V0KCk7Cisg ICAgW1t3ZWJWaWV3LmdldCgpIG1haW5GcmFtZV0gbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCBy ZXF1ZXN0V2l0aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiYXR0 cmlidXRlZFN0cmluZ0N1c3RvbUZvbnQiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rv cnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXV07CisgICAgCisgICAgVXRpbDo6cnVuKCZk aWRGaW5pc2hMb2FkKTsKKyAgICBkaWRGaW5pc2hMb2FkID0gZmFsc2U7CisgICAgICAgIAorICAg IE5TQXR0cmlidXRlZFN0cmluZyAqYXR0clN0cmluZyA9IFsoTlNWaWV3IDxOU1RleHRJbnB1dD4g KilbW1t3ZWJWaWV3LmdldCgpIG1haW5GcmFtZV0gZnJhbWVWaWV3XSBkb2N1bWVudFZpZXddIGF0 dHJpYnV0ZWRTdWJzdHJpbmdGcm9tUmFuZ2U6TlNNYWtlUmFuZ2UoMCwgNSldOworCisgICAgRVhQ RUNUX1RSVUUoW1thdHRyU3RyaW5nIHN0cmluZ10gaXNFcXVhbDpAIkxvcmVtIl0pOworfQorCitU RVNUKFdlYktpdDIsIEF0dHJpYnV0ZWRTdHJpbmdUZXN0KQoreworICAgIFdLUmV0YWluUHRyPFdL Q29udGV4dFJlZj4gY29udGV4dChBZG9wdFdLLCBXS0NvbnRleHRDcmVhdGUoKSk7CisgICAgUGxh dGZvcm1XZWJWaWV3IHdlYlZpZXcoY29udGV4dC5nZXQoKSk7CisgICAgCisgICAgV0tQYWdlTG9h ZGVyQ2xpZW50IGxvYWRlckNsaWVudDsKKyAgICBtZW1zZXQoJmxvYWRlckNsaWVudCwgMCwgc2l6 ZW9mKGxvYWRlckNsaWVudCkpOworICAgIGxvYWRlckNsaWVudC52ZXJzaW9uID0gMDsKKyAgICBs b2FkZXJDbGllbnQuZGlkRmluaXNoTG9hZEZvckZyYW1lID0gZGlkRmluaXNoTG9hZEZvckZyYW1l OworICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQod2ViVmlldy5wYWdlKCksICZsb2FkZXJD bGllbnQpOworICAgIAorICAgIFdLUGFnZUxvYWRVUkwod2ViVmlldy5wYWdlKCksIGFkb3B0V0so VXRpbDo6Y3JlYXRlVVJMRm9yUmVzb3VyY2UoImF0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Iiwg Imh0bWwiKSkuZ2V0KCkpOworCisgICAgVXRpbDo6cnVuKCZkaWRGaW5pc2hMb2FkKTsKKyAgICBk aWRGaW5pc2hMb2FkID0gZmFsc2U7CisgICAgCisgICAgTlNSYW5nZSByYW5nZSA9IE5TTWFrZVJh bmdlKDAsIDUpOworICAgIE5TUmFuZ2UgYWN0dWFsUmFuZ2U7CisgICAgTlNBdHRyaWJ1dGVkU3Ry aW5nICphdHRyU3RyaW5nID0gW3dlYlZpZXcucGxhdGZvcm1WaWV3KCkgYXR0cmlidXRlZFN1YnN0 cmluZ0ZvclByb3Bvc2VkUmFuZ2U6cmFuZ2UgYWN0dWFsUmFuZ2U6JmFjdHVhbFJhbmdlXTsKKyAg ICBFWFBFQ1RfVFJVRShbW2F0dHJTdHJpbmcgc3RyaW5nXSBpc0VxdWFsOkAiTG9yZW0iXSk7Cit9 CisKKyAgICAKK30gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKSW5kZXg6IFRvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvbWFjL2F0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvYXR0cmlidXRlZFN0cmluZ0N1 c3RvbUZvbnQuaHRtbAkocmV2aXNpb24gMCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv bWFjL2F0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMTUgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c3R5bGU+CisgICAgICAgICAg ICBAZm9udC1mYWNlIHsKKyAgICAgICAgICAgICAgICBmb250LWZhbWlseTogY3VzdG9tRm9udDsK KyAgICAgICAgICAgICAgICBzcmM6IHVybChBaGVtLnR0Zik7CisgICAgICAgICAgICB9CisgICAg ICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5IGNvbnRlbnRlZGl0YWJsZSBzdHls ZT0iZm9udC1mYW1pbHk6IGN1c3RvbUZvbnQ7IGZvbnQtc2l6ZTogNDhweDsiPkxvcmVtIElwc3Vt CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LmZvY3VzKCk7Cisg ICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4K 132884 2012-03-20 13:14:26 -0700 2012-03-20 14:14:22 -0700 patch patch_3-20-12-attributed-string.txt text/plain 14406 adele SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTQzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTIwICBBZGVsZSBQ ZXRlcnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KKworICAgICAgICAiQXR0ZW1wdCB0byBpbnNlcnQg bmlsIHZhbHVlICIgZXhjZXB0aW9uIHdoZW4gY2FsbGluZyBhdHRyaWJ1dGVkIHN0cmluZyBBUElz IG9uIGNvbnRlbnQgd2l0aCBhIGN1c3RvbSBmb250CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTYzMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTA2 NTA2NjA+IAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6IFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0F0dHJpYnV0ZWRTdHJpbmcubW0gCisKKyAg ICAgICAgSWYgY29udGVudCBpcyB1c2luZyBhIGN1c3RvbSBmb250LCB0aGVuIHRoZSBwbGF0Zm9y bSBmb250IHdpbGwgYmUgbmlsIGFuZCBuZWVkcyB0byBiZSBuaWwgY2hlY2tlZC4KKworICAgICAg ICAqIHBsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLm1tOiAoK1tXZWJIVE1MQ29udmVydGVyIGVk aXRpbmdBdHRyaWJ1dGVkU3RyaW5nRnJvbVJhbmdlOl0pOgorCiAyMDEyLTAzLTIwICBWc2V2b2xv ZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFRhYmJlZCBwYW5lIGRyb3AgZG93biBzaG91bGQgYmUgc29ydGVkLgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL0hUTUxDb252ZXJ0ZXIubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL0hUTUxDb252ZXJ0ZXIubW0JKHJldmlzaW9uIDExMDY2MikK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLm1tCSh3b3JraW5n IGNvcHkpCkBAIC0xNjk1LDggKzE2OTUsOCBAQCArIChOU0F0dHJpYnV0ZWRTdHJpbmcgKillZGl0 aW5nQXR0cmlidXRlCiAgICAgICAgIFJlbmRlclN0eWxlKiBzdHlsZSA9IHJlbmRlcmVyLT5zdHls ZSgpOwogICAgICAgICBpZiAoc3R5bGUtPnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkgJiBVTkRF UkxJTkUpCiAgICAgICAgICAgICBbYXR0cnMuZ2V0KCkgc2V0T2JqZWN0OltOU051bWJlciBudW1i ZXJXaXRoSW50ZWdlcjpOU1VuZGVybGluZVN0eWxlU2luZ2xlXSBmb3JLZXk6TlNVbmRlcmxpbmVT dHlsZUF0dHJpYnV0ZU5hbWVdOwotICAgICAgICBOU0ZvbnQgKmZvbnQgPSBzdHlsZS0+Zm9udCgp LnByaW1hcnlGb250KCktPmdldE5TRm9udCgpOwotICAgICAgICBbYXR0cnMuZ2V0KCkgc2V0T2Jq ZWN0OmZvbnQgZm9yS2V5Ok5TRm9udEF0dHJpYnV0ZU5hbWVdOworICAgICAgICBpZiAoTlNGb250 ICpmb250ID0gc3R5bGUtPmZvbnQoKS5wcmltYXJ5Rm9udCgpLT5nZXROU0ZvbnQoKSkKKyAgICAg ICAgICAgIFthdHRycy5nZXQoKSBzZXRPYmplY3Q6Zm9udCBmb3JLZXk6TlNGb250QXR0cmlidXRl TmFtZV07CiAgICAgICAgIGlmIChzdHlsZS0+dmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3Bl cnR5Q29sb3IpLmFscGhhKCkpCiAgICAgICAgICAgICBbYXR0cnMuZ2V0KCkgc2V0T2JqZWN0Om5z Q29sb3Ioc3R5bGUtPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSkgZm9y S2V5Ok5TRm9yZWdyb3VuZENvbG9yQXR0cmlidXRlTmFtZV07CiAgICAgICAgIGVsc2UKSW5kZXg6 IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9u IDExMTQzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIw IEBACisyMDEyLTAzLTIwICBBZGVsZSBQZXRlcnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KKworICAg ICAgICAiQXR0ZW1wdCB0byBpbnNlcnQgbmlsIHZhbHVlICIgZXhjZXB0aW9uIHdoZW4gY2FsbGlu ZyBhdHRyaWJ1dGVkIHN0cmluZyBBUElzIG9uIGNvbnRlbnQgd2l0aCBhIGN1c3RvbSBmb250Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTYzMAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMTA2NTA2NjA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL21h Yy9BaGVtLnR0ZjogQWRkZWQuCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvQXR0 cmlidXRlZFN0cmluZy5tbTogQWRkZWQuCisgICAgICAgICgtW0F0dHJpYnV0ZWRTdHJpbmdUZXN0 IHdlYlZpZXc6ZGlkRmluaXNoTG9hZEZvckZyYW1lOl0pOgorICAgICAgICAoVGVzdFdlYktpdEFQ SSk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUpOgorICAg ICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0 cy9tYWMvYXR0cmlidXRlZFN0cmluZ0N1c3RvbUZvbnQuaHRtbDogQWRkZWQuCisKIDIwMTItMDMt MjAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21h Y10gUmVzdG9yZSBjb2xvciBzcGFjZSBzd2l0Y2hpbmcgY29kZSB0byBydW4td2Via2l0LXRlc3Rz CkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRB UEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMTEwNjYyKQorKysgVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdv cmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDYgQEAKIAkJOTMwQUQ0MDIxNTA2OThEMDAwNjc5NzBG IC8qIGxvdHMtb2YtdGV4dC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDkzMEFENDAxMTUwNjk4QjMwMDY3OTcwRiAvKiBsb3RzLW9mLXRl eHQuaHRtbCAqLzsgfTsKIAkJOTM2MTAwMjkxNERDOTVBNzAwNjEzNzlEIC8qIGxvdHMtb2YtaWZy YW1lcy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDkzNjEwMDI4MTREQzk1N0IwMDYxMzc5RCAvKiBsb3RzLW9mLWlmcmFtZXMuaHRtbCAq LzsgfTsKIAkJOTM5QkE5MTcxNDEwMzQxMjAwMUEwMUJEIC8qIERldmljZVNjYWxlRmFjdG9yT25C YWNrLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM5 QkE5MTYxNDEwMzQxMjAwMUEwMUJEIC8qIERldmljZVNjYWxlRmFjdG9yT25CYWNrLm1tICovOyB9 OwotCQk5M0FGNEVDQjE1MDZGMDM1MDA3RkQ1N0UgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0Rm9ySW1hZ2VzLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDkzQUY0RUNBMTUwNkYwMzUwMDdGRDU3RSAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9u RW1wdHlMYXlvdXRGb3JJbWFnZXMuY3BwICovOyB9OwogCQk5M0FGNEVDRTE1MDZGMDY0MDA3RkQ1 N0UgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9ySW1hZ2VzX0J1bmRsZS5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5M0FGNEVDRDE1 MDZGMDY0MDA3RkQ1N0UgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9ySW1hZ2Vz X0J1bmRsZS5jcHAgKi87IH07CiAJCTkzQUY0RUQwMTUwNkYxMjMwMDdGRDU3RSAvKiBsb3RzLW9m LWltYWdlcy5odG1sIGluIFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA5M0FGNEVDRjE1MDZGMTIzMDA3RkQ1N0UgLyogbG90cy1vZi1pbWFnZXMuaHRtbCAqLzsg fTsKIAkJOTNBRjRFRDExNTA2RjEzMDAwN0ZENTdFIC8qIGxvdHMtb2YtaW1hZ2VzLmh0bWwgaW4g Q29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTNBRjRF Q0YxNTA2RjEyMzAwN0ZENTdFIC8qIGxvdHMtb2YtaW1hZ2VzLmh0bWwgKi87IH07CkBAIC01OCw2 ICs1Nyw5IEBACiAJCTkzRjdFODZDMTREQzhFNEQwMEM4NEE5OSAvKiBOZXdGaXJzdFZpc3VhbGx5 Tm9uRW1wdHlMYXlvdXRGcmFtZXMuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gOTNGN0U4NkIxNERDOEU0RDAwQzg0QTk5IC8qIE5ld0ZpcnN0VmlzdWFs bHlOb25FbXB0eUxheW91dEZyYW1lcy5jcHAgKi87IH07CiAJCTkzRjdFODZGMTREQzhFNUMwMEM4 NEE5OSAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXNfQnVuZGxlLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzRjdFODZFMTRE QzhFNUIwMEM4NEE5OSAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXNfQnVu ZGxlLmNwcCAqLzsgfTsKIAkJQTdBOTY2REIxNDBFQ0NDODAwNUVGOUI0IC8qIENoZWNrZWRBcml0 aG1ldGljT3BlcmF0aW9ucy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBBN0E5NjZEQTE0MEVDQ0M4MDA1RUY5QjQgLyogQ2hlY2tlZEFyaXRobWV0aWNP cGVyYXRpb25zLmNwcCAqLzsgfTsKKwkJQjU1RjExQTAxNTE2ODM0RjAwOTE1OTE2IC8qIEF0dHJp YnV0ZWRTdHJpbmcubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBCNTVGMTE5RjE1MTY4MzRGMDA5MTU5MTYgLyogQXR0cmlidXRlZFN0cmluZy5tbSAqLzsg fTsKKwkJQjU1RjExQjcxNTE3RDAzMzAwOTE1OTE2IC8qIGF0dHJpYnV0ZWRTdHJpbmdDdXN0b21G b250Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gQjU1RjExQjAxNTE3QTJDNDAwOTE1OTE2IC8qIGF0dHJpYnV0ZWRTdHJpbmdDdXN0b21G b250Lmh0bWwgKi87IH07CisJCUI1NUYxMUJFMTUxOTFBMDYwMDkxNTkxNiAvKiBBaGVtLnR0ZiBp biBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCNTVG MTFCOTE1MTkxNkU2MDA5MTU5MTYgLyogQWhlbS50dGYgKi87IH07CiAJCUJDMDI5QjE4MTQ4NkFE NjQwMDgxN0RBOSAvKiBSZXRhaW5QdHIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQkMwMjlCMTYxNDg2QUQ2NDAwODE3REE5IC8qIFJldGFpblB0ci5j cHAgKi87IH07CiAJCUJDMDI5QjFDMTQ4NkIyNTkwMDgxN0RBOSAvKiBSZXRhaW5QdHIubW0gaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzAyOUIxQjE0ODZC MjU5MDA4MTdEQTkgLyogUmV0YWluUHRyLm1tICovOyB9OwogCQlCQzEzMTg4NTExNzExNEI2MDBC Njk3MjcgLyogUGxhdGZvcm1VdGlsaXRpZXNNYWMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzEzMTg4NDExNzExNEI2MDBCNjk3MjcgLyogUGxhdGZv cm1VdGlsaXRpZXNNYWMubW0gKi87IH07CkBAIC0xNTgsNiArMTYwLDggQEAKIAkJCWRzdFBhdGgg PSBUZXN0V2ViS2l0QVBJLnJlc291cmNlczsKIAkJCWRzdFN1YmZvbGRlclNwZWMgPSA3OwogCQkJ ZmlsZXMgPSAoCisJCQkJQjU1RjExQkUxNTE5MUEwNjAwOTE1OTE2IC8qIEFoZW0udHRmIGluIENv cHkgUmVzb3VyY2VzICovLAorCQkJCUI1NUYxMUI3MTUxN0QwMzMwMDkxNTkxNiAvKiBhdHRyaWJ1 dGVkU3RyaW5nQ3VzdG9tRm9udC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTM3OTAy OEI5MTRGQUMyNEMwMDdFNkI0MyAvKiBhY2NlcHRzRmlyc3RNb3VzZS5odG1sIGluIENvcHkgUmVz b3VyY2VzICovLAogCQkJCTMzREM4OTEyMTQxOTU1RkUwMDc0N0VGNyAvKiBzaW1wbGUtaWZyYW1l Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJMUE5RTUyQzkxM0U2NUVGNDAwNjkxN0Y1 IC8qIDE4LWNoYXJhY3RlcnMuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKQEAgLTIzNCw2ICsy MzgsOSBAQAogCQk5M0Y3RTg2QjE0REM4RTREMDBDODRBOTkgLyogTmV3Rmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0RnJhbWVzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZyYW1lcy5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTkzRjdFODZFMTREQzhFNUIwMEM4NEE5OSAvKiBOZXdGaXJzdFZp c3VhbGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXNfQnVuZGxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZyYW1lc19C dW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBN0E5NjZEQTE0MEVDQ0M4 MDA1RUY5QjQgLyogQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRpb25zLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IENoZWNrZWRBcml0aG1ldGljT3BlcmF0aW9ucy5jcHA7 IHBhdGggPSBXVEYvQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRpb25zLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJQjU1RjExOUYxNTE2ODM0RjAwOTE1OTE2IC8qIEF0dHJpYnV0ZWRT dHJpbmcubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBBdHRyaWJ1 dGVkU3RyaW5nLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQlCNTVGMTFCMDE1MTdB MkM0MDA5MTU5MTYgLyogYXR0cmlidXRlZFN0cmluZ0N1c3RvbUZvbnQuaHRtbCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHRleHQuaHRtbDsgcGF0aCA9IGF0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWw7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUI1NUYxMUI5MTUxOTE2RTYwMDkxNTkxNiAvKiBBaGVt LnR0ZiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IGZp bGU7IHBhdGggPSBBaGVtLnR0Zjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMwMjlC MTYxNDg2QUQ2NDAwODE3REE5IC8qIFJldGFpblB0ci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBSZXRhaW5QdHIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQlCQzAyOUIxQjE0ODZCMjU5MDA4MTdEQTkgLyogUmV0YWluUHRyLm1tICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gUmV0YWluUHRyLm1tOyBwYXRoID0gV1RGL25z L1JldGFpblB0ci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMxMzE4ODMxMTcx MTRBODAwQjY5NzI3IC8qIFBsYXRmb3JtVXRpbGl0aWVzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IFBsYXRmb3JtVXRpbGl0aWVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CkBAIC01ODcsNiArNTk0LDcgQEAKIAkJCWNoaWxkcmVuID0gKAogCQkJCUMwN0U2Q0IwMTNG RDczN0MwMDM4QjIyQiAvKiBSZXNvdXJjZXMgKi8sCiAJCQkJMzc5MDI4QjUxNEZBQkQ5MjAwN0U2 QjQzIC8qIEFjY2VwdHNGaXJzdE1vdXNlLm1tICovLAorCQkJCUI1NUYxMTlGMTUxNjgzNEYwMDkx NTkxNiAvKiBBdHRyaWJ1dGVkU3RyaW5nLm1tICovLAogCQkJCTM3REM2NzhCMTQwRDdDNTAwMEFC Q0NEQiAvKiBET01SYW5nZU9mU3RyaW5nLm1tICovLAogCQkJCUMwN0U2Q0FFMTNGRDY3NjUwMDM4 QjIyQiAvKiBEeW5hbWljRGV2aWNlU2NhbGVGYWN0b3IubW0gKi8sCiAJCQkJMzc3NkJDNjIxNTA5 NDZCQzAwNDNBNjZEIC8qIERldmljZVNjYWxlRmFjdG9ySW5EYXNoYm9hcmRSZWdpb25zLm1tICov LApAQCAtNjAzLDYgKzYxMSw4IEBACiAJCUMwN0U2Q0IwMTNGRDczN0MwMDM4QjIyQiAvKiBSZXNv dXJjZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAorCQkJCUI1 NUYxMUI5MTUxOTE2RTYwMDkxNTkxNiAvKiBBaGVtLnR0ZiAqLywKKwkJCQlCNTVGMTFCMDE1MTdB MkM0MDA5MTU5MTYgLyogYXR0cmlidXRlZFN0cmluZ0N1c3RvbUZvbnQuaHRtbCAqLywKIAkJCQkz NzkwMjhCODE0RkFCRTQ5MDA3RTZCNDMgLyogYWNjZXB0c0ZpcnN0TW91c2UuaHRtbCAqLywKIAkJ CQlDMDdFNkNCMTEzRkQ3MzhBMDAzOEIyMkIgLyogZGV2aWNlUGl4ZWxSYXRpby5odG1sICovLAog CQkJCTM3REM2NzhGMTQwRDdEM0EwMEFCQ0NEQiAvKiBET01SYW5nZU9mU3RyaW5nLmh0bWwgKi8s CkBAIC04MDAsNiArODEwLDcgQEAKIAkJCQlFNDkwMjk2ODE0RTJFM0E0MDAyQkVERDEgLyogVHlw aW5nU3R5bGVDcmFzaC5tbSBpbiBTb3VyY2VzICovLAogCQkJCTM3OTAyOEI2MTRGQUJEOTIwMDdF NkI0MyAvKiBBY2NlcHRzRmlyc3RNb3VzZS5tbSBpbiBTb3VyY2VzICovLAogCQkJCTM3NzZCQzYz MTUwOTQ2QkMwMDQzQTY2RCAvKiBEZXZpY2VTY2FsZUZhY3RvckluRGFzaGJvYXJkUmVnaW9ucy5t bSBpbiBTb3VyY2VzICovLAorCQkJCUI1NUYxMUEwMTUxNjgzNEYwMDkxNTkxNiAvKiBBdHRyaWJ1 dGVkU3RyaW5nLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1l bnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL21hYy9BaGVtLnR0Zgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L21hYy9BaGVtLnR0ZgkocmV2aXNpb24gMTEwNjYyKQkoZnJvbSBMYXlvdXRUZXN0cy9yZXNvdXJj ZXMvQWhlbS50dGY6MTEwNjYyKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvQWhl bS50dGYJKHdvcmtpbmcgY29weSkKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFj L0F0dHJpYnV0ZWRTdHJpbmcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9tYWMvQXR0cmlidXRlZFN0cmluZy5tbQkocmV2aXNpb24gMCkKKysrIFRvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvbWFjL0F0dHJpYnV0ZWRTdHJpbmcubW0JKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsOTIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0 OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g dGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks IE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAi UGxhdGZvcm1VdGlsaXRpZXMuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVdlYlZpZXcuaCIKKyNpbmNs dWRlIDx3dGYvUmV0YWluUHRyLmg+CisKKworQGludGVyZmFjZSBBdHRyaWJ1dGVkU3RyaW5nVGVz dCA6IE5TT2JqZWN0IHsKK30KK0BlbmQKKworc3RhdGljIGJvb2wgZGlkRmluaXNoTG9hZDsKKwor QGltcGxlbWVudGF0aW9uIEF0dHJpYnV0ZWRTdHJpbmdUZXN0CisKKy0gKHZvaWQpd2ViVmlldzoo V2ViVmlldyAqKXNlbmRlciBkaWRGaW5pc2hMb2FkRm9yRnJhbWU6KFdlYkZyYW1lICopZnJhbWUK K3sKKyAgICBkaWRGaW5pc2hMb2FkID0gdHJ1ZTsKK30KK0BlbmQKKworbmFtZXNwYWNlIFRlc3RX ZWJLaXRBUEkgeworCitzdGF0aWMgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdlUmVm LCBXS0ZyYW1lUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqKQoreworICAgIGRpZEZpbmlzaExv YWQgPSB0cnVlOworfQorCitURVNUKFdlYktpdDEsIEF0dHJpYnV0ZWRTdHJpbmdUZXN0KQorewor ICAgIFJldGFpblB0cjxXZWJWaWV3PiB3ZWJWaWV3KEFkb3B0TlMsIFtbV2ViVmlldyBhbGxvY10g aW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDEyMCwgMjAwKSBmcmFtZU5hbWU6bmlsIGdy b3VwTmFtZTpuaWxdKTsKKyAgICBSZXRhaW5QdHI8QXR0cmlidXRlZFN0cmluZ1Rlc3Q+IHRlc3RD b250cm9sbGVyKEFkb3B0TlMsIFtBdHRyaWJ1dGVkU3RyaW5nVGVzdCBuZXddKTsKKyAgICAKKyAg ICB3ZWJWaWV3LmdldCgpLmZyYW1lTG9hZERlbGVnYXRlID0gdGVzdENvbnRyb2xsZXIuZ2V0KCk7 CisgICAgW1t3ZWJWaWV3LmdldCgpIG1haW5GcmFtZV0gbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVz dCByZXF1ZXN0V2l0aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAi YXR0cmlidXRlZFN0cmluZ0N1c3RvbUZvbnQiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJl Y3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXV07CisgICAgCisgICAgVXRpbDo6cnVu KCZkaWRGaW5pc2hMb2FkKTsKKyAgICBkaWRGaW5pc2hMb2FkID0gZmFsc2U7CisgICAgICAgIAor ICAgIE5TQXR0cmlidXRlZFN0cmluZyAqYXR0clN0cmluZyA9IFsoTlNWaWV3IDxOU1RleHRJbnB1 dD4gKilbW1t3ZWJWaWV3LmdldCgpIG1haW5GcmFtZV0gZnJhbWVWaWV3XSBkb2N1bWVudFZpZXdd IGF0dHJpYnV0ZWRTdWJzdHJpbmdGcm9tUmFuZ2U6TlNNYWtlUmFuZ2UoMCwgNSldOworCisgICAg RVhQRUNUX1RSVUUoW1thdHRyU3RyaW5nIHN0cmluZ10gaXNFcXVhbDpAIkxvcmVtIl0pOworfQor CitURVNUKFdlYktpdDIsIEF0dHJpYnV0ZWRTdHJpbmdUZXN0KQoreworICAgIFdLUmV0YWluUHRy PFdLQ29udGV4dFJlZj4gY29udGV4dChBZG9wdFdLLCBXS0NvbnRleHRDcmVhdGUoKSk7CisgICAg UGxhdGZvcm1XZWJWaWV3IHdlYlZpZXcoY29udGV4dC5nZXQoKSk7CisgICAgCisgICAgV0tQYWdl TG9hZGVyQ2xpZW50IGxvYWRlckNsaWVudDsKKyAgICBtZW1zZXQoJmxvYWRlckNsaWVudCwgMCwg c2l6ZW9mKGxvYWRlckNsaWVudCkpOworICAgIGxvYWRlckNsaWVudC52ZXJzaW9uID0gMDsKKyAg ICBsb2FkZXJDbGllbnQuZGlkRmluaXNoTG9hZEZvckZyYW1lID0gZGlkRmluaXNoTG9hZEZvckZy YW1lOworICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQod2ViVmlldy5wYWdlKCksICZsb2Fk ZXJDbGllbnQpOworICAgIAorICAgIFdLUGFnZUxvYWRVUkwod2ViVmlldy5wYWdlKCksIGFkb3B0 V0soVXRpbDo6Y3JlYXRlVVJMRm9yUmVzb3VyY2UoImF0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250 IiwgImh0bWwiKSkuZ2V0KCkpOworCisgICAgVXRpbDo6cnVuKCZkaWRGaW5pc2hMb2FkKTsKKyAg ICBkaWRGaW5pc2hMb2FkID0gZmFsc2U7CisgICAgCisgICAgTlNSYW5nZSByYW5nZSA9IE5TTWFr ZVJhbmdlKDAsIDUpOworICAgIE5TUmFuZ2UgYWN0dWFsUmFuZ2U7CisgICAgTlNBdHRyaWJ1dGVk U3RyaW5nICphdHRyU3RyaW5nID0gW3dlYlZpZXcucGxhdGZvcm1WaWV3KCkgYXR0cmlidXRlZFN1 YnN0cmluZ0ZvclByb3Bvc2VkUmFuZ2U6cmFuZ2UgYWN0dWFsUmFuZ2U6JmFjdHVhbFJhbmdlXTsK KyAgICBFWFBFQ1RfVFJVRShbW2F0dHJTdHJpbmcgc3RyaW5nXSBpc0VxdWFsOkAiTG9yZW0iXSk7 Cit9CisKKyAgICAKK30gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKSW5kZXg6IFRvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvbWFjL2F0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvYXR0cmlidXRlZFN0cmlu Z0N1c3RvbUZvbnQuaHRtbAkocmV2aXNpb24gMCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvbWFjL2F0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsMTUgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c3R5bGU+CisgICAgICAg ICAgICBAZm9udC1mYWNlIHsKKyAgICAgICAgICAgICAgICBmb250LWZhbWlseTogY3VzdG9tRm9u dDsKKyAgICAgICAgICAgICAgICBzcmM6IHVybChBaGVtLnR0Zik7CisgICAgICAgICAgICB9Cisg ICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5IGNvbnRlbnRlZGl0YWJsZSBz dHlsZT0iZm9udC1mYW1pbHk6IGN1c3RvbUZvbnQ7IGZvbnQtc2l6ZTogNDhweDsiPkxvcmVtIElw c3VtCisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LmZvY3VzKCk7 CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4K 132902 2012-03-20 14:35:11 -0700 2012-03-20 14:37:18 -0700 updated the test patch_3-20-12-test.txt text/plain 1598 adele SW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0F0dHJpYnV0ZWRTdHJpbmcubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvQXR0cmlidXRlZFN0 cmluZy5tbQkocmV2aXNpb24gMTExNDM3KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9t YWMvQXR0cmlidXRlZFN0cmluZy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjMsNyArNjMsNyBAQAog ICAgICAgICAKICAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJTdHJpbmcgPSBbKE5TVmlldyA8 TlNUZXh0SW5wdXQ+ICopW1tbd2ViVmlldy5nZXQoKSBtYWluRnJhbWVdIGZyYW1lVmlld10gZG9j dW1lbnRWaWV3XSBhdHRyaWJ1dGVkU3Vic3RyaW5nRnJvbVJhbmdlOk5TTWFrZVJhbmdlKDAsIDUp XTsKIAotICAgIEVYUEVDVF9UUlVFKFtbYXR0clN0cmluZyBzdHJpbmddIGlzRXF1YWw6QCJMb3Jl bSJdKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIkxvcmVtIiwgW2F0dHJTdHJpbmcgc3RyaW5nXSk7 CiB9CiAKIFRFU1QoV2ViS2l0MiwgQXR0cmlidXRlZFN0cmluZ1Rlc3QpCkBAIC04NSw3ICs4NSw4 IEBACiAgICAgTlNSYW5nZSByYW5nZSA9IE5TTWFrZVJhbmdlKDAsIDUpOwogICAgIE5TUmFuZ2Ug YWN0dWFsUmFuZ2U7CiAgICAgTlNBdHRyaWJ1dGVkU3RyaW5nICphdHRyU3RyaW5nID0gW3dlYlZp ZXcucGxhdGZvcm1WaWV3KCkgYXR0cmlidXRlZFN1YnN0cmluZ0ZvclByb3Bvc2VkUmFuZ2U6cmFu Z2UgYWN0dWFsUmFuZ2U6JmFjdHVhbFJhbmdlXTsKLSAgICBFWFBFQ1RfVFJVRShbW2F0dHJTdHJp bmcgc3RyaW5nXSBpc0VxdWFsOkAiTG9yZW0iXSk7CisKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIkxv cmVtIiwgW2F0dHJTdHJpbmcgc3RyaW5nXSk7CiB9CiAKICAgICAKSW5kZXg6IFRvb2xzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTQzOCkKKysr IFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDEzIEBACiAyMDEyLTAz LTIwICBBZGVsZSBQZXRlcnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KIAorICAgICAgICBVcGRhdGUg dGhlIGxhc3QgdGVzdCB0byB1c2UgRVhQRUNUX1dLX1NUUkVRLgorCisgICAgICAgIFJldmlld2Vk IGJ5IC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0F0dHJpYnV0ZWRTdHJp bmcubW06IChUZXN0V2ViS2l0QVBJOjpURVNUKToKKworMjAxMi0wMy0yMCAgQWRlbGUgUGV0ZXJz b24gIDxhZGVsZUBhcHBsZS5jb20+CisKICAgICAgICAgIkF0dGVtcHQgdG8gaW5zZXJ0IG5pbCB2 YWx1ZSAiIGV4Y2VwdGlvbiB3aGVuIGNhbGxpbmcgYXR0cmlidXRlZCBzdHJpbmcgQVBJcyBvbiBj b250ZW50IHdpdGggYSBjdXN0b20gZm9udAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODE2MzAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwNjUwNjYw Pgo=