131006 2014-03-31 20:33:55 -0700 std::bind not compiling with Visual Studio 2014-04-02 07:28:15 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 alex.christensen webkit-unassigned agomez benjamin calvaris cgarcia cmarcelo commit-queue eric.carlson glenn gustavo jer.noble menard mrobinson philipj pnormand sergio vjaquez oldest_to_newest 996108 0 alex.christensen 2014-03-31 20:33:55 -0700 I'm getting lots of compile errors like this when compiling after r166496 and I'm trying to avoid adding template parameters everywhere. This is a shot-in-the dark solution. 1>..\platform\graphics\gstreamer\WebKitWebSourceGStreamer.cpp(745): error C2668: 'WTF::GMainLoopSource::schedule' : ambiguous call to overloaded function C:\Projects\BuildSlave\win-cairo-release\build\WebKitBuild\Release_WinCairo\include\private\wtf/gobject/GMainLoopSource.h(55): could be 'void WTF::GMainLoopSource::schedule(const char *,std::function<bool (GIOCondition)>,GSocket *,GIOCondition,std::function<void (void)>,GMainContext *)' C:\Projects\BuildSlave\win-cairo-release\build\WebKitBuild\Release_WinCairo\include\private\wtf/gobject/GMainLoopSource.h(54): or 'void WTF::GMainLoopSource::schedule(const char *,std::function<bool (void)>,int,std::function<void (void)>,GMainContext *)' C:\Projects\BuildSlave\win-cairo-release\build\WebKitBuild\Release_WinCairo\include\private\wtf/gobject/GMainLoopSource.h(53): or 'void WTF::GMainLoopSource::schedule(const char *,std::function<void (void)>,int,std::function<void (void)>,GMainContext *)' while trying to match the argument list '(const char [32], std::_Bind<true,void,void (__cdecl *const )(WebKitWebSrc *),WebKitWebSrc *&>, int, webKitWebSrcSeekDataCb::<lambda_d0654a0fb2d903f9cc92bf36e3e47024>)' 996109 1 228236 alex.christensen 2014-03-31 20:37:03 -0700 Created attachment 228236 Patch 996111 2 228238 alex.christensen 2014-03-31 20:50:11 -0700 Created attachment 228238 Patch 996160 3 228238 cgarcia 2014-04-01 00:28:12 -0700 Comment on attachment 228238 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228238&action=review We use the versions with the bool function to decide whether to use g_idle or g_timeout, if you remove the versions receiving a bool function it's impossible to implement a repeating source. I guess the problem with visual studio is that the compiler doesn't know which one to use, so a possible workaround would be to add a cast in the callers, see the discussion here: https://bugs.webkit.org/show_bug.cgi?id=130027#c15 > Source/WTF/ChangeLog:4 > + [WinCairo] Build fix after r166496. > + https://bugs.webkit.org/show_bug.cgi?id=131006 Removing the code that doesn't build for you is not a build fix :-) 996396 4 alex.christensen 2014-04-01 13:03:08 -0700 > Removing the code that doesn't build for you is not a build fix :-) That's why it was a shot in the dark. I was just hoping that nobody would ever need to use the bool version :) I added some std::function<void ()> constructors. I was going to add static_casts, but I think this is a better solution. 996402 5 228311 alex.christensen 2014-04-01 13:09:19 -0700 Created attachment 228311 Patch 996603 6 228311 cgarcia 2014-04-01 23:50:03 -0700 Comment on attachment 228311 Patch Thanks for confirming that was indeed the problem, and sorry for the build break. 996698 7 228311 commit-queue 2014-04-02 07:28:09 -0700 Comment on attachment 228311 Patch Clearing flags on attachment: 228311 Committed r166643: <http://trac.webkit.org/changeset/166643> 996699 8 commit-queue 2014-04-02 07:28:15 -0700 All reviewed patches have been landed. Closing bug. 228236 2014-03-31 20:37:03 -0700 2014-03-31 20:50:07 -0700 Patch bug-131006-20140331213642.patch text/plain 2259 alex.christensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNjY1NjIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAzLTMxICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dpbkNhaXJvXSBCdWlsZCBmaXgg YWZ0ZXIgcjE2NjQ5Ni4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzMTAwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmg6CisgICAgICAgIFJlbW92ZWQg ZXh0cmEgb3ZlcmxvYWRzIGZvciBzY2hlZHVsZSBhbmQgc2NoZWR1bGVBZnRlckRlbGF5LgorCiAy MDE0LTAzLTMxICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1v dmUgV0VCX0FOSU1BVElPTlMKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29w U291cmNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BT b3VyY2UuaAkocmV2aXNpb24gMTY2NTU5KQorKysgU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFp bkxvb3BTb3VyY2UuaAkod29ya2luZyBjb3B5KQpAQCAtNTEsMTIgKzUxLDkgQEAgcHVibGljOgog ICAgIGJvb2wgaXNBY3RpdmUoKSBjb25zdDsKIAogICAgIHZvaWQgc2NoZWR1bGUoY29uc3QgY2hh ciogbmFtZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiwgaW50IHByaW9yaXR5ID0gR19QUklPUklU WV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGRlc3Ryb3lGdW5jdGlvbiA9IG51bGxw dHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKLSAgICB2b2lkIHNjaGVkdWxlKGNvbnN0IGNo YXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCAoKT4sIGludCBwcmlvcml0eSA9IEdfUFJJT1JJ VFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxs cHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAgICAgdm9pZCBzY2hlZHVsZShjb25zdCBj aGFyKiBuYW1lLCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKEdJT0NvbmRpdGlvbik+LCBHU29ja2V0Kiwg R0lPQ29uZGl0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGRlc3Ryb3lGdW5jdGlvbiA9IG51 bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKICAgICB2b2lkIHNjaGVkdWxlQWZ0ZXJE ZWxheShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+LCBzdGQ6OmNocm9u bzo6bWlsbGlzZWNvbmRzLCBpbnQgcHJpb3JpdHkgPSBHX1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6 ZnVuY3Rpb248dm9pZCAoKT4gZGVzdHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0 KiA9IG51bGxwdHIpOwotICAgIHZvaWQgc2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNoYXIqIG5h bWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCAoKT4sIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMsIGlu dCBwcmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBk ZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAgICAg dm9pZCBzY2hlZHVsZUFmdGVyRGVsYXkoY29uc3QgY2hhciogbmFtZSwgc3RkOjpmdW5jdGlvbjx2 b2lkICgpPiwgc3RkOjpjaHJvbm86OnNlY29uZHMsIGludCBwcmlvcml0eSA9IEdfUFJJT1JJVFlf REVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRy LCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7Ci0gICAgdm9pZCBzY2hlZHVsZUFmdGVyRGVsYXko Y29uc3QgY2hhciogbmFtZSwgc3RkOjpmdW5jdGlvbjxib29sICgpPiwgc3RkOjpjaHJvbm86OnNl Y29uZHMsIGludCBwcmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2 b2lkICgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0 cik7CiAgICAgdm9pZCBjYW5jZWwoKTsKIAogcHJpdmF0ZToK 228238 2014-03-31 20:50:11 -0700 2014-04-01 13:09:10 -0700 Patch bug-131006-20140331214951.patch text/plain 5019 alex.christensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNjY1NjIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAzLTMxICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dpbkNhaXJvXSBCdWlsZCBmaXgg YWZ0ZXIgcjE2NjQ5Ni4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzMTAwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmNwcDoKKyAgICAgICAgKFdURjo6 R01haW5Mb29wU291cmNlOjpzY2hlZHVsZUFmdGVyRGVsYXkpOgorICAgICAgICAoV1RGOjpHTWFp bkxvb3BTb3VyY2U6OnNjaGVkdWxlKTogRGVsZXRlZC4KKyAgICAgICAgKiB3dGYvZ29iamVjdC9H TWFpbkxvb3BTb3VyY2UuaDoKKyAgICAgICAgUmVtb3ZlZCBib29sIG92ZXJsb2FkcyBmb3Igc2No ZWR1bGUgYW5kIHNjaGVkdWxlQWZ0ZXJEZWxheS4KKwogMjAxNC0wMy0zMSAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFdFQl9BTklNQVRJT05TCkluZGV4 OiBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuY3BwCShyZXZpc2lvbiAx NjY1NTkpCisrKyBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEwNywxNCArMTA3LDYgQEAgdm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNj aGVkdWxlKGNvbnN0IGNoYQogICAgIHNjaGVkdWxlSWRsZVNvdXJjZShuYW1lLCByZWludGVycHJl dF9jYXN0PEdTb3VyY2VGdW5jPih2b2lkU291cmNlQ2FsbGJhY2spLCBwcmlvcml0eSwgY29udGV4 dCk7CiB9CiAKLXZvaWQgR01haW5Mb29wU291cmNlOjpzY2hlZHVsZShjb25zdCBjaGFyKiBuYW1l LCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKCk+IGZ1bmN0aW9uLCBpbnQgcHJpb3JpdHksIHN0ZDo6ZnVu Y3Rpb248dm9pZCAoKT4gZGVzdHJveUZ1bmN0aW9uLCBHTWFpbkNvbnRleHQqIGNvbnRleHQpCi17 Ci0gICAgY2FuY2VsKCk7Ci0gICAgbV9ib29sQ2FsbGJhY2sgPSBzdGQ6Om1vdmUoZnVuY3Rpb24p OwotICAgIG1fZGVzdHJveUNhbGxiYWNrID0gc3RkOjptb3ZlKGRlc3Ryb3lGdW5jdGlvbik7Ci0g ICAgc2NoZWR1bGVJZGxlU291cmNlKG5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1bmM+ KGJvb2xTb3VyY2VDYWxsYmFjayksIHByaW9yaXR5LCBjb250ZXh0KTsKLX0KLQogdm9pZCBHTWFp bkxvb3BTb3VyY2U6OnNjaGVkdWxlKGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9v bCAoR0lPQ29uZGl0aW9uKT4gZnVuY3Rpb24sIEdTb2NrZXQqIHNvY2tldCwgR0lPQ29uZGl0aW9u IGNvbmRpdGlvbiwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBkZXN0cm95RnVuY3Rpb24sIEdNYWlu Q29udGV4dCogY29udGV4dCkKIHsKICAgICBjYW5jZWwoKTsKQEAgLTE1MiwxNSArMTQ0LDYgQEAg dm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlQWZ0ZXJEZWxheQogICAgIHNjaGVkdWxlVGlt ZW91dFNvdXJjZShuYW1lLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPih2b2lkU291cmNl Q2FsbGJhY2spLCBwcmlvcml0eSwgY29udGV4dCk7CiB9CiAKLXZvaWQgR01haW5Mb29wU291cmNl OjpzY2hlZHVsZUFmdGVyRGVsYXkoY29uc3QgY2hhciogbmFtZSwgc3RkOjpmdW5jdGlvbjxib29s ICgpPiBmdW5jdGlvbiwgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcyBkZWxheSwgaW50IHByaW9y aXR5LCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGRlc3Ryb3lGdW5jdGlvbiwgR01haW5Db250ZXh0 KiBjb250ZXh0KQotewotICAgIGNhbmNlbCgpOwotICAgIG1fc291cmNlID0gYWRvcHRHUmVmKGdf dGltZW91dF9zb3VyY2VfbmV3KGRlbGF5LmNvdW50KCkpKTsKLSAgICBtX2Jvb2xDYWxsYmFjayA9 IHN0ZDo6bW92ZShmdW5jdGlvbik7Ci0gICAgbV9kZXN0cm95Q2FsbGJhY2sgPSBzdGQ6Om1vdmUo ZGVzdHJveUZ1bmN0aW9uKTsKLSAgICBzY2hlZHVsZVRpbWVvdXRTb3VyY2UobmFtZSwgcmVpbnRl cnByZXRfY2FzdDxHU291cmNlRnVuYz4oYm9vbFNvdXJjZUNhbGxiYWNrKSwgcHJpb3JpdHksIGNv bnRleHQpOwotfQotCiB2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5KGNv bnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZnVuY3Rpb24sIHN0ZDo6Y2hy b25vOjpzZWNvbmRzIGRlbGF5LCBpbnQgcHJpb3JpdHksIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4g ZGVzdHJveUZ1bmN0aW9uLCBHTWFpbkNvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgY2FuY2VsKCk7 CkBAIC0xNzAsMTUgKzE1Myw2IEBAIHZvaWQgR01haW5Mb29wU291cmNlOjpzY2hlZHVsZUFmdGVy RGVsYXkKICAgICBzY2hlZHVsZVRpbWVvdXRTb3VyY2UobmFtZSwgcmVpbnRlcnByZXRfY2FzdDxH U291cmNlRnVuYz4odm9pZFNvdXJjZUNhbGxiYWNrKSwgcHJpb3JpdHksIGNvbnRleHQpOwogfQog Ci12b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNoYXIqIG5h bWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCAoKT4gZnVuY3Rpb24sIHN0ZDo6Y2hyb25vOjpzZWNvbmRz IGRlbGF5LCBpbnQgcHJpb3JpdHksIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZGVzdHJveUZ1bmN0 aW9uLCBHTWFpbkNvbnRleHQqIGNvbnRleHQpCi17Ci0gICAgY2FuY2VsKCk7Ci0gICAgbV9zb3Vy Y2UgPSBhZG9wdEdSZWYoZ190aW1lb3V0X3NvdXJjZV9uZXdfc2Vjb25kcyhkZWxheS5jb3VudCgp KSk7Ci0gICAgbV9ib29sQ2FsbGJhY2sgPSBzdGQ6Om1vdmUoZnVuY3Rpb24pOwotICAgIG1fZGVz dHJveUNhbGxiYWNrID0gc3RkOjptb3ZlKGRlc3Ryb3lGdW5jdGlvbik7Ci0gICAgc2NoZWR1bGVU aW1lb3V0U291cmNlKG5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1bmM+KGJvb2xTb3Vy Y2VDYWxsYmFjayksIHByaW9yaXR5LCBjb250ZXh0KTsKLX0KLQogdm9pZCBHTWFpbkxvb3BTb3Vy Y2U6OnZvaWRDYWxsYmFjaygpCiB7CiAgICAgaWYgKCFtX3NvdXJjZSkKSW5kZXg6IFNvdXJjZS9X VEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dU Ri93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAkocmV2aXNpb24gMTY2NTU5KQorKysgU291 cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAkod29ya2luZyBjb3B5KQpAQCAt NTEsMTIgKzUxLDkgQEAgcHVibGljOgogICAgIGJvb2wgaXNBY3RpdmUoKSBjb25zdDsKIAogICAg IHZvaWQgc2NoZWR1bGUoY29uc3QgY2hhciogbmFtZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiwg aW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+ IGRlc3Ryb3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKLSAg ICB2b2lkIHNjaGVkdWxlKGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCAoKT4s IGludCBwcmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkICgp PiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAg ICAgdm9pZCBzY2hlZHVsZShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKEdJ T0NvbmRpdGlvbik+LCBHU29ja2V0KiwgR0lPQ29uZGl0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQg KCk+IGRlc3Ryb3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsK ICAgICB2b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQgKCk+LCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzLCBpbnQgcHJpb3JpdHkgPSBH X1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZGVzdHJveUZ1bmN0aW9u ID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOwotICAgIHZvaWQgc2NoZWR1bGVB ZnRlckRlbGF5KGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCAoKT4sIHN0ZDo6 Y2hyb25vOjptaWxsaXNlY29uZHMsIGludCBwcmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwg c3RkOjpmdW5jdGlvbjx2b2lkICgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNv bnRleHQqID0gbnVsbHB0cik7CiAgICAgdm9pZCBzY2hlZHVsZUFmdGVyRGVsYXkoY29uc3QgY2hh ciogbmFtZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiwgc3RkOjpjaHJvbm86OnNlY29uZHMsIGlu dCBwcmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBk ZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7Ci0gICAg dm9pZCBzY2hlZHVsZUFmdGVyRGVsYXkoY29uc3QgY2hhciogbmFtZSwgc3RkOjpmdW5jdGlvbjxi b29sICgpPiwgc3RkOjpjaHJvbm86OnNlY29uZHMsIGludCBwcmlvcml0eSA9IEdfUFJJT1JJVFlf REVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRy LCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAgICAgdm9pZCBjYW5jZWwoKTsKIAogcHJpdmF0 ZToK 228311 2014-04-01 13:09:19 -0700 2014-04-02 07:28:09 -0700 Patch bug-131006-20140401140859.patch text/plain 13134 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjYwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTA0LTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dpbkNhaXJv XSBCdWlsZCBmaXggYWZ0ZXIgcjE2NjQ5Ni4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzMTAwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0luYmFuZFRl eHRUcmFja1ByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kVGV4 dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6aGFuZGxlU2FtcGxlKToKKyAgICAgICAgKFdlYkNvcmU6 OkluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI6OnN0cmVhbUNoYW5nZWQpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpj aGFuZ2VQaXBlbGluZVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6dmlkZW9DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6dmlkZW9DYXBzQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmF1ZGlvQ2hhbmdlZCk6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnRleHRDaGFuZ2VkKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJC YXNlOjp2b2x1bWVDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lckJhc2U6Om11dGVDaGFuZ2VkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpUcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyOjphY3RpdmVDaGFuZ2VkKToKKyAgICAgICAg KFdlYkNvcmU6OlRyYWNrUHJpdmF0ZUJhc2VHU3RyZWFtZXI6OnRhZ3NDaGFuZ2VkKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcDoK KyAgICAgICAgKHdlYmtpdFZpZGVvU2lua1JlbmRlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHA6CisgICAgICAgICh3 ZWJLaXRXZWJTcmNDaGFuZ2VTdGF0ZSk6CisgICAgICAgICh3ZWJLaXRXZWJTcmNOZWVkRGF0YUNi KToKKyAgICAgICAgKHdlYktpdFdlYlNyY0Vub3VnaERhdGFDYik6CisgICAgICAgICh3ZWJLaXRX ZWJTcmNTZWVrRGF0YUNiKToKKyAgICAgICAgQWRkZWQgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGNv bnN0cnVjdG9ycyB0byBoZWxwIFZpc3VhbCBTdHVkaW8gZGVjaWRlIHdoaWNoIHZlcnNpb24gb2Yg CisgICAgICAgIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGUgb3IgR01haW5Mb29wU291cmNlOjpz Y2hlZHVsZUFmdGVyRGVsYXkgdG8gdXNlLgorCiAyMDE0LTA0LTAxICBEYW5pZWwgQmF0ZXMgIDxk YWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5kZXJRdW90ZSBtdXN0IGRlc3Ryb3kgcmVt YWluaW5nIHRleHQgcmVuZGVyZXIgYmVmb3JlIGZpcnN0IGxldHRlciByZW5kZXJlcgpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0luYmFuZFRleHRUcmFj a1ByaXZhdGVHU3RyZWFtZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyLmNw cAkocmV2aXNpb24gMTY2NTU5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL0luYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC04MCwxMiArODAsMTIgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVh bWVyOjpoYQogICAgICAgICBNdXRleExvY2tlciBsb2NrKG1fc2FtcGxlTXV0ZXgpOwogICAgICAg ICBtX3BlbmRpbmdTYW1wbGVzLmFwcGVuZChzYW1wbGUpOwogICAgIH0KLSAgICBtX3NhbXBsZVRp bWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJl YW1lcjo6bm90aWZ5VHJhY2tPZlNhbXBsZSIsIHN0ZDo6YmluZCgmSW5iYW5kVGV4dFRyYWNrUHJp dmF0ZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlNhbXBsZSwgdGhpcykpOworICAgIG1fc2FtcGxl VGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBJbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0 cmVhbWVyOjpub3RpZnlUcmFja09mU2FtcGxlIiwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KHN0ZDo6 YmluZCgmSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlNhbXBs ZSwgdGhpcykpKTsKIH0KIAogdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyOjpz dHJlYW1DaGFuZ2VkKCkKIHsKLSAgICBtX3N0cmVhbVRpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dl YktpdF0gSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlN0cmVh bUNoYW5nZWQiLCBzdGQ6OmJpbmQoJkluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI6Om5v dGlmeVRyYWNrT2ZTdHJlYW1DaGFuZ2VkLCB0aGlzKSk7CisgICAgbV9zdHJlYW1UaW1lckhhbmRs ZXIuc2NoZWR1bGUoIltXZWJLaXRdIEluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI6Om5v dGlmeVRyYWNrT2ZTdHJlYW1DaGFuZ2VkIiwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KHN0ZDo6Ymlu ZCgmSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlN0cmVhbUNo YW5nZWQsIHRoaXMpKSk7CiB9CiAKIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1l cjo6bm90aWZ5VHJhY2tPZlNhbXBsZSgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAkocmV2aXNpb24gMTY2NTU5KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5MCw3ICszOTAsNyBAQCBib29sIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2hhbmdlCiAgICAgLy8gQWxzbyBsZXRzIHJlbW92ZSB0aGUg dGltZXIgaWYgd2UgcmVxdWVzdCBhIHN0YXRlIGNoYW5nZSBmb3IgYW55IHN0YXRlIG90aGVyIHRo YW4gUkVBRFkuCiAgICAgLy8gU2VlIGFsc28gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExNzM1NAogICAgIGlmIChuZXdTdGF0ZSA9PSBHU1RfU1RBVEVfUkVBRFkgJiYg IW1fcmVhZHlUaW1lckhhbmRsZXIuaXNTY2hlZHVsZWQoKSkgewotICAgICAgICBtX3JlYWR5VGlt ZXJIYW5kbGVyLnNjaGVkdWxlQWZ0ZXJEZWxheSgiW1dlYktpdF0gbWVkaWFQbGF5ZXJQcml2YXRl UmVhZHlTdGF0ZVRpbWVvdXRDYWxsYmFjayIsIFt0aGlzXSB7IGNoYW5nZVBpcGVsaW5lU3RhdGUo R1NUX1NUQVRFX05VTEwpOyB9LAorICAgICAgICBtX3JlYWR5VGltZXJIYW5kbGVyLnNjaGVkdWxl QWZ0ZXJEZWxheSgiW1dlYktpdF0gbWVkaWFQbGF5ZXJQcml2YXRlUmVhZHlTdGF0ZVRpbWVvdXRD YWxsYmFjayIsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPihbdGhpc10geyBjaGFuZ2VQaXBlbGluZVN0 YXRlKEdTVF9TVEFURV9OVUxMKTsgfSksCiAgICAgICAgICAgICBzdGQ6OmNocm9ubzo6c2Vjb25k cyhnUmVhZHlTdGF0ZVRpbWVySW50ZXJ2YWwpKTsKICAgICB9IGVsc2UgaWYgKG5ld1N0YXRlICE9 IEdTVF9TVEFURV9SRUFEWSAmJiBtX3JlYWR5VGltZXJIYW5kbGVyLmlzU2NoZWR1bGVkKCkpIHsK ICAgICAgICAgbV9yZWFkeVRpbWVySGFuZGxlci5jYW5jZWwoKTsKQEAgLTYxNCwxMiArNjE0LDEy IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZWVraW4KIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvQ2hhbmdlZCgpCiB7Ci0gICAgbV92aWRlb1Rp bWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy Ojp2aWRlb0NoYW5nZWQiLCBzdGQ6OmJpbmQoJk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 bm90aWZ5UGxheWVyT2ZWaWRlbywgdGhpcykpOworICAgIG1fdmlkZW9UaW1lckhhbmRsZXIuc2No ZWR1bGUoIltXZWJLaXRdIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dmlkZW9DaGFuZ2Vk Iiwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KHN0ZDo6YmluZCgmTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlZpZGVvLCB0aGlzKSkpOwogfQogCiB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6dmlkZW9DYXBzQ2hhbmdlZCgpCiB7Ci0gICAgbV92aWRlb0Nh cHNUaW1lckhhbmRsZXIuc2NoZWR1bGUoIltXZWJLaXRdIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6dmlkZW9DYXBzQ2hhbmdlZCIsIHN0ZDo6YmluZCgmTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlZpZGVvQ2FwcywgdGhpcykpOworICAgIG1fdmlkZW9DYXBz VGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OnZpZGVvQ2Fwc0NoYW5nZWQiLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4oc3RkOjpiaW5kKCZN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXllck9mVmlkZW9DYXBzLCB0aGlz KSkpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVy T2ZWaWRlbygpCkBAIC02NjcsNyArNjY3LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6Om5vdGlmeQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6YXVkaW9D aGFuZ2VkKCkKIHsKLSAgICBtX2F1ZGlvVGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmF1ZGlvQ2hhbmdlZCIsIHN0ZDo6YmluZCgmTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZkF1ZGlvLCB0aGlzKSk7Cisg ICAgbV9hdWRpb1RpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyOjphdWRpb0NoYW5nZWQiLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4oc3RkOjpi aW5kKCZNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXllck9mQXVkaW8sIHRo aXMpKSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5 ZXJPZkF1ZGlvKCkKQEAgLTcxMCw3ICs3MTAsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6bm90aWZ5CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnRleHRDaGFuZ2VkKCkKIHsKLSAgICBtX3RleHRUaW1lckhhbmRs ZXIuc2NoZWR1bGUoIltXZWJLaXRdIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dGV4dENo YW5nZWQiLCBzdGQ6OmJpbmQoJk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxh eWVyT2ZUZXh0LCB0aGlzKSk7CisgICAgbV90ZXh0VGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2Vi S2l0XSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnRleHRDaGFuZ2VkIiwgc3RkOjpmdW5j dGlvbjx2b2lkKCk+KHN0ZDo6YmluZCgmTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3Rp ZnlQbGF5ZXJPZlRleHQsIHRoaXMpKSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlRleHQoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAkocmV2aXNpb24gMTY2NTU5KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjIsNyArMjIyLDcg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpubwogCiB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnZvbHVtZUNoYW5nZWQoKQogewotICAgIG1fdm9s dW1lVGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlOjp2b2x1bWVDaGFuZ2VkIiwgc3RkOjpiaW5kKCZNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlOjpub3RpZnlQbGF5ZXJPZlZvbHVtZUNoYW5nZSwgdGhpcykpOworICAgIG1f dm9sdW1lVGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlOjp2b2x1bWVDaGFuZ2VkIiwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KHN0ZDo6 YmluZCgmTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6bm90aWZ5UGxheWVyT2ZWb2x1 bWVDaGFuZ2UsIHRoaXMpKSk7CiB9CiAKIE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6bmV0d29ya1N0YXRlKCkgY29uc3QKQEAgLTI3MCw3 ICsyNzAsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om5vCiAKIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6bXV0ZUNoYW5nZWQoKQogewotICAg IG1fbXV0ZVRpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyQmFzZTo6bXV0ZUNoYW5nZWQiLCBzdGQ6OmJpbmQoJk1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lckJhc2U6Om5vdGlmeVBsYXllck9mTXV0ZSwgdGhpcykpOworICAgIG1fbXV0ZVRp bWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZTo6bXV0ZUNoYW5nZWQiLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4oc3RkOjpiaW5kKCZNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpub3RpZnlQbGF5ZXJPZk11dGUsIHRoaXMpKSk7 CiB9CiAKICNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmICFVU0UoQ09PUkRJTkFURURfR1JB UEhJQ1MpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv VHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RyYWNrUHJpdmF0ZUJhc2VHU3RyZWFtZXIu Y3BwCShyZXZpc2lvbiAxNjY1NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTkyLDcgKzkyLDcgQEAgdm9pZCBUcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyOjpkaXNjb25u ZQogCiB2b2lkIFRyYWNrUHJpdmF0ZUJhc2VHU3RyZWFtZXI6OmFjdGl2ZUNoYW5nZWQoKQogewot ICAgIG1fYWN0aXZlVGltZXJIYW5kbGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBUcmFja1ByaXZhdGVC YXNlR1N0cmVhbWVyOjpub3RpZnlUcmFja09mQWN0aXZlQ2hhbmdlZCIsIHN0ZDo6YmluZCgmVHJh Y2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZkFjdGl2ZUNoYW5nZWQsIHRoaXMp KTsKKyAgICBtX2FjdGl2ZVRpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gVHJhY2tQcml2 YXRlQmFzZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZkFjdGl2ZUNoYW5nZWQiLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQoKT4oc3RkOjpiaW5kKCZUcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyOjpub3RpZnlU cmFja09mQWN0aXZlQ2hhbmdlZCwgdGhpcykpKTsKIH0KIAogdm9pZCBUcmFja1ByaXZhdGVCYXNl R1N0cmVhbWVyOjp0YWdzQ2hhbmdlZCgpCkBAIC0xMDYsNyArMTA2LDcgQEAgdm9pZCBUcmFja1By aXZhdGVCYXNlR1N0cmVhbWVyOjp0YWdzQ2hhbgogICAgICAgICBtX3RhZ3Muc3dhcCh0YWdzKTsK ICAgICB9CiAKLSAgICBtX3RhZ1RpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gVHJhY2tQ cml2YXRlQmFzZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlRhZ3NDaGFuZ2VkIiwgc3RkOjpiaW5k KCZUcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyOjpub3RpZnlUcmFja09mVGFnc0NoYW5nZWQsIHRo aXMpKTsKKyAgICBtX3RhZ1RpbWVySGFuZGxlci5zY2hlZHVsZSgiW1dlYktpdF0gVHJhY2tQcml2 YXRlQmFzZUdTdHJlYW1lcjo6bm90aWZ5VHJhY2tPZlRhZ3NDaGFuZ2VkIiwgc3RkOjpmdW5jdGlv bjx2b2lkKCk+KHN0ZDo6YmluZCgmVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6bm90aWZ5VHJh Y2tPZlRhZ3NDaGFuZ2VkLCB0aGlzKSkpOwogfQogCiB2b2lkIFRyYWNrUHJpdmF0ZUJhc2VHU3Ry ZWFtZXI6Om5vdGlmeVRyYWNrT2ZBY3RpdmVDaGFuZ2VkKCkKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9WaWRlb1NpbmtHU3RyZWFtZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9WaWRl b1NpbmtHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiAxNjY1NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjE1LDcgKzIxNSw3IEBAIHN0YXRpYyBHc3RGbG93UmV0dXJuIHdlYmtpdFZp ZGVvU2lua1JlbmQKICAgICAvLyBsb3dlciBwcmlvcml0eSBzb3VyY2VzLgogICAgIC8vIFNlZTog aHR0cHM6Ly9idWd6aWxsYS5nbm9tZS5vcmcvc2hvd19idWcuY2dpP2lkPTYxMDgzMC4KICAgICBn c3Rfb2JqZWN0X3JlZihzaW5rKTsKLSAgICBwcml2LT50aW1lb3V0U291cmNlLnNjaGVkdWxlKCJb V2ViS2l0XSB3ZWJraXRWaWRlb1NpbmtUaW1lb3V0Q2FsbGJhY2siLCBzdGQ6OmJpbmQod2Via2l0 VmlkZW9TaW5rVGltZW91dENhbGxiYWNrLCBzaW5rKSwgR19QUklPUklUWV9ERUZBVUxULAorICAg IHByaXYtPnRpbWVvdXRTb3VyY2Uuc2NoZWR1bGUoIltXZWJLaXRdIHdlYmtpdFZpZGVvU2lua1Rp bWVvdXRDYWxsYmFjayIsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPihzdGQ6OmJpbmQod2Via2l0Vmlk ZW9TaW5rVGltZW91dENhbGxiYWNrLCBzaW5rKSksIEdfUFJJT1JJVFlfREVGQVVMVCwKICAgICAg ICAgW3NpbmtdIHsgZ3N0X29iamVjdF91bnJlZihzaW5rKTsgfSk7CiAKICAgICBnX2NvbmRfd2Fp dChwcml2LT5kYXRhQ29uZGl0aW9uLCBwcml2LT5idWZmZXJNdXRleCk7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVh bWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAkocmV2aXNpb24gMTY2NTU5KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNv dXJjZUdTdHJlYW1lci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUzMiw3ICs1MzIsNyBAQCBzdGF0 aWMgR3N0U3RhdGVDaGFuZ2VSZXR1cm4gd2ViS2l0V2ViU3JjCiAgICAgY2FzZSBHU1RfU1RBVEVf Q0hBTkdFX1JFQURZX1RPX1BBVVNFRDoKICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJS RUFEWS0+UEFVU0VEIik7CiAgICAgICAgIGdzdF9vYmplY3RfcmVmKHNyYyk7Ci0gICAgICAgIHBy aXYtPnN0YXJ0U291cmNlLnNjaGVkdWxlKCJbV2ViS2l0XSB3ZWJLaXRXZWJTcmNTdGFydCIsIHN0 ZDo6YmluZCh3ZWJLaXRXZWJTcmNTdGFydCwgc3JjKSwgR19QUklPUklUWV9ERUZBVUxULAorICAg ICAgICBwcml2LT5zdGFydFNvdXJjZS5zY2hlZHVsZSgiW1dlYktpdF0gd2ViS2l0V2ViU3JjU3Rh cnQiLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4oc3RkOjpiaW5kKHdlYktpdFdlYlNyY1N0YXJ0LCBz cmMpKSwgR19QUklPUklUWV9ERUZBVUxULAogICAgICAgICAgICAgW3NyY10geyBnc3Rfb2JqZWN0 X3VucmVmKHNyYyk7IH0pOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEdTVF9TVEFURV9DSEFO R0VfUEFVU0VEX1RPX1JFQURZOgpAQCAtNTQwLDcgKzU0MCw3IEBAIHN0YXRpYyBHc3RTdGF0ZUNo YW5nZVJldHVybiB3ZWJLaXRXZWJTcmMKICAgICAgICAgLy8gY2FuY2VsIHBlbmRpbmcgc291cmNl cwogICAgICAgICByZW1vdmVUaW1lb3V0U291cmNlcyhzcmMpOwogICAgICAgICBnc3Rfb2JqZWN0 X3JlZihzcmMpOwotICAgICAgICBwcml2LT5zdG9wU291cmNlLnNjaGVkdWxlKCJbV2ViS2l0XSB3 ZWJLaXRXZWJTcmNTdG9wIiwgc3RkOjpiaW5kKHdlYktpdFdlYlNyY1N0b3AsIHNyYyksIEdfUFJJ T1JJVFlfREVGQVVMVCwKKyAgICAgICAgcHJpdi0+c3RvcFNvdXJjZS5zY2hlZHVsZSgiW1dlYktp dF0gd2ViS2l0V2ViU3JjU3RvcCIsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPihzdGQ6OmJpbmQod2Vi S2l0V2ViU3JjU3RvcCwgc3JjKSksIEdfUFJJT1JJVFlfREVGQVVMVCwKICAgICAgICAgICAgIFtz cmNdIHsgZ3N0X29iamVjdF91bnJlZihzcmMpOyB9KTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVm YXVsdDoKQEAgLTY4Miw3ICs2ODIsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNOZWVkRGF0 YUNiKEdzdEFwCiAgICAgICAgIHJldHVybjsKIAogICAgIGdzdF9vYmplY3RfcmVmKHNyYyk7Ci0g ICAgcHJpdi0+bmVlZERhdGFTb3VyY2Uuc2NoZWR1bGUoIltXZWJLaXRdIHdlYktpdFdlYlNyY05l ZWREYXRhTWFpbkNiIiwgc3RkOjpiaW5kKHdlYktpdFdlYlNyY05lZWREYXRhTWFpbkNiLCBzcmMp LCBHX1BSSU9SSVRZX0RFRkFVTFQsCisgICAgcHJpdi0+bmVlZERhdGFTb3VyY2Uuc2NoZWR1bGUo IltXZWJLaXRdIHdlYktpdFdlYlNyY05lZWREYXRhTWFpbkNiIiwgc3RkOjpmdW5jdGlvbjx2b2lk KCk+KHN0ZDo6YmluZCh3ZWJLaXRXZWJTcmNOZWVkRGF0YU1haW5DYiwgc3JjKSksIEdfUFJJT1JJ VFlfREVGQVVMVCwKICAgICAgICAgW3NyY10geyBnc3Rfb2JqZWN0X3VucmVmKHNyYyk7IH0pOwog fQogCkBAIC03MTIsNyArNzEyLDcgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRW5vdWdoRGF0 YUNiKEdzdAogICAgICAgICByZXR1cm47CiAKICAgICBnc3Rfb2JqZWN0X3JlZihzcmMpOwotICAg IHByaXYtPmVub3VnaERhdGFTb3VyY2Uuc2NoZWR1bGUoIltXZWJLaXRdIHdlYktpdFdlYlNyY0Vu b3VnaERhdGFNYWluQ2IiLCBzdGQ6OmJpbmQod2ViS2l0V2ViU3JjRW5vdWdoRGF0YU1haW5DYiwg c3JjKSwgR19QUklPUklUWV9ERUZBVUxULAorICAgIHByaXYtPmVub3VnaERhdGFTb3VyY2Uuc2No ZWR1bGUoIltXZWJLaXRdIHdlYktpdFdlYlNyY0Vub3VnaERhdGFNYWluQ2IiLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQoKT4oc3RkOjpiaW5kKHdlYktpdFdlYlNyY0Vub3VnaERhdGFNYWluQ2IsIHNyYykp LCBHX1BSSU9SSVRZX0RFRkFVTFQsCiAgICAgICAgIFtzcmNdIHsgZ3N0X29iamVjdF91bnJlZihz cmMpOyB9KTsKIH0KIApAQCAtNzQxLDcgKzc0MSw3IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJLaXRX ZWJTcmNTZWVrRGF0YUNiKEcKICAgICBwcml2LT5yZXF1ZXN0ZWRPZmZzZXQgPSBvZmZzZXQ7CiAK ICAgICBnc3Rfb2JqZWN0X3JlZihzcmMpOwotICAgIHByaXYtPnNlZWtTb3VyY2Uuc2NoZWR1bGUo IltXZWJLaXRdIHdlYktpdFdlYlNyY1NlZWtNYWluQ2IiLCBzdGQ6OmJpbmQod2ViS2l0V2ViU3Jj U2Vla01haW5DYiwgc3JjKSwgR19QUklPUklUWV9ERUZBVUxULAorICAgIHByaXYtPnNlZWtTb3Vy Y2Uuc2NoZWR1bGUoIltXZWJLaXRdIHdlYktpdFdlYlNyY1NlZWtNYWluQ2IiLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQoKT4oc3RkOjpiaW5kKHdlYktpdFdlYlNyY1NlZWtNYWluQ2IsIHNyYykpLCBHX1BS SU9SSVRZX0RFRkFVTFQsCiAgICAgICAgIFtzcmNdIHsgZ3N0X29iamVjdF91bnJlZihzcmMpOyB9 KTsKICAgICByZXR1cm4gVFJVRTsKIH0K