46534 2010-09-24 15:42:51 -0700 Fill in more of PluginProcess 2010-09-24 17:22:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca rniwa webkit.review.bot oldest_to_newest 284783 0 andersca 2010-09-24 15:42:51 -0700 Fill in more of PluginProcess 284787 1 68776 andersca 2010-09-24 15:46:30 -0700 Created attachment 68776 Patch 284790 2 webkit.review.bot 2010-09-24 15:50:21 -0700 Attachment 68776 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/UIProcess/Plugins/PluginProcessProxy.h:38: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 284798 3 68776 aroben 2010-09-24 16:02:03 -0700 Comment on attachment 68776 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68776&action=review > WebKit2/PluginProcess/PluginProcess.cpp:37 > +static const double ShutdownTimeout = 15.0; We don't normally capitalize variable names. Or add ".0". > WebKit2/PluginProcess/PluginProcess.cpp:114 > +void PluginProcess::createWebProcessConnection() > +{ > + // FIXME: This is platform specific! > + > + // Create the listening port. > + mach_port_t listeningPort; > + mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort); > + > + // Create a listening connection. > + RefPtr<WebProcessConnection> connection = WebProcessConnection::create(listeningPort); > + m_webProcessConnections.append(connection.release()); > + > + CoreIPC::MachPort clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND); > + m_connection->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientPort), 0); > + > + // Stop the shutdown timer. > + m_shutdownTimer.stop(); > +} Why not create PluginProcessMac.mm and put the platform-specific code there? That will make it easier for other platforms to adopt. No need for the local connection or clientPort variables. > WebKit2/Scripts/webkit2/messages.py:288 > def header_for_type(type): > special_cases = { > + 'CoreIPC::MachPort': '"MachPort.h"', > 'WTF::String': '<wtf/text/WTFString.h>', > 'WebKit::WebKeyboardEvent': '"WebEvent.h"', > 'WebKit::WebMouseEvent': '"WebEvent.h"', Test please! 284813 4 andersca 2010-09-24 16:13:16 -0700 Committed r68309: <http://trac.webkit.org/changeset/68309> 284856 5 rniwa 2010-09-24 17:00:22 -0700 I believe you forgot to add PluginProcessProxyMessageReceiver.cpp or that the change to WebKit2/WebKit2.xcodeproj/project.pbxproj wasn't intentional. WebKit2 fails to compile on my local check (r68314). I'm waiting for the bots to catch up in order to confirm this. 284866 6 andersca 2010-09-24 17:22:58 -0700 (In reply to comment #5) > I believe you forgot to add PluginProcessProxyMessageReceiver.cpp or that the change to WebKit2/WebKit2.xcodeproj/project.pbxproj wasn't intentional. WebKit2 fails to compile on my local check (r68314). I'm waiting for the bots to catch up in order to confirm this. PluginProcessProxyMessageReceiver.cpp is autogenerated by DerivedSources.make from PluginProcessProxy.messages.in, all of which are checked in. 68776 2010-09-24 15:46:30 -0700 2010-09-24 16:02:02 -0700 Patch bug-46534-20100924154629.patch text/plain 18647 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg M2JjYjRkYzEzMDZiMThhN2JmYTFlYzQzMzNhOGUxZDkxMjg0N2Y4Ni4uZGRjM2MwZjQ0NWE3MjNj NDJlY2Y4MTFmNjUzZmE3NmY2ZmI3NzBjMCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1NSBAQAogMjAxMC0wOS0yNCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpbGwgaW4gbW9yZSBvZiBQbHVnaW5Qcm9jZXNz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjUzNAor CisgICAgICAgICogRGVyaXZlZFNvdXJjZXMubWFrZToKKyAgICAgICAgQWRkIFBsdWdpblByb2Nl c3NQcm94eS4KKworICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZUlELmg6CisgICAg ICAgIEFkZCBhIE1lc3NhZ2VDbGFzc1BsdWdpblByb2Nlc3NQcm94eSBtZXNzYWdlIGNsYXNzLgor CisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcDoKKyAgICAgICAgKFdl YktpdDo6UGx1Z2luUHJvY2Vzczo6UGx1Z2luUHJvY2Vzcyk6CisgICAgICAgIEluaXRpYWxpemUg dGhlIHNodXRkb3duIHRpbWVyLgorCisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3M6Omlu aXRpYWxpemVDb25uZWN0aW9uKToKKyAgICAgICAgUmVuYW1lIHRoaXMgdG8gaW5pdGlhbGl6ZUNv bm5lY3Rpb24gdG8gYXZvaWQgY29uZmxpY3RzIGluIHRoZSBDb3JlSVBDIG1lc3NhZ2UgaGFuZGxl ci4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzOjpyZW1vdmVXZWJQcm9jZXNzQ29u bmVjdGlvbik6CisgICAgICAgIFJlbW92ZSB0aGUgZ2l2ZW4gd2ViIHByb2Nlc3MgY29ubmVjdGlv biBmcm9tIG91ciB2ZWN0b3IuCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzczo6aW5p dGlhbGl6ZSk6CisgICAgICAgIENyZWF0ZSB0aGUgcGx1Zy1pbiBtb2R1bGUuCisKKyAgICAgICAg KFdlYktpdDo6UGx1Z2luUHJvY2Vzczo6Y3JlYXRlV2ViUHJvY2Vzc0Nvbm5lY3Rpb24pOgorICAg ICAgICBDcmVhdGUgYSBjb25uZWN0aW9uIGhhbmRsZSBhbmQgc2VuZCBpdCB0byB0aGUgVUkgcHJv Y2Vzcy4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzOjpzaHV0ZG93blRpbWVyRmly ZWQpOgorICAgICAgICBRdWl0LgorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2lu UHJvY2Vzc01haW5NYWMubW06CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NNYWluKToK KyAgICAgICAgQ2FsbCBpbml0aWFsaXplQ29ubmVjdGlvbi4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0Mi9tZXNzYWdlcy5weToKKyAgICAgICAgQWRkIENvcmVJUEM6Ok1hY2hQb3J0IGFzIGEg c3BlY2lhbCBjYXNlLgorCisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vz c1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc1Byb3h5OjpkaWRDcmVh dGVXZWJQcm9jZXNzQ29ubmVjdGlvbik6CisgICAgICAgIEFkZCBlbXB0eSBmdW5jdGlvbi4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5tZXNzYWdlcy5p bjogQWRkZWQuCisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgor ICAgICAgICBBZGQgUGx1Z2luUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluLgorCisgICAgICAgICog V2ViS2l0MlByZWZpeC5oOgorICAgICAgICBBZGQgYW4gRU5BQkxFX1BMVUdJTl9QUk9DRVNTICNk ZWZpbmUgd2hpY2ggaXMgMCBmb3Igbm93LgorCisyMDEwLTA5LTI0ICBBbmRlcnMgQ2FybHNzb24g IDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4K IAogICAgICAgICBtZXNzYWdlc191bml0dGVzdC5weSBzaG91bGQgY29tcGFyZSB0aGUgZ2VuZXJh dGVkIHJlc3VsdHMgYWdhaW5zdCBleHBlY3RlZCByZXN1bHRzCmRpZmYgLS1naXQgYS9XZWJLaXQy L0Rlcml2ZWRTb3VyY2VzLm1ha2UgYi9XZWJLaXQyL0Rlcml2ZWRTb3VyY2VzLm1ha2UKaW5kZXgg NGQ4ZThiYjI1NWMzMWVlOWFmYzg5OWRiYzY3YjQzMWZmNzkwZThjMi4uZGMxYzA0NjIxOTE2Yzk4 YmRiZGVjNTRlMTc3NmY2ZDZhNDdjOThlYyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9EZXJpdmVkU291 cmNlcy5tYWtlCisrKyBiL1dlYktpdDIvRGVyaXZlZFNvdXJjZXMubWFrZQpAQCAtMSwxMCArMSwx MiBAQAogVlBBVEggPSBcCiAgICAgJChXZWJLaXQyKS9QbHVnaW5Qcm9jZXNzIFwKICAgICAkKFdl YktpdDIpL1dlYlByb2Nlc3MvV2ViUGFnZSBcCisgICAgJChXZWJLaXQyKS9VSVByb2Nlc3MvUGx1 Z2lucyBcCiAjCiAKIE1FU1NBR0VfUkVDRUlWRVJTID0gXAogICAgIFBsdWdpblByb2Nlc3MgXAor ICAgIFBsdWdpblByb2Nlc3NQcm94eSBcCiAgICAgV2ViUGFnZSBcCiAjCiAKZGlmZiAtLWdpdCBh L1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlSUQuaCBiL1dlYktpdDIvUGxhdGZvcm0v Q29yZUlQQy9NZXNzYWdlSUQuaAppbmRleCBkMjAwYjI5NTQ1NWEyYmUwMzFjNTNiMWZmN2UxMDk2 Y2FkZDg1ZDVkLi5lNmE1MGEwNmQ1NzRkZjEyZjA2YWFiNTg3NjRhZDQ1MDYzMjczZTNlIDEwMDY0 NAotLS0gYS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZUlELmgKKysrIGIvV2ViS2l0 Mi9QbGF0Zm9ybS9Db3JlSVBDL01lc3NhZ2VJRC5oCkBAIC00OCw2ICs0OCw5IEBAIGVudW0gTWVz c2FnZUNsYXNzIHsKICAgICAKICAgICAvLyBNZXNzYWdlcyBzZW50IGJ5IHRoZSBVSSBwcm9jZXNz IHRvIHRoZSBwbHVnLWluIHByb2Nlc3MuCiAgICAgTWVzc2FnZUNsYXNzUGx1Z2luUHJvY2VzcywK KworICAgIC8vIE1lc3NhZ2VzIHNlbnQgYnkgdGhlIHBsdWctaW4gcHJvY2VzcyB0byB0aGUgVUkg cHJvY2Vzcy4KKyAgICBNZXNzYWdlQ2xhc3NQbHVnaW5Qcm9jZXNzUHJveHksCiB9OwogCiB0ZW1w bGF0ZTx0eXBlbmFtZT4gc3RydWN0IE1lc3NhZ2VLaW5kVHJhaXRzIHsgfTsKZGlmZiAtLWdpdCBh L1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcCBiL1dlYktpdDIvUGx1Z2lu UHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcAppbmRleCBjNjMwZGUyOTQ0MWFjZmRhZjhkNjQ4MWIx M2UyN2FjMDY2NWRiZTFjLi5jNjE3ZDliMjM1ZGM2NGJmMjA0ZjUyMWY1Y2EyMjhlMDc3NTBhY2Iy IDEwMDY0NAotLS0gYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5jcHAKKysr IGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuY3BwCkBAIC0yMywxMiArMjMs MTkgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCisjaWYgRU5B QkxFKFBMVUdJTl9QUk9DRVNTKQorCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzcy5oIgogCi0jaWYg RU5BQkxFKFBMVUdJTl9QUk9DRVNTKQorI2luY2x1ZGUgIk1hY2hQb3J0LmgiCisjaW5jbHVkZSAi TmV0c2NhcGVQbHVnaW5Nb2R1bGUuaCIKKyNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzUHJveHlNZXNz YWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NDb25uZWN0aW9uLmgiCiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCitzdGF0aWMgY29uc3QgZG91YmxlIFNodXRkb3duVGltZW91dCA9IDE1LjA7CisK IFBsdWdpblByb2Nlc3MmIFBsdWdpblByb2Nlc3M6OnNoYXJlZCgpCiB7CiAgICAgREVGSU5FX1NU QVRJQ19MT0NBTChQbHVnaW5Qcm9jZXNzLCBwbHVnaW5Qcm9jZXNzLCAoKSk7CkBAIC0zNiw2ICs0 Myw3IEBAIFBsdWdpblByb2Nlc3MmIFBsdWdpblByb2Nlc3M6OnNoYXJlZCgpCiB9CiAKIFBsdWdp blByb2Nlc3M6OlBsdWdpblByb2Nlc3MoKQorICAgIDogbV9zaHV0ZG93blRpbWVyKFJ1bkxvb3A6 Om1haW4oKSwgdGhpcywgJlBsdWdpblByb2Nlc3M6OnNodXRkb3duVGltZXJGaXJlZCkKIHsKIH0K IApAQCAtNDMsNyArNTEsNyBAQCBQbHVnaW5Qcm9jZXNzOjp+UGx1Z2luUHJvY2VzcygpCiB7CiB9 CiAKLXZvaWQgUGx1Z2luUHJvY2Vzczo6aW5pdGlhbGl6ZShDb3JlSVBDOjpDb25uZWN0aW9uOjpJ ZGVudGlmaWVyIHNlcnZlcklkZW50aWZpZXIpCit2b2lkIFBsdWdpblByb2Nlc3M6OmluaXRpYWxp emVDb25uZWN0aW9uKENvcmVJUEM6OkNvbm5lY3Rpb246OklkZW50aWZpZXIgc2VydmVySWRlbnRp ZmllcikKIHsKICAgICBBU1NFUlQoIW1fY29ubmVjdGlvbik7CiAKQEAgLTUxLDYgKzU5LDE5IEBA IHZvaWQgUGx1Z2luUHJvY2Vzczo6aW5pdGlhbGl6ZShDb3JlSVBDOjpDb25uZWN0aW9uOjpJZGVu dGlmaWVyIHNlcnZlcklkZW50aWZpZXIpCiAgICAgbV9jb25uZWN0aW9uLT5vcGVuKCk7CiB9CiAK K3ZvaWQgUGx1Z2luUHJvY2Vzczo6cmVtb3ZlV2ViUHJvY2Vzc0Nvbm5lY3Rpb24oV2ViUHJvY2Vz c0Nvbm5lY3Rpb24qIHdlYlByb2Nlc3NDb25uZWN0aW9uKQoreworICAgIHNpemVfdCB2ZWN0b3JJ bmRleCA9IG1fd2ViUHJvY2Vzc0Nvbm5lY3Rpb25zLmZpbmQod2ViUHJvY2Vzc0Nvbm5lY3Rpb24p OworICAgIEFTU0VSVCh2ZWN0b3JJbmRleCAhPSBub3RGb3VuZCk7CisKKyAgICBtX3dlYlByb2Nl c3NDb25uZWN0aW9ucy5yZW1vdmUodmVjdG9ySW5kZXgpOworCisgICAgaWYgKG1fd2ViUHJvY2Vz c0Nvbm5lY3Rpb25zLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBTdGFydCB0aGUgc2h1dGRvd24g dGltZXIuCisgICAgICAgIG1fc2h1dGRvd25UaW1lci5zdGFydE9uZVNob3QoU2h1dGRvd25UaW1l b3V0KTsKKyAgICB9Cit9CisKIHZvaWQgUGx1Z2luUHJvY2Vzczo6ZGlkUmVjZWl2ZU1lc3NhZ2Uo Q29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3Nh Z2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiB9CkBAIC02Niw2 ICs4NywzNyBAQCB2b2lkIFBsdWdpblByb2Nlc3M6OmRpZFJlY2VpdmVJbnZhbGlkTWVzc2FnZShD b3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzcwogewogfQogCit2b2lkIFBsdWdpblBy b2Nlc3M6OmluaXRpYWxpemUoY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoKQoreworICAgIEFTU0VS VCghbV9wbHVnaW5Nb2R1bGUpOworCisgICAgbV9wbHVnaW5Nb2R1bGUgPSBOZXRzY2FwZVBsdWdp bk1vZHVsZTo6Z2V0T3JDcmVhdGUocGx1Z2luUGF0aCk7Cit9CisKK3ZvaWQgUGx1Z2luUHJvY2Vz czo6Y3JlYXRlV2ViUHJvY2Vzc0Nvbm5lY3Rpb24oKQoreworICAgIC8vIEZJWE1FOiBUaGlzIGlz IHBsYXRmb3JtIHNwZWNpZmljIQorCisgICAgLy8gQ3JlYXRlIHRoZSBsaXN0ZW5pbmcgcG9ydC4K KyAgICBtYWNoX3BvcnRfdCBsaXN0ZW5pbmdQb3J0OworICAgIG1hY2hfcG9ydF9hbGxvY2F0ZSht YWNoX3Rhc2tfc2VsZigpLCBNQUNIX1BPUlRfUklHSFRfUkVDRUlWRSwgJmxpc3RlbmluZ1BvcnQp OworCisgICAgLy8gQ3JlYXRlIGEgbGlzdGVuaW5nIGNvbm5lY3Rpb24uCisgICAgUmVmUHRyPFdl YlByb2Nlc3NDb25uZWN0aW9uPiBjb25uZWN0aW9uID0gV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmNy ZWF0ZShsaXN0ZW5pbmdQb3J0KTsKKyAgICBtX3dlYlByb2Nlc3NDb25uZWN0aW9ucy5hcHBlbmQo Y29ubmVjdGlvbi5yZWxlYXNlKCkpOworCisgICAgQ29yZUlQQzo6TWFjaFBvcnQgY2xpZW50UG9y dChsaXN0ZW5pbmdQb3J0LCBNQUNIX01TR19UWVBFX01BS0VfU0VORCk7CisgICAgbV9jb25uZWN0 aW9uLT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Qcm9jZXNzUHJveHk6OkRpZENyZWF0ZVdlYlByb2Nl c3NDb25uZWN0aW9uKGNsaWVudFBvcnQpLCAwKTsKKworICAgIC8vIFN0b3AgdGhlIHNodXRkb3du IHRpbWVyLgorICAgIG1fc2h1dGRvd25UaW1lci5zdG9wKCk7Cit9CisKK3ZvaWQgUGx1Z2luUHJv Y2Vzczo6c2h1dGRvd25UaW1lckZpcmVkKCkKK3sKKyAgICBSdW5Mb29wOjpjdXJyZW50KCktPnN0 b3AoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBFTkFCTEUoUExV R0lOX1BST0NFU1MpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJv Y2Vzcy5oIGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuaAppbmRleCA2MGIz MjczM2Q0OGI3NDc0ZWI2YzMxYjY0MTcyNDNmM2JjOGEzNzRlLi5jMzM4YjIzMmQ1MjM1YTYyNDlk NDM3NDVmZGE2OWNmOGI2MWJjY2QyIDEwMDY0NAotLS0gYS9XZWJLaXQyL1BsdWdpblByb2Nlc3Mv UGx1Z2luUHJvY2Vzcy5oCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNz LmgKQEAgLTMwLDE0ICszMCwyMSBAQAogCiAjaW5jbHVkZSAiQ29ubmVjdGlvbi5oIgogI2luY2x1 ZGUgIlJ1bkxvb3AuaCIKKyNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogCiBuYW1lc3BhY2UgV2Vi S2l0IHsKIAorY2xhc3MgTmV0c2NhcGVQbHVnaW5Nb2R1bGU7CitjbGFzcyBXZWJQcm9jZXNzQ29u bmVjdGlvbjsKKyAgICAgICAgCiBjbGFzcyBQbHVnaW5Qcm9jZXNzIDogTm9uY29weWFibGUsIENv cmVJUEM6OkNvbm5lY3Rpb246OkNsaWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBsdWdpblBy b2Nlc3MmIHNoYXJlZCgpOwogCi0gICAgdm9pZCBpbml0aWFsaXplKENvcmVJUEM6OkNvbm5lY3Rp b246OklkZW50aWZpZXIpOworICAgIHZvaWQgaW5pdGlhbGl6ZUNvbm5lY3Rpb24oQ29yZUlQQzo6 Q29ubmVjdGlvbjo6SWRlbnRpZmllcik7CisgICAgdm9pZCByZW1vdmVXZWJQcm9jZXNzQ29ubmVj dGlvbihXZWJQcm9jZXNzQ29ubmVjdGlvbiogd2ViUHJvY2Vzc0Nvbm5lY3Rpb24pOworCisgICAg TmV0c2NhcGVQbHVnaW5Nb2R1bGUqIG5ldHNjYXBlUGx1Z2luTW9kdWxlKCkgY29uc3QgeyByZXR1 cm4gbV9wbHVnaW5Nb2R1bGUuZ2V0KCk7IH0KIAogcHJpdmF0ZToKICAgICBQbHVnaW5Qcm9jZXNz KCk7CkBAIC00OCw4ICs1NSwyMyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRDbG9z ZShDb3JlSVBDOjpDb25uZWN0aW9uKik7CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVJbnZh bGlkTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlEKTsKIAor ICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCisgICAgdm9pZCBpbml0aWFsaXplKGNvbnN0IFN0cmlu ZyYgcGx1Z2luUGF0aCk7CisgICAgdm9pZCBjcmVhdGVXZWJQcm9jZXNzQ29ubmVjdGlvbigpOwor ICAgIAorICAgIHZvaWQgc2h1dGRvd25UaW1lckZpcmVkKCk7CisKICAgICAvLyBUaGUgY29ubmVj dGlvbiB0byB0aGUgVUkgcHJvY2Vzcy4KICAgICBSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4g bV9jb25uZWN0aW9uOworCisgICAgLy8gT3VyIHdlYiBwcm9jZXNzIGNvbm5lY3Rpb25zLgorICAg IFZlY3RvcjxSZWZQdHI8V2ViUHJvY2Vzc0Nvbm5lY3Rpb24+ID4gbV93ZWJQcm9jZXNzQ29ubmVj dGlvbnM7CisKKyAgICAvLyBUaGUgcGx1Zy1pbiBtb2R1bGUuCisgICAgUmVmUHRyPE5ldHNjYXBl UGx1Z2luTW9kdWxlPiBtX3BsdWdpbk1vZHVsZTsKKyAgICAKKyAgICAvLyBBIHRpbWVyIHVzZWQg Zm9yIHRoZSBzaHV0ZG93biB0aW1lb3V0LgorICAgIFJ1bkxvb3A6OlRpbWVyPFBsdWdpblByb2Nl c3M+IG1fc2h1dGRvd25UaW1lcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNzTWFpbk1hYy5tbSBi L1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01haW5NYWMubW0KaW5kZXgg NzcyY2Q0MTAwZWQ2M2YxYzBhZDZjNDQzMjY0YzRhMmFkMjA4NjcyNS4uZWFhMzUyNjI3N2Q1MDI2 YzhiOGI0ZDI4NTU1NzMyNWU0MDg0OWYzZCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbHVnaW5Qcm9j ZXNzL21hYy9QbHVnaW5Qcm9jZXNzTWFpbk1hYy5tbQorKysgYi9XZWJLaXQyL1BsdWdpblByb2Nl c3MvbWFjL1BsdWdpblByb2Nlc3NNYWluTWFjLm1tCkBAIC03MSw4ICs3MSw4IEBAIGludCBQbHVn aW5Qcm9jZXNzTWFpbihjb25zdCBDb21tYW5kTGluZSYgY29tbWFuZExpbmUpCiAgICAgV1RGOjpp bml0aWFsaXplTWFpblRocmVhZCgpOwogICAgIFJ1bkxvb3A6OmluaXRpYWxpemVNYWluUnVuTG9v cCgpOwogCi0gICAgLy8gSW5pdGlhbGl6ZSB0aGUgcGx1Zy1pbiBob3N0IHByb2Nlc3MuCi0gICAg UGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkuaW5pdGlhbGl6ZShzZXJ2ZXJQb3J0KTsKKyAgICAvLyBJ bml0aWFsaXplIHRoZSBwbHVnLWluIHByb2Nlc3MgY29ubmVjdGlvbi4KKyAgICBQbHVnaW5Qcm9j ZXNzOjpzaGFyZWQoKS5pbml0aWFsaXplQ29ubmVjdGlvbihzZXJ2ZXJQb3J0KTsKIAogICAgIFtO U0FwcGxpY2F0aW9uIHNoYXJlZEFwcGxpY2F0aW9uXTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9T Y3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkgYi9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNz YWdlcy5weQppbmRleCA3MTk1NTc1ZWNhMTQxMzdjMTk3YjRjYzM4ZWYyNDQ4ZDZjZWNlZjg3Li40 YTZlMTJmZGE1Njc2ZWUyOTM0ZDU0NGE4ODU4NzFmZWY0NTY5ODdlIDEwMDY0NAotLS0gYS9XZWJL aXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weQorKysgYi9XZWJLaXQyL1NjcmlwdHMvd2Vi a2l0Mi9tZXNzYWdlcy5weQpAQCAtMjgyLDYgKzI4Miw3IEBAIGRlZiBjYXNlX3N0YXRlbWVudChy ZWNlaXZlciwgbWVzc2FnZSk6CiAKIGRlZiBoZWFkZXJfZm9yX3R5cGUodHlwZSk6CiAgICAgc3Bl Y2lhbF9jYXNlcyA9IHsKKyAgICAgICAgJ0NvcmVJUEM6Ok1hY2hQb3J0JzogJyJNYWNoUG9ydC5o IicsCiAgICAgICAgICdXVEY6OlN0cmluZyc6ICc8d3RmL3RleHQvV1RGU3RyaW5nLmg+JywKICAg ICAgICAgJ1dlYktpdDo6V2ViS2V5Ym9hcmRFdmVudCc6ICciV2ViRXZlbnQuaCInLAogICAgICAg ICAnV2ViS2l0OjpXZWJNb3VzZUV2ZW50JzogJyJXZWJFdmVudC5oIicsCmRpZmYgLS1naXQgYS9X ZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAgYi9XZWJLaXQy L1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAKaW5kZXggMTQ0NjIwOTlk MzUzM2M2YzEzYzQxYjAxMTVkNjgzZTYxNWViZWE0Yi4uZTUzYjlkNjM4MTA5OWNiMTkwYjU2NGNk ODE5NmViOWE4ZDA3OTE1YSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5Qcm9jZXNzUHJveHkuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luUHJvY2Vzc1Byb3h5LmNwcApAQCAtNzksNiArNzksMTEgQEAgdm9pZCBQbHVnaW5Qcm9jZXNz UHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqLCBDb3JlSVBDOjpDb25u ZWN0aW8KICAgICBtX2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OlBsdWdpblByb2Nlc3M6Oklu aXRpYWxpemUobV9wbHVnaW5JbmZvLnBhdGgpLCAwKTsKIH0KIAordm9pZCBQbHVnaW5Qcm9jZXNz UHJveHk6OmRpZENyZWF0ZVdlYlByb2Nlc3NDb25uZWN0aW9uKGNvbnN0IENvcmVJUEM6Ok1hY2hQ b3J0JikKK3sKKyAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKIAogI2VuZGlmIC8vIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKZGlmZiAtLWdpdCBhL1dl YktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmggYi9XZWJLaXQyL1VJ UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5oCmluZGV4IGU2NDA2Y2Y4NGNlYmQx NWRmODIyYTk1MWZlMmVmN2I4NWI3YzZiYzMuLjZkYTgyZTFkNGUxZWU3OWJlYTEwYTA1YWEyMWQz OWNjZjVkYWM4ZGUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu UHJvY2Vzc1Byb3h5LmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9j ZXNzUHJveHkuaApAQCAtMzMsNiArMzMsMTEgQEAKICNpbmNsdWRlICJQcm9jZXNzTGF1bmNoZXIu aCIKICNpbmNsdWRlIDx3dGYvRGVxdWUuaD4KIAorLy8gRklYTUU6IFRoaXMgaXMgcGxhdGZvcm0g c3BlY2lmaWMuCituYW1lc3BhY2UgQ29yZUlQQyB7CisgICAgY2xhc3MgTWFjaFBvcnQ7Cit9CisK IG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBQbHVnaW5Qcm9jZXNzTWFuYWdlcjsKQEAgLTU0 LDcgKzU5LDExIEBAIHByaXZhdGU6CiAKICAgICAvLyBQcm9jZXNzTGF1bmNoZXI6OkNsaWVudAog ICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xhdW5jaGVyKiwgQ29y ZUlQQzo6Q29ubmVjdGlvbjo6SWRlbnRpZmllcik7Ci0gICAgCisKKyAgICAvLyBNZXNzYWdlIGhh bmRsZXJzCisgICAgdm9pZCBkaWRSZWNlaXZlUGx1Z2luUHJvY2Vzc1Byb3h5TWVzc2FnZShDb3Jl SVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERl Y29kZXIqKTsKKyAgICB2b2lkIGRpZENyZWF0ZVdlYlByb2Nlc3NDb25uZWN0aW9uKGNvbnN0IENv cmVJUEM6Ok1hY2hQb3J0Jik7CisKICAgICAvLyBUaGUgcGx1Zy1pbiBob3N0IHByb2Nlc3MgbWFu YWdlci4KICAgICBQbHVnaW5Qcm9jZXNzTWFuYWdlciogbV9wbHVnaW5Qcm9jZXNzTWFuYWdlcjsK ICAgICAKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vz c1Byb3h5Lm1lc3NhZ2VzLmluIGIvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9j ZXNzUHJveHkubWVzc2FnZXMuaW4KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uY2JkNWFiYzNiM2Y0ZmE3MTY3NDIxYjEz MTViZGY3YTMzODcyYjUzNQotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluCkBAIC0wLDAgKzEsMzAgQEAKKyMg Q29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMg UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor IworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnIEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUg R09PRFMgT1IKKyMgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBC VVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwKKyMg T1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworI2lmIEVOQUJMRShQTFVHSU5f UFJPQ0VTUykKKworbWVzc2FnZXMgLT4gUGx1Z2luUHJvY2Vzc1Byb3h5IHsKKyAgICAjIEZJWE1F OiBUaGlzIGlzIHBsYXRmb3JtIHNwZWNpZmljCisgICAgRGlkQ3JlYXRlV2ViUHJvY2Vzc0Nvbm5l Y3Rpb24oQ29yZUlQQzo6TWFjaFBvcnQgY29ubmVjdGlvbklkZW50aWZpZXIpCit9CisKKyNlbmRp ZgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2og Yi9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBkOGE2MmQz Njk3NTY3NmRkZTUyYjRiODVjZWM4NDkxMTdhODhiODdjLi5jMTZjOGMyMDUyNTVmYmRhNTgwMjkz N2RkNDhmMDRlYmMxY2U4MmZhIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagorKysgYi9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagpAQCAtNDcsNiArNDcsOSBAQAogCQkxQTA0Mzk3NzEyNEQwMzQ4MDBGRkJGQjUgLyog UGx1Z2luUHJvY2Vzcy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQTA0Mzk3NTEyNEQwMzQ4MDBGRkJGQjUgLyogUGx1Z2luUHJvY2Vzcy5jcHAgKi87 IH07CiAJCTFBMDQzQTA5MTI0RDExQTkwMEZGQkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlvbi5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwNDNBMDcx MjREMTFBOTAwRkZCRkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uLmggKi87IH07CiAJCTFBMDQz QTBBMTI0RDExQTkwMEZGQkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTA0M0EwODEyNEQxMUE5MDBG RkJGQjUgLyogV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwICovOyB9OworCQkxQTA0M0I0RDEyNEQ1 RTM2MDBGRkJGQjUgLyogUGx1Z2luUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluIGluIFJlc291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTA0M0I0QzEyNEQ1RTM2MDBG RkJGQjUgLyogUGx1Z2luUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluICovOyB9OworCQkxQTA0M0I1 RDEyNEQ1RTlEMDBGRkJGQjUgLyogUGx1Z2luUHJvY2Vzc1Byb3h5TWVzc2FnZVJlY2VpdmVyLmNw cCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMDQzQjVC MTI0RDVFOUQwMEZGQkZCNSAvKiBQbHVnaW5Qcm9jZXNzUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3Bw ICovOyB9OworCQkxQTA0M0I1RTEyNEQ1RTlEMDBGRkJGQjUgLyogUGx1Z2luUHJvY2Vzc1Byb3h5 TWVzc2FnZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBMDQzQjVDMTI0RDVFOUQwMEZGQkZCNSAvKiBQbHVnaW5Qcm9jZXNzUHJveHlNZXNzYWdlcy5o ICovOyB9OwogCQkxQTBFQzYwMzEyNEE5RjJDMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01hbmFn ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMEVD NjAxMTI0QTlGMkMwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzTWFuYWdlci5oICovOyB9OwogCQkx QTBFQzYwNDEyNEE5RjJDMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwRUM2MDIxMjRBOUYy QzAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcCAqLzsgfTsKIAkJMUEwRUM2QzAx MjRCQkQ5QjAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwRUM2QkUxMjRCQkQ5QjAwN0VGNEE1 IC8qIFBsdWdpblByb2Nlc3NNZXNzYWdlcy5oICovOyB9OwpAQCAtNDUzLDYgKzQ1Niw5IEBACiAJ CTFBMDQzOTc1MTI0RDAzNDgwMEZGQkZCNSAvKiBQbHVnaW5Qcm9jZXNzLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBsdWdpblByb2Nlc3MuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQkxQTA0M0EwNzEyNEQxMUE5MDBGRkJGQjUgLyogV2ViUHJvY2Vz c0Nvbm5lY3Rpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViUHJvY2Vz c0Nvbm5lY3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEwNDNBMDgxMjRE MTFBOTAwRkZCRkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYlByb2Nlc3NDb25uZWN0aW9uLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUEwNDNCNEMxMjRENUUzNjAwRkZCRkI1IC8qIFBsdWdpblBy b2Nlc3NQcm94eS5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBQbHVnaW5Qcm9j ZXNzUHJveHkubWVzc2FnZXMuaW47IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBMDQz QjVCMTI0RDVFOUQwMEZGQkZCNSAvKiBQbHVnaW5Qcm9jZXNzUHJveHlNZXNzYWdlUmVjZWl2ZXIu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gUGx1Z2luUHJvY2Vzc1By b3h5TWVzc2FnZVJlY2VpdmVyLmNwcDsgcGF0aCA9IC9Vc2Vycy9hbmRlcnNjYS9CdWlsZC9EZWJ1 Zy9EZXJpdmVkU291cmNlcy9XZWJLaXQyL1BsdWdpblByb2Nlc3NQcm94eU1lc3NhZ2VSZWNlaXZl ci5jcHA7IHNvdXJjZVRyZWUgPSAiPGFic29sdXRlPiI7IH07CisJCTFBMDQzQjVDMTI0RDVFOUQw MEZGQkZCNSAvKiBQbHVnaW5Qcm9jZXNzUHJveHlNZXNzYWdlcy5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IG5hbWUgPSBQbHVnaW5Qcm9jZXNzUHJveHlNZXNzYWdlcy5oOyBwYXRoID0gL1Vz ZXJzL2FuZGVyc2NhL0J1aWxkL0RlYnVnL0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvUGx1Z2luUHJv Y2Vzc1Byb3h5TWVzc2FnZXMuaDsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+IjsgfTsKIAkJMUEw RUM2MDExMjRBOUYyQzAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNYW5hZ2VyLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdpblByb2Nlc3NNYW5hZ2VyLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMEVDNjAyMTI0QTlGMkMwMDdFRjRBNSAvKiBQbHVnaW5Q cm9jZXNzTWFuYWdlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQ bHVnaW5Qcm9jZXNzTWFuYWdlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFB MEVDNkIxMTI0QkJEMzYwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzLm1lc3NhZ2VzLmluICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gdGV4dDsgcGF0aCA9IFBsdWdpblByb2Nlc3MubWVzc2FnZXMuaW47IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CkBAIC0xMTAwLDYgKzExMDYsNyBAQAogCQkJCTFBMEVDNjAxMTI0QTlG MkMwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzTWFuYWdlci5oICovLAogCQkJCTFBMEVDNzVEMTI0 QkM3QjIwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzUHJveHkuY3BwICovLAogCQkJCTFBMEVDNzVD MTI0QkM3QjIwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzUHJveHkuaCAqLywKKwkJCQkxQTA0M0I0 QzEyNEQ1RTM2MDBGRkJGQjUgLyogUGx1Z2luUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluICovLAog CQkJKTsKIAkJCXBhdGggPSBQbHVnaW5zOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKQEAg LTE1ODEsNiArMTU4OCw4IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQkxQTBFQzZCRDEyNEJCRDlC MDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01lc3NhZ2VSZWNlaXZlci5jcHAgKi8sCiAJCQkJMUEw RUM2QkUxMjRCQkQ5QjAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNZXNzYWdlcy5oICovLAorCQkJ CTFBMDQzQjVCMTI0RDVFOUQwMEZGQkZCNSAvKiBQbHVnaW5Qcm9jZXNzUHJveHlNZXNzYWdlUmVj ZWl2ZXIuY3BwICovLAorCQkJCTFBMDQzQjVDMTI0RDVFOUQwMEZGQkZCNSAvKiBQbHVnaW5Qcm9j ZXNzUHJveHlNZXNzYWdlcy5oICovLAogCQkJCUMwQ0U3MjlFMTI0N0U3MUQwMEJDMEVDNCAvKiBX ZWJQYWdlTWVzc2FnZVJlY2VpdmVyLmNwcCAqLywKIAkJCQlDMENFNzI5RjEyNDdFNzFEMDBCQzBF QzQgLyogV2ViUGFnZU1lc3NhZ2VzLmggKi8sCiAJCQkpOwpAQCAtMTc5OSw2ICsxODA4LDcgQEAK IAkJCQkxQTBFQzkwRjEyNEMwQUY1MDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25N YW5hZ2VyLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTA0Mzk3NjEyNEQwMzQ4MDBGRkJGQjUgLyog UGx1Z2luUHJvY2Vzcy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUEwNDNBMDkxMjREMTFBOTAwRkZC RkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uLmggaW4gSGVhZGVycyAqLywKKwkJCQkxQTA0M0I1 RTEyNEQ1RTlEMDBGRkJGQjUgLyogUGx1Z2luUHJvY2Vzc1Byb3h5TWVzc2FnZXMuaCBpbiBIZWFk ZXJzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAw OwogCQl9OwpAQCAtMTg4Myw2ICsxODkzLDcgQEAKIAkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0 ODM2NDc7CiAJCQlmaWxlcyA9ICgKIAkJCQk4REMyRUY1MzA0ODZBNjk0MDA5OEIyMTYgLyogSW5m b1BsaXN0LnN0cmluZ3MgaW4gUmVzb3VyY2VzICovLAorCQkJCTFBMDQzQjREMTI0RDVFMzYwMEZG QkZCNSAvKiBQbHVnaW5Qcm9jZXNzUHJveHkubWVzc2FnZXMuaW4gaW4gUmVzb3VyY2VzICovLAog CQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpA QCAtMjA3Nyw2ICsyMDg4LDcgQEAKIAkJCQkxQTA0Mzk3NzEyNEQwMzQ4MDBGRkJGQjUgLyogUGx1 Z2luUHJvY2Vzcy5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkxQTA0M0EwQTEyNEQxMUE5MDBGRkJG QjUgLyogV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQzA2QzYw OTUxMjRDMTQ0QjAwMDE2ODJGIC8qIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwIGluIFNv dXJjZXMgKi8sCisJCQkJMUEwNDNCNUQxMjRENUU5RDAwRkZCRkI1IC8qIFBsdWdpblByb2Nlc3NQ cm94eU1lc3NhZ2VSZWNlaXZlci5jcHAgaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5 Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKZGlmZiAtLWdpdCBhL1dlYktp dDIvV2ViS2l0MlByZWZpeC5oIGIvV2ViS2l0Mi9XZWJLaXQyUHJlZml4LmgKaW5kZXggZjM4Nzc3 YTYzYzI2ZjI5OWZlYzkyZWI4MDQ4N2QwOGM0ZTYxM2ViZi4uNTgxMWZhMzA2MzE0NmYzYzYyOGRi YWExYzcyYjAxM2JiNjkxNWFkOCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJLaXQyUHJlZml4LmgK KysrIGIvV2ViS2l0Mi9XZWJLaXQyUHJlZml4LmgKQEAgLTQzLDYgKzQzLDkgQEAKICNkZWZpbmUg RU5BQkxFX1dFQl9QUk9DRVNTX1NBTkRCT1ggMQogI2VuZGlmCiAKKy8vIEZJWE1FOiBFbmFibGUg b25jZSB0aGlzIHdvcmtzIHdlbGwgZW5vdWdoLgorI2RlZmluZSBFTkFCTEVfUExVR0lOX1BST0NF U1MgMAorCiAjaW1wb3J0IDxDb3JlR3JhcGhpY3MvQ29yZUdyYXBoaWNzLmg+CiAKICNpZmRlZiBf X09CSkNfXwo=