137000 2014-09-22 06:51:56 -0700 [WinCairo] Compile errors when GStreamer is enabled. 2014-11-18 11:10:21 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) PC Unspecified RESOLVED FIXED P2 Normal --- 1 peavo webkit-unassigned alex.christensen benjamin bfulgham cmarcelo commit-queue ossy pnormand zan oldest_to_newest 1036522 0 peavo 2014-09-22 06:51:56 -0700 MSVC does not allow the keyword default on move constructors. Also, MSVC cannot assign an initializer list to a struct. 1036524 1 238479 peavo 2014-09-22 06:57:45 -0700 Created attachment 238479 Patch 1036670 2 pnormand 2014-09-23 01:09:23 -0700 This breaks GTK and EFL though. Can you please fix it? 1036672 3 zan 2014-09-23 01:14:09 -0700 What version of MSVC? (In reply to comment #0) > Also, MSVC cannot assign an initializer list to a struct. MSVC 2013 supposedly supports this. Does it support initializing a class object via the initializer list? 1036673 4 238479 zan 2014-09-23 01:16:17 -0700 Comment on attachment 238479 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238479&action=review > Source/WTF/wtf/gobject/GMainLoopSource.h:98 > + *this = c; That's a copy. Use WTF::move(). 1036681 5 zan 2014-09-23 02:07:27 -0700 (In reply to comment #3) > What version of MSVC? > > (In reply to comment #0) > > Also, MSVC cannot assign an initializer list to a struct. > > MSVC 2013 supposedly supports this. Does it support initializing a class object via the initializer list? For clarity, here's the MSDN document: http://msdn.microsoft.com/en-us/library/dn387583.aspx Does MSVC compile this? m_context = Context({ adoptGRef(g_socket_create_source(socket, condition, socketCancellable)), adoptGRef(g_cancellable_new()), adoptGRef(socketCancellable), nullptr, // voidCallback nullptr, // boolCallback WTF::move(function), WTF::move(destroyFunction) }); 1036715 6 peavo 2014-09-23 07:16:42 -0700 (In reply to comment #5) > > Does MSVC compile this? > > m_context = Context({ > adoptGRef(g_socket_create_source(socket, condition, socketCancellable)), > adoptGRef(g_cancellable_new()), > adoptGRef(socketCancellable), > nullptr, // voidCallback > nullptr, // boolCallback > WTF::move(function), > WTF::move(destroyFunction) > }); No, the error is: 1>..\wtf\gobject\GMainLoopSource.cpp(130): error C2440: 'initializing' : cannot convert from 'initializer-list' to 'WTF::GMainLoopSource::Context' 1> No constructor could take the source type, or constructor overload resolution was ambiguous 1036718 7 238537 peavo 2014-09-23 07:25:07 -0700 Created attachment 238537 Patch 1036721 8 peavo 2014-09-23 07:30:21 -0700 (In reply to comment #3) > What version of MSVC? > MSVC 2013. The original error was: ..\wtf\gobject\GMainLoopSource.cpp(130): error C2679: binary '=' : no operator found which takes a right-hand operand of type 'initializer-list' (or there is no acceptable conversion) 1037170 9 238645 peavo 2014-09-25 00:49:33 -0700 Created attachment 238645 Patch 1037171 10 peavo 2014-09-25 00:51:30 -0700 (In reply to comment #9) > Created an attachment (id=238645) [details] > Patch It turns out MSVC can assign an initializer list to a struct, but the move constructor causes a compile error. I removed the move constructor in the latest patch, but I'm not sure it just can be removed without other changes ... 1037173 11 238647 peavo 2014-09-25 01:02:44 -0700 Created attachment 238647 Patch 1037445 12 peavo 2014-09-26 01:21:14 -0700 (In reply to comment #11) > Created an attachment (id=238647) [details] > Patch Updated patch to fix compile errors. 1040518 13 peavo 2014-10-09 03:41:39 -0700 Apologies for nagging :) Any chance of a review? 1041833 14 239862 peavo 2014-10-15 03:19:51 -0700 Created attachment 239862 Patch 1041834 15 peavo 2014-10-15 03:21:12 -0700 (In reply to comment #14) > Created an attachment (id=239862) [details] > Patch Resolved conflicts. 1049525 16 239862 pnormand 2014-11-18 10:33:42 -0800 Comment on attachment 239862 Patch Let's cross fingers a rebase is not needed :) 1049527 17 peavo 2014-11-18 10:36:00 -0800 (In reply to comment #16) > Comment on attachment 239862 [details] > Patch > > Let's cross fingers a rebase is not needed :) Thanks for reviewing! 1049534 18 239862 commit-queue 2014-11-18 11:10:15 -0800 Comment on attachment 239862 Patch Clearing flags on attachment: 239862 Committed r176269: <http://trac.webkit.org/changeset/176269> 1049535 19 commit-queue 2014-11-18 11:10:21 -0800 All reviewed patches have been landed. Closing bug. 238479 2014-09-22 06:57:45 -0700 2014-09-23 07:24:56 -0700 Patch bug-137000-20140922155728.patch text/plain 8523 peavo SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNzM4MzQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA5LTIyICBwZWF2b0BvdXRsb29rLmNvbSAg PHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gQ29tcGlsZSBlcnJvcnMg d2hlbiBHU3RyZWFtZXIgaXMgZW5hYmxlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNzAwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1TVkMgZG9lcyBub3QgYWxsb3cgdGhlIGtleXdvcmQgZGVmYXVs dCBvbiBtb3ZlIGNvbnN0cnVjdG9ycy4KKyAgICAgICAgQWxzbywgTVNWQyBjYW5ub3QgYXNzaWdu IGFuIGluaXRpYWxpemVyIGxpc3QgdG8gYSBzdHJ1Y3QuCisKKyAgICAgICAgKiB3dGYvZ29iamVj dC9HTWFpbkxvb3BTb3VyY2UuY3BwOgorICAgICAgICAoV1RGOjpHTWFpbkxvb3BTb3VyY2U6OnNj aGVkdWxlKToKKyAgICAgICAgKFdURjo6R01haW5Mb29wU291cmNlOjpzY2hlZHVsZUFmdGVyRGVs YXkpOgorICAgICAgICAqIHd0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5oOgorICAgICAgICAo V1RGOjpHTWFpbkxvb3BTb3VyY2U6OkNvbnRleHQ6OkNvbnRleHQpOgorICAgICAgICAoV1RGOjpH TWFpbkxvb3BTb3VyY2U6OkNvbnRleHQ6Om9wZXJhdG9yPSk6CisKIDIwMTQtMDktMjIgIFNhbSBX ZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBFbGltaW5hdGUgcmVkdW5kYW50IFB0 ckhhc2ggc3BlY2lhbGl6YXRpb25zCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWlu TG9vcFNvdXJjZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFp bkxvb3BTb3VyY2UuY3BwCShyZXZpc2lvbiAxNzM4MzQpCisrKyBTb3VyY2UvV1RGL3d0Zi9nb2Jq ZWN0L0dNYWluTG9vcFNvdXJjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExOSwxNSArMTE5LDEz IEBAIHZvaWQgR01haW5Mb29wU291cmNlOjpzY2hlZHVsZShjb25zdCBjaGEKICAgICBjYW5jZWxX aXRob3V0TG9ja2luZygpOwogCiAgICAgQVNTRVJUKCFtX2NvbnRleHQuc291cmNlKTsKLSAgICBt X2NvbnRleHQgPSB7Ci0gICAgICAgIGFkb3B0R1JlZihnX2lkbGVfc291cmNlX25ldygpKSwKLSAg ICAgICAgYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpLAotICAgICAgICBudWxscHRyLCAv LyBzb2NrZXRDYW5jZWxsYWJsZQotICAgICAgICBXVEY6Om1vdmUoZnVuY3Rpb24pLAotICAgICAg ICBudWxscHRyLCAvLyBib29sQ2FsbGJhY2sKLSAgICAgICAgbnVsbHB0ciwgLy8gc29ja2V0Q2Fs bGJhY2sKLSAgICAgICAgV1RGOjptb3ZlKGRlc3Ryb3lGdW5jdGlvbikKLSAgICB9OworICAgIG1f Y29udGV4dC5zb3VyY2UgPSBhZG9wdEdSZWYoZ19pZGxlX3NvdXJjZV9uZXcoKSk7CisgICAgbV9j b250ZXh0LmNhbmNlbGxhYmxlID0gYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpOworICAg IG1fY29udGV4dC5zb2NrZXRDYW5jZWxsYWJsZSA9IG51bGxwdHI7CisgICAgbV9jb250ZXh0LnZv aWRDYWxsYmFjayA9IFdURjo6bW92ZShmdW5jdGlvbik7CisgICAgbV9jb250ZXh0LmJvb2xDYWxs YmFjayA9IG51bGxwdHI7CisgICAgbV9jb250ZXh0LnNvY2tldENhbGxiYWNrID0gbnVsbHB0cjsK KyAgICBtX2NvbnRleHQuZGVzdHJveUNhbGxiYWNrID0gV1RGOjptb3ZlKGRlc3Ryb3lGdW5jdGlv bik7CiAgICAgc2NoZWR1bGVJZGxlU291cmNlKG5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJj ZUZ1bmM+KHZvaWRTb3VyY2VDYWxsYmFjayksIHByaW9yaXR5LCBjb250ZXh0KTsKIH0KIApAQCAt MTM3LDE1ICsxMzUsMTMgQEAgdm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlKGNvbnN0IGNo YQogICAgIGNhbmNlbFdpdGhvdXRMb2NraW5nKCk7CiAKICAgICBBU1NFUlQoIW1fY29udGV4dC5z b3VyY2UpOwotICAgIG1fY29udGV4dCA9IHsKLSAgICAgICAgYWRvcHRHUmVmKGdfaWRsZV9zb3Vy Y2VfbmV3KCkpLAotICAgICAgICBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXcoKSksCi0gICAg ICAgIG51bGxwdHIsIC8vIHNvY2tldENhbmNlbGxhYmxlCi0gICAgICAgIG51bGxwdHIsIC8vIHZv aWRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZnVuY3Rpb24pLAotICAgICAgICBudWxscHRy LCAvLyBzb2NrZXRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKQot ICAgIH07CisgICAgbV9jb250ZXh0LnNvdXJjZSA9IGFkb3B0R1JlZihnX2lkbGVfc291cmNlX25l dygpKTsKKyAgICBtX2NvbnRleHQuY2FuY2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJs ZV9uZXcoKSk7CisgICAgbV9jb250ZXh0LnNvY2tldENhbmNlbGxhYmxlID0gbnVsbHB0cjsKKyAg ICBtX2NvbnRleHQudm9pZENhbGxiYWNrID0gbnVsbHB0cjsKKyAgICBtX2NvbnRleHQuYm9vbENh bGxiYWNrID0gV1RGOjptb3ZlKGZ1bmN0aW9uKTsKKyAgICBtX2NvbnRleHQuc29ja2V0Q2FsbGJh Y2sgPSBudWxscHRyOworICAgIG1fY29udGV4dC5kZXN0cm95Q2FsbGJhY2sgPSBXVEY6Om1vdmUo ZGVzdHJveUZ1bmN0aW9uKTsKICAgICBzY2hlZHVsZUlkbGVTb3VyY2UobmFtZSwgcmVpbnRlcnBy ZXRfY2FzdDxHU291cmNlRnVuYz4oYm9vbFNvdXJjZUNhbGxiYWNrKSwgcHJpb3JpdHksIGNvbnRl eHQpOwogfQogCkBAIC0xNTYsMTUgKzE1MiwxMyBAQCB2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2No ZWR1bGUoY29uc3QgY2hhCiAKICAgICBBU1NFUlQoIW1fY29udGV4dC5zb3VyY2UpOwogICAgIEdD YW5jZWxsYWJsZSogc29ja2V0Q2FuY2VsbGFibGUgPSBnX2NhbmNlbGxhYmxlX25ldygpOwotICAg IG1fY29udGV4dCA9IHsKLSAgICAgICAgYWRvcHRHUmVmKGdfc29ja2V0X2NyZWF0ZV9zb3VyY2Uo c29ja2V0LCBjb25kaXRpb24sIHNvY2tldENhbmNlbGxhYmxlKSksCi0gICAgICAgIGFkb3B0R1Jl ZihnX2NhbmNlbGxhYmxlX25ldygpKSwKLSAgICAgICAgYWRvcHRHUmVmKHNvY2tldENhbmNlbGxh YmxlKSwKLSAgICAgICAgbnVsbHB0ciwgLy8gdm9pZENhbGxiYWNrCi0gICAgICAgIG51bGxwdHIs IC8vIGJvb2xDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZnVuY3Rpb24pLAotICAgICAgICBX VEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKQotICAgIH07CisgICAgbV9jb250ZXh0LnNvdXJjZSA9 IGFkb3B0R1JlZihnX3NvY2tldF9jcmVhdGVfc291cmNlKHNvY2tldCwgY29uZGl0aW9uLCBzb2Nr ZXRDYW5jZWxsYWJsZSkpOworICAgIG1fY29udGV4dC5jYW5jZWxsYWJsZSA9IGFkb3B0R1JlZihn X2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICBtX2NvbnRleHQuc29ja2V0Q2FuY2VsbGFibGUgPSBh ZG9wdEdSZWYoc29ja2V0Q2FuY2VsbGFibGUpOworICAgIG1fY29udGV4dC52b2lkQ2FsbGJhY2sg PSBudWxscHRyOworICAgIG1fY29udGV4dC5ib29sQ2FsbGJhY2sgPSBudWxscHRyOworICAgIG1f Y29udGV4dC5zb2NrZXRDYWxsYmFjayA9IFdURjo6bW92ZShmdW5jdGlvbik7CisgICAgbV9jb250 ZXh0LmRlc3Ryb3lDYWxsYmFjayA9IFdURjo6bW92ZShkZXN0cm95RnVuY3Rpb24pOwogCiAgICAg QVNTRVJUKG1fc3RhdHVzID09IFJlYWR5KTsKICAgICBtX3N0YXR1cyA9IFNjaGVkdWxlZDsKQEAg LTE5MSwxNSArMTg1LDEzIEBAIHZvaWQgR01haW5Mb29wU291cmNlOjpzY2hlZHVsZUFmdGVyRGVs YXkKICAgICBjYW5jZWxXaXRob3V0TG9ja2luZygpOwogCiAgICAgQVNTRVJUKCFtX2NvbnRleHQu c291cmNlKTsKLSAgICBtX2NvbnRleHQgPSB7Ci0gICAgICAgIGFkb3B0R1JlZihnX3RpbWVvdXRf c291cmNlX25ldyhkZWxheS5jb3VudCgpKSksCi0gICAgICAgIGFkb3B0R1JlZihnX2NhbmNlbGxh YmxlX25ldygpKSwKLSAgICAgICAgbnVsbHB0ciwgLy8gc29ja2V0Q2FuY2VsbGFibGUKLSAgICAg ICAgV1RGOjptb3ZlKGZ1bmN0aW9uKSwKLSAgICAgICAgbnVsbHB0ciwgLy8gYm9vbENhbGxiYWNr Ci0gICAgICAgIG51bGxwdHIsIC8vIHNvY2tldENhbGxiYWNrCi0gICAgICAgIFdURjo6bW92ZShk ZXN0cm95RnVuY3Rpb24pCi0gICAgfTsKKyAgICBtX2NvbnRleHQuc291cmNlID0gYWRvcHRHUmVm KGdfdGltZW91dF9zb3VyY2VfbmV3KGRlbGF5LmNvdW50KCkpKTsKKyAgICBtX2NvbnRleHQuY2Fu Y2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXcoKSk7CisgICAgbV9jb250ZXh0 LnNvY2tldENhbmNlbGxhYmxlID0gbnVsbHB0cjsKKyAgICBtX2NvbnRleHQudm9pZENhbGxiYWNr ID0gV1RGOjptb3ZlKGZ1bmN0aW9uKTsKKyAgICBtX2NvbnRleHQuYm9vbENhbGxiYWNrID0gbnVs bHB0cjsKKyAgICBtX2NvbnRleHQuc29ja2V0Q2FsbGJhY2sgPSBudWxscHRyOworICAgIG1fY29u dGV4dC5kZXN0cm95Q2FsbGJhY2sgPSBXVEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKTsKICAgICBz Y2hlZHVsZVRpbWVvdXRTb3VyY2UobmFtZSwgcmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4o dm9pZFNvdXJjZUNhbGxiYWNrKSwgcHJpb3JpdHksIGNvbnRleHQpOwogfQogCkBAIC0yMDksMTUg KzIwMSwxMyBAQCB2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5CiAgICAg Y2FuY2VsV2l0aG91dExvY2tpbmcoKTsKIAogICAgIEFTU0VSVCghbV9jb250ZXh0LnNvdXJjZSk7 Ci0gICAgbV9jb250ZXh0ID0gewotICAgICAgICBhZG9wdEdSZWYoZ190aW1lb3V0X3NvdXJjZV9u ZXcoZGVsYXkuY291bnQoKSkpLAotICAgICAgICBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXco KSksCi0gICAgICAgIG51bGxwdHIsIC8vIHNvY2tldENhbmNlbGxhYmxlCi0gICAgICAgIG51bGxw dHIsIC8vIHZvaWRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZnVuY3Rpb24pLAotICAgICAg ICBudWxscHRyLCAvLyBzb2NrZXRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZGVzdHJveUZ1 bmN0aW9uKQotICAgIH07CisgICAgbV9jb250ZXh0LnNvdXJjZSA9IGFkb3B0R1JlZihnX3RpbWVv dXRfc291cmNlX25ldyhkZWxheS5jb3VudCgpKSk7CisgICAgbV9jb250ZXh0LmNhbmNlbGxhYmxl ID0gYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpOworICAgIG1fY29udGV4dC5zb2NrZXRD YW5jZWxsYWJsZSA9IG51bGxwdHI7CisgICAgbV9jb250ZXh0LnZvaWRDYWxsYmFjayA9IG51bGxw dHI7CisgICAgbV9jb250ZXh0LmJvb2xDYWxsYmFjayA9IFdURjo6bW92ZShmdW5jdGlvbik7Cisg ICAgbV9jb250ZXh0LnNvY2tldENhbGxiYWNrID0gbnVsbHB0cjsKKyAgICBtX2NvbnRleHQuZGVz dHJveUNhbGxiYWNrID0gV1RGOjptb3ZlKGRlc3Ryb3lGdW5jdGlvbik7CiAgICAgc2NoZWR1bGVU aW1lb3V0U291cmNlKG5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1bmM+KGJvb2xTb3Vy Y2VDYWxsYmFjayksIHByaW9yaXR5LCBjb250ZXh0KTsKIH0KIApAQCAtMjI3LDE1ICsyMTcsMTMg QEAgdm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlQWZ0ZXJEZWxheQogICAgIGNhbmNlbFdp dGhvdXRMb2NraW5nKCk7CiAKICAgICBBU1NFUlQoIW1fY29udGV4dC5zb3VyY2UpOwotICAgIG1f Y29udGV4dCA9IHsKLSAgICAgICAgYWRvcHRHUmVmKGdfdGltZW91dF9zb3VyY2VfbmV3X3NlY29u ZHMoZGVsYXkuY291bnQoKSkpLAotICAgICAgICBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXco KSksCi0gICAgICAgIG51bGxwdHIsIC8vIHNvY2tldENhbmNlbGxhYmxlCi0gICAgICAgIFdURjo6 bW92ZShmdW5jdGlvbiksCi0gICAgICAgIG51bGxwdHIsIC8vIGJvb2xDYWxsYmFjawotICAgICAg ICBudWxscHRyLCAvLyBzb2NrZXRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZGVzdHJveUZ1 bmN0aW9uKQotICAgIH07CisgICAgbV9jb250ZXh0LnNvdXJjZSA9IGFkb3B0R1JlZihnX3RpbWVv dXRfc291cmNlX25ld19zZWNvbmRzKGRlbGF5LmNvdW50KCkpKTsKKyAgICBtX2NvbnRleHQuY2Fu Y2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXcoKSk7CisgICAgbV9jb250ZXh0 LnNvY2tldENhbmNlbGxhYmxlID0gbnVsbHB0cjsKKyAgICBtX2NvbnRleHQudm9pZENhbGxiYWNr ID0gV1RGOjptb3ZlKGZ1bmN0aW9uKTsKKyAgICBtX2NvbnRleHQuYm9vbENhbGxiYWNrID0gbnVs bHB0cjsKKyAgICBtX2NvbnRleHQuc29ja2V0Q2FsbGJhY2sgPSBudWxscHRyOworICAgIG1fY29u dGV4dC5kZXN0cm95Q2FsbGJhY2sgPSBXVEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKTsKICAgICBz Y2hlZHVsZVRpbWVvdXRTb3VyY2UobmFtZSwgcmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4o dm9pZFNvdXJjZUNhbGxiYWNrKSwgcHJpb3JpdHksIGNvbnRleHQpOwogfQogCkBAIC0yNDUsMTUg KzIzMywxMyBAQCB2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5CiAgICAg Y2FuY2VsV2l0aG91dExvY2tpbmcoKTsKIAogICAgIEFTU0VSVCghbV9jb250ZXh0LnNvdXJjZSk7 Ci0gICAgbV9jb250ZXh0ID0gewotICAgICAgICBhZG9wdEdSZWYoZ190aW1lb3V0X3NvdXJjZV9u ZXdfc2Vjb25kcyhkZWxheS5jb3VudCgpKSksCi0gICAgICAgIGFkb3B0R1JlZihnX2NhbmNlbGxh YmxlX25ldygpKSwKLSAgICAgICAgbnVsbHB0ciwgLy8gc29ja2V0Q2FuY2VsbGFibGUKLSAgICAg ICAgbnVsbHB0ciwgLy8gdm9pZENhbGxiYWNrCi0gICAgICAgIFdURjo6bW92ZShmdW5jdGlvbiks Ci0gICAgICAgIG51bGxwdHIsIC8vIHNvY2tldENhbGxiYWNrCi0gICAgICAgIFdURjo6bW92ZShk ZXN0cm95RnVuY3Rpb24pCi0gICAgfTsKKyAgICBtX2NvbnRleHQuc291cmNlID0gYWRvcHRHUmVm KGdfdGltZW91dF9zb3VyY2VfbmV3X3NlY29uZHMoZGVsYXkuY291bnQoKSkpOworICAgIG1fY29u dGV4dC5jYW5jZWxsYWJsZSA9IGFkb3B0R1JlZihnX2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICBt X2NvbnRleHQuc29ja2V0Q2FuY2VsbGFibGUgPSBudWxscHRyOworICAgIG1fY29udGV4dC52b2lk Q2FsbGJhY2sgPSBudWxscHRyOworICAgIG1fY29udGV4dC5ib29sQ2FsbGJhY2sgPSBXVEY6Om1v dmUoZnVuY3Rpb24pOworICAgIG1fY29udGV4dC5zb2NrZXRDYWxsYmFjayA9IG51bGxwdHI7Cisg ICAgbV9jb250ZXh0LmRlc3Ryb3lDYWxsYmFjayA9IFdURjo6bW92ZShkZXN0cm95RnVuY3Rpb24p OwogICAgIHNjaGVkdWxlVGltZW91dFNvdXJjZShuYW1lLCByZWludGVycHJldF9jYXN0PEdTb3Vy Y2VGdW5jPihib29sU291cmNlQ2FsbGJhY2spLCBwcmlvcml0eSwgY29udGV4dCk7CiB9CiAKSW5k ZXg6IFNvdXJjZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAkocmV2aXNpb24gMTcz ODM0KQorKysgU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtOTMsOCArOTMsMjEgQEAgcHJpdmF0ZToKIAogICAgIHN0cnVjdCBDb250ZXh0 IHsKICAgICAgICAgQ29udGV4dCgpID0gZGVmYXVsdDsKLSAgICAgICAgQ29udGV4dChDb250ZXh0 JiYpID0gZGVmYXVsdDsKLSAgICAgICAgQ29udGV4dCYgb3BlcmF0b3I9KENvbnRleHQmJikgPSBk ZWZhdWx0OworICAgICAgICBDb250ZXh0KENvbnRleHQmJiBjKQorICAgICAgICB7CisgICAgICAg ICAgICAqdGhpcyA9IGM7CisgICAgICAgIH0KKyAgICAgICAgQ29udGV4dCYgb3BlcmF0b3I9KENv bnRleHQmJiBjKQorICAgICAgICB7CisgICAgICAgICAgICBzb3VyY2UgPSBXVEY6Om1vdmUoYy5z b3VyY2UpOworICAgICAgICAgICAgY2FuY2VsbGFibGUgPSBXVEY6Om1vdmUoYy5jYW5jZWxsYWJs ZSk7CisgICAgICAgICAgICBzb2NrZXRDYW5jZWxsYWJsZSA9IFdURjo6bW92ZShjLnNvY2tldENh bmNlbGxhYmxlKTsKKyAgICAgICAgICAgIHZvaWRDYWxsYmFjayA9IFdURjo6bW92ZShjLnZvaWRD YWxsYmFjayk7CisgICAgICAgICAgICBib29sQ2FsbGJhY2sgPSBXVEY6Om1vdmUoYy5ib29sQ2Fs bGJhY2spOworICAgICAgICAgICAgc29ja2V0Q2FsbGJhY2sgPSBXVEY6Om1vdmUoYy5zb2NrZXRD YWxsYmFjayk7CisgICAgICAgICAgICBkZXN0cm95Q2FsbGJhY2sgPSBXVEY6Om1vdmUoYy5kZXN0 cm95Q2FsbGJhY2spOworICAgICAgICAgICAgcmV0dXJuICp0aGlzOworICAgICAgICB9CiAKICAg ICAgICAgdm9pZCBkZXN0cm95U291cmNlKCk7CiAK 238537 2014-09-23 07:25:07 -0700 2014-09-25 00:49:24 -0700 Patch bug-137000-20140923162449.patch text/plain 8534 peavo SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNzM4MzQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA5LTIyICBwZWF2b0BvdXRsb29rLmNvbSAg PHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gQ29tcGlsZSBlcnJvcnMg d2hlbiBHU3RyZWFtZXIgaXMgZW5hYmxlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNzAwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1TVkMgZG9lcyBub3QgYWxsb3cgdGhlIGtleXdvcmQgZGVmYXVs dCBvbiBtb3ZlIGNvbnN0cnVjdG9ycy4KKyAgICAgICAgQWxzbywgTVNWQyBjYW5ub3QgYXNzaWdu IGFuIGluaXRpYWxpemVyIGxpc3QgdG8gYSBzdHJ1Y3QuCisKKyAgICAgICAgKiB3dGYvZ29iamVj dC9HTWFpbkxvb3BTb3VyY2UuY3BwOgorICAgICAgICAoV1RGOjpHTWFpbkxvb3BTb3VyY2U6OnNj aGVkdWxlKToKKyAgICAgICAgKFdURjo6R01haW5Mb29wU291cmNlOjpzY2hlZHVsZUFmdGVyRGVs YXkpOgorICAgICAgICAqIHd0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5oOgorICAgICAgICAo V1RGOjpHTWFpbkxvb3BTb3VyY2U6OkNvbnRleHQ6OkNvbnRleHQpOgorICAgICAgICAoV1RGOjpH TWFpbkxvb3BTb3VyY2U6OkNvbnRleHQ6Om9wZXJhdG9yPSk6CisKIDIwMTQtMDktMjIgIFNhbSBX ZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBFbGltaW5hdGUgcmVkdW5kYW50IFB0 ckhhc2ggc3BlY2lhbGl6YXRpb25zCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWlu TG9vcFNvdXJjZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFp bkxvb3BTb3VyY2UuY3BwCShyZXZpc2lvbiAxNzM4MzQpCisrKyBTb3VyY2UvV1RGL3d0Zi9nb2Jq ZWN0L0dNYWluTG9vcFNvdXJjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExOSwxNSArMTE5LDEz IEBAIHZvaWQgR01haW5Mb29wU291cmNlOjpzY2hlZHVsZShjb25zdCBjaGEKICAgICBjYW5jZWxX aXRob3V0TG9ja2luZygpOwogCiAgICAgQVNTRVJUKCFtX2NvbnRleHQuc291cmNlKTsKLSAgICBt X2NvbnRleHQgPSB7Ci0gICAgICAgIGFkb3B0R1JlZihnX2lkbGVfc291cmNlX25ldygpKSwKLSAg ICAgICAgYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpLAotICAgICAgICBudWxscHRyLCAv LyBzb2NrZXRDYW5jZWxsYWJsZQotICAgICAgICBXVEY6Om1vdmUoZnVuY3Rpb24pLAotICAgICAg ICBudWxscHRyLCAvLyBib29sQ2FsbGJhY2sKLSAgICAgICAgbnVsbHB0ciwgLy8gc29ja2V0Q2Fs bGJhY2sKLSAgICAgICAgV1RGOjptb3ZlKGRlc3Ryb3lGdW5jdGlvbikKLSAgICB9OworICAgIG1f Y29udGV4dC5zb3VyY2UgPSBhZG9wdEdSZWYoZ19pZGxlX3NvdXJjZV9uZXcoKSk7CisgICAgbV9j b250ZXh0LmNhbmNlbGxhYmxlID0gYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpOworICAg IG1fY29udGV4dC5zb2NrZXRDYW5jZWxsYWJsZSA9IG51bGxwdHI7CisgICAgbV9jb250ZXh0LnZv aWRDYWxsYmFjayA9IFdURjo6bW92ZShmdW5jdGlvbik7CisgICAgbV9jb250ZXh0LmJvb2xDYWxs YmFjayA9IG51bGxwdHI7CisgICAgbV9jb250ZXh0LnNvY2tldENhbGxiYWNrID0gbnVsbHB0cjsK KyAgICBtX2NvbnRleHQuZGVzdHJveUNhbGxiYWNrID0gV1RGOjptb3ZlKGRlc3Ryb3lGdW5jdGlv bik7CiAgICAgc2NoZWR1bGVJZGxlU291cmNlKG5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJj ZUZ1bmM+KHZvaWRTb3VyY2VDYWxsYmFjayksIHByaW9yaXR5LCBjb250ZXh0KTsKIH0KIApAQCAt MTM3LDE1ICsxMzUsMTMgQEAgdm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlKGNvbnN0IGNo YQogICAgIGNhbmNlbFdpdGhvdXRMb2NraW5nKCk7CiAKICAgICBBU1NFUlQoIW1fY29udGV4dC5z b3VyY2UpOwotICAgIG1fY29udGV4dCA9IHsKLSAgICAgICAgYWRvcHRHUmVmKGdfaWRsZV9zb3Vy Y2VfbmV3KCkpLAotICAgICAgICBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXcoKSksCi0gICAg ICAgIG51bGxwdHIsIC8vIHNvY2tldENhbmNlbGxhYmxlCi0gICAgICAgIG51bGxwdHIsIC8vIHZv aWRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZnVuY3Rpb24pLAotICAgICAgICBudWxscHRy LCAvLyBzb2NrZXRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKQot ICAgIH07CisgICAgbV9jb250ZXh0LnNvdXJjZSA9IGFkb3B0R1JlZihnX2lkbGVfc291cmNlX25l dygpKTsKKyAgICBtX2NvbnRleHQuY2FuY2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJs ZV9uZXcoKSk7CisgICAgbV9jb250ZXh0LnNvY2tldENhbmNlbGxhYmxlID0gbnVsbHB0cjsKKyAg ICBtX2NvbnRleHQudm9pZENhbGxiYWNrID0gbnVsbHB0cjsKKyAgICBtX2NvbnRleHQuYm9vbENh bGxiYWNrID0gV1RGOjptb3ZlKGZ1bmN0aW9uKTsKKyAgICBtX2NvbnRleHQuc29ja2V0Q2FsbGJh Y2sgPSBudWxscHRyOworICAgIG1fY29udGV4dC5kZXN0cm95Q2FsbGJhY2sgPSBXVEY6Om1vdmUo ZGVzdHJveUZ1bmN0aW9uKTsKICAgICBzY2hlZHVsZUlkbGVTb3VyY2UobmFtZSwgcmVpbnRlcnBy ZXRfY2FzdDxHU291cmNlRnVuYz4oYm9vbFNvdXJjZUNhbGxiYWNrKSwgcHJpb3JpdHksIGNvbnRl eHQpOwogfQogCkBAIC0xNTYsMTUgKzE1MiwxMyBAQCB2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2No ZWR1bGUoY29uc3QgY2hhCiAKICAgICBBU1NFUlQoIW1fY29udGV4dC5zb3VyY2UpOwogICAgIEdD YW5jZWxsYWJsZSogc29ja2V0Q2FuY2VsbGFibGUgPSBnX2NhbmNlbGxhYmxlX25ldygpOwotICAg IG1fY29udGV4dCA9IHsKLSAgICAgICAgYWRvcHRHUmVmKGdfc29ja2V0X2NyZWF0ZV9zb3VyY2Uo c29ja2V0LCBjb25kaXRpb24sIHNvY2tldENhbmNlbGxhYmxlKSksCi0gICAgICAgIGFkb3B0R1Jl ZihnX2NhbmNlbGxhYmxlX25ldygpKSwKLSAgICAgICAgYWRvcHRHUmVmKHNvY2tldENhbmNlbGxh YmxlKSwKLSAgICAgICAgbnVsbHB0ciwgLy8gdm9pZENhbGxiYWNrCi0gICAgICAgIG51bGxwdHIs IC8vIGJvb2xDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZnVuY3Rpb24pLAotICAgICAgICBX VEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKQotICAgIH07CisgICAgbV9jb250ZXh0LnNvdXJjZSA9 IGFkb3B0R1JlZihnX3NvY2tldF9jcmVhdGVfc291cmNlKHNvY2tldCwgY29uZGl0aW9uLCBzb2Nr ZXRDYW5jZWxsYWJsZSkpOworICAgIG1fY29udGV4dC5jYW5jZWxsYWJsZSA9IGFkb3B0R1JlZihn X2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICBtX2NvbnRleHQuc29ja2V0Q2FuY2VsbGFibGUgPSBh ZG9wdEdSZWYoc29ja2V0Q2FuY2VsbGFibGUpOworICAgIG1fY29udGV4dC52b2lkQ2FsbGJhY2sg PSBudWxscHRyOworICAgIG1fY29udGV4dC5ib29sQ2FsbGJhY2sgPSBudWxscHRyOworICAgIG1f Y29udGV4dC5zb2NrZXRDYWxsYmFjayA9IFdURjo6bW92ZShmdW5jdGlvbik7CisgICAgbV9jb250 ZXh0LmRlc3Ryb3lDYWxsYmFjayA9IFdURjo6bW92ZShkZXN0cm95RnVuY3Rpb24pOwogCiAgICAg QVNTRVJUKG1fc3RhdHVzID09IFJlYWR5KTsKICAgICBtX3N0YXR1cyA9IFNjaGVkdWxlZDsKQEAg LTE5MSwxNSArMTg1LDEzIEBAIHZvaWQgR01haW5Mb29wU291cmNlOjpzY2hlZHVsZUFmdGVyRGVs YXkKICAgICBjYW5jZWxXaXRob3V0TG9ja2luZygpOwogCiAgICAgQVNTRVJUKCFtX2NvbnRleHQu c291cmNlKTsKLSAgICBtX2NvbnRleHQgPSB7Ci0gICAgICAgIGFkb3B0R1JlZihnX3RpbWVvdXRf c291cmNlX25ldyhkZWxheS5jb3VudCgpKSksCi0gICAgICAgIGFkb3B0R1JlZihnX2NhbmNlbGxh YmxlX25ldygpKSwKLSAgICAgICAgbnVsbHB0ciwgLy8gc29ja2V0Q2FuY2VsbGFibGUKLSAgICAg ICAgV1RGOjptb3ZlKGZ1bmN0aW9uKSwKLSAgICAgICAgbnVsbHB0ciwgLy8gYm9vbENhbGxiYWNr Ci0gICAgICAgIG51bGxwdHIsIC8vIHNvY2tldENhbGxiYWNrCi0gICAgICAgIFdURjo6bW92ZShk ZXN0cm95RnVuY3Rpb24pCi0gICAgfTsKKyAgICBtX2NvbnRleHQuc291cmNlID0gYWRvcHRHUmVm KGdfdGltZW91dF9zb3VyY2VfbmV3KGRlbGF5LmNvdW50KCkpKTsKKyAgICBtX2NvbnRleHQuY2Fu Y2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXcoKSk7CisgICAgbV9jb250ZXh0 LnNvY2tldENhbmNlbGxhYmxlID0gbnVsbHB0cjsKKyAgICBtX2NvbnRleHQudm9pZENhbGxiYWNr ID0gV1RGOjptb3ZlKGZ1bmN0aW9uKTsKKyAgICBtX2NvbnRleHQuYm9vbENhbGxiYWNrID0gbnVs bHB0cjsKKyAgICBtX2NvbnRleHQuc29ja2V0Q2FsbGJhY2sgPSBudWxscHRyOworICAgIG1fY29u dGV4dC5kZXN0cm95Q2FsbGJhY2sgPSBXVEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKTsKICAgICBz Y2hlZHVsZVRpbWVvdXRTb3VyY2UobmFtZSwgcmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4o dm9pZFNvdXJjZUNhbGxiYWNrKSwgcHJpb3JpdHksIGNvbnRleHQpOwogfQogCkBAIC0yMDksMTUg KzIwMSwxMyBAQCB2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5CiAgICAg Y2FuY2VsV2l0aG91dExvY2tpbmcoKTsKIAogICAgIEFTU0VSVCghbV9jb250ZXh0LnNvdXJjZSk7 Ci0gICAgbV9jb250ZXh0ID0gewotICAgICAgICBhZG9wdEdSZWYoZ190aW1lb3V0X3NvdXJjZV9u ZXcoZGVsYXkuY291bnQoKSkpLAotICAgICAgICBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXco KSksCi0gICAgICAgIG51bGxwdHIsIC8vIHNvY2tldENhbmNlbGxhYmxlCi0gICAgICAgIG51bGxw dHIsIC8vIHZvaWRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZnVuY3Rpb24pLAotICAgICAg ICBudWxscHRyLCAvLyBzb2NrZXRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZGVzdHJveUZ1 bmN0aW9uKQotICAgIH07CisgICAgbV9jb250ZXh0LnNvdXJjZSA9IGFkb3B0R1JlZihnX3RpbWVv dXRfc291cmNlX25ldyhkZWxheS5jb3VudCgpKSk7CisgICAgbV9jb250ZXh0LmNhbmNlbGxhYmxl ID0gYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpOworICAgIG1fY29udGV4dC5zb2NrZXRD YW5jZWxsYWJsZSA9IG51bGxwdHI7CisgICAgbV9jb250ZXh0LnZvaWRDYWxsYmFjayA9IG51bGxw dHI7CisgICAgbV9jb250ZXh0LmJvb2xDYWxsYmFjayA9IFdURjo6bW92ZShmdW5jdGlvbik7Cisg ICAgbV9jb250ZXh0LnNvY2tldENhbGxiYWNrID0gbnVsbHB0cjsKKyAgICBtX2NvbnRleHQuZGVz dHJveUNhbGxiYWNrID0gV1RGOjptb3ZlKGRlc3Ryb3lGdW5jdGlvbik7CiAgICAgc2NoZWR1bGVU aW1lb3V0U291cmNlKG5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1bmM+KGJvb2xTb3Vy Y2VDYWxsYmFjayksIHByaW9yaXR5LCBjb250ZXh0KTsKIH0KIApAQCAtMjI3LDE1ICsyMTcsMTMg QEAgdm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlQWZ0ZXJEZWxheQogICAgIGNhbmNlbFdp dGhvdXRMb2NraW5nKCk7CiAKICAgICBBU1NFUlQoIW1fY29udGV4dC5zb3VyY2UpOwotICAgIG1f Y29udGV4dCA9IHsKLSAgICAgICAgYWRvcHRHUmVmKGdfdGltZW91dF9zb3VyY2VfbmV3X3NlY29u ZHMoZGVsYXkuY291bnQoKSkpLAotICAgICAgICBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXco KSksCi0gICAgICAgIG51bGxwdHIsIC8vIHNvY2tldENhbmNlbGxhYmxlCi0gICAgICAgIFdURjo6 bW92ZShmdW5jdGlvbiksCi0gICAgICAgIG51bGxwdHIsIC8vIGJvb2xDYWxsYmFjawotICAgICAg ICBudWxscHRyLCAvLyBzb2NrZXRDYWxsYmFjawotICAgICAgICBXVEY6Om1vdmUoZGVzdHJveUZ1 bmN0aW9uKQotICAgIH07CisgICAgbV9jb250ZXh0LnNvdXJjZSA9IGFkb3B0R1JlZihnX3RpbWVv dXRfc291cmNlX25ld19zZWNvbmRzKGRlbGF5LmNvdW50KCkpKTsKKyAgICBtX2NvbnRleHQuY2Fu Y2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXcoKSk7CisgICAgbV9jb250ZXh0 LnNvY2tldENhbmNlbGxhYmxlID0gbnVsbHB0cjsKKyAgICBtX2NvbnRleHQudm9pZENhbGxiYWNr ID0gV1RGOjptb3ZlKGZ1bmN0aW9uKTsKKyAgICBtX2NvbnRleHQuYm9vbENhbGxiYWNrID0gbnVs bHB0cjsKKyAgICBtX2NvbnRleHQuc29ja2V0Q2FsbGJhY2sgPSBudWxscHRyOworICAgIG1fY29u dGV4dC5kZXN0cm95Q2FsbGJhY2sgPSBXVEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKTsKICAgICBz Y2hlZHVsZVRpbWVvdXRTb3VyY2UobmFtZSwgcmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4o dm9pZFNvdXJjZUNhbGxiYWNrKSwgcHJpb3JpdHksIGNvbnRleHQpOwogfQogCkBAIC0yNDUsMTUg KzIzMywxMyBAQCB2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5CiAgICAg Y2FuY2VsV2l0aG91dExvY2tpbmcoKTsKIAogICAgIEFTU0VSVCghbV9jb250ZXh0LnNvdXJjZSk7 Ci0gICAgbV9jb250ZXh0ID0gewotICAgICAgICBhZG9wdEdSZWYoZ190aW1lb3V0X3NvdXJjZV9u ZXdfc2Vjb25kcyhkZWxheS5jb3VudCgpKSksCi0gICAgICAgIGFkb3B0R1JlZihnX2NhbmNlbGxh YmxlX25ldygpKSwKLSAgICAgICAgbnVsbHB0ciwgLy8gc29ja2V0Q2FuY2VsbGFibGUKLSAgICAg ICAgbnVsbHB0ciwgLy8gdm9pZENhbGxiYWNrCi0gICAgICAgIFdURjo6bW92ZShmdW5jdGlvbiks Ci0gICAgICAgIG51bGxwdHIsIC8vIHNvY2tldENhbGxiYWNrCi0gICAgICAgIFdURjo6bW92ZShk ZXN0cm95RnVuY3Rpb24pCi0gICAgfTsKKyAgICBtX2NvbnRleHQuc291cmNlID0gYWRvcHRHUmVm KGdfdGltZW91dF9zb3VyY2VfbmV3X3NlY29uZHMoZGVsYXkuY291bnQoKSkpOworICAgIG1fY29u dGV4dC5jYW5jZWxsYWJsZSA9IGFkb3B0R1JlZihnX2NhbmNlbGxhYmxlX25ldygpKTsKKyAgICBt X2NvbnRleHQuc29ja2V0Q2FuY2VsbGFibGUgPSBudWxscHRyOworICAgIG1fY29udGV4dC52b2lk Q2FsbGJhY2sgPSBudWxscHRyOworICAgIG1fY29udGV4dC5ib29sQ2FsbGJhY2sgPSBXVEY6Om1v dmUoZnVuY3Rpb24pOworICAgIG1fY29udGV4dC5zb2NrZXRDYWxsYmFjayA9IG51bGxwdHI7Cisg ICAgbV9jb250ZXh0LmRlc3Ryb3lDYWxsYmFjayA9IFdURjo6bW92ZShkZXN0cm95RnVuY3Rpb24p OwogICAgIHNjaGVkdWxlVGltZW91dFNvdXJjZShuYW1lLCByZWludGVycHJldF9jYXN0PEdTb3Vy Y2VGdW5jPihib29sU291cmNlQ2FsbGJhY2spLCBwcmlvcml0eSwgY29udGV4dCk7CiB9CiAKSW5k ZXg6IFNvdXJjZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAkocmV2aXNpb24gMTcz ODM0KQorKysgU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtOTMsOCArOTMsMjEgQEAgcHJpdmF0ZToKIAogICAgIHN0cnVjdCBDb250ZXh0 IHsKICAgICAgICAgQ29udGV4dCgpID0gZGVmYXVsdDsKLSAgICAgICAgQ29udGV4dChDb250ZXh0 JiYpID0gZGVmYXVsdDsKLSAgICAgICAgQ29udGV4dCYgb3BlcmF0b3I9KENvbnRleHQmJikgPSBk ZWZhdWx0OworICAgICAgICBDb250ZXh0KENvbnRleHQmJiBjKQorICAgICAgICB7CisgICAgICAg ICAgICAqdGhpcyA9IFdURjo6bW92ZShjKTsKKyAgICAgICAgfQorICAgICAgICBDb250ZXh0JiBv cGVyYXRvcj0oQ29udGV4dCYmIGMpCisgICAgICAgIHsKKyAgICAgICAgICAgIHNvdXJjZSA9IFdU Rjo6bW92ZShjLnNvdXJjZSk7CisgICAgICAgICAgICBjYW5jZWxsYWJsZSA9IFdURjo6bW92ZShj LmNhbmNlbGxhYmxlKTsKKyAgICAgICAgICAgIHNvY2tldENhbmNlbGxhYmxlID0gV1RGOjptb3Zl KGMuc29ja2V0Q2FuY2VsbGFibGUpOworICAgICAgICAgICAgdm9pZENhbGxiYWNrID0gV1RGOjpt b3ZlKGMudm9pZENhbGxiYWNrKTsKKyAgICAgICAgICAgIGJvb2xDYWxsYmFjayA9IFdURjo6bW92 ZShjLmJvb2xDYWxsYmFjayk7CisgICAgICAgICAgICBzb2NrZXRDYWxsYmFjayA9IFdURjo6bW92 ZShjLnNvY2tldENhbGxiYWNrKTsKKyAgICAgICAgICAgIGRlc3Ryb3lDYWxsYmFjayA9IFdURjo6 bW92ZShjLmRlc3Ryb3lDYWxsYmFjayk7CisgICAgICAgICAgICByZXR1cm4gKnRoaXM7CisgICAg ICAgIH0KIAogICAgICAgICB2b2lkIGRlc3Ryb3lTb3VyY2UoKTsKIAo= 238645 2014-09-25 00:49:33 -0700 2014-09-25 01:02:32 -0700 Patch bug-137000-20140925094916.patch text/plain 1653 peavo SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNzM4MzQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA5LTIyICBwZWF2b0BvdXRsb29rLmNvbSAg PHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gQ29tcGlsZSBlcnJvcnMg d2hlbiBHU3RyZWFtZXIgaXMgZW5hYmxlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNzAwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1TVkMgZG9lcyBub3QgYWxsb3cgdGhlIGtleXdvcmQgZGVmYXVs dCBvbiBtb3ZlIGNvbnN0cnVjdG9ycy4KKworICAgICAgICAqIHd0Zi9nb2JqZWN0L0dNYWluTG9v cFNvdXJjZS5oOgorICAgICAgICAoV1RGOjpHTWFpbkxvb3BTb3VyY2U6OkNvbnRleHQ6OkNvbnRl eHQpOgorICAgICAgICAoV1RGOjpHTWFpbkxvb3BTb3VyY2U6OkNvbnRleHQ6Om9wZXJhdG9yPSk6 CisKIDIwMTQtMDktMjIgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBF bGltaW5hdGUgcmVkdW5kYW50IFB0ckhhc2ggc3BlY2lhbGl6YXRpb25zCkluZGV4OiBTb3VyY2Uv V1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X VEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmgJKHJldmlzaW9uIDE3MzgzNCkKKysrIFNv dXJjZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmgJKHdvcmtpbmcgY29weSkKQEAg LTkzLDggKzkzLDE3IEBAIHByaXZhdGU6CiAKICAgICBzdHJ1Y3QgQ29udGV4dCB7CiAgICAgICAg IENvbnRleHQoKSA9IGRlZmF1bHQ7Ci0gICAgICAgIENvbnRleHQoQ29udGV4dCYmKSA9IGRlZmF1 bHQ7Ci0gICAgICAgIENvbnRleHQmIG9wZXJhdG9yPShDb250ZXh0JiYpID0gZGVmYXVsdDsKKyAg ICAgICAgQ29udGV4dCYgb3BlcmF0b3I9KENvbnRleHQmJiBjKQorICAgICAgICB7CisgICAgICAg ICAgICBzb3VyY2UgPSBXVEY6Om1vdmUoYy5zb3VyY2UpOworICAgICAgICAgICAgY2FuY2VsbGFi bGUgPSBXVEY6Om1vdmUoYy5jYW5jZWxsYWJsZSk7CisgICAgICAgICAgICBzb2NrZXRDYW5jZWxs YWJsZSA9IFdURjo6bW92ZShjLnNvY2tldENhbmNlbGxhYmxlKTsKKyAgICAgICAgICAgIHZvaWRD YWxsYmFjayA9IFdURjo6bW92ZShjLnZvaWRDYWxsYmFjayk7CisgICAgICAgICAgICBib29sQ2Fs bGJhY2sgPSBXVEY6Om1vdmUoYy5ib29sQ2FsbGJhY2spOworICAgICAgICAgICAgc29ja2V0Q2Fs bGJhY2sgPSBXVEY6Om1vdmUoYy5zb2NrZXRDYWxsYmFjayk7CisgICAgICAgICAgICBkZXN0cm95 Q2FsbGJhY2sgPSBXVEY6Om1vdmUoYy5kZXN0cm95Q2FsbGJhY2spOworICAgICAgICAgICAgcmV0 dXJuICp0aGlzOworICAgICAgICB9CiAKICAgICAgICAgdm9pZCBkZXN0cm95U291cmNlKCk7CiAK 238647 2014-09-25 01:02:44 -0700 2014-10-15 03:19:41 -0700 Patch bug-137000-20140925100226.patch text/plain 2242 peavo SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNzM4MzQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA5LTIyICBwZWF2b0BvdXRsb29rLmNvbSAg PHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gQ29tcGlsZSBlcnJvcnMg d2hlbiBHU3RyZWFtZXIgaXMgZW5hYmxlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNzAwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1TVkMgZG9lcyBub3QgYWxsb3cgdGhlIGtleXdvcmQgZGVmYXVs dCBvbiBtb3ZlIGNvbnN0cnVjdG9ycy4KKworICAgICAgICAqIHd0Zi9nb2JqZWN0L0dNYWluTG9v cFNvdXJjZS5oOgorICAgICAgICAoV1RGOjpHTWFpbkxvb3BTb3VyY2U6OkNvbnRleHQ6OkNvbnRl eHQpOgorICAgICAgICAoV1RGOjpHTWFpbkxvb3BTb3VyY2U6OkNvbnRleHQ6Om9wZXJhdG9yPSk6 CisgICAgICAgICogd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNlLmNwcDoKKyAgICAgICAgKFdU Rjo6R01haW5Mb29wU291cmNlOjpjYW5jZWxXaXRob3V0TG9ja2luZyk6CisKIDIwMTQtMDktMjIg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBFbGltaW5hdGUgcmVkdW5k YW50IFB0ckhhc2ggc3BlY2lhbGl6YXRpb25zCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0 L0dNYWluTG9vcFNvdXJjZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvZ29iamVj dC9HTWFpbkxvb3BTb3VyY2UuY3BwCShyZXZpc2lvbiAxNzM4MzQpCisrKyBTb3VyY2UvV1RGL3d0 Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3LDcgKzk3 LDggQEAgdm9pZCBHTWFpbkxvb3BTb3VyY2U6OmNhbmNlbFdpdGhvdXRMb2NraQogICAgIGlmICgh bV9jb250ZXh0LnNvdXJjZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgQ29udGV4dCBjb250ZXh0 ID0gV1RGOjptb3ZlKG1fY29udGV4dCk7CisgICAgQ29udGV4dCBjb250ZXh0OworICAgIGNvbnRl eHQgPSBXVEY6Om1vdmUobV9jb250ZXh0KTsKICAgICBjb250ZXh0LmRlc3Ryb3lTb3VyY2UoKTsK IH0KIApJbmRleDogU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5oCShyZXZp c2lvbiAxNzM4MzQpCisrKyBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5o CSh3b3JraW5nIGNvcHkpCkBAIC05Myw4ICs5MywxNyBAQCBwcml2YXRlOgogCiAgICAgc3RydWN0 IENvbnRleHQgewogICAgICAgICBDb250ZXh0KCkgPSBkZWZhdWx0OwotICAgICAgICBDb250ZXh0 KENvbnRleHQmJikgPSBkZWZhdWx0OwotICAgICAgICBDb250ZXh0JiBvcGVyYXRvcj0oQ29udGV4 dCYmKSA9IGRlZmF1bHQ7CisgICAgICAgIENvbnRleHQmIG9wZXJhdG9yPShDb250ZXh0JiYgYykK KyAgICAgICAgeworICAgICAgICAgICAgc291cmNlID0gV1RGOjptb3ZlKGMuc291cmNlKTsKKyAg ICAgICAgICAgIGNhbmNlbGxhYmxlID0gV1RGOjptb3ZlKGMuY2FuY2VsbGFibGUpOworICAgICAg ICAgICAgc29ja2V0Q2FuY2VsbGFibGUgPSBXVEY6Om1vdmUoYy5zb2NrZXRDYW5jZWxsYWJsZSk7 CisgICAgICAgICAgICB2b2lkQ2FsbGJhY2sgPSBXVEY6Om1vdmUoYy52b2lkQ2FsbGJhY2spOwor ICAgICAgICAgICAgYm9vbENhbGxiYWNrID0gV1RGOjptb3ZlKGMuYm9vbENhbGxiYWNrKTsKKyAg ICAgICAgICAgIHNvY2tldENhbGxiYWNrID0gV1RGOjptb3ZlKGMuc29ja2V0Q2FsbGJhY2spOwor ICAgICAgICAgICAgZGVzdHJveUNhbGxiYWNrID0gV1RGOjptb3ZlKGMuZGVzdHJveUNhbGxiYWNr KTsKKyAgICAgICAgICAgIHJldHVybiAqdGhpczsKKyAgICAgICAgfQogCiAgICAgICAgIHZvaWQg ZGVzdHJveVNvdXJjZSgpOwogCg== 239862 2014-10-15 03:19:51 -0700 2014-11-18 11:10:15 -0800 Patch bug-137000-20141015121946.patch text/plain 2592 peavo SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNzQ3MjUpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTEwLTE1ICBwZWF2b0BvdXRsb29rLmNvbSAg PHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gQ29tcGlsZSBlcnJvcnMg d2hlbiBHU3RyZWFtZXIgaXMgZW5hYmxlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNzAwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1TVkMgZG9lcyBub3QgYWxsb3cgdGhlIGtleXdvcmQgZGVmYXVs dCBvbiBtb3ZlIGNvbnN0cnVjdG9ycyBhbmQgbW92ZSBhc3NpZ25tZW50IG9wZXJhdG9ycy4KKwor ICAgICAgICAqIHd0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5jcHA6CisgICAgICAgIChXVEY6 OkdNYWluTG9vcFNvdXJjZTo6Y2FuY2VsKToKKyAgICAgICAgKFdURjo6R01haW5Mb29wU291cmNl Ojpzb2NrZXRDYWxsYmFjayk6CisgICAgICAgICogd3RmL2dvYmplY3QvR01haW5Mb29wU291cmNl Lmg6CisgICAgICAgIChXVEY6OkdNYWluTG9vcFNvdXJjZTo6Q29udGV4dDo6b3BlcmF0b3I9KToK KwogMjAxNC0xMC0xNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBbV2luXSBVbnJldmlld2VkIGdhcmRlbmluZy4gSWdub3JlIFZpc3VhbCBTdHVkaW8gKi5z ZGYgZmlsZXMuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2Uu Y3BwCShyZXZpc2lvbiAxNzQ2ODEpCisrKyBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9v cFNvdXJjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgwLDcgKzgwLDggQEAgdm9pZCBHTWFpbkxv b3BTb3VyY2U6OmNhbmNlbCgpCiAgICAgaWYgKCFtX2NvbnRleHQuc291cmNlKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBDb250ZXh0IGNvbnRleHQgPSBXVEY6Om1vdmUobV9jb250ZXh0KTsKKyAg ICBDb250ZXh0IGNvbnRleHQ7CisgICAgY29udGV4dCA9IFdURjo6bW92ZShtX2NvbnRleHQpOwog ICAgIGNvbnRleHQuZGVzdHJveVNvdXJjZSgpOwogfQogCkBAIC0zNDgsNyArMzQ5LDggQEAgYm9v bCBHTWFpbkxvb3BTb3VyY2U6OnNvY2tldENhbGxiYWNrKEdJTwogICAgIGlmICghbV9jb250ZXh0 LnNvdXJjZSkKICAgICAgICAgcmV0dXJuIFN0b3A7CiAKLSAgICBDb250ZXh0IGNvbnRleHQgPSBX VEY6Om1vdmUobV9jb250ZXh0KTsKKyAgICBDb250ZXh0IGNvbnRleHQ7CisgICAgY29udGV4dCA9 IFdURjo6bW92ZShtX2NvbnRleHQpOwogCiAgICAgQVNTRVJUKGNvbnRleHQuc29ja2V0Q2FsbGJh Y2spOwogICAgIEFTU0VSVChtX3N0YXR1cyA9PSBTY2hlZHVsZWQgfHwgbV9zdGF0dXMgPT0gRGlz cGF0Y2hpbmcpOwpJbmRleDogU291cmNlL1dURi93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2Uu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNvdXJjZS5o CShyZXZpc2lvbiAxNzQ2ODEpCisrKyBTb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9vcFNv dXJjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03Miw4ICs3MiwxNyBAQCBwcm90ZWN0ZWQ6CiAKICAg ICBzdHJ1Y3QgQ29udGV4dCB7CiAgICAgICAgIENvbnRleHQoKSA9IGRlZmF1bHQ7Ci0gICAgICAg IENvbnRleHQoQ29udGV4dCYmKSA9IGRlZmF1bHQ7Ci0gICAgICAgIENvbnRleHQmIG9wZXJhdG9y PShDb250ZXh0JiYpID0gZGVmYXVsdDsKKyAgICAgICAgQ29udGV4dCYgb3BlcmF0b3I9KENvbnRl eHQmJiBjKQorICAgICAgICB7CisgICAgICAgICAgICBzb3VyY2UgPSBXVEY6Om1vdmUoYy5zb3Vy Y2UpOworICAgICAgICAgICAgY2FuY2VsbGFibGUgPSBXVEY6Om1vdmUoYy5jYW5jZWxsYWJsZSk7 CisgICAgICAgICAgICBzb2NrZXRDYW5jZWxsYWJsZSA9IFdURjo6bW92ZShjLnNvY2tldENhbmNl bGxhYmxlKTsKKyAgICAgICAgICAgIHZvaWRDYWxsYmFjayA9IFdURjo6bW92ZShjLnZvaWRDYWxs YmFjayk7CisgICAgICAgICAgICBib29sQ2FsbGJhY2sgPSBXVEY6Om1vdmUoYy5ib29sQ2FsbGJh Y2spOworICAgICAgICAgICAgc29ja2V0Q2FsbGJhY2sgPSBXVEY6Om1vdmUoYy5zb2NrZXRDYWxs YmFjayk7CisgICAgICAgICAgICBkZXN0cm95Q2FsbGJhY2sgPSBXVEY6Om1vdmUoYy5kZXN0cm95 Q2FsbGJhY2spOworICAgICAgICAgICAgcmV0dXJuICp0aGlzOworICAgICAgICB9CiAKICAgICAg ICAgdm9pZCBkZXN0cm95U291cmNlKCk7CiAK