27906 2009-07-31 18:10:12 -0700 [chromium] MessagePort construction fails in worker process 2009-08-04 00:06:16 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 jam webkit-unassigned abarth dglazkov levin oldest_to_newest 136323 0 jam 2009-07-31 18:10:12 -0700 Need a fix in bindings. Per discussion with Dimitri, here's the fix and cleanup of the other place. 136324 1 33915 jam 2009-07-31 18:13:36 -0700 Created attachment 33915 Proposed patch 136335 2 jam 2009-07-31 18:40:20 -0700 note, for the MessagePort case, I hit this assert in debug mode and I'm not sure what the right fix is (i.e. this isn't ready to commit until it's fixed) WorkerContextExecutionProxy::ToV8Object calls V8DOMWrapper::setJSWrapperForDOMObject which has this code: #ifndef NDEBUG V8ClassIndex::V8WrapperType type = V8DOMWrapper::domWrapperType(wrapper); switch (type) { #define MAKE_CASE(TYPE, NAME) case V8ClassIndex::TYPE: ACTIVE_DOM_OBJECT_TYPES(MAKE_CASE) ASSERT_NOT_REACHED(); #undef MAKE_CASE default: break; } #endif Note sure why the check was added. Should WOrkerContextExecutionProxy not call V8DOMWrapper::setJSWrapperForDOMObject(impl, result); for MessagePort? 136337 3 33918 jam 2009-07-31 18:52:04 -0700 Created attachment 33918 fix style problems 136637 4 33918 dglazkov 2009-08-03 08:35:01 -0700 Comment on attachment 33918 fix style problems r=me. I feel a bit queasy looking WorkerContextExecutionProxy and all its parallel methods. It also needs to be style-cleaned. I'll aks jianli or dimich to look into this. 136642 5 jam 2009-08-03 08:46:02 -0700 Thanks, I agree it'd be good to try and share more code there. per comment 2, this is NOT ready to commit. There's still an assert that gets hit, I was wondering if you know the best way to avoid it (not sure exactly what it's testing against). I'll ping you on irc in a little bit, gotta take care of some other stuff first. 136664 6 33983 jam 2009-08-03 09:44:10 -0700 Created attachment 33983 Fixed a few problems with WorkerContextExecutionProxy, good to go 136672 7 33983 dglazkov 2009-08-03 10:01:09 -0700 Comment on attachment 33983 Fixed a few problems with WorkerContextExecutionProxy, good to go Ugh. r=me. 136681 8 levin 2009-08-03 10:09:26 -0700 Drive by comments, In WebCore/bindings/v8/V8DOMWrapper.cpp 520 // These objects can be constructed under WorkerContextExecutionProxy, need special handling 521 // as V8Proxy::retrieve() will crash then. I can't parse this (maybe there is a typo). Line 523-526 seems like it should be indented by one more space. In WebCore/bindings/v8/WorkerContextExecutionProxy.cpp, 219 #define MAKE_CASE(TYPE, NAME) case V8ClassIndex::TYPE: 220 ACTIVE_DOM_OBJECT_TYPES(MAKE_CASE) 221 isActiveDomObject = true; 222 #undef MAKE_CASE Shouldn't there be a break right after line 221 (or else something that says fall through)? 136685 9 33985 jam 2009-08-03 10:17:12 -0700 Created attachment 33985 fixed David's comments 136686 10 jam 2009-08-03 10:18:38 -0700 (In reply to comment #8) > Drive by comments, Thanks, replies below. > > In WebCore/bindings/v8/V8DOMWrapper.cpp > > 520 // These objects can be constructed under WorkerContextExecutionProxy, > need special handling > 521 // as V8Proxy::retrieve() will crash then. > > I can't parse this (maybe there is a typo). you're right, it wasn't that clear. updated. > > Line 523-526 seems like it should be indented by one more space. > done > > > In WebCore/bindings/v8/WorkerContextExecutionProxy.cpp, > > 219 #define MAKE_CASE(TYPE, NAME) case V8ClassIndex::TYPE: > 220 ACTIVE_DOM_OBJECT_TYPES(MAKE_CASE) > 221 isActiveDomObject = true; > 222 #undef MAKE_CASE > > > Shouldn't there be a break right after line 221 (or else something that says > fall through)? The code I copied this from (V8DOMWrapper::setJSWrapperForActiveDOMObject) didn't have it. It doesn't make a difference either way, since it'll fall through to the default case which breaks, but I added it anyways. 136699 11 dglazkov 2009-08-03 10:33:03 -0700 > > Shouldn't there be a break right after line 221 (or else something that says > > fall through)? > > The code I copied this from (V8DOMWrapper::setJSWrapperForActiveDOMObject) > didn't have it. It doesn't make a difference either way, since it'll fall > through to the default case which breaks, but I added it anyways. You did? :) 136700 12 33990 jam 2009-08-03 10:33:33 -0700 Created attachment 33990 Really update the patch 136702 13 33990 levin 2009-08-03 10:36:39 -0700 Comment on attachment 33990 Really update the patch Thanks John. 136903 14 abarth 2009-08-03 23:20:11 -0700 John, do you mean to have this bug assigned to you? In this state, it won't be committed out of the commit queue. If you'd like me to commit it for you, you can reset the assignee to the default and nominate it landing by setting the commit-queue flag to "?" 136908 15 jam 2009-08-03 23:38:03 -0700 (In reply to comment #14) > John, do you mean to have this bug assigned to you? In this state, it won't be > committed out of the commit queue. If you'd like me to commit it for you, you > can reset the assignee to the default and nominate it landing by setting the > commit-queue flag to "?" oops, thanks for alerting me, it doesn't have to be assigned to me anymore. Don't see the commit-queue flag though. 136913 16 33990 abarth 2009-08-04 00:06:11 -0700 Comment on attachment 33990 Really update the patch Clearing review flag on attachment: 33990 Sending WebCore/ChangeLog Sending WebCore/bindings/v8/V8DOMWrapper.cpp Sending WebCore/bindings/v8/V8Proxy.cpp Sending WebCore/bindings/v8/WorkerContextExecutionProxy.cpp Transmitting file data .... Committed revision 46748. http://trac.webkit.org/changeset/46748 136914 17 abarth 2009-08-04 00:06:16 -0700 All reviewed patches have been landed. Closing bug. 33915 2009-07-31 18:13:36 -0700 2009-07-31 18:52:04 -0700 Proposed patch mpv8.txt text/plain 5820 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMzEgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggTWVzc2FnZVBvcnQgY29uc3RydWN0aW9uIGluIHdvcmtlciBwcm9jZXNzLiAgQWxzbyBt YWtlIHRoZSBvdGhlciBvYmplY3QgY29uc3RydWN0aW9ucyBtYXRjaCB0aGlzLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzkwNgorCisgICAgICAg ICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9N V3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJv eHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpUb1Y4T2JqZWN0KToK KwogMjAwOS0wNy0zMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9N V3JhcHBlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwCShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFw cGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTE3LDYgKzUxNywxNyBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpjb252CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0lu ZGV4OjpFVkVOVFRBUkdFVCk7CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0luZGV4OjpFVkVO VCk7CiAKKyAgICAvLyBUaGVzZSBvYmplY3RzIGNhbiBiZSBjb25zdHJ1Y3RlZCB1bmRlciBXb3Jr ZXJDb250ZXh0RXhlY3V0aW9uUHJveHksIG5lZWQgc3BlY2lhbCBoYW5kbGluZworICAgIC8vIGFz IFY4UHJveHk6OnJldHJpZXZlKCkgd2lsbCBjcmFzaCB0aGVuLgorICAgIGlmICgodHlwZSA9PSBW OENsYXNzSW5kZXg6OkRPTUNPUkVFWENFUFRJT04gfHwKKyAgICAgICAgIHR5cGUgPT0gVjhDbGFz c0luZGV4OjpSQU5HRUVYQ0VQVElPTiB8fAorICAgICAgICAgdHlwZSA9PSBWOENsYXNzSW5kZXg6 OkVWRU5URVhDRVBUSU9OIHx8CisgICAgICAgICB0eXBlID09IFY4Q2xhc3NJbmRleDo6WE1MSFRU UFJFUVVFU1RFWENFUFRJT04gfHwKKyAgICAgICAgIHR5cGUgPT0gVjhDbGFzc0luZGV4OjpNRVNT QUdFUE9SVCkgJiYKKyAgICAgICAgV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpyZXRyaWV2 ZSgpKSB7CisgICAgICAgIHJldHVybiBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OlRvVjhP YmplY3QodHlwZSwgaW1wbCk7CisgICAgfQorCiAgICAgYm9vbCBpc0FjdGl2ZURvbU9iamVjdCA9 IGZhbHNlOwogICAgIHN3aXRjaCAodHlwZSkgewogI2RlZmluZSBNQUtFX0NBU0UoVFlQRSwgTkFN RSkgY2FzZSBWOENsYXNzSW5kZXg6OlRZUEU6CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 UHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAJ KHJldmlzaW9uIDQ2NjQ4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNiBAQAogI2luY2x1ZGUgIlY4SGlkZGVuUHJvcGVydHlO YW1lLmgiCiAjaW5jbHVkZSAiVjhJbmRleC5oIgogI2luY2x1ZGUgIlY4SXNvbGF0ZWRXb3JsZC5o IgotI2luY2x1ZGUgIldvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5oIgogCiAjaW5jbHVkZSA8 YWxnb3JpdGhtPgogI2luY2x1ZGUgPHV0aWxpdHk+CkBAIC0xMDI4LDE4ICsxMDI3LDYgQEAgdm9p ZCBWOFByb3h5Ojppbml0Q29udGV4dElmTmVlZGVkKCkKICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+ ZGlzcGF0Y2hXaW5kb3dPYmplY3RBdmFpbGFibGUoKTsKIH0KIAotdGVtcGxhdGUgPGNsYXNzIFQ+ Ci12b2lkIHNldERPTUV4Y2VwdGlvbkhlbHBlcihWOENsYXNzSW5kZXg6OlY4V3JhcHBlclR5cGUg dHlwZSwgUGFzc1JlZlB0cjxUPiBleGNlcHRpb24pCi17Ci0gICAgdjg6OkhhbmRsZTx2ODo6VmFs dWU+IHY4RXhjZXB0aW9uOwotICAgIGlmIChXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OnJl dHJpZXZlKCkpCi0gICAgICAgIHY4RXhjZXB0aW9uID0gV29ya2VyQ29udGV4dEV4ZWN1dGlvblBy b3h5OjpUb1Y4T2JqZWN0KHR5cGUsIGV4Y2VwdGlvbi5nZXQoKSk7Ci0gICAgZWxzZQotICAgICAg ICB2OEV4Y2VwdGlvbiA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QodHlwZSwgZXhj ZXB0aW9uLmdldCgpKTsKLQotICAgIHY4OjpUaHJvd0V4Y2VwdGlvbih2OEV4Y2VwdGlvbik7Ci19 Ci0KIHZvaWQgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGludCBleGNlcHRpb25Db2RlKQogewog ICAgIGlmIChleGNlcHRpb25Db2RlIDw9IDApCkBAIC0xMDUxLDMxICsxMDM4LDMxIEBAIHZvaWQg VjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGludCBleGNlcHQKICAgICB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gZXhjZXB0aW9uOwogICAgIHN3aXRjaCAoZGVzY3JpcHRpb24udHlwZSkgewogICAgIGNh c2UgRE9NRXhjZXB0aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xh c3NJbmRleDo6RE9NQ09SRUVYQ0VQVElPTiwgRE9NQ29yZUV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2Ny aXB0aW9uKSk7Ci0gICAgICAgIGJyZWFrOworICAgICAgICBleGNlcHRpb24gPSBWOERPTVdyYXBw ZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6RE9NQ09SRUVYQ0VQVElPTiwgRE9N Q29yZUV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CisgICAgICAgIGJyZWFrOyAgCiAg ICAgY2FzZSBSYW5nZUV4Y2VwdGlvblR5cGU6Ci0gICAgICAgIHNldERPTUV4Y2VwdGlvbkhlbHBl cihWOENsYXNzSW5kZXg6OlJBTkdFRVhDRVBUSU9OLCBSYW5nZUV4Y2VwdGlvbjo6Y3JlYXRlKGRl c2NyaXB0aW9uKSk7CisgICAgICAgIGV4Y2VwdGlvbiA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRv VjhPYmplY3QoVjhDbGFzc0luZGV4OjpSQU5HRUVYQ0VQVElPTiwgUmFuZ2VFeGNlcHRpb246OmNy ZWF0ZShkZXNjcmlwdGlvbikpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEV2ZW50RXhjZXB0 aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6RVZF TlRFWENFUFRJT04sIEV2ZW50RXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAg ICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5k ZXg6OkVWRU5URVhDRVBUSU9OLCBFdmVudEV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7 CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgWE1MSHR0cFJlcXVlc3RFeGNlcHRpb25UeXBlOgot ICAgICAgICBzZXRET01FeGNlcHRpb25IZWxwZXIoVjhDbGFzc0luZGV4OjpYTUxIVFRQUkVRVUVT VEVYQ0VQVElPTiwgWE1MSHR0cFJlcXVlc3RFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikp OworICAgICAgICBleGNlcHRpb24gPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4 Q2xhc3NJbmRleDo6WE1MSFRUUFJFUVVFU1RFWENFUFRJT04sIFhNTEh0dHBSZXF1ZXN0RXhjZXB0 aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKICAgICAgICAgYnJlYWs7CiAjaWYgRU5BQkxFKFNW RykKICAgICBjYXNlIFNWR0V4Y2VwdGlvblR5cGU6Ci0gICAgICAgIHNldERPTUV4Y2VwdGlvbkhl bHBlcihWOENsYXNzSW5kZXg6OlNWR0VYQ0VQVElPTiwgU1ZHRXhjZXB0aW9uOjpjcmVhdGUoZGVz Y3JpcHRpb24pKTsKKyAgICAgICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9W OE9iamVjdChWOENsYXNzSW5kZXg6OlNWR0VYQ0VQVElPTiwgU1ZHRXhjZXB0aW9uOjpjcmVhdGUo ZGVzY3JpcHRpb24pKTsKICAgICAgICAgYnJlYWs7CiAjZW5kaWYKICNpZiBFTkFCTEUoWFBBVEgp CiAgICAgY2FzZSBYUGF0aEV4Y2VwdGlvblR5cGU6Ci0gICAgICAgIHNldERPTUV4Y2VwdGlvbkhl bHBlcihWOENsYXNzSW5kZXg6OlhQQVRIRVhDRVBUSU9OLCBYUGF0aEV4Y2VwdGlvbjo6Y3JlYXRl KGRlc2NyaXB0aW9uKSk7CisgICAgICAgIGV4Y2VwdGlvbiA9IFY4RE9NV3JhcHBlcjo6Y29udmVy dFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpYUEFUSEVYQ0VQVElPTiwgWFBhdGhFeGNlcHRpb246 OmNyZWF0ZShkZXNjcmlwdGlvbikpOwogICAgICAgICBicmVhazsKICNlbmRpZgotICAgIGRlZmF1 bHQ6Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICBicmVhazsKICAgICB9 CisKKyAgQVNTRVJUKCFleGNlcHRpb24uSXNFbXB0eSgpKTsKKyAgdjg6OlRocm93RXhjZXB0aW9u KGV4Y2VwdGlvbik7CiB9CiAKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFByb3h5Ojp0aHJvd0Vy cm9yKEVycm9yVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBtZXNzYWdlKQpJbmRleDogV2ViQ29yZS9i aW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmNwcAkocmV2 aXNpb24gNDY2NDgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlckNvbnRleHRFeGVjdXRp b25Qcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRlICJE T01Db3JlRXhjZXB0aW9uLmgiCiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJFdmVudEV4 Y2VwdGlvbi5oIgorI2luY2x1ZGUgIk1lc3NhZ2VQb3J0LmgiCiAjaW5jbHVkZSAiUmFuZ2VFeGNl cHRpb24uaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKICNpbmNsdWRlICJWOERPTU1hcC5oIgpA QCAtMjQ4LDYgKzI0OSw5IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBXb3JrZXJDb250ZXh0RXhl Y3UKICAgICAgICAgICAgIGNhc2UgVjhDbGFzc0luZGV4OjpYTUxIVFRQUkVRVUVTVEVYQ0VQVElP TjoKICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxYTUxIdHRwUmVxdWVzdEV4Y2VwdGlvbio+ KGltcGwpLT5yZWYoKTsKICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2Ug VjhDbGFzc0luZGV4OjpNRVNTQUdFUE9SVDoKKyAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxN ZXNzYWdlUG9ydCo+KGltcGwpLT5yZWYoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgQVNTRVJUKGZhbHNlKTsKICAgICAgICAg ICAgIH0K 33918 2009-07-31 18:52:04 -0700 2009-08-03 09:44:10 -0700 fix style problems mpv8_2.txt text/plain 5802 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMzEgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggTWVzc2FnZVBvcnQgY29uc3RydWN0aW9uIGluIHdvcmtlciBwcm9jZXNzLiAgQWxzbyBt YWtlIHRoZSBvdGhlciBvYmplY3QgY29uc3RydWN0aW9ucyBtYXRjaCB0aGlzLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzkwNgorCisgICAgICAg ICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9N V3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJv eHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpUb1Y4T2JqZWN0KToK KwogMjAwOS0wNy0zMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9N V3JhcHBlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwCShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFw cGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTE3LDYgKzUxNywxNyBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpjb252CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0lu ZGV4OjpFVkVOVFRBUkdFVCk7CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0luZGV4OjpFVkVO VCk7CiAKKyAgICAvLyBUaGVzZSBvYmplY3RzIGNhbiBiZSBjb25zdHJ1Y3RlZCB1bmRlciBXb3Jr ZXJDb250ZXh0RXhlY3V0aW9uUHJveHksIG5lZWQgc3BlY2lhbCBoYW5kbGluZworICAgIC8vIGFz IFY4UHJveHk6OnJldHJpZXZlKCkgd2lsbCBjcmFzaCB0aGVuLgorICAgIGlmICgodHlwZSA9PSBW OENsYXNzSW5kZXg6OkRPTUNPUkVFWENFUFRJT04KKyAgICAgICAgfHwgdHlwZSA9PSBWOENsYXNz SW5kZXg6OlJBTkdFRVhDRVBUSU9OCisgICAgICAgIHx8IHR5cGUgPT0gVjhDbGFzc0luZGV4OjpF VkVOVEVYQ0VQVElPTgorICAgICAgICB8fCB0eXBlID09IFY4Q2xhc3NJbmRleDo6WE1MSFRUUFJF UVVFU1RFWENFUFRJT04KKyAgICAgICAgfHwgdHlwZSA9PSBWOENsYXNzSW5kZXg6Ok1FU1NBR0VQ T1JUKQorICAgICAgICAmJiBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OnJldHJpZXZlKCkp IHsKKyAgICAgICAgcmV0dXJuIFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6VG9WOE9iamVj dCh0eXBlLCBpbXBsKTsKKyAgICB9CisKICAgICBib29sIGlzQWN0aXZlRG9tT2JqZWN0ID0gZmFs c2U7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAjZGVmaW5lIE1BS0VfQ0FTRShUWVBFLCBOQU1FKSBj YXNlIFY4Q2xhc3NJbmRleDo6VFlQRToKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAkocmV2 aXNpb24gNDY2NDgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00Niw3ICs0Niw2IEBACiAjaW5jbHVkZSAiVjhIaWRkZW5Qcm9wZXJ0eU5hbWUu aCIKICNpbmNsdWRlICJWOEluZGV4LmgiCiAjaW5jbHVkZSAiVjhJc29sYXRlZFdvcmxkLmgiCi0j aW5jbHVkZSAiV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmgiCiAKICNpbmNsdWRlIDxhbGdv cml0aG0+CiAjaW5jbHVkZSA8dXRpbGl0eT4KQEAgLTEwMjgsMTggKzEwMjcsNiBAQCB2b2lkIFY4 UHJveHk6OmluaXRDb250ZXh0SWZOZWVkZWQoKQogICAgIG1fZnJhbWUtPmxvYWRlcigpLT5kaXNw YXRjaFdpbmRvd09iamVjdEF2YWlsYWJsZSgpOwogfQogCi10ZW1wbGF0ZSA8Y2xhc3MgVD4KLXZv aWQgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6VjhXcmFwcGVyVHlwZSB0eXBl LCBQYXNzUmVmUHRyPFQ+IGV4Y2VwdGlvbikKLXsKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g djhFeGNlcHRpb247Ci0gICAgaWYgKFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6cmV0cmll dmUoKSkKLSAgICAgICAgdjhFeGNlcHRpb24gPSBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6 OlRvVjhPYmplY3QodHlwZSwgZXhjZXB0aW9uLmdldCgpKTsKLSAgICBlbHNlCi0gICAgICAgIHY4 RXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdCh0eXBlLCBleGNlcHRp b24uZ2V0KCkpOwotCi0gICAgdjg6OlRocm93RXhjZXB0aW9uKHY4RXhjZXB0aW9uKTsKLX0KLQog dm9pZCBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oaW50IGV4Y2VwdGlvbkNvZGUpCiB7CiAgICAg aWYgKGV4Y2VwdGlvbkNvZGUgPD0gMCkKQEAgLTEwNTEsMzEgKzEwMzgsMzEgQEAgdm9pZCBWOFBy b3h5OjpzZXRET01FeGNlcHRpb24oaW50IGV4Y2VwdAogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBleGNlcHRpb247CiAgICAgc3dpdGNoIChkZXNjcmlwdGlvbi50eXBlKSB7CiAgICAgY2FzZSBE T01FeGNlcHRpb25UeXBlOgotICAgICAgICBzZXRET01FeGNlcHRpb25IZWxwZXIoVjhDbGFzc0lu ZGV4OjpET01DT1JFRVhDRVBUSU9OLCBET01Db3JlRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRp b24pKTsKKyAgICAgICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVj dChWOENsYXNzSW5kZXg6OkRPTUNPUkVFWENFUFRJT04sIERPTUNvcmVFeGNlcHRpb246OmNyZWF0 ZShkZXNjcmlwdGlvbikpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFJhbmdlRXhjZXB0aW9u VHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6UkFOR0VF WENFUFRJT04sIFJhbmdlRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAgICAg ZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5kZXg6 OlJBTkdFRVhDRVBUSU9OLCBSYW5nZUV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgRXZlbnRFeGNlcHRpb25UeXBlOgotICAgICAgICBzZXRE T01FeGNlcHRpb25IZWxwZXIoVjhDbGFzc0luZGV4OjpFVkVOVEVYQ0VQVElPTiwgRXZlbnRFeGNl cHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOworICAgICAgICBleGNlcHRpb24gPSBWOERPTVdy YXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6RVZFTlRFWENFUFRJT04sIEV2 ZW50RXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBYTUxIdHRwUmVxdWVzdEV4Y2VwdGlvblR5cGU6Ci0gICAgICAgIHNldERPTUV4Y2VwdGlv bkhlbHBlcihWOENsYXNzSW5kZXg6OlhNTEhUVFBSRVFVRVNURVhDRVBUSU9OLCBYTUxIdHRwUmVx dWVzdEV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CisgICAgICAgIGV4Y2VwdGlvbiA9 IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpYTUxIVFRQUkVR VUVTVEVYQ0VQVElPTiwgWE1MSHR0cFJlcXVlc3RFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlv bikpOwogICAgICAgICBicmVhazsKICNpZiBFTkFCTEUoU1ZHKQogICAgIGNhc2UgU1ZHRXhjZXB0 aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6U1ZH RVhDRVBUSU9OLCBTVkdFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOworICAgICAgICBl eGNlcHRpb24gPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6 U1ZHRVhDRVBUSU9OLCBTVkdFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOwogICAgICAg ICBicmVhazsKICNlbmRpZgogI2lmIEVOQUJMRShYUEFUSCkKICAgICBjYXNlIFhQYXRoRXhjZXB0 aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6WFBB VEhFWENFUFRJT04sIFhQYXRoRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAg ICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5k ZXg6OlhQQVRIRVhDRVBUSU9OLCBYUGF0aEV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7 CiAgICAgICAgIGJyZWFrOwogI2VuZGlmCi0gICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7Ci0gICAgICAgIGJyZWFrOwogICAgIH0KKworICAgIEFTU0VSVCghZXhjZXB0 aW9uLklzRW1wdHkoKSk7CisgICAgdjg6OlRocm93RXhjZXB0aW9uKGV4Y2VwdGlvbik7CiB9CiAK IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFByb3h5Ojp0aHJvd0Vycm9yKEVycm9yVHlwZSB0eXBl LCBjb25zdCBjaGFyKiBtZXNzYWdlKQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JrZXJD b250ZXh0RXhlY3V0aW9uUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mv djgvV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmNwcAkocmV2aXNpb24gNDY2NDgpCisrKyBX ZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRlICJET01Db3JlRXhjZXB0aW9uLmgi CiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJFdmVudEV4Y2VwdGlvbi5oIgorI2luY2x1 ZGUgIk1lc3NhZ2VQb3J0LmgiCiAjaW5jbHVkZSAiUmFuZ2VFeGNlcHRpb24uaCIKICNpbmNsdWRl ICJWOEJpbmRpbmcuaCIKICNpbmNsdWRlICJWOERPTU1hcC5oIgpAQCAtMjQ4LDYgKzI0OSw5IEBA IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBXb3JrZXJDb250ZXh0RXhlY3UKICAgICAgICAgICAgIGNh c2UgVjhDbGFzc0luZGV4OjpYTUxIVFRQUkVRVUVTVEVYQ0VQVElPTjoKICAgICAgICAgICAgICAg ICBzdGF0aWNfY2FzdDxYTUxIdHRwUmVxdWVzdEV4Y2VwdGlvbio+KGltcGwpLT5yZWYoKTsKICAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgVjhDbGFzc0luZGV4OjpNRVNT QUdFUE9SVDoKKyAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxNZXNzYWdlUG9ydCo+KGltcGwp LT5yZWYoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6CiAg ICAgICAgICAgICAgICAgQVNTRVJUKGZhbHNlKTsKICAgICAgICAgICAgIH0K 33983 2009-08-03 09:44:10 -0700 2009-08-03 10:17:12 -0700 Fixed a few problems with WorkerContextExecutionProxy, good to go mpv8_3.txt text/plain 7068 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMzEgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggTWVzc2FnZVBvcnQgY29uc3RydWN0aW9uIGluIHdvcmtlciBwcm9jZXNzLiAgQWxzbyBt YWtlIHRoZSBvdGhlciBvYmplY3QgY29uc3RydWN0aW9ucyBtYXRjaCB0aGlzLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzkwNgorCisgICAgICAg ICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9N V3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJv eHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpUb1Y4T2JqZWN0KToK KwogMjAwOS0wNy0zMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9N V3JhcHBlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwCShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFw cGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTE3LDYgKzUxNywxNyBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpjb252CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0lu ZGV4OjpFVkVOVFRBUkdFVCk7CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0luZGV4OjpFVkVO VCk7CiAKKyAgICAvLyBUaGVzZSBvYmplY3RzIGNhbiBiZSBjb25zdHJ1Y3RlZCB1bmRlciBXb3Jr ZXJDb250ZXh0RXhlY3V0aW9uUHJveHksIG5lZWQgc3BlY2lhbCBoYW5kbGluZworICAgIC8vIGFz IFY4UHJveHk6OnJldHJpZXZlKCkgd2lsbCBjcmFzaCB0aGVuLgorICAgIGlmICgodHlwZSA9PSBW OENsYXNzSW5kZXg6OkRPTUNPUkVFWENFUFRJT04KKyAgICAgICAgfHwgdHlwZSA9PSBWOENsYXNz SW5kZXg6OlJBTkdFRVhDRVBUSU9OCisgICAgICAgIHx8IHR5cGUgPT0gVjhDbGFzc0luZGV4OjpF VkVOVEVYQ0VQVElPTgorICAgICAgICB8fCB0eXBlID09IFY4Q2xhc3NJbmRleDo6WE1MSFRUUFJF UVVFU1RFWENFUFRJT04KKyAgICAgICAgfHwgdHlwZSA9PSBWOENsYXNzSW5kZXg6Ok1FU1NBR0VQ T1JUKQorICAgICAgICAmJiBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OnJldHJpZXZlKCkp IHsKKyAgICAgICAgcmV0dXJuIFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6VG9WOE9iamVj dCh0eXBlLCBpbXBsKTsKKyAgICB9CisKICAgICBib29sIGlzQWN0aXZlRG9tT2JqZWN0ID0gZmFs c2U7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAjZGVmaW5lIE1BS0VfQ0FTRShUWVBFLCBOQU1FKSBj YXNlIFY4Q2xhc3NJbmRleDo6VFlQRToKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAkocmV2 aXNpb24gNDY2NDgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00Niw3ICs0Niw2IEBACiAjaW5jbHVkZSAiVjhIaWRkZW5Qcm9wZXJ0eU5hbWUu aCIKICNpbmNsdWRlICJWOEluZGV4LmgiCiAjaW5jbHVkZSAiVjhJc29sYXRlZFdvcmxkLmgiCi0j aW5jbHVkZSAiV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmgiCiAKICNpbmNsdWRlIDxhbGdv cml0aG0+CiAjaW5jbHVkZSA8dXRpbGl0eT4KQEAgLTEwMjgsMTggKzEwMjcsNiBAQCB2b2lkIFY4 UHJveHk6OmluaXRDb250ZXh0SWZOZWVkZWQoKQogICAgIG1fZnJhbWUtPmxvYWRlcigpLT5kaXNw YXRjaFdpbmRvd09iamVjdEF2YWlsYWJsZSgpOwogfQogCi10ZW1wbGF0ZSA8Y2xhc3MgVD4KLXZv aWQgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6VjhXcmFwcGVyVHlwZSB0eXBl LCBQYXNzUmVmUHRyPFQ+IGV4Y2VwdGlvbikKLXsKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g djhFeGNlcHRpb247Ci0gICAgaWYgKFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6cmV0cmll dmUoKSkKLSAgICAgICAgdjhFeGNlcHRpb24gPSBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6 OlRvVjhPYmplY3QodHlwZSwgZXhjZXB0aW9uLmdldCgpKTsKLSAgICBlbHNlCi0gICAgICAgIHY4 RXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdCh0eXBlLCBleGNlcHRp b24uZ2V0KCkpOwotCi0gICAgdjg6OlRocm93RXhjZXB0aW9uKHY4RXhjZXB0aW9uKTsKLX0KLQog dm9pZCBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oaW50IGV4Y2VwdGlvbkNvZGUpCiB7CiAgICAg aWYgKGV4Y2VwdGlvbkNvZGUgPD0gMCkKQEAgLTEwNTEsMzEgKzEwMzgsMzEgQEAgdm9pZCBWOFBy b3h5OjpzZXRET01FeGNlcHRpb24oaW50IGV4Y2VwdAogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBleGNlcHRpb247CiAgICAgc3dpdGNoIChkZXNjcmlwdGlvbi50eXBlKSB7CiAgICAgY2FzZSBE T01FeGNlcHRpb25UeXBlOgotICAgICAgICBzZXRET01FeGNlcHRpb25IZWxwZXIoVjhDbGFzc0lu ZGV4OjpET01DT1JFRVhDRVBUSU9OLCBET01Db3JlRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRp b24pKTsKKyAgICAgICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVj dChWOENsYXNzSW5kZXg6OkRPTUNPUkVFWENFUFRJT04sIERPTUNvcmVFeGNlcHRpb246OmNyZWF0 ZShkZXNjcmlwdGlvbikpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFJhbmdlRXhjZXB0aW9u VHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6UkFOR0VF WENFUFRJT04sIFJhbmdlRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAgICAg ZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5kZXg6 OlJBTkdFRVhDRVBUSU9OLCBSYW5nZUV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgRXZlbnRFeGNlcHRpb25UeXBlOgotICAgICAgICBzZXRE T01FeGNlcHRpb25IZWxwZXIoVjhDbGFzc0luZGV4OjpFVkVOVEVYQ0VQVElPTiwgRXZlbnRFeGNl cHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOworICAgICAgICBleGNlcHRpb24gPSBWOERPTVdy YXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6RVZFTlRFWENFUFRJT04sIEV2 ZW50RXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBYTUxIdHRwUmVxdWVzdEV4Y2VwdGlvblR5cGU6Ci0gICAgICAgIHNldERPTUV4Y2VwdGlv bkhlbHBlcihWOENsYXNzSW5kZXg6OlhNTEhUVFBSRVFVRVNURVhDRVBUSU9OLCBYTUxIdHRwUmVx dWVzdEV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CisgICAgICAgIGV4Y2VwdGlvbiA9 IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpYTUxIVFRQUkVR VUVTVEVYQ0VQVElPTiwgWE1MSHR0cFJlcXVlc3RFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlv bikpOwogICAgICAgICBicmVhazsKICNpZiBFTkFCTEUoU1ZHKQogICAgIGNhc2UgU1ZHRXhjZXB0 aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6U1ZH RVhDRVBUSU9OLCBTVkdFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOworICAgICAgICBl eGNlcHRpb24gPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6 U1ZHRVhDRVBUSU9OLCBTVkdFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOwogICAgICAg ICBicmVhazsKICNlbmRpZgogI2lmIEVOQUJMRShYUEFUSCkKICAgICBjYXNlIFhQYXRoRXhjZXB0 aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6WFBB VEhFWENFUFRJT04sIFhQYXRoRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAg ICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5k ZXg6OlhQQVRIRVhDRVBUSU9OLCBYUGF0aEV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7 CiAgICAgICAgIGJyZWFrOwogI2VuZGlmCi0gICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7Ci0gICAgICAgIGJyZWFrOwogICAgIH0KKworICAgIEFTU0VSVCghZXhjZXB0 aW9uLklzRW1wdHkoKSk7CisgICAgdjg6OlRocm93RXhjZXB0aW9uKGV4Y2VwdGlvbik7CiB9CiAK IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFByb3h5Ojp0aHJvd0Vycm9yKEVycm9yVHlwZSB0eXBl LCBjb25zdCBjaGFyKiBtZXNzYWdlKQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JrZXJD b250ZXh0RXhlY3V0aW9uUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mv djgvV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmNwcAkocmV2aXNpb24gNDY2NDgpCisrKyBX ZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM5LDkgKzM5LDExIEBACiAjaW5jbHVkZSAiRE9NQ29yZUV4Y2VwdGlvbi5o IgogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiRXZlbnRFeGNlcHRpb24uaCIKKyNpbmNs dWRlICJNZXNzYWdlUG9ydC5oIgogI2luY2x1ZGUgIlJhbmdlRXhjZXB0aW9uLmgiCiAjaW5jbHVk ZSAiVjhCaW5kaW5nLmgiCiAjaW5jbHVkZSAiVjhET01NYXAuaCIKKyNpbmNsdWRlICJWOEluZGV4 LmgiCiAjaW5jbHVkZSAiVjhQcm94eS5oIgogI2luY2x1ZGUgIlY4V29ya2VyQ29udGV4dEV2ZW50 TGlzdGVuZXIuaCIKICNpbmNsdWRlICJWOFdvcmtlckNvbnRleHRPYmplY3RFdmVudExpc3RlbmVy LmgiCkBAIC01MCw2ICs1Miw3IEBACiAjaW5jbHVkZSAiV29ya2VyTG9jYXRpb24uaCIKICNpbmNs dWRlICJXb3JrZXJOYXZpZ2F0b3IuaCIKICNpbmNsdWRlICJXb3JrZXJTY3JpcHRDb250cm9sbGVy LmgiCisjaW5jbHVkZSAiWE1MSHR0cFJlcXVlc3QuaCIKICNpbmNsdWRlICJYTUxIdHRwUmVxdWVz dEV4Y2VwdGlvbi5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0yMTEsMTYgKzIxNCwzMyBA QCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV29ya2VyQ29udGV4dEV4ZWN1CiAgICAgaWYgKHR5cGUg PT0gVjhDbGFzc0luZGV4OjpERURJQ0FURURXT1JLRVJDT05URVhUKQogICAgICAgICByZXR1cm4g V29ya2VyQ29udGV4dFRvVjhPYmplY3Qoc3RhdGljX2Nhc3Q8V29ya2VyQ29udGV4dCo+KGltcGwp KTsKIAotICAgIGlmICh0eXBlID09IFY4Q2xhc3NJbmRleDo6V09SS0VSIHx8IHR5cGUgPT0gVjhD bGFzc0luZGV4OjpYTUxIVFRQUkVRVUVTVCkgeworICAgIGJvb2wgaXNBY3RpdmVEb21PYmplY3Qg PSBmYWxzZTsKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyNkZWZpbmUgTUFLRV9DQVNFKFRZUEUsIE5B TUUpIGNhc2UgVjhDbGFzc0luZGV4OjpUWVBFOgorICAgICAgICBBQ1RJVkVfRE9NX09CSkVDVF9U WVBFUyhNQUtFX0NBU0UpCisgICAgICAgIGlzQWN0aXZlRG9tT2JqZWN0ID0gdHJ1ZTsKKyN1bmRl ZiBNQUtFX0NBU0UKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBp ZiAoaXNBY3RpdmVEb21PYmplY3QpIHsKICAgICAgICAgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVj dD4gcmVzdWx0ID0gZ2V0QWN0aXZlRE9NT2JqZWN0TWFwKCkuZ2V0KGltcGwpOwogICAgICAgICBp ZiAoIXJlc3VsdC5Jc0VtcHR5KCkpCiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogCiAgICAg ICAgIHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBvYmplY3QgPSB0b1Y4KHR5cGUsIHR5cGUsIGltcGwp OwotICAgICAgICBpZiAoIW9iamVjdC5Jc0VtcHR5KCkpCi0gICAgICAgICAgICBzdGF0aWNfY2Fz dDxXb3JrZXIqPihpbXBsKS0+cmVmKCk7CisgICAgICAgIHN3aXRjaCAodHlwZSkgeworI2RlZmlu ZSBNQUtFX0NBU0UoVFlQRSwgTkFNRSkgXAorICAgICAgICBjYXNlIFY4Q2xhc3NJbmRleDo6VFlQ RTogc3RhdGljX2Nhc3Q8TkFNRSo+KGltcGwpLT5yZWYoKTsgYnJlYWs7CisgICAgICAgICAgICBB Q1RJVkVfRE9NX09CSkVDVF9UWVBFUyhNQUtFX0NBU0UpCisjdW5kZWYgTUFLRV9DQVNFCisgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAg fQorCiAgICAgICAgIHJlc3VsdCA9IHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+OjpOZXcob2Jq ZWN0KTsKLSAgICAgICAgVjhET01XcmFwcGVyOjpzZXRKU1dyYXBwZXJGb3JET01PYmplY3QoaW1w bCwgcmVzdWx0KTsKKyAgICAgICAgVjhET01XcmFwcGVyOjpzZXRKU1dyYXBwZXJGb3JBY3RpdmVE T01PYmplY3QoaW1wbCwgcmVzdWx0KTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAK 33985 2009-08-03 10:17:12 -0700 2009-08-03 10:33:33 -0700 fixed David's comments mpv8_4.txt text/plain 7068 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMzEgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggTWVzc2FnZVBvcnQgY29uc3RydWN0aW9uIGluIHdvcmtlciBwcm9jZXNzLiAgQWxzbyBt YWtlIHRoZSBvdGhlciBvYmplY3QgY29uc3RydWN0aW9ucyBtYXRjaCB0aGlzLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzkwNgorCisgICAgICAg ICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9N V3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJv eHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpUb1Y4T2JqZWN0KToK KwogMjAwOS0wNy0zMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9N V3JhcHBlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwCShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFw cGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTE3LDYgKzUxNywxNyBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpjb252CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0lu ZGV4OjpFVkVOVFRBUkdFVCk7CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0luZGV4OjpFVkVO VCk7CiAKKyAgICAvLyBUaGVzZSBvYmplY3RzIGNhbiBiZSBjb25zdHJ1Y3RlZCB1bmRlciBXb3Jr ZXJDb250ZXh0RXhlY3V0aW9uUHJveHksIG5lZWQgc3BlY2lhbCBoYW5kbGluZworICAgIC8vIGFz IFY4UHJveHk6OnJldHJpZXZlKCkgd2lsbCBjcmFzaCB0aGVuLgorICAgIGlmICgodHlwZSA9PSBW OENsYXNzSW5kZXg6OkRPTUNPUkVFWENFUFRJT04KKyAgICAgICAgfHwgdHlwZSA9PSBWOENsYXNz SW5kZXg6OlJBTkdFRVhDRVBUSU9OCisgICAgICAgIHx8IHR5cGUgPT0gVjhDbGFzc0luZGV4OjpF VkVOVEVYQ0VQVElPTgorICAgICAgICB8fCB0eXBlID09IFY4Q2xhc3NJbmRleDo6WE1MSFRUUFJF UVVFU1RFWENFUFRJT04KKyAgICAgICAgfHwgdHlwZSA9PSBWOENsYXNzSW5kZXg6Ok1FU1NBR0VQ T1JUKQorICAgICAgICAmJiBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OnJldHJpZXZlKCkp IHsKKyAgICAgICAgcmV0dXJuIFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6VG9WOE9iamVj dCh0eXBlLCBpbXBsKTsKKyAgICB9CisKICAgICBib29sIGlzQWN0aXZlRG9tT2JqZWN0ID0gZmFs c2U7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAjZGVmaW5lIE1BS0VfQ0FTRShUWVBFLCBOQU1FKSBj YXNlIFY4Q2xhc3NJbmRleDo6VFlQRToKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAkocmV2 aXNpb24gNDY2NDgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00Niw3ICs0Niw2IEBACiAjaW5jbHVkZSAiVjhIaWRkZW5Qcm9wZXJ0eU5hbWUu aCIKICNpbmNsdWRlICJWOEluZGV4LmgiCiAjaW5jbHVkZSAiVjhJc29sYXRlZFdvcmxkLmgiCi0j aW5jbHVkZSAiV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmgiCiAKICNpbmNsdWRlIDxhbGdv cml0aG0+CiAjaW5jbHVkZSA8dXRpbGl0eT4KQEAgLTEwMjgsMTggKzEwMjcsNiBAQCB2b2lkIFY4 UHJveHk6OmluaXRDb250ZXh0SWZOZWVkZWQoKQogICAgIG1fZnJhbWUtPmxvYWRlcigpLT5kaXNw YXRjaFdpbmRvd09iamVjdEF2YWlsYWJsZSgpOwogfQogCi10ZW1wbGF0ZSA8Y2xhc3MgVD4KLXZv aWQgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6VjhXcmFwcGVyVHlwZSB0eXBl LCBQYXNzUmVmUHRyPFQ+IGV4Y2VwdGlvbikKLXsKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g djhFeGNlcHRpb247Ci0gICAgaWYgKFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6cmV0cmll dmUoKSkKLSAgICAgICAgdjhFeGNlcHRpb24gPSBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6 OlRvVjhPYmplY3QodHlwZSwgZXhjZXB0aW9uLmdldCgpKTsKLSAgICBlbHNlCi0gICAgICAgIHY4 RXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdCh0eXBlLCBleGNlcHRp b24uZ2V0KCkpOwotCi0gICAgdjg6OlRocm93RXhjZXB0aW9uKHY4RXhjZXB0aW9uKTsKLX0KLQog dm9pZCBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oaW50IGV4Y2VwdGlvbkNvZGUpCiB7CiAgICAg aWYgKGV4Y2VwdGlvbkNvZGUgPD0gMCkKQEAgLTEwNTEsMzEgKzEwMzgsMzEgQEAgdm9pZCBWOFBy b3h5OjpzZXRET01FeGNlcHRpb24oaW50IGV4Y2VwdAogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBleGNlcHRpb247CiAgICAgc3dpdGNoIChkZXNjcmlwdGlvbi50eXBlKSB7CiAgICAgY2FzZSBE T01FeGNlcHRpb25UeXBlOgotICAgICAgICBzZXRET01FeGNlcHRpb25IZWxwZXIoVjhDbGFzc0lu ZGV4OjpET01DT1JFRVhDRVBUSU9OLCBET01Db3JlRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRp b24pKTsKKyAgICAgICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVj dChWOENsYXNzSW5kZXg6OkRPTUNPUkVFWENFUFRJT04sIERPTUNvcmVFeGNlcHRpb246OmNyZWF0 ZShkZXNjcmlwdGlvbikpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFJhbmdlRXhjZXB0aW9u VHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6UkFOR0VF WENFUFRJT04sIFJhbmdlRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAgICAg ZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5kZXg6 OlJBTkdFRVhDRVBUSU9OLCBSYW5nZUV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgRXZlbnRFeGNlcHRpb25UeXBlOgotICAgICAgICBzZXRE T01FeGNlcHRpb25IZWxwZXIoVjhDbGFzc0luZGV4OjpFVkVOVEVYQ0VQVElPTiwgRXZlbnRFeGNl cHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOworICAgICAgICBleGNlcHRpb24gPSBWOERPTVdy YXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6RVZFTlRFWENFUFRJT04sIEV2 ZW50RXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBYTUxIdHRwUmVxdWVzdEV4Y2VwdGlvblR5cGU6Ci0gICAgICAgIHNldERPTUV4Y2VwdGlv bkhlbHBlcihWOENsYXNzSW5kZXg6OlhNTEhUVFBSRVFVRVNURVhDRVBUSU9OLCBYTUxIdHRwUmVx dWVzdEV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CisgICAgICAgIGV4Y2VwdGlvbiA9 IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpYTUxIVFRQUkVR VUVTVEVYQ0VQVElPTiwgWE1MSHR0cFJlcXVlc3RFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlv bikpOwogICAgICAgICBicmVhazsKICNpZiBFTkFCTEUoU1ZHKQogICAgIGNhc2UgU1ZHRXhjZXB0 aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6U1ZH RVhDRVBUSU9OLCBTVkdFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOworICAgICAgICBl eGNlcHRpb24gPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6 U1ZHRVhDRVBUSU9OLCBTVkdFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOwogICAgICAg ICBicmVhazsKICNlbmRpZgogI2lmIEVOQUJMRShYUEFUSCkKICAgICBjYXNlIFhQYXRoRXhjZXB0 aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6WFBB VEhFWENFUFRJT04sIFhQYXRoRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAg ICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5k ZXg6OlhQQVRIRVhDRVBUSU9OLCBYUGF0aEV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7 CiAgICAgICAgIGJyZWFrOwogI2VuZGlmCi0gICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7Ci0gICAgICAgIGJyZWFrOwogICAgIH0KKworICAgIEFTU0VSVCghZXhjZXB0 aW9uLklzRW1wdHkoKSk7CisgICAgdjg6OlRocm93RXhjZXB0aW9uKGV4Y2VwdGlvbik7CiB9CiAK IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFByb3h5Ojp0aHJvd0Vycm9yKEVycm9yVHlwZSB0eXBl LCBjb25zdCBjaGFyKiBtZXNzYWdlKQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JrZXJD b250ZXh0RXhlY3V0aW9uUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mv djgvV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5LmNwcAkocmV2aXNpb24gNDY2NDgpCisrKyBX ZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM5LDkgKzM5LDExIEBACiAjaW5jbHVkZSAiRE9NQ29yZUV4Y2VwdGlvbi5o IgogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiRXZlbnRFeGNlcHRpb24uaCIKKyNpbmNs dWRlICJNZXNzYWdlUG9ydC5oIgogI2luY2x1ZGUgIlJhbmdlRXhjZXB0aW9uLmgiCiAjaW5jbHVk ZSAiVjhCaW5kaW5nLmgiCiAjaW5jbHVkZSAiVjhET01NYXAuaCIKKyNpbmNsdWRlICJWOEluZGV4 LmgiCiAjaW5jbHVkZSAiVjhQcm94eS5oIgogI2luY2x1ZGUgIlY4V29ya2VyQ29udGV4dEV2ZW50 TGlzdGVuZXIuaCIKICNpbmNsdWRlICJWOFdvcmtlckNvbnRleHRPYmplY3RFdmVudExpc3RlbmVy LmgiCkBAIC01MCw2ICs1Miw3IEBACiAjaW5jbHVkZSAiV29ya2VyTG9jYXRpb24uaCIKICNpbmNs dWRlICJXb3JrZXJOYXZpZ2F0b3IuaCIKICNpbmNsdWRlICJXb3JrZXJTY3JpcHRDb250cm9sbGVy LmgiCisjaW5jbHVkZSAiWE1MSHR0cFJlcXVlc3QuaCIKICNpbmNsdWRlICJYTUxIdHRwUmVxdWVz dEV4Y2VwdGlvbi5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0yMTEsMTYgKzIxNCwzMyBA QCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gV29ya2VyQ29udGV4dEV4ZWN1CiAgICAgaWYgKHR5cGUg PT0gVjhDbGFzc0luZGV4OjpERURJQ0FURURXT1JLRVJDT05URVhUKQogICAgICAgICByZXR1cm4g V29ya2VyQ29udGV4dFRvVjhPYmplY3Qoc3RhdGljX2Nhc3Q8V29ya2VyQ29udGV4dCo+KGltcGwp KTsKIAotICAgIGlmICh0eXBlID09IFY4Q2xhc3NJbmRleDo6V09SS0VSIHx8IHR5cGUgPT0gVjhD bGFzc0luZGV4OjpYTUxIVFRQUkVRVUVTVCkgeworICAgIGJvb2wgaXNBY3RpdmVEb21PYmplY3Qg PSBmYWxzZTsKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyNkZWZpbmUgTUFLRV9DQVNFKFRZUEUsIE5B TUUpIGNhc2UgVjhDbGFzc0luZGV4OjpUWVBFOgorICAgICAgICBBQ1RJVkVfRE9NX09CSkVDVF9U WVBFUyhNQUtFX0NBU0UpCisgICAgICAgIGlzQWN0aXZlRG9tT2JqZWN0ID0gdHJ1ZTsKKyN1bmRl ZiBNQUtFX0NBU0UKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBp ZiAoaXNBY3RpdmVEb21PYmplY3QpIHsKICAgICAgICAgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVj dD4gcmVzdWx0ID0gZ2V0QWN0aXZlRE9NT2JqZWN0TWFwKCkuZ2V0KGltcGwpOwogICAgICAgICBp ZiAoIXJlc3VsdC5Jc0VtcHR5KCkpCiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogCiAgICAg ICAgIHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBvYmplY3QgPSB0b1Y4KHR5cGUsIHR5cGUsIGltcGwp OwotICAgICAgICBpZiAoIW9iamVjdC5Jc0VtcHR5KCkpCi0gICAgICAgICAgICBzdGF0aWNfY2Fz dDxXb3JrZXIqPihpbXBsKS0+cmVmKCk7CisgICAgICAgIHN3aXRjaCAodHlwZSkgeworI2RlZmlu ZSBNQUtFX0NBU0UoVFlQRSwgTkFNRSkgXAorICAgICAgICBjYXNlIFY4Q2xhc3NJbmRleDo6VFlQ RTogc3RhdGljX2Nhc3Q8TkFNRSo+KGltcGwpLT5yZWYoKTsgYnJlYWs7CisgICAgICAgICAgICBB Q1RJVkVfRE9NX09CSkVDVF9UWVBFUyhNQUtFX0NBU0UpCisjdW5kZWYgTUFLRV9DQVNFCisgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAg fQorCiAgICAgICAgIHJlc3VsdCA9IHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+OjpOZXcob2Jq ZWN0KTsKLSAgICAgICAgVjhET01XcmFwcGVyOjpzZXRKU1dyYXBwZXJGb3JET01PYmplY3QoaW1w bCwgcmVzdWx0KTsKKyAgICAgICAgVjhET01XcmFwcGVyOjpzZXRKU1dyYXBwZXJGb3JBY3RpdmVE T01PYmplY3QoaW1wbCwgcmVzdWx0KTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAK 33990 2009-08-03 10:33:33 -0700 2009-08-04 00:06:11 -0700 Really update the patch mpv8_5.txt text/plain 7133 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMzEgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggTWVzc2FnZVBvcnQgY29uc3RydWN0aW9uIGluIHdvcmtlciBwcm9jZXNzLiAgQWxzbyBt YWtlIHRoZSBvdGhlciBvYmplY3QgY29uc3RydWN0aW9ucyBtYXRjaCB0aGlzLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzkwNgorCisgICAgICAg ICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9N V3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4UHJv eHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6V29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpUb1Y4T2JqZWN0KToK KwogMjAwOS0wNy0zMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9N V3JhcHBlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwCShyZXZpc2lvbiA0NjY0OCkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFw cGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTE3LDYgKzUxNywxNyBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpjb252CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0lu ZGV4OjpFVkVOVFRBUkdFVCk7CiAgICAgQVNTRVJUKHR5cGUgIT0gVjhDbGFzc0luZGV4OjpFVkVO VCk7CiAKKyAgICAvLyBUaGVzZSBvYmplY3RzIGNhbiBiZSBjb25zdHJ1Y3RlZCB1bmRlciBXb3Jr ZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuICBUaGV5IG5lZWQgc3BlY2lhbAorICAgIC8vIGhhbmRs aW5nLCBzaW5jZSBpZiB3ZSBwcm9jZWVkIGJlbG93IFY4UHJveHk6OnJldHJpZXZlKCkgd2lsbCBn ZXQgY2FsbGVkIGFuZCB3aWxsIGNyYXNoLgorICAgIGlmICgodHlwZSA9PSBWOENsYXNzSW5kZXg6 OkRPTUNPUkVFWENFUFRJT04KKyAgICAgICAgIHx8IHR5cGUgPT0gVjhDbGFzc0luZGV4OjpSQU5H RUVYQ0VQVElPTgorICAgICAgICAgfHwgdHlwZSA9PSBWOENsYXNzSW5kZXg6OkVWRU5URVhDRVBU SU9OCisgICAgICAgICB8fCB0eXBlID09IFY4Q2xhc3NJbmRleDo6WE1MSFRUUFJFUVVFU1RFWENF UFRJT04KKyAgICAgICAgIHx8IHR5cGUgPT0gVjhDbGFzc0luZGV4OjpNRVNTQUdFUE9SVCkKKyAg ICAgICAgJiYgV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpyZXRyaWV2ZSgpKSB7CisgICAg ICAgIHJldHVybiBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OlRvVjhPYmplY3QodHlwZSwg aW1wbCk7CisgICAgfQorCiAgICAgYm9vbCBpc0FjdGl2ZURvbU9iamVjdCA9IGZhbHNlOwogICAg IHN3aXRjaCAodHlwZSkgewogI2RlZmluZSBNQUtFX0NBU0UoVFlQRSwgTkFNRSkgY2FzZSBWOENs YXNzSW5kZXg6OlRZUEU6CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAJKHJldmlzaW9uIDQ2 NjQ4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDYsNyArNDYsNiBAQAogI2luY2x1ZGUgIlY4SGlkZGVuUHJvcGVydHlOYW1lLmgiCiAjaW5j bHVkZSAiVjhJbmRleC5oIgogI2luY2x1ZGUgIlY4SXNvbGF0ZWRXb3JsZC5oIgotI2luY2x1ZGUg IldvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eS5oIgogCiAjaW5jbHVkZSA8YWxnb3JpdGhtPgog I2luY2x1ZGUgPHV0aWxpdHk+CkBAIC0xMDI4LDE4ICsxMDI3LDYgQEAgdm9pZCBWOFByb3h5Ojpp bml0Q29udGV4dElmTmVlZGVkKCkKICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+ZGlzcGF0Y2hXaW5k b3dPYmplY3RBdmFpbGFibGUoKTsKIH0KIAotdGVtcGxhdGUgPGNsYXNzIFQ+Ci12b2lkIHNldERP TUV4Y2VwdGlvbkhlbHBlcihWOENsYXNzSW5kZXg6OlY4V3JhcHBlclR5cGUgdHlwZSwgUGFzc1Jl ZlB0cjxUPiBleGNlcHRpb24pCi17Ci0gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHY4RXhjZXB0 aW9uOwotICAgIGlmIChXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHk6OnJldHJpZXZlKCkpCi0g ICAgICAgIHY4RXhjZXB0aW9uID0gV29ya2VyQ29udGV4dEV4ZWN1dGlvblByb3h5OjpUb1Y4T2Jq ZWN0KHR5cGUsIGV4Y2VwdGlvbi5nZXQoKSk7Ci0gICAgZWxzZQotICAgICAgICB2OEV4Y2VwdGlv biA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QodHlwZSwgZXhjZXB0aW9uLmdldCgp KTsKLQotICAgIHY4OjpUaHJvd0V4Y2VwdGlvbih2OEV4Y2VwdGlvbik7Ci19Ci0KIHZvaWQgVjhQ cm94eTo6c2V0RE9NRXhjZXB0aW9uKGludCBleGNlcHRpb25Db2RlKQogewogICAgIGlmIChleGNl cHRpb25Db2RlIDw9IDApCkBAIC0xMDUxLDMxICsxMDM4LDMxIEBAIHZvaWQgVjhQcm94eTo6c2V0 RE9NRXhjZXB0aW9uKGludCBleGNlcHQKICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZXhjZXB0 aW9uOwogICAgIHN3aXRjaCAoZGVzY3JpcHRpb24udHlwZSkgewogICAgIGNhc2UgRE9NRXhjZXB0 aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6RE9N Q09SRUVYQ0VQVElPTiwgRE9NQ29yZUV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7Cisg ICAgICAgIGV4Y2VwdGlvbiA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFz c0luZGV4OjpET01DT1JFRVhDRVBUSU9OLCBET01Db3JlRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3Jp cHRpb24pKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBSYW5nZUV4Y2VwdGlvblR5cGU6Ci0g ICAgICAgIHNldERPTUV4Y2VwdGlvbkhlbHBlcihWOENsYXNzSW5kZXg6OlJBTkdFRVhDRVBUSU9O LCBSYW5nZUV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CisgICAgICAgIGV4Y2VwdGlv biA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpSQU5HRUVY Q0VQVElPTiwgUmFuZ2VFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOwogICAgICAgICBi cmVhazsKICAgICBjYXNlIEV2ZW50RXhjZXB0aW9uVHlwZToKLSAgICAgICAgc2V0RE9NRXhjZXB0 aW9uSGVscGVyKFY4Q2xhc3NJbmRleDo6RVZFTlRFWENFUFRJT04sIEV2ZW50RXhjZXB0aW9uOjpj cmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAgICAgZXhjZXB0aW9uID0gVjhET01XcmFwcGVyOjpj b252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5kZXg6OkVWRU5URVhDRVBUSU9OLCBFdmVudEV4Y2Vw dGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgWE1M SHR0cFJlcXVlc3RFeGNlcHRpb25UeXBlOgotICAgICAgICBzZXRET01FeGNlcHRpb25IZWxwZXIo VjhDbGFzc0luZGV4OjpYTUxIVFRQUkVRVUVTVEVYQ0VQVElPTiwgWE1MSHR0cFJlcXVlc3RFeGNl cHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOworICAgICAgICBleGNlcHRpb24gPSBWOERPTVdy YXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6WE1MSFRUUFJFUVVFU1RFWENF UFRJT04sIFhNTEh0dHBSZXF1ZXN0RXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKICAg ICAgICAgYnJlYWs7CiAjaWYgRU5BQkxFKFNWRykKICAgICBjYXNlIFNWR0V4Y2VwdGlvblR5cGU6 Ci0gICAgICAgIHNldERPTUV4Y2VwdGlvbkhlbHBlcihWOENsYXNzSW5kZXg6OlNWR0VYQ0VQVElP TiwgU1ZHRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKKyAgICAgICAgZXhjZXB0aW9u ID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5kZXg6OlNWR0VYQ0VQ VElPTiwgU1ZHRXhjZXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRpb24pKTsKICAgICAgICAgYnJlYWs7 CiAjZW5kaWYKICNpZiBFTkFCTEUoWFBBVEgpCiAgICAgY2FzZSBYUGF0aEV4Y2VwdGlvblR5cGU6 Ci0gICAgICAgIHNldERPTUV4Y2VwdGlvbkhlbHBlcihWOENsYXNzSW5kZXg6OlhQQVRIRVhDRVBU SU9OLCBYUGF0aEV4Y2VwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0aW9uKSk7CisgICAgICAgIGV4Y2Vw dGlvbiA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpYUEFU SEVYQ0VQVElPTiwgWFBhdGhFeGNlcHRpb246OmNyZWF0ZShkZXNjcmlwdGlvbikpOwogICAgICAg ICBicmVhazsKICNlbmRpZgotICAgIGRlZmF1bHQ6Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwotICAgICAgICBicmVhazsKICAgICB9CisKKyAgICBBU1NFUlQoIWV4Y2VwdGlvbi5Jc0Vt cHR5KCkpOworICAgIHY4OjpUaHJvd0V4Y2VwdGlvbihleGNlcHRpb24pOwogfQogCiB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gVjhQcm94eTo6dGhyb3dFcnJvcihFcnJvclR5cGUgdHlwZSwgY29uc3Qg Y2hhciogbWVzc2FnZSkKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyQ29udGV4dEV4 ZWN1dGlvblByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtl ckNvbnRleHRFeGVjdXRpb25Qcm94eS5jcHAJKHJldmlzaW9uIDQ2NjQ4KQorKysgV2ViQ29yZS9i aW5kaW5ncy92OC9Xb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zOSw5ICszOSwxMSBAQAogI2luY2x1ZGUgIkRPTUNvcmVFeGNlcHRpb24uaCIKICNpbmNs dWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkV2ZW50RXhjZXB0aW9uLmgiCisjaW5jbHVkZSAiTWVz c2FnZVBvcnQuaCIKICNpbmNsdWRlICJSYW5nZUV4Y2VwdGlvbi5oIgogI2luY2x1ZGUgIlY4Qmlu ZGluZy5oIgogI2luY2x1ZGUgIlY4RE9NTWFwLmgiCisjaW5jbHVkZSAiVjhJbmRleC5oIgogI2lu Y2x1ZGUgIlY4UHJveHkuaCIKICNpbmNsdWRlICJWOFdvcmtlckNvbnRleHRFdmVudExpc3RlbmVy LmgiCiAjaW5jbHVkZSAiVjhXb3JrZXJDb250ZXh0T2JqZWN0RXZlbnRMaXN0ZW5lci5oIgpAQCAt NTAsNiArNTIsNyBAQAogI2luY2x1ZGUgIldvcmtlckxvY2F0aW9uLmgiCiAjaW5jbHVkZSAiV29y a2VyTmF2aWdhdG9yLmgiCiAjaW5jbHVkZSAiV29ya2VyU2NyaXB0Q29udHJvbGxlci5oIgorI2lu Y2x1ZGUgIlhNTEh0dHBSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiWE1MSHR0cFJlcXVlc3RFeGNlcHRp b24uaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMjExLDE2ICsyMTQsMzQgQEAgdjg6Okhh bmRsZTx2ODo6VmFsdWU+IFdvcmtlckNvbnRleHRFeGVjdQogICAgIGlmICh0eXBlID09IFY4Q2xh c3NJbmRleDo6REVESUNBVEVEV09SS0VSQ09OVEVYVCkKICAgICAgICAgcmV0dXJuIFdvcmtlckNv bnRleHRUb1Y4T2JqZWN0KHN0YXRpY19jYXN0PFdvcmtlckNvbnRleHQqPihpbXBsKSk7CiAKLSAg ICBpZiAodHlwZSA9PSBWOENsYXNzSW5kZXg6OldPUktFUiB8fCB0eXBlID09IFY4Q2xhc3NJbmRl eDo6WE1MSFRUUFJFUVVFU1QpIHsKKyAgICBib29sIGlzQWN0aXZlRG9tT2JqZWN0ID0gZmFsc2U7 CisgICAgc3dpdGNoICh0eXBlKSB7CisjZGVmaW5lIE1BS0VfQ0FTRShUWVBFLCBOQU1FKSBjYXNl IFY4Q2xhc3NJbmRleDo6VFlQRToKKyAgICAgICAgQUNUSVZFX0RPTV9PQkpFQ1RfVFlQRVMoTUFL RV9DQVNFKQorICAgICAgICBpc0FjdGl2ZURvbU9iamVjdCA9IHRydWU7CisgICAgICAgIGJyZWFr OworI3VuZGVmIE1BS0VfQ0FTRQorICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0K KworICAgIGlmIChpc0FjdGl2ZURvbU9iamVjdCkgewogICAgICAgICB2ODo6UGVyc2lzdGVudDx2 ODo6T2JqZWN0PiByZXN1bHQgPSBnZXRBY3RpdmVET01PYmplY3RNYXAoKS5nZXQoaW1wbCk7CiAg ICAgICAgIGlmICghcmVzdWx0LklzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7 CiAKICAgICAgICAgdjg6OkxvY2FsPHY4OjpPYmplY3Q+IG9iamVjdCA9IHRvVjgodHlwZSwgdHlw ZSwgaW1wbCk7Ci0gICAgICAgIGlmICghb2JqZWN0LklzRW1wdHkoKSkKLSAgICAgICAgICAgIHN0 YXRpY19jYXN0PFdvcmtlcio+KGltcGwpLT5yZWYoKTsKKyAgICAgICAgc3dpdGNoICh0eXBlKSB7 CisjZGVmaW5lIE1BS0VfQ0FTRShUWVBFLCBOQU1FKSBcCisgICAgICAgIGNhc2UgVjhDbGFzc0lu ZGV4OjpUWVBFOiBzdGF0aWNfY2FzdDxOQU1FKj4oaW1wbCktPnJlZigpOyBicmVhazsKKyAgICAg ICAgICAgIEFDVElWRV9ET01fT0JKRUNUX1RZUEVTKE1BS0VfQ0FTRSkKKyN1bmRlZiBNQUtFX0NB U0UKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICB9CisKICAgICAgICAgcmVzdWx0ID0gdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD46 Ok5ldyhvYmplY3QpOwotICAgICAgICBWOERPTVdyYXBwZXI6OnNldEpTV3JhcHBlckZvckRPTU9i amVjdChpbXBsLCByZXN1bHQpOworICAgICAgICBWOERPTVdyYXBwZXI6OnNldEpTV3JhcHBlckZv ckFjdGl2ZURPTU9iamVjdChpbXBsLCByZXN1bHQpOwogICAgICAgICByZXR1cm4gcmVzdWx0Owog ICAgIH0KIAo=