35763 2010-03-04 13:22:12 -0800 Remove the now-redundant Settings fields for the Database 2010-03-10 14:44:14 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P4 Minor --- 1 ericu ericu commit-queue dbates dumi eric.carlson levin oldest_to_newest 196197 0 ericu 2010-03-04 13:22:12 -0800 Bug 35310 finished adding the new interface; I then removed the last use of the old interface from Chromium. It's now save to remove the Database fields from Settings and WebSettings. 196201 1 50049 ericu 2010-03-04 13:30:20 -0800 Created attachment 50049 Patch 196213 2 50049 eric 2010-03-04 13:56:04 -0800 Comment on attachment 50049 Patch Patch fails to apply: Failed to run "['/mnt/git/webkit-chromium-ews/WebKitTools/Scripts/svn-apply', '--force']" exit_code: 1 patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/WebCore.base.exp patching file WebCore/page/Settings.cpp Hunk #1 succeeded at 73 (offset 1 line). Hunk #2 FAILED at 261. 1 out of 2 hunks FAILED -- saving rejects to file WebCore/page/Settings.cpp.rej Ok. Why do we have a separate way of managing database settings? 196219 3 ericu 2010-03-04 14:05:37 -0800 I'll update to fix the patch; my code was a few days old. The Settings object isn't available to Workers. In order to get the Database accessible to Workers, the enable bit has to live somewhere that they can get at it. WebSockets implemented their enable bit this way [as a static class member], so I followed that model. 196253 4 50060 ericu 2010-03-04 15:58:16 -0800 Created attachment 50060 Patch 197183 5 50060 commit-queue 2010-03-08 08:42:04 -0800 Comment on attachment 50060 Patch Clearing flags on attachment: 50060 Committed r55666: <http://trac.webkit.org/changeset/55666> 197184 6 commit-queue 2010-03-08 08:42:09 -0800 All reviewed patches have been landed. Closing bug. 197190 7 dbates 2010-03-08 09:07:24 -0800 This change broke the Windows bots. Looks like the corresponding Windows changes were not landed. 197193 8 dbates 2010-03-08 09:33:31 -0800 Applied corresponding change to file WebView.cpp to fix the Windows build. Committed fix in r55667 <http://trac.webkit.org/changeset/55667>. 197393 9 50265 ericu 2010-03-08 16:34:45 -0800 Created attachment 50265 Fix the build fix. That build fix patch fixed the compile, but failed to restore the path by which the database enable preference can actually enable the database API. This puts the right call in. 197394 10 ericu 2010-03-08 16:35:23 -0800 Reopening for the new fix patch. 197445 11 50265 levin 2010-03-08 21:16:31 -0800 Comment on attachment 50265 Fix the build fix. > Index: WebKit/win/ChangeLog > +2010-03-08 Eric Uhrhane <ericu@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + The build fix for my patch on bug #35763 wasn't quite right--it removed > + the call entirely, instead of replacing it with the new API. This adds > + the call to Database::setIsAvailable. Please add a bug link here. > Index: WebKit/win/WebView.cpp > + hr = prefsPrivate->databasesEnabled(&enabled); > + if (FAILED(hr)) > + return hr; > + Database::setIsAvailable(enabled); > + This needs an appropriate if ENABLE guard. 197752 12 50342 ericu 2010-03-09 13:38:46 -0800 Created attachment 50342 Patch 197753 13 ericu 2010-03-09 13:40:11 -0800 (In reply to comment #11) > (From update of attachment 50265 [details]) > > Index: WebKit/win/ChangeLog > > +2010-03-08 Eric Uhrhane <ericu@chromium.org> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + The build fix for my patch on bug #35763 wasn't quite right--it removed > > + the call entirely, instead of replacing it with the new API. This adds > > + the call to Database::setIsAvailable. > > Please add a bug link here. Done. > > Index: WebKit/win/WebView.cpp > > + hr = prefsPrivate->databasesEnabled(&enabled); > > + if (FAILED(hr)) > > + return hr; > > + Database::setIsAvailable(enabled); > > + > > This needs an appropriate if ENABLE guard. Done, and I now have a post-it on my Mac's monitor reminding me to check for that every time. 198354 14 50342 commit-queue 2010-03-10 14:44:08 -0800 Comment on attachment 50342 Patch Clearing flags on attachment: 50342 Committed r55809: <http://trac.webkit.org/changeset/55809> 198355 15 commit-queue 2010-03-10 14:44:14 -0800 All reviewed patches have been landed. Closing bug. 50049 2010-03-04 13:30:20 -0800 2010-03-04 15:58:13 -0800 Patch bug-35763-20100304133019.patch text/plain 9962 ericu SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTU0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMtMDQgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgdGhlIG5vdy1yZWR1bmRhbnQgU2V0dGluZ3MgZmllbGRzIGZvciB0aGUgRGF0YWJhc2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NzYzCisK KyAgICAgICAgTm8gbmV3IHRlc3RzOyB0aGlzIGNvZGUgaXNuJ3QgY2FsbGVkLgorCisgICAgICAg ICogV2ViQ29yZS5iYXNlLmV4cDoKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6CisgICAgICAgICogcGFnZS9TZXR0aW5n cy5oOgorCiAyMDEwLTAzLTA0ICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRG1pdHJ5IFRpdG92LgpJbmRleDogV2ViQ29yZS9XZWJDb3Jl LmJhc2UuZXhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAkocmV2aXNp b24gNTU0OTkpCisrKyBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAJKHdvcmtpbmcgY29weSkKQEAg LTYzNSw3ICs2MzUsNiBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MxOHNldERlZmF1bHRGb250U2l6 CiBfX1pON1dlYkNvcmU4U2V0dGluZ3MxOHNldEZpeGVkRm9udEZhbWlseUVSS05TXzEyQXRvbWlj U3RyaW5nRQogX19aTjdXZWJDb3JlOFNldHRpbmdzMThzZXRNaW5pbXVtRm9udFNpemVFaQogX19a TjdXZWJDb3JlOFNldHRpbmdzMThzZXRTZXJpZkZvbnRGYW1pbHlFUktOU18xMkF0b21pY1N0cmlu Z0UKLV9fWk43V2ViQ29yZThTZXR0aW5nczE5c2V0RGF0YWJhc2VzRW5hYmxlZEViCiBfX1pON1dl YkNvcmU4U2V0dGluZ3MxOXNldFNob3dEZWJ1Z0JvcmRlcnNFYgogX19aTjdXZWJDb3JlOFNldHRp bmdzMjBzZXRDdXJzaXZlRm9udEZhbWlseUVSS05TXzEyQXRvbWljU3RyaW5nRQogX19aTjdXZWJD b3JlOFNldHRpbmdzMjBzZXRGYW50YXN5Rm9udEZhbWlseUVSS05TXzEyQXRvbWljU3RyaW5nRQpJ bmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuY3BwCShyZXZpc2lvbiA1NTQ5OSkKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5n cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyLDcgKzcyLDYgQEAgU2V0dGluZ3M6OlNldHRpbmdz KFBhZ2UqIHBhZ2UpCiAgICAgLCBtX2NhcmV0QnJvd3NpbmdFbmFibGVkKGZhbHNlKQogICAgICwg bV9hcmVJbWFnZXNFbmFibGVkKHRydWUpCiAgICAgLCBtX2FyZVBsdWdpbnNFbmFibGVkKGZhbHNl KQotICAgICwgbV9kYXRhYmFzZXNFbmFibGVkKGZhbHNlKQogICAgICwgbV9sb2NhbFN0b3JhZ2VF bmFibGVkKGZhbHNlKQogICAgICwgbV9pc0phdmFTY3JpcHRFbmFibGVkKGZhbHNlKQogICAgICwg bV9pc1dlYlNlY3VyaXR5RW5hYmxlZCh0cnVlKQpAQCAtMjYxLDEyICsyNjAsNiBAQCB2b2lkIFNl dHRpbmdzOjpzZXRQbHVnaW5zRW5hYmxlZChib29sIGFyCiAgICAgbV9hcmVQbHVnaW5zRW5hYmxl ZCA9IGFyZVBsdWdpbnNFbmFibGVkOwogfQogCi12b2lkIFNldHRpbmdzOjpzZXREYXRhYmFzZXNF bmFibGVkKGJvb2wgZGF0YWJhc2VzRW5hYmxlZCkKLXsKLSAgICBtX2RhdGFiYXNlc0VuYWJsZWQg PSBkYXRhYmFzZXNFbmFibGVkOwotICAgIERhdGFiYXNlOjpzZXRJc0F2YWlsYWJsZShkYXRhYmFz ZXNFbmFibGVkKTsKLX0KLQogdm9pZCBTZXR0aW5nczo6c2V0TG9jYWxTdG9yYWdlRW5hYmxlZChi b29sIGxvY2FsU3RvcmFnZUVuYWJsZWQpCiB7CiAgICAgbV9sb2NhbFN0b3JhZ2VFbmFibGVkID0g bG9jYWxTdG9yYWdlRW5hYmxlZDsKSW5kZXg6IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCShyZXZpc2lvbiA1NTQ5OSkKKysrIFdl YkNvcmUvcGFnZS9TZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgsOSArMTI4LDYgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldFBsdWdpbnNFbmFibGVkKGJvb2wp OwogICAgICAgICBib29sIGFyZVBsdWdpbnNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9hcmVQ bHVnaW5zRW5hYmxlZDsgfQogCi0gICAgICAgIHZvaWQgc2V0RGF0YWJhc2VzRW5hYmxlZChib29s KTsKLSAgICAgICAgYm9vbCBkYXRhYmFzZXNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9kYXRh YmFzZXNFbmFibGVkOyB9Ci0KICAgICAgICAgdm9pZCBzZXRMb2NhbFN0b3JhZ2VFbmFibGVkKGJv b2wpOwogICAgICAgICBib29sIGxvY2FsU3RvcmFnZUVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBt X2xvY2FsU3RvcmFnZUVuYWJsZWQ7IH0KIApAQCAtMzE3LDcgKzMxNCw2IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX2NhcmV0QnJvd3NpbmdFbmFibGVkIDogMTsKICAgICAg ICAgYm9vbCBtX2FyZUltYWdlc0VuYWJsZWQgOiAxOwogICAgICAgICBib29sIG1fYXJlUGx1Z2lu c0VuYWJsZWQgOiAxOwotICAgICAgICBib29sIG1fZGF0YWJhc2VzRW5hYmxlZCA6IDE7CiAgICAg ICAgIGJvb2wgbV9sb2NhbFN0b3JhZ2VFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX2lzSmF2 YVNjcmlwdEVuYWJsZWQgOiAxOwogICAgICAgICBib29sIG1faXNXZWJTZWN1cml0eUVuYWJsZWQg OiAxOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1NTU0OSkKKysrIFdlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMy0wNCAg RXJpYyBVaHJoYW5lICA8ZXJpY3VAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgbm93LXJlZHVuZGFudCBTZXR0 aW5ncyBmaWVsZHMgZm9yIHRoZSBEYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3NjMKKworICAgICAgICBObyBuZXcgdGVzdHM7IHRoaXMg Y29kZSBpc24ndCBjYWxsZWQuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViU2V0dGluZ3MuaDoKKyAg ICAgICAgKiBzcmMvV2ViU2V0dGluZ3NJbXBsLmNwcDoKKyAgICAgICAgKiBzcmMvV2ViU2V0dGlu Z3NJbXBsLmg6CisKIDIwMTAtMDMtMDQgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEbWl0cnkgVGl0b3YuCkluZGV4OiBXZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJTZXR0aW5ncy5oCShyZXZpc2lvbiA1NTQ5OSkKKysrIFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtNzYsNyArNzYsNiBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldEVkaXRhYmxlTGlua0JlaGF2aW9yTmV2ZXJMaXZl KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRGb250UmVuZGVyaW5nTW9kZU5vcm1hbCgpID0g MDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvdWxkUGFpbnRDdXN0b21TY3JvbGxiYXJzKGJvb2wp ID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0RGF0YWJhc2VzRW5hYmxlZChib29sKSA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIHNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wp ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKGJv b2wpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNp b25CZWhhdmlvck5ldmVySW5jbHVkZWQoKSA9IDA7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlNldHRpbmdzSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJTZXR0aW5nc0ltcGwuY3BwCShyZXZpc2lvbiA1NTQ5OSkKKysrIFdlYktpdC9jaHJvbWl1bS9z cmMvV2ViU2V0dGluZ3NJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI2LDExICsyMjYsNiBA QCB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0U2hvdWxkUGFpbnRDdXN0CiAgICAgbV9zZXR0aW5n cy0+c2V0U2hvdWxkUGFpbnRDdXN0b21TY3JvbGxiYXJzKGVuYWJsZWQpOwogfQogCi12b2lkIFdl YlNldHRpbmdzSW1wbDo6c2V0RGF0YWJhc2VzRW5hYmxlZChib29sIGVuYWJsZWQpCi17Ci0gICAg bV9zZXR0aW5ncy0+c2V0RGF0YWJhc2VzRW5hYmxlZChlbmFibGVkKTsKLX0KLQogdm9pZCBXZWJT ZXR0aW5nc0ltcGw6OnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wgYWxs b3cpCiB7CiAgICAgbV9zZXR0aW5ncy0+c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMoYWxsb3cpOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCShyZXZp c2lvbiA1NTQ5OSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgJKHdv cmtpbmcgY29weSkKQEAgLTc4LDcgKzc4LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBz ZXRFZGl0YWJsZUxpbmtCZWhhdmlvck5ldmVyTGl2ZSgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRG b250UmVuZGVyaW5nTW9kZU5vcm1hbCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTaG91bGRQYWlu dEN1c3RvbVNjcm9sbGJhcnMoYm9vbCk7Ci0gICAgdmlydHVhbCB2b2lkIHNldERhdGFiYXNlc0Vu YWJsZWQoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJv bUZpbGVVUkxzKGJvb2wpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRBbGxvd0ZpbGVBY2Nlc3NGcm9t RmlsZVVSTHMoYm9vbCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFRleHREaXJlY3Rpb25TdWJtZW51 SW5jbHVzaW9uQmVoYXZpb3JOZXZlckluY2x1ZGVkKCk7CkluZGV4OiBXZWJLaXQvZ3RrL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL0NoYW5nZUxvZwkocmV2aXNpb24gNTU1NDkp CisrKyBXZWJLaXQvZ3RrL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDEwLTAzLTA0ICBFcmljIFVocmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBub3ct cmVkdW5kYW50IFNldHRpbmdzIGZpZWxkcyBmb3IgdGhlIERhdGFiYXNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTc2MworCisgICAgICAgIE5vIG5l dyB0ZXN0czsgdGhpcyBjb2RlIGlzbid0IGNhbGxlZC4KKworICAgICAgICAqIHdlYmtpdC93ZWJr aXR3ZWJ2aWV3LmNwcDogUmVtb3ZlIHRoZSBjYWxscyBpbnRvIFNldHRpbmdzLgorICAgICAgICAo RE5EQ29udGVudHNSZXF1ZXN0Ojp3ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3NldHRpbmdzKToKKyAg ICAgICAgKERORENvbnRlbnRzUmVxdWVzdDo6d2Via2l0X3dlYl92aWV3X3NldHRpbmdzX25vdGlm eSk6CisKIDIwMTAtMDMtMDMgIEZyaWRyaWNoIFN0cmJhICA8ZnJpZHJpY2guc3RyYmFAYmx1ZXdp bi5jaD4KIAogICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXouCkluZGV4OiBXZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXR3ZWJ2aWV3LmNwcAkocmV2aXNpb24gNTU0OTkpCisrKyBXZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXR3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcyOSw3ICsyNzI5LDYgQEAg c3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3VwZGF0ZV9zZXR0aQogICAgIHNldHRpbmdzLT5z ZXREZXZlbG9wZXJFeHRyYXNFbmFibGVkKGVuYWJsZURldmVsb3BlckV4dHJhcyk7CiAgICAgc2V0 dGluZ3MtPnNldFByaXZhdGVCcm93c2luZ0VuYWJsZWQoZW5hYmxlUHJpdmF0ZUJyb3dzaW5nKTsK ICAgICBzZXR0aW5ncy0+c2V0Q2FyZXRCcm93c2luZ0VuYWJsZWQoZW5hYmxlQ2FyZXRCcm93c2lu Zyk7Ci0gICAgc2V0dGluZ3MtPnNldERhdGFiYXNlc0VuYWJsZWQoZW5hYmxlSFRNTDVEYXRhYmFz ZSk7CiAjaWYgRU5BQkxFKERBVEFCQVNFKQogICAgIERhdGFiYXNlOjpzZXRJc0F2YWlsYWJsZShl bmFibGVIVE1MNURhdGFiYXNlKTsKICNlbmRpZgpAQCAtMjgyMiw3ICsyODIxLDYgQEAgc3RhdGlj IHZvaWQgd2Via2l0X3dlYl92aWV3X3NldHRpbmdzX25vdAogICAgICAgICBzZXR0aW5ncy0+c2V0 Q2FyZXRCcm93c2luZ0VuYWJsZWQoZ192YWx1ZV9nZXRfYm9vbGVhbigmdmFsdWUpKTsKICNpZiBF TkFCTEUoREFUQUJBU0UpCiAgICAgZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoImVu YWJsZS1odG1sNS1kYXRhYmFzZSIpKSB7Ci0gICAgICAgIHNldHRpbmdzLT5zZXREYXRhYmFzZXNF bmFibGVkKGdfdmFsdWVfZ2V0X2Jvb2xlYW4oJnZhbHVlKSk7CiAgICAgICAgIERhdGFiYXNlOjpz ZXRJc0F2YWlsYWJsZShnX3ZhbHVlX2dldF9ib29sZWFuKCZ2YWx1ZSkpOwogICAgIH0KICNlbmRp ZgpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU1NTQ5KQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMy0wNCAgRXJpYyBVaHJoYW5lICA8ZXJp Y3VAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSB0aGUgbm93LXJlZHVuZGFudCBTZXR0aW5ncyBmaWVsZHMgZm9yIHRo ZSBEYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzU3NjMKKworICAgICAgICBObyBuZXcgdGVzdHM7IHRoaXMgY29kZSBpc24ndCBjYWxsZWQu CisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06IFJlbW92ZSB0aGUgY2FsbCBpbnRvIFNl dHRpbmdzLgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRp b246XSk6CisKIDIwMTAtMDMtMDQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgpJbmRleDogV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcu bW0JKHJldmlzaW9uIDU1NDk5KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdv cmtpbmcgY29weSkKQEAgLTEzMDUsNyArMTMwNSw2IEBAIHN0YXRpYyBib29sIGZhc3REb2N1bWVu dFRlYXJkb3duRW5hYmxlZCgKICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUZvbnRTaXplKFtwcmVm ZXJlbmNlcyBtaW5pbXVtRm9udFNpemVdKTsKICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxvZ2lj YWxGb250U2l6ZShbcHJlZmVyZW5jZXMgbWluaW11bUxvZ2ljYWxGb250U2l6ZV0pOwogICAgIHNl dHRpbmdzLT5zZXRQbHVnaW5zRW5hYmxlZChbcHJlZmVyZW5jZXMgYXJlUGx1Z0luc0VuYWJsZWRd KTsKLSAgICBzZXR0aW5ncy0+c2V0RGF0YWJhc2VzRW5hYmxlZChbcHJlZmVyZW5jZXMgZGF0YWJh c2VzRW5hYmxlZF0pOwogI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICBEYXRhYmFzZTo6c2V0SXNB dmFpbGFibGUoW3ByZWZlcmVuY2VzIGRhdGFiYXNlc0VuYWJsZWRdKTsKICNlbmRpZgpJbmRleDog V2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdlTG9nCShy ZXZpc2lvbiA1NTU0OSkKKysrIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNSBAQAorMjAxMC0wMy0wNCAgRXJpYyBVaHJoYW5lICA8ZXJpY3VAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSB0aGUgbm93LXJlZHVuZGFudCBTZXR0aW5ncyBmaWVsZHMgZm9yIHRoZSBEYXRhYmFzZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3NjMKKwor ICAgICAgICBObyBuZXcgdGVzdHM7IHRoaXMgY29kZSBpc24ndCBjYWxsZWQuCisKKyAgICAgICAg KiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAgICAgICAgKFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFw cGx5KTogUmVtb3ZlIHRoZSBjYWxsIGludG8gU2V0dGluZ3MuCisKIDIwMTAtMDMtMDQgIFNpbW9u IEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vi c2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNw cAkocmV2aXNpb24gNTU0OTkpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIxMSw3ICsyMTEsNiBAQCB2b2lkIFFXZWJTZXR0aW5nc1ByaXZhdGU6 OmFwcGx5KCkKICNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgICAgIHZhbHVlID0gYXR0cmlidXRl cy52YWx1ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFs dWUoUVdlYlNldHRpbmdzOjpPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCkpOwotICAgICAg ICBzZXR0aW5ncy0+c2V0RGF0YWJhc2VzRW5hYmxlZCh2YWx1ZSk7CiAgICAgICAgIFdlYkNvcmU6 OkRhdGFiYXNlOjpzZXRJc0F2YWlsYWJsZSh2YWx1ZSk7CiAjZW5kaWYKIAo= 50060 2010-03-04 15:58:16 -0800 2010-03-09 13:38:39 -0800 Patch bug-35763-20100304155815.patch text/plain 9998 ericu SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTU1OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMtMDQgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgdGhlIG5vdy1yZWR1bmRhbnQgU2V0dGluZ3MgZmllbGRzIGZvciB0aGUgRGF0YWJhc2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NzYzCisK KyAgICAgICAgTm8gbmV3IHRlc3RzOyB0aGlzIGNvZGUgaXNuJ3QgY2FsbGVkLgorCisgICAgICAg ICogV2ViQ29yZS5iYXNlLmV4cDoKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6CisgICAgICAgICogcGFnZS9TZXR0aW5n cy5oOgorCiAyMDEwLTAzLTA0ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9X ZWJDb3JlLmJhc2UuZXhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAko cmV2aXNpb24gNTU1NTgpCisrKyBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAJKHdvcmtpbmcgY29w eSkKQEAgLTYzNSw3ICs2MzUsNiBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MxOHNldERlZmF1bHRG b250U2l6CiBfX1pON1dlYkNvcmU4U2V0dGluZ3MxOHNldEZpeGVkRm9udEZhbWlseUVSS05TXzEy QXRvbWljU3RyaW5nRQogX19aTjdXZWJDb3JlOFNldHRpbmdzMThzZXRNaW5pbXVtRm9udFNpemVF aQogX19aTjdXZWJDb3JlOFNldHRpbmdzMThzZXRTZXJpZkZvbnRGYW1pbHlFUktOU18xMkF0b21p Y1N0cmluZ0UKLV9fWk43V2ViQ29yZThTZXR0aW5nczE5c2V0RGF0YWJhc2VzRW5hYmxlZEViCiBf X1pON1dlYkNvcmU4U2V0dGluZ3MxOXNldFNob3dEZWJ1Z0JvcmRlcnNFYgogX19aTjdXZWJDb3Jl OFNldHRpbmdzMjBzZXRDdXJzaXZlRm9udEZhbWlseUVSS05TXzEyQXRvbWljU3RyaW5nRQogX19a TjdXZWJDb3JlOFNldHRpbmdzMjBzZXRGYW50YXN5Rm9udEZhbWlseUVSS05TXzEyQXRvbWljU3Ry aW5nRQpJbmRleDogV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BhZ2UvU2V0dGluZ3MuY3BwCShyZXZpc2lvbiA1NTU1OCkKKysrIFdlYkNvcmUvcGFnZS9T ZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczLDcgKzczLDYgQEAgU2V0dGluZ3M6OlNl dHRpbmdzKFBhZ2UqIHBhZ2UpCiAgICAgLCBtX2NhcmV0QnJvd3NpbmdFbmFibGVkKGZhbHNlKQog ICAgICwgbV9hcmVJbWFnZXNFbmFibGVkKHRydWUpCiAgICAgLCBtX2FyZVBsdWdpbnNFbmFibGVk KGZhbHNlKQotICAgICwgbV9kYXRhYmFzZXNFbmFibGVkKGZhbHNlKQogICAgICwgbV9sb2NhbFN0 b3JhZ2VFbmFibGVkKGZhbHNlKQogICAgICwgbV9pc0phdmFTY3JpcHRFbmFibGVkKGZhbHNlKQog ICAgICwgbV9pc1dlYlNlY3VyaXR5RW5hYmxlZCh0cnVlKQpAQCAtMjY3LDE0ICsyNjYsNiBAQCB2 b2lkIFNldHRpbmdzOjpzZXRQbHVnaW5zRW5hYmxlZChib29sIGFyCiAgICAgbV9hcmVQbHVnaW5z RW5hYmxlZCA9IGFyZVBsdWdpbnNFbmFibGVkOwogfQogCi12b2lkIFNldHRpbmdzOjpzZXREYXRh YmFzZXNFbmFibGVkKGJvb2wgZGF0YWJhc2VzRW5hYmxlZCkKLXsKLSAgICBtX2RhdGFiYXNlc0Vu YWJsZWQgPSBkYXRhYmFzZXNFbmFibGVkOwotI2lmIEVOQUJMRShEQVRBQkFTRSkKLSAgICBEYXRh YmFzZTo6c2V0SXNBdmFpbGFibGUoZGF0YWJhc2VzRW5hYmxlZCk7Ci0jZW5kaWYKLX0KLQogdm9p ZCBTZXR0aW5nczo6c2V0TG9jYWxTdG9yYWdlRW5hYmxlZChib29sIGxvY2FsU3RvcmFnZUVuYWJs ZWQpCiB7CiAgICAgbV9sb2NhbFN0b3JhZ2VFbmFibGVkID0gbG9jYWxTdG9yYWdlRW5hYmxlZDsK SW5kZXg6IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFn ZS9TZXR0aW5ncy5oCShyZXZpc2lvbiA1NTU1OCkKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsOSArMTMxLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICB2b2lkIHNldFBsdWdpbnNFbmFibGVkKGJvb2wpOwogICAgICAgICBib29sIGFyZVBs dWdpbnNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9hcmVQbHVnaW5zRW5hYmxlZDsgfQogCi0g ICAgICAgIHZvaWQgc2V0RGF0YWJhc2VzRW5hYmxlZChib29sKTsKLSAgICAgICAgYm9vbCBkYXRh YmFzZXNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZXNFbmFibGVkOyB9Ci0KICAg ICAgICAgdm9pZCBzZXRMb2NhbFN0b3JhZ2VFbmFibGVkKGJvb2wpOwogICAgICAgICBib29sIGxv Y2FsU3RvcmFnZUVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2xvY2FsU3RvcmFnZUVuYWJsZWQ7 IH0KIApAQCAtMzIxLDcgKzMxOCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9v bCBtX2NhcmV0QnJvd3NpbmdFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX2FyZUltYWdlc0Vu YWJsZWQgOiAxOwogICAgICAgICBib29sIG1fYXJlUGx1Z2luc0VuYWJsZWQgOiAxOwotICAgICAg ICBib29sIG1fZGF0YWJhc2VzRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9sb2NhbFN0b3Jh Z2VFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX2lzSmF2YVNjcmlwdEVuYWJsZWQgOiAxOwog ICAgICAgICBib29sIG1faXNXZWJTZWN1cml0eUVuYWJsZWQgOiAxOwpJbmRleDogV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTU1OCkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMy0wNCAgRXJpYyBVaHJoYW5lICA8ZXJpY3VA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFJlbW92ZSB0aGUgbm93LXJlZHVuZGFudCBTZXR0aW5ncyBmaWVsZHMgZm9yIHRoZSBE YXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzU3NjMKKworICAgICAgICBObyBuZXcgdGVzdHM7IHRoaXMgY29kZSBpc24ndCBjYWxsZWQuCisK KyAgICAgICAgKiBwdWJsaWMvV2ViU2V0dGluZ3MuaDoKKyAgICAgICAgKiBzcmMvV2ViU2V0dGlu Z3NJbXBsLmNwcDoKKyAgICAgICAgKiBzcmMvV2ViU2V0dGluZ3NJbXBsLmg6CisKIDIwMTAtMDMt MDQgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEbWl0cnkgVGl0b3YuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRp bmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5o CShyZXZpc2lvbiA1NTU1OCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3Mu aAkod29ya2luZyBjb3B5KQpAQCAtNzYsNyArNzYsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2 b2lkIHNldEVkaXRhYmxlTGlua0JlaGF2aW9yTmV2ZXJMaXZlKCkgPSAwOwogICAgIHZpcnR1YWwg dm9pZCBzZXRGb250UmVuZGVyaW5nTW9kZU5vcm1hbCgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg c2V0U2hvdWxkUGFpbnRDdXN0b21TY3JvbGxiYXJzKGJvb2wpID0gMDsKLSAgICB2aXJ0dWFsIHZv aWQgc2V0RGF0YWJhc2VzRW5hYmxlZChib29sKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldEFs bG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wpID0gMDsKICAgICB2aXJ0dWFsIHZv aWQgc2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wpID0gMDsKICAgICB2aXJ0dWFs IHZvaWQgc2V0VGV4dERpcmVjdGlvblN1Ym1lbnVJbmNsdXNpb25CZWhhdmlvck5ldmVySW5jbHVk ZWQoKSA9IDA7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCShy ZXZpc2lvbiA1NTU1OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjI2LDExICsyMjYsNiBAQCB2b2lkIFdlYlNldHRpbmdzSW1w bDo6c2V0U2hvdWxkUGFpbnRDdXN0CiAgICAgbV9zZXR0aW5ncy0+c2V0U2hvdWxkUGFpbnRDdXN0 b21TY3JvbGxiYXJzKGVuYWJsZWQpOwogfQogCi12b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0RGF0 YWJhc2VzRW5hYmxlZChib29sIGVuYWJsZWQpCi17Ci0gICAgbV9zZXR0aW5ncy0+c2V0RGF0YWJh c2VzRW5hYmxlZChlbmFibGVkKTsKLX0KLQogdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldEFsbG93 VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wgYWxsb3cpCiB7CiAgICAgbV9zZXR0aW5n cy0+c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoYWxsb3cpOwpJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCShyZXZpc2lvbiA1NTU1OCkKKysrIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTc4LDcg Kzc4LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRFZGl0YWJsZUxpbmtCZWhhdmlv ck5ldmVyTGl2ZSgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRGb250UmVuZGVyaW5nTW9kZU5vcm1h bCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTaG91bGRQYWludEN1c3RvbVNjcm9sbGJhcnMoYm9v bCk7Ci0gICAgdmlydHVhbCB2b2lkIHNldERhdGFiYXNlc0VuYWJsZWQoYm9vbCk7CiAgICAgdmly dHVhbCB2b2lkIHNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wpOwogICAg IHZpcnR1YWwgdm9pZCBzZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoYm9vbCk7CiAgICAg dmlydHVhbCB2b2lkIHNldFRleHREaXJlY3Rpb25TdWJtZW51SW5jbHVzaW9uQmVoYXZpb3JOZXZl ckluY2x1ZGVkKCk7CkluZGV4OiBXZWJLaXQvZ3RrL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvZ3RrL0NoYW5nZUxvZwkocmV2aXNpb24gNTU1NTgpCisrKyBXZWJLaXQvZ3RrL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEwLTAzLTA0ICBFcmljIFVo cmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBub3ctcmVkdW5kYW50IFNldHRpbmdzIGZp ZWxkcyBmb3IgdGhlIERhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNTc2MworCisgICAgICAgIE5vIG5ldyB0ZXN0czsgdGhpcyBjb2RlIGlz bid0IGNhbGxlZC4KKworICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDogUmVtb3Zl IHRoZSBjYWxscyBpbnRvIFNldHRpbmdzLgorICAgICAgICAoRE5EQ29udGVudHNSZXF1ZXN0Ojp3 ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3NldHRpbmdzKToKKyAgICAgICAgKERORENvbnRlbnRzUmVx dWVzdDo6d2Via2l0X3dlYl92aWV3X3NldHRpbmdzX25vdGlmeSk6CisKIDIwMTAtMDMtMDMgIEZy aWRyaWNoIFN0cmJhICA8ZnJpZHJpY2guc3RyYmFAYmx1ZXdpbi5jaD4KIAogICAgICAgICBSZXZp ZXdlZCBieSBYYW4gTG9wZXouCkluZGV4OiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAko cmV2aXNpb24gNTU1NTgpCisrKyBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjcyOSw3ICsyNzI5LDYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dl Yl92aWV3X3VwZGF0ZV9zZXR0aQogICAgIHNldHRpbmdzLT5zZXREZXZlbG9wZXJFeHRyYXNFbmFi bGVkKGVuYWJsZURldmVsb3BlckV4dHJhcyk7CiAgICAgc2V0dGluZ3MtPnNldFByaXZhdGVCcm93 c2luZ0VuYWJsZWQoZW5hYmxlUHJpdmF0ZUJyb3dzaW5nKTsKICAgICBzZXR0aW5ncy0+c2V0Q2Fy ZXRCcm93c2luZ0VuYWJsZWQoZW5hYmxlQ2FyZXRCcm93c2luZyk7Ci0gICAgc2V0dGluZ3MtPnNl dERhdGFiYXNlc0VuYWJsZWQoZW5hYmxlSFRNTDVEYXRhYmFzZSk7CiAjaWYgRU5BQkxFKERBVEFC QVNFKQogICAgIERhdGFiYXNlOjpzZXRJc0F2YWlsYWJsZShlbmFibGVIVE1MNURhdGFiYXNlKTsK ICNlbmRpZgpAQCAtMjgyMiw3ICsyODIxLDYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3 X3NldHRpbmdzX25vdAogICAgICAgICBzZXR0aW5ncy0+c2V0Q2FyZXRCcm93c2luZ0VuYWJsZWQo Z192YWx1ZV9nZXRfYm9vbGVhbigmdmFsdWUpKTsKICNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAg ZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoImVuYWJsZS1odG1sNS1kYXRhYmFzZSIp KSB7Ci0gICAgICAgIHNldHRpbmdzLT5zZXREYXRhYmFzZXNFbmFibGVkKGdfdmFsdWVfZ2V0X2Jv b2xlYW4oJnZhbHVlKSk7CiAgICAgICAgIERhdGFiYXNlOjpzZXRJc0F2YWlsYWJsZShnX3ZhbHVl X2dldF9ib29sZWFuKCZ2YWx1ZSkpOwogICAgIH0KICNlbmRpZgpJbmRleDogV2ViS2l0L21hYy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDU1 NTU4KQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NSBAQAorMjAxMC0wMy0wNCAgRXJpYyBVaHJoYW5lICA8ZXJpY3VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUg bm93LXJlZHVuZGFudCBTZXR0aW5ncyBmaWVsZHMgZm9yIHRoZSBEYXRhYmFzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3NjMKKworICAgICAgICBO byBuZXcgdGVzdHM7IHRoaXMgY29kZSBpc24ndCBjYWxsZWQuCisKKyAgICAgICAgKiBXZWJWaWV3 L1dlYlZpZXcubW06IFJlbW92ZSB0aGUgY2FsbCBpbnRvIFNldHRpbmdzLgorICAgICAgICAoLVtX ZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRpb246XSk6CisKIDIwMTAtMDMtMDQg IEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEdlb2ZmIEdhcmVuLgpJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDU1NTU4KQor KysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTEzMDUs NyArMTMwNSw2IEBAIHN0YXRpYyBib29sIGZhc3REb2N1bWVudFRlYXJkb3duRW5hYmxlZCgKICAg ICBzZXR0aW5ncy0+c2V0TWluaW11bUZvbnRTaXplKFtwcmVmZXJlbmNlcyBtaW5pbXVtRm9udFNp emVdKTsKICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZShbcHJlZmVyZW5j ZXMgbWluaW11bUxvZ2ljYWxGb250U2l6ZV0pOwogICAgIHNldHRpbmdzLT5zZXRQbHVnaW5zRW5h YmxlZChbcHJlZmVyZW5jZXMgYXJlUGx1Z0luc0VuYWJsZWRdKTsKLSAgICBzZXR0aW5ncy0+c2V0 RGF0YWJhc2VzRW5hYmxlZChbcHJlZmVyZW5jZXMgZGF0YWJhc2VzRW5hYmxlZF0pOwogI2lmIEVO QUJMRShEQVRBQkFTRSkKICAgICBEYXRhYmFzZTo6c2V0SXNBdmFpbGFibGUoW3ByZWZlcmVuY2Vz IGRhdGFiYXNlc0VuYWJsZWRdKTsKICNlbmRpZgpJbmRleDogV2ViS2l0L3F0L0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA1NTU1OCkKKysrIFdl YktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0w My0wNCAgRXJpYyBVaHJoYW5lICA8ZXJpY3VAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgbm93LXJlZHVuZGFu dCBTZXR0aW5ncyBmaWVsZHMgZm9yIHRoZSBEYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3NjMKKworICAgICAgICBObyBuZXcgdGVzdHM7 IHRoaXMgY29kZSBpc24ndCBjYWxsZWQuCisKKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNw cDoKKyAgICAgICAgKFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KTogUmVtb3ZlIHRoZSBjYWxs IGludG8gU2V0dGluZ3MuCisKIDIwMTAtMDMtMDQgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1 c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hy aXN0aWFuc2VuLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24gNTU1NTgpCisr KyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw3 ICsyMTEsNiBAQCB2b2lkIFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KCkKICNpZiBFTkFCTEUo REFUQUJBU0UpCiAgICAgICAgIHZhbHVlID0gYXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6 Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpPZmZs aW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCkpOwotICAgICAgICBzZXR0aW5ncy0+c2V0RGF0YWJh c2VzRW5hYmxlZCh2YWx1ZSk7CiAgICAgICAgIFdlYkNvcmU6OkRhdGFiYXNlOjpzZXRJc0F2YWls YWJsZSh2YWx1ZSk7CiAjZW5kaWYKIAo= 50265 2010-03-08 16:34:45 -0800 2010-03-09 13:38:42 -0800 Fix the build fix. build_fix.patch text/plain 1613 ericu SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA1NTY4NikKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDMtMDggIEVyaWMgVWhyaGFuZSAgPGVyaWN1 QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgYnVpbGQgZml4IGZvciBteSBwYXRjaCBvbiBidWcgIzM1NzYzIHdhc24ndCBx dWl0ZSByaWdodC0taXQgcmVtb3ZlZAorICAgICAgICB0aGUgY2FsbCBlbnRpcmVseSwgaW5zdGVh ZCBvZiByZXBsYWNpbmcgaXQgd2l0aCB0aGUgbmV3IEFQSS4gIFRoaXMgYWRkcworICAgICAgICB0 aGUgY2FsbCB0byBEYXRhYmFzZTo6c2V0SXNBdmFpbGFibGUuCisKKyAgICAgICAgKiBXZWJWaWV3 LmNwcDogQWRkZWQgYSBjYWxsIHRvIERhdGFiYXNlOjpzZXRJc0F2YWlsYWJsZSB3aGVyZSBjaGFu Z2UgNTU2NjcgcmVtb3ZlZCB0aGUgb2xkIFNldHRpbmdzIEFQSSBjYWxsIDxodHRwOi8vdHJhYy53 ZWJraXQub3JnL2NoYW5nZXNldC81NTY2Nz4uCisgICAgICAgIChXZWJWaWV3Ojpub3RpZnlQcmVm ZXJlbmNlc0NoYW5nZWQpOgorCiAyMDEwLTAzLTA4ICBBZGFtIFRyZWF0ICA8YXRyZWF0QHJpbS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIFdpbmRvd3MuCkluZGV4OiBX ZWJLaXQvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViVmlldy5j cHAJKHJldmlzaW9uIDU1Njc5KQorKysgV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNzMsNiArNzMsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ29udGV4dE1lbnVDb250 cm9sbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Db29raWVTdG9yYWdlV2luLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9DdXJzb3IuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0RhdGFiYXNlLmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9Eb2N1bWVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRHJhZ0NvbnRyb2xs ZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0RyYWdEYXRhLmg+CkBAIC00NjA4LDYgKzQ2MDksMTEg QEAgSFJFU1VMVCBXZWJWaWV3Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZQogICAgICAgICByZXR1 cm4gaHI7CiAgICAgc2V0dGluZ3MtPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxl ZChlbmFibGVkKTsKIAorICAgIGhyID0gcHJlZnNQcml2YXRlLT5kYXRhYmFzZXNFbmFibGVkKCZl bmFibGVkKTsKKyAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICAgICAgcmV0dXJuIGhyOworICAgIERh dGFiYXNlOjpzZXRJc0F2YWlsYWJsZShlbmFibGVkKTsKKwogICAgIGhyID0gcHJlZnNQcml2YXRl LT5sb2NhbFN0b3JhZ2VFbmFibGVkKCZlbmFibGVkKTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAg ICAgICAgcmV0dXJuIGhyOwo= 50342 2010-03-09 13:38:46 -0800 2010-03-10 14:44:08 -0800 Patch bug-35763-20100309133844.patch text/plain 1700 ericu SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA1NTcyOSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDMtMDggIEVyaWMgVWhyaGFuZSAgPGVyaWN1 QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgYnVpbGQgZml4IGZvciBteSBwYXRjaCBvbiBidWcgIzM1NzYzIHdhc24ndCBx dWl0ZSByaWdodC0taXQgcmVtb3ZlZAorICAgICAgICB0aGUgY2FsbCBlbnRpcmVseSwgaW5zdGVh ZCBvZiByZXBsYWNpbmcgaXQgd2l0aCB0aGUgbmV3IEFQSS4gIFRoaXMgYWRkcworICAgICAgICB0 aGUgY2FsbCB0byBEYXRhYmFzZTo6c2V0SXNBdmFpbGFibGUuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NzYzCisKKyAgICAgICAgKiBXZWJWaWV3 LmNwcDogQWRkZWQgYSBjYWxsIHRvIERhdGFiYXNlOjpzZXRJc0F2YWlsYWJsZSB3aGVyZSBjaGFu Z2UgNTU2NjcgcmVtb3ZlZCB0aGUgb2xkIFNldHRpbmdzIEFQSSBjYWxsIDxodHRwOi8vdHJhYy53 ZWJraXQub3JnL2NoYW5nZXNldC81NTY2Nz4uCisgICAgICAgIChXZWJWaWV3Ojpub3RpZnlQcmVm ZXJlbmNlc0NoYW5nZWQpOgorCiAyMDEwLTAzLTA4ICBBZGFtIFRyZWF0ICA8YXRyZWF0QHJpbS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIFdpbmRvd3MuCkluZGV4OiBX ZWJLaXQvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViVmlldy5j cHAJKHJldmlzaW9uIDU1NzI5KQorKysgV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNzMsNiArNzMsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ29udGV4dE1lbnVDb250 cm9sbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Db29raWVTdG9yYWdlV2luLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9DdXJzb3IuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0RhdGFiYXNlLmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9Eb2N1bWVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRHJhZ0NvbnRyb2xs ZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0RyYWdEYXRhLmg+CkBAIC00NjA4LDYgKzQ2MDksMTMg QEAgSFJFU1VMVCBXZWJWaWV3Ojpub3RpZnlQcmVmZXJlbmNlc0NoYW5nZQogICAgICAgICByZXR1 cm4gaHI7CiAgICAgc2V0dGluZ3MtPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxl ZChlbmFibGVkKTsKIAorI2lmIEVOQUJMRShEQVRBQkFTRSkKKyAgICBociA9IHByZWZzUHJpdmF0 ZS0+ZGF0YWJhc2VzRW5hYmxlZCgmZW5hYmxlZCk7CisgICAgaWYgKEZBSUxFRChocikpCisgICAg ICAgIHJldHVybiBocjsKKyAgICBEYXRhYmFzZTo6c2V0SXNBdmFpbGFibGUoZW5hYmxlZCk7Cisj ZW5kaWYKKwogICAgIGhyID0gcHJlZnNQcml2YXRlLT5sb2NhbFN0b3JhZ2VFbmFibGVkKCZlbmFi bGVkKTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAgcmV0dXJuIGhyOwo=