96415 2012-09-11 11:52:45 -0700 Get rid of the PluginProcessShim for 64-bit plug-ins 2012-09-11 16:17:08 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson andersca oldest_to_newest 717447 0 beidson 2012-09-11 11:52:45 -0700 Get rid of the PluginProcessShim for 64-bit plug-ins We don't need it for 64-bit plug-ins and we're paying DYLIB and I/O costs for installing it anyways. In radar as <rdar://problem/12068560> 717451 1 163416 beidson 2012-09-11 11:58:01 -0700 Created attachment 163416 Patch v1 717487 2 163416 buildbot 2012-09-11 13:09:32 -0700 Comment on attachment 163416 Patch v1 Attachment 163416 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13811673 717494 3 163423 beidson 2012-09-11 13:17:03 -0700 Created attachment 163423 Patch v2 - Now with more objc headers 717690 4 beidson 2012-09-11 16:17:08 -0700 http://trac.webkit.org/changeset/128236 163416 2012-09-11 11:58:01 -0700 2012-09-11 13:17:03 -0700 Patch v1 patch.txt text/plain 10970 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjZWFhZjI4Li4yMzM1NmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzUg QEAKIDIwMTItMDktMTEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIEdldCByaWQgb2YgdGhlIFBsdWdpblByb2Nlc3NTaGltIGZvciA2NC1iaXQgcGx1Zy1pbnMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyMDY4NTYwPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuaDoKKyAg ICAgICAgKFBsdWdpblByb2Nlc3MpOgorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9tYWMvUGx1 Z2luUHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktpdDo6Z2V0Q3VycmVudEV2ZW50QnV0dG9u U3RhdGUpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6YmVnaW5Nb2RhbCk6 IE1vdmVkIGZyb20gdGhlIHNoaW0sIHRvIGJlIHNoYXJlZCB3aXRoIHNoaW1tZWQgcHJvY2Vzc2Vz LgorICAgICAgICAoV2ViS2l0OjplbmRNb2RhbCk6IERpdHRvLgorICAgICAgICAoV2ViS2l0Ojpy ZXBsYWNlZFJ1bk1vZGFsRm9yV2luZG93KTogT25seSB1c2VkIGJ5IENvY29hIG92ZXJyaWRlcy4K KyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzczo6aW5pdGlhbGl6ZVNoaW0pOgorICAgICAg ICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzOjppbml0aWFsaXplQ29jb2FPdmVycmlkZXMpOiAKKwor ICAgICAgICAqIFBsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWluTWFjLm1tOgorICAg ICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzTWFpbik6IE9ubHkgY2FsbCBpbml0aWFsaXplU2hp bSBmb3IgMzItYml0IHByb2Nlc3NlcywgYWx3YXlzIGNhbGwgaW5pdGlhbGl6ZUNvY29hT3ZlcnJp ZGVzCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNzU2hpbS5oOgor ICAgICAgICAoUGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MpOgorICAgICAgICAqIFBsdWdpblBy b2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1tOgorICAgICAgICAoV2ViS2l0KToKKyAgICAg ICAgKFdlYktpdDo6c2hpbU1vZGFsRGlhbG9nKTogQ2FsbCBiZWdpbk1vZGFsL2VuZE1vZGFsIGZy b20gdGhlIHNoaW0gY2FsbGJhY2tzLgorICAgICAgICAoV2ViS2l0OjpzaGltQWxlcnQpOiBEaXR0 by4KKyAgICAgICAgKFdlYktpdDo6V2ViS2l0UGx1Z2luUHJvY2Vzc1NoaW1Jbml0aWFsaXplKTog RG9uJ3QgZG8gdGhlIENvY29hIG92ZXJyaWRlcyBhcyB0aGV5IGFyZSBub3cgaGFuZGxlZCBvdXRz aWRlIHRoZSBzaGltLgorCisyMDEyLTA5LTExICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxl LmNvbT4KKwogICAgICAgICBXZSBzaG91bGQgd2FpdCBsb25nZXIgYmVmb3JlIGtpbGxpbmcgdGhl IFBsdWdpblByb2Nlc3MuCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjA2NzcyOD4gYW5kIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjQwNwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuaCBiL1NvdXJjZS9X ZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5oCmluZGV4IDVhZTRkMzUuLmJlMzRl OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vz cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5oCkBA IC01Niw2ICs1Niw3IEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICB2b2lkIGlu aXRpYWxpemVTaGltKCk7CisgICAgdm9pZCBpbml0aWFsaXplQ29jb2FPdmVycmlkZXMoKTsKIAog ICAgIHZvaWQgc2V0TW9kYWxXaW5kb3dJc1Nob3dpbmcoYm9vbCk7CiAgICAgdm9pZCBzZXRGdWxs c2NyZWVuV2luZG93SXNTaG93aW5nKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1Bs dWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWMubW0KaW5kZXggZmFiOTIxZS4uMjVjYWY1 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJv Y2Vzc01hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Q cm9jZXNzTWFjLm1tCkBAIC0xNjAsMTYgKzE2MCw2IEBAIHN0YXRpYyBVSW50MzIgZ2V0Q3VycmVu dEV2ZW50QnV0dG9uU3RhdGUoKQogICAgIHJldHVybiAwOwogI2VuZGlmCiB9Ci0gICAgCi1zdGF0 aWMgdm9pZCBjb2NvYVdpbmRvd1Nob3duKE5TV2luZG93ICp3aW5kb3cpCi17Ci0gICAgZnVsbHNj cmVlbldpbmRvd1RyYWNrZXIoKS53aW5kb3dTaG93bih3aW5kb3cpOwotfQotCi1zdGF0aWMgdm9p ZCBjb2NvYVdpbmRvd0hpZGRlbihOU1dpbmRvdyAqd2luZG93KQotewotICAgIGZ1bGxzY3JlZW5X aW5kb3dUcmFja2VyKCkud2luZG93SGlkZGVuKHdpbmRvdyk7Ci19CiAKIHN0YXRpYyB2b2lkIGNh cmJvbldpbmRvd1Nob3duKFdpbmRvd1JlZiB3aW5kb3cpCiB7CkBAIC0xOTAsMTQgKzE4MCw0NCBA QCBzdGF0aWMgdm9pZCBzZXRNb2RhbChib29sIG1vZGFsV2luZG93SXNTaG93aW5nKQogICAgIFBs dWdpblByb2Nlc3M6OnNoYXJlZCgpLnNldE1vZGFsV2luZG93SXNTaG93aW5nKG1vZGFsV2luZG93 SXNTaG93aW5nKTsKIH0KIAorc3RhdGljIHVuc2lnbmVkIG1vZGFsQ291bnQgPSAwOworCitzdGF0 aWMgdm9pZCBiZWdpbk1vZGFsKCkKK3sKKyAgICAvLyBNYWtlIHN1cmUgdG8gbWFrZSBvdXJzZWx2 ZXMgdGhlIGZyb250IHByb2Nlc3MKKyAgICBQcm9jZXNzU2VyaWFsTnVtYmVyIHBzbjsKKyAgICBH ZXRDdXJyZW50UHJvY2VzcygmcHNuKTsKKyAgICBTZXRGcm9udFByb2Nlc3MoJnBzbik7CisgICAg CisgICAgaWYgKCFtb2RhbENvdW50KyspCisgICAgICAgIHNldE1vZGFsKHRydWUpOworfQorCitz dGF0aWMgdm9pZCBlbmRNb2RhbCgpCit7CisgICAgaWYgKCEtLW1vZGFsQ291bnQpCisgICAgICAg IHNldE1vZGFsKGZhbHNlKTsKK30KKworc3RhdGljIElNUCBOU0FwcGxpY2F0aW9uX1J1bk1vZGFs Rm9yV2luZG93OworCitzdGF0aWMgTlNJbnRlZ2VyIHJlcGxhY2VkUnVuTW9kYWxGb3JXaW5kb3co aWQgc2VsZiwgU0VMIF9jbWQsIE5TV2luZG93KiB3aW5kb3cpCit7CisgICAgYmVnaW5Nb2RhbCgp OworICAgIE5TSW50ZWdlciByZXN1bHQgPSAoKE5TSW50ZWdlciAoKikoaWQsIFNFTCwgTlNXaW5k b3cgKikpTlNBcHBsaWNhdGlvbl9SdW5Nb2RhbEZvcldpbmRvdykoc2VsZiwgX2NtZCwgd2luZG93 KTsKKyAgICBlbmRNb2RhbCgpOworCisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwogdm9pZCBQbHVn aW5Qcm9jZXNzOjppbml0aWFsaXplU2hpbSgpCiB7CiAgICAgY29uc3QgUGx1Z2luUHJvY2Vzc1No aW1DYWxsYmFja3MgY2FsbGJhY2tzID0gewogICAgICAgICBzaG91bGRDYWxsUmVhbERlYnVnZ2Vy LAogICAgICAgICBpc1dpbmRvd0FjdGl2ZSwKICAgICAgICAgZ2V0Q3VycmVudEV2ZW50QnV0dG9u U3RhdGUsCi0gICAgICAgIGNvY29hV2luZG93U2hvd24sCi0gICAgICAgIGNvY29hV2luZG93SGlk ZGVuLAorICAgICAgICBiZWdpbk1vZGFsLAorICAgICAgICBlbmRNb2RhbCwKICAgICAgICAgY2Fy Ym9uV2luZG93U2hvd24sCiAgICAgICAgIGNhcmJvbldpbmRvd0hpZGRlbiwKICAgICAgICAgc2V0 TW9kYWwsCkBAIC0yMDcsNiArMjI3LDMwIEBAIHZvaWQgUGx1Z2luUHJvY2Vzczo6aW5pdGlhbGl6 ZVNoaW0oKQogICAgIGluaXRGdW5jKGNhbGxiYWNrcyk7CiB9CiAKK3ZvaWQgUGx1Z2luUHJvY2Vz czo6aW5pdGlhbGl6ZUNvY29hT3ZlcnJpZGVzKCkKK3sKKyAgICAvLyBPdmVycmlkZSAtW05TQXBw bGljYXRpb24gcnVuTW9kYWxGb3JXaW5kb3c6XQorICAgIE1ldGhvZCBydW5Nb2RhbEZvcldpbmRv d01ldGhvZCA9IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKG9iamNfZ2V0Q2xhc3MoIk5TQXBwbGlj YXRpb24iKSwgQHNlbGVjdG9yKHJ1bk1vZGFsRm9yV2luZG93OikpOworICAgIE5TQXBwbGljYXRp b25fUnVuTW9kYWxGb3JXaW5kb3cgPSBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24ocnVuTW9kYWxG b3JXaW5kb3dNZXRob2QsIHJlaW50ZXJwcmV0X2Nhc3Q8SU1QPihyZXBsYWNlZFJ1bk1vZGFsRm9y V2luZG93KSk7CisKKyAgICBOU05vdGlmaWNhdGlvbkNlbnRlciAqZGVmYXVsdENlbnRlciA9IFtO U05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXTsKKworICAgIC8vIFRyYWNrIHdoZW4g YW55IENvY29hIHdpbmRvdyBpcyBhYm91dCB0byBiZSBiZSBzaG93bi4KKyAgICBpZCBvcmRlck9u U2NyZWVuT2JzZXJ2ZXIgPSBbZGVmYXVsdENlbnRlciBhZGRPYnNlcnZlckZvck5hbWU6V0tXaW5k b3dXaWxsT3JkZXJPblNjcmVlbk5vdGlmaWNhdGlvbigpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0Om5pbAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBxdWV1ZTpu aWwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICpub3RpZmljYXRpb24pIHsgZnVsbHNj cmVlbldpbmRvd1RyYWNrZXIoKS53aW5kb3dTaG93bihbbm90aWZpY2F0aW9uIG9iamVjdF0pOyB9 XTsKKyAgICAvLyBUcmFjayB3aGVuIGFueSBDb2NvYSB3aW5kb3cgaXMgYWJvdXQgdG8gYmUgaGlk ZGVuLgorICAgIGlkIG9yZGVyT2ZmU2NyZWVuT2JzZXJ2ZXIgPSBbZGVmYXVsdENlbnRlciBhZGRP YnNlcnZlckZvck5hbWU6V0tXaW5kb3dXaWxsT3JkZXJPZmZTY3JlZW5Ob3RpZmljYXRpb24oKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBvYmplY3Q6bmlsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBxdWV1ZTpuaWwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1c2luZ0Jsb2NrOl4oTlNOb3RpZmljYXRpb24gKm5v dGlmaWNhdGlvbikgeyBmdWxsc2NyZWVuV2luZG93VHJhY2tlcigpLndpbmRvd0hpZGRlbihbbm90 aWZpY2F0aW9uIG9iamVjdF0pOyB9XTsKKworICAgIC8vIExlYWsgdGhlIHR3byBvYnNlcnZlcnMg c28gdGhhdCB0aGV5IG9ic2VydmUgbm90aWZpY2F0aW9ucyBmb3IgdGhlIGxpZmV0aW1lIG9mIHRo ZSBwcm9jZXNzLgorICAgIENGUmV0YWluKG9yZGVyT25TY3JlZW5PYnNlcnZlcik7CisgICAgQ0ZS ZXRhaW4ob3JkZXJPZmZTY3JlZW5PYnNlcnZlcik7Cit9CisKIHZvaWQgUGx1Z2luUHJvY2Vzczo6 c2V0TW9kYWxXaW5kb3dJc1Nob3dpbmcoYm9vbCBtb2RhbFdpbmRvd0lzU2hvd2luZykKIHsKICAg ICBtX2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OlBsdWdpblByb2Nlc3NQcm94eTo6U2V0TW9k YWxXaW5kb3dJc1Nob3dpbmcobW9kYWxXaW5kb3dJc1Nob3dpbmcpLCAwKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWluTWFjLm1t IGIvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01haW5NYWMu bW0KaW5kZXggNzMyY2ZmOC4uNDViNTZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGx1 Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01haW5NYWMubW0KKysrIGIvU291cmNlL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01haW5NYWMubW0KQEAgLTExNiw4ICsx MTYsMTMgQEAgaW50IFBsdWdpblByb2Nlc3NNYWluKGNvbnN0IENvbW1hbmRMaW5lJiBjb21tYW5k TGluZSkKICAgICBXVEY6OmluaXRpYWxpemVNYWluVGhyZWFkKCk7CiAgICAgUnVuTG9vcDo6aW5p dGlhbGl6ZU1haW5SdW5Mb29wKCk7CiAKLSAgICAvLyBJbml0aWFsaXplIHRoZSBzaGltLgorI2lm IGRlZmluZWQoX19pMzg2X18pCisgICAgLy8gSW5pdGlhbGl6ZSB0aGUgc2hpbSBmb3IgMzItYml0 IG9ubHkuCiAgICAgUGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkuaW5pdGlhbGl6ZVNoaW0oKTsKKyNl bmRpZgorCisgICAgLy8gSW5pdGlhbGl6ZSBDb2NvYSBvdmVycmlkZXMuIAorICAgIFBsdWdpblBy b2Nlc3M6OnNoYXJlZCgpLmluaXRpYWxpemVDb2NvYU92ZXJyaWRlcygpOwogCiAgICAgLy8gSW5p dGlhbGl6ZSB0aGUgcGx1Zy1pbiBwcm9jZXNzIGNvbm5lY3Rpb24uCiAgICAgUGx1Z2luUHJvY2Vz czo6c2hhcmVkKCkuaW5pdGlhbGl6ZShDb3JlSVBDOjpDb25uZWN0aW9uOjpJZGVudGlmaWVyKHNl cnZlclBvcnQpLCBSdW5Mb29wOjptYWluKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc1NoaW0uaCBiL1NvdXJjZS9XZWJLaXQyL1Bs dWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLmgKaW5kZXggYjAyMWEzYS4uYjViNTk3 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJv Y2Vzc1NoaW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Q cm9jZXNzU2hpbS5oCkBAIC0zNiw4ICszNiw4IEBAIHN0cnVjdCBQbHVnaW5Qcm9jZXNzU2hpbUNh bGxiYWNrcyB7CiAgICAgYm9vbCAoKnNob3VsZENhbGxSZWFsRGVidWdnZXIpKCk7CiAgICAgYm9v bCAoKmlzV2luZG93QWN0aXZlKShXaW5kb3dSZWYsIGJvb2wmIHJlc3VsdCk7CiAgICAgVUludDMy ICgqZ2V0Q3VycmVudEV2ZW50QnV0dG9uU3RhdGUpKCk7Ci0gICAgdm9pZCAoKmNvY29hV2luZG93 U2hvd24pKE5TV2luZG93ICopOwotICAgIHZvaWQgKCpjb2NvYVdpbmRvd0hpZGRlbikoTlNXaW5k b3cgKik7CisgICAgdm9pZCAoKmJlZ2luTW9kYWwpKCk7CisgICAgdm9pZCAoKmVuZE1vZGFsKSgp OwogICAgIHZvaWQgKCpjYXJib25XaW5kb3dTaG93bikoV2luZG93UmVmKTsKICAgICB2b2lkICgq Y2FyYm9uV2luZG93SGlkZGVuKShXaW5kb3dSZWYpOwogICAgIHZvaWQgKCpzZXRNb2RhbCkoYm9v bCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Q cm9jZXNzU2hpbS5tbSBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblBy b2Nlc3NTaGltLm1tCmluZGV4IGZjZWI5OWIuLjk4NDc2NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1tCkBAIC00Miwz NSArNDIsNiBAQCBleHRlcm4gIkMiIHZvaWQgV2ViS2l0UGx1Z2luUHJvY2Vzc1NoaW1Jbml0aWFs aXplKGNvbnN0IFBsdWdpblByb2Nlc3NTaGltQ2FsbGJhYwogCiBzdGF0aWMgUGx1Z2luUHJvY2Vz c1NoaW1DYWxsYmFja3MgcGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3M7CiAKLXN0YXRpYyBJTVAg TlNBcHBsaWNhdGlvbl9SdW5Nb2RhbEZvcldpbmRvdzsKLXN0YXRpYyB1bnNpZ25lZCBtb2RhbENv dW50ID0gMDsKLQotc3RhdGljIHZvaWQgYmVnaW5Nb2RhbCgpCi17Ci0gICAgLy8gTWFrZSBzdXJl IHRvIG1ha2Ugb3Vyc2VsdmVzIHRoZSBmcm9udCBwcm9jZXNzCi0gICAgUHJvY2Vzc1NlcmlhbE51 bWJlciBwc247Ci0gICAgR2V0Q3VycmVudFByb2Nlc3MoJnBzbik7Ci0gICAgU2V0RnJvbnRQcm9j ZXNzKCZwc24pOwotICAgIAotICAgIGlmICghbW9kYWxDb3VudCsrKQotICAgICAgICBwbHVnaW5Q cm9jZXNzU2hpbUNhbGxiYWNrcy5zZXRNb2RhbCh0cnVlKTsKLX0KLQotc3RhdGljIHZvaWQgZW5k TW9kYWwoKQotewotICAgIGlmICghLS1tb2RhbENvdW50KQotICAgICAgICBwbHVnaW5Qcm9jZXNz U2hpbUNhbGxiYWNrcy5zZXRNb2RhbChmYWxzZSk7Ci19ICAgIAotCi1zdGF0aWMgTlNJbnRlZ2Vy IHNoaW1fTlNBcHBsaWNhdGlvbl9SdW5Nb2RhbEZvcldpbmRvdyhpZCBzZWxmLCBTRUwgX2NtZCwg TlNXaW5kb3cqIHdpbmRvdykKLXsKLSAgICBiZWdpbk1vZGFsKCk7Ci0gICAgTlNJbnRlZ2VyIHJl c3VsdCA9ICgoTlNJbnRlZ2VyICgqKShpZCwgU0VMLCBOU1dpbmRvdyAqKSlOU0FwcGxpY2F0aW9u X1J1bk1vZGFsRm9yV2luZG93KShzZWxmLCBfY21kLCB3aW5kb3cpOwotICAgIGVuZE1vZGFsKCk7 Ci0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCiAjaWZuZGVmIF9fTFA2NF9fCiAKICNpZiBDT01Q SUxFUihDTEFORykKQEAgLTEwMiwxNiArNzMsMTYgQEAgc3RhdGljIEJvb2xlYW4gc2hpbUlzV2lu ZG93QWN0aXZlKFdpbmRvd1JlZiB3aW5kb3cpCiAKIHN0YXRpYyB2b2lkIHNoaW1Nb2RhbERpYWxv ZyhNb2RhbEZpbHRlclVQUCBtb2RhbEZpbHRlciwgRGlhbG9nSXRlbUluZGV4ICppdGVtSGl0KQog ewotICAgIGJlZ2luTW9kYWwoKTsKKyAgICBwbHVnaW5Qcm9jZXNzU2hpbUNhbGxiYWNrcy5iZWdp bk1vZGFsKCk7CiAgICAgTW9kYWxEaWFsb2cobW9kYWxGaWx0ZXIsIGl0ZW1IaXQpOwotICAgIGVu ZE1vZGFsKCk7CisgICAgcGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MuZW5kTW9kYWwoKTsKIH0K IAogc3RhdGljIERpYWxvZ0l0ZW1JbmRleCBzaGltQWxlcnQoU0ludDE2IGFsZXJ0SUQsIE1vZGFs RmlsdGVyVVBQIG1vZGFsRmlsdGVyKQogewotICAgIGJlZ2luTW9kYWwoKTsKKyAgICBwbHVnaW5Q cm9jZXNzU2hpbUNhbGxiYWNrcy5iZWdpbk1vZGFsKCk7CiAgICAgRGlhbG9nSXRlbUluZGV4IGlu ZGV4ID0gQWxlcnQoYWxlcnRJRCwgbW9kYWxGaWx0ZXIpOwotICAgIGVuZE1vZGFsKCk7CisgICAg cGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MuZW5kTW9kYWwoKTsKICAgICAKICAgICByZXR1cm4g aW5kZXg7CiB9CkBAIC0xNDYsMjcgKzExNyw2IEBAIF9fYXR0cmlidXRlX18oKHZpc2liaWxpdHko ImRlZmF1bHQiKSkpCiB2b2lkIFdlYktpdFBsdWdpblByb2Nlc3NTaGltSW5pdGlhbGl6ZShjb25z dCBQbHVnaW5Qcm9jZXNzU2hpbUNhbGxiYWNrcyYgY2FsbGJhY2tzKQogewogICAgIHBsdWdpblBy b2Nlc3NTaGltQ2FsbGJhY2tzID0gY2FsbGJhY2tzOwotCi0gICAgLy8gT3ZlcnJpZGUgLVtOU0Fw cGxpY2F0aW9uIHJ1bk1vZGFsRm9yV2luZG93Ol0KLSAgICBNZXRob2QgcnVuTW9kYWxGb3JXaW5k b3dNZXRob2QgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChvYmpjX2dldENsYXNzKCJOU0FwcGxp Y2F0aW9uIiksIEBzZWxlY3RvcihydW5Nb2RhbEZvcldpbmRvdzopKTsKLSAgICBOU0FwcGxpY2F0 aW9uX1J1bk1vZGFsRm9yV2luZG93ID0gbWV0aG9kX3NldEltcGxlbWVudGF0aW9uKHJ1bk1vZGFs Rm9yV2luZG93TWV0aG9kLCByZWludGVycHJldF9jYXN0PElNUD4oc2hpbV9OU0FwcGxpY2F0aW9u X1J1bk1vZGFsRm9yV2luZG93KSk7Ci0KLSAgICBOU05vdGlmaWNhdGlvbkNlbnRlciAqZGVmYXVs dENlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXTsKLQotICAgIC8v IFRyYWNrIHdoZW4gYW55IENvY29hIHdpbmRvdyBpcyBhYm91dCB0byBiZSBiZSBzaG93bi4KLSAg ICBpZCBvcmRlck9uU2NyZWVuT2JzZXJ2ZXIgPSBbZGVmYXVsdENlbnRlciBhZGRPYnNlcnZlckZv ck5hbWU6V0tXaW5kb3dXaWxsT3JkZXJPblNjcmVlbk5vdGlmaWNhdGlvbigpCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0Om5p bAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBxdWV1ZTpuaWwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICpub3RpZmljYXRp b24pIHsgcGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MuY29jb2FXaW5kb3dTaG93bihbbm90aWZp Y2F0aW9uIG9iamVjdF0pOyB9XTsKLSAgICAvLyBUcmFjayB3aGVuIGFueSBjb2NvYSB3aW5kb3cg aXMgYWJvdXQgdG8gYmUgaGlkZGVuLgotICAgIGlkIG9yZGVyT2ZmU2NyZWVuT2JzZXJ2ZXIgPSBb ZGVmYXVsdENlbnRlciBhZGRPYnNlcnZlckZvck5hbWU6V0tXaW5kb3dXaWxsT3JkZXJPZmZTY3Jl ZW5Ob3RpZmljYXRpb24oKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBvYmplY3Q6bmlsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBxdWV1ZTpuaWwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1c2luZ0Jsb2NrOl4o TlNOb3RpZmljYXRpb24gKm5vdGlmaWNhdGlvbikgeyBwbHVnaW5Qcm9jZXNzU2hpbUNhbGxiYWNr cy5jb2NvYVdpbmRvd0hpZGRlbihbbm90aWZpY2F0aW9uIG9iamVjdF0pOyB9XTsKLQotICAgIC8v IExlYWsgdGhlIHR3byBvYnNlcnZlcnMgc28gdGhhdCB0aGV5IG9ic2VydmUgbm90aWZpY2F0aW9u cyBmb3IgdGhlIGxpZmV0aW1lIG9mIHRoZSBwcm9jZXNzLgotICAgIENGUmV0YWluKG9yZGVyT25T Y3JlZW5PYnNlcnZlcik7Ci0gICAgQ0ZSZXRhaW4ob3JkZXJPZmZTY3JlZW5PYnNlcnZlcik7CiB9 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 163423 2012-09-11 13:17:03 -0700 2012-09-11 13:17:45 -0700 Patch v2 - Now with more objc headers patch.txt text/plain 11153 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjZWFhZjI4Li4yMzM1NmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzUg QEAKIDIwMTItMDktMTEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIEdldCByaWQgb2YgdGhlIFBsdWdpblByb2Nlc3NTaGltIGZvciA2NC1iaXQgcGx1Zy1pbnMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEyMDY4NTYwPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuaDoKKyAg ICAgICAgKFBsdWdpblByb2Nlc3MpOgorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9tYWMvUGx1 Z2luUHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktpdDo6Z2V0Q3VycmVudEV2ZW50QnV0dG9u U3RhdGUpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6YmVnaW5Nb2RhbCk6 IE1vdmVkIGZyb20gdGhlIHNoaW0sIHRvIGJlIHNoYXJlZCB3aXRoIHNoaW1tZWQgcHJvY2Vzc2Vz LgorICAgICAgICAoV2ViS2l0OjplbmRNb2RhbCk6IERpdHRvLgorICAgICAgICAoV2ViS2l0Ojpy ZXBsYWNlZFJ1bk1vZGFsRm9yV2luZG93KTogT25seSB1c2VkIGJ5IENvY29hIG92ZXJyaWRlcy4K KyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzczo6aW5pdGlhbGl6ZVNoaW0pOgorICAgICAg ICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzOjppbml0aWFsaXplQ29jb2FPdmVycmlkZXMpOiAKKwor ICAgICAgICAqIFBsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWluTWFjLm1tOgorICAg ICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzTWFpbik6IE9ubHkgY2FsbCBpbml0aWFsaXplU2hp bSBmb3IgMzItYml0IHByb2Nlc3NlcywgYWx3YXlzIGNhbGwgaW5pdGlhbGl6ZUNvY29hT3ZlcnJp ZGVzCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNzU2hpbS5oOgor ICAgICAgICAoUGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MpOgorICAgICAgICAqIFBsdWdpblBy b2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1tOgorICAgICAgICAoV2ViS2l0KToKKyAgICAg ICAgKFdlYktpdDo6c2hpbU1vZGFsRGlhbG9nKTogQ2FsbCBiZWdpbk1vZGFsL2VuZE1vZGFsIGZy b20gdGhlIHNoaW0gY2FsbGJhY2tzLgorICAgICAgICAoV2ViS2l0OjpzaGltQWxlcnQpOiBEaXR0 by4KKyAgICAgICAgKFdlYktpdDo6V2ViS2l0UGx1Z2luUHJvY2Vzc1NoaW1Jbml0aWFsaXplKTog RG9uJ3QgZG8gdGhlIENvY29hIG92ZXJyaWRlcyBhcyB0aGV5IGFyZSBub3cgaGFuZGxlZCBvdXRz aWRlIHRoZSBzaGltLgorCisyMDEyLTA5LTExICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxl LmNvbT4KKwogICAgICAgICBXZSBzaG91bGQgd2FpdCBsb25nZXIgYmVmb3JlIGtpbGxpbmcgdGhl IFBsdWdpblByb2Nlc3MuCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMjA2NzcyOD4gYW5kIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjQwNwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuaCBiL1NvdXJjZS9X ZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5oCmluZGV4IDVhZTRkMzUuLmJlMzRl OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vz cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5oCkBA IC01Niw2ICs1Niw3IEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICB2b2lkIGlu aXRpYWxpemVTaGltKCk7CisgICAgdm9pZCBpbml0aWFsaXplQ29jb2FPdmVycmlkZXMoKTsKIAog ICAgIHZvaWQgc2V0TW9kYWxXaW5kb3dJc1Nob3dpbmcoYm9vbCk7CiAgICAgdm9pZCBzZXRGdWxs c2NyZWVuV2luZG93SXNTaG93aW5nKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1Bs dWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWMubW0KaW5kZXggZmFiOTIxZS4uZjRlODM0 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJv Y2Vzc01hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Q cm9jZXNzTWFjLm1tCkBAIC0zNiw2ICszNiw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL0xvY2FsaXpl ZFN0cmluZ3MuaD4KICNpbXBvcnQgPFdlYktpdFN5c3RlbUludGVyZmFjZS5oPgogI2ltcG9ydCA8 ZGxmY24uaD4KKyNpbXBvcnQgPG9iamMvcnVudGltZS5oPgogI2ltcG9ydCA8d3RmL0hhc2hTZXQu aD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC0xNjAsMTYgKzE2MSw2IEBAIHN0YXRpYyBVSW50 MzIgZ2V0Q3VycmVudEV2ZW50QnV0dG9uU3RhdGUoKQogICAgIHJldHVybiAwOwogI2VuZGlmCiB9 Ci0gICAgCi1zdGF0aWMgdm9pZCBjb2NvYVdpbmRvd1Nob3duKE5TV2luZG93ICp3aW5kb3cpCi17 Ci0gICAgZnVsbHNjcmVlbldpbmRvd1RyYWNrZXIoKS53aW5kb3dTaG93bih3aW5kb3cpOwotfQot Ci1zdGF0aWMgdm9pZCBjb2NvYVdpbmRvd0hpZGRlbihOU1dpbmRvdyAqd2luZG93KQotewotICAg IGZ1bGxzY3JlZW5XaW5kb3dUcmFja2VyKCkud2luZG93SGlkZGVuKHdpbmRvdyk7Ci19CiAKIHN0 YXRpYyB2b2lkIGNhcmJvbldpbmRvd1Nob3duKFdpbmRvd1JlZiB3aW5kb3cpCiB7CkBAIC0xOTAs MTQgKzE4MSw0NCBAQCBzdGF0aWMgdm9pZCBzZXRNb2RhbChib29sIG1vZGFsV2luZG93SXNTaG93 aW5nKQogICAgIFBsdWdpblByb2Nlc3M6OnNoYXJlZCgpLnNldE1vZGFsV2luZG93SXNTaG93aW5n KG1vZGFsV2luZG93SXNTaG93aW5nKTsKIH0KIAorc3RhdGljIHVuc2lnbmVkIG1vZGFsQ291bnQg PSAwOworCitzdGF0aWMgdm9pZCBiZWdpbk1vZGFsKCkKK3sKKyAgICAvLyBNYWtlIHN1cmUgdG8g bWFrZSBvdXJzZWx2ZXMgdGhlIGZyb250IHByb2Nlc3MKKyAgICBQcm9jZXNzU2VyaWFsTnVtYmVy IHBzbjsKKyAgICBHZXRDdXJyZW50UHJvY2VzcygmcHNuKTsKKyAgICBTZXRGcm9udFByb2Nlc3Mo JnBzbik7CisgICAgCisgICAgaWYgKCFtb2RhbENvdW50KyspCisgICAgICAgIHNldE1vZGFsKHRy dWUpOworfQorCitzdGF0aWMgdm9pZCBlbmRNb2RhbCgpCit7CisgICAgaWYgKCEtLW1vZGFsQ291 bnQpCisgICAgICAgIHNldE1vZGFsKGZhbHNlKTsKK30KKworc3RhdGljIElNUCBOU0FwcGxpY2F0 aW9uX1J1bk1vZGFsRm9yV2luZG93OworCitzdGF0aWMgTlNJbnRlZ2VyIHJlcGxhY2VkUnVuTW9k YWxGb3JXaW5kb3coaWQgc2VsZiwgU0VMIF9jbWQsIE5TV2luZG93KiB3aW5kb3cpCit7CisgICAg YmVnaW5Nb2RhbCgpOworICAgIE5TSW50ZWdlciByZXN1bHQgPSAoKE5TSW50ZWdlciAoKikoaWQs IFNFTCwgTlNXaW5kb3cgKikpTlNBcHBsaWNhdGlvbl9SdW5Nb2RhbEZvcldpbmRvdykoc2VsZiwg X2NtZCwgd2luZG93KTsKKyAgICBlbmRNb2RhbCgpOworCisgICAgcmV0dXJuIHJlc3VsdDsKK30K Kwogdm9pZCBQbHVnaW5Qcm9jZXNzOjppbml0aWFsaXplU2hpbSgpCiB7CiAgICAgY29uc3QgUGx1 Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MgY2FsbGJhY2tzID0gewogICAgICAgICBzaG91bGRDYWxs UmVhbERlYnVnZ2VyLAogICAgICAgICBpc1dpbmRvd0FjdGl2ZSwKICAgICAgICAgZ2V0Q3VycmVu dEV2ZW50QnV0dG9uU3RhdGUsCi0gICAgICAgIGNvY29hV2luZG93U2hvd24sCi0gICAgICAgIGNv Y29hV2luZG93SGlkZGVuLAorICAgICAgICBiZWdpbk1vZGFsLAorICAgICAgICBlbmRNb2RhbCwK ICAgICAgICAgY2FyYm9uV2luZG93U2hvd24sCiAgICAgICAgIGNhcmJvbldpbmRvd0hpZGRlbiwK ICAgICAgICAgc2V0TW9kYWwsCkBAIC0yMDcsNiArMjI4LDMwIEBAIHZvaWQgUGx1Z2luUHJvY2Vz czo6aW5pdGlhbGl6ZVNoaW0oKQogICAgIGluaXRGdW5jKGNhbGxiYWNrcyk7CiB9CiAKK3ZvaWQg UGx1Z2luUHJvY2Vzczo6aW5pdGlhbGl6ZUNvY29hT3ZlcnJpZGVzKCkKK3sKKyAgICAvLyBPdmVy cmlkZSAtW05TQXBwbGljYXRpb24gcnVuTW9kYWxGb3JXaW5kb3c6XQorICAgIE1ldGhvZCBydW5N b2RhbEZvcldpbmRvd01ldGhvZCA9IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKG9iamNfZ2V0Q2xh c3MoIk5TQXBwbGljYXRpb24iKSwgQHNlbGVjdG9yKHJ1bk1vZGFsRm9yV2luZG93OikpOworICAg IE5TQXBwbGljYXRpb25fUnVuTW9kYWxGb3JXaW5kb3cgPSBtZXRob2Rfc2V0SW1wbGVtZW50YXRp b24ocnVuTW9kYWxGb3JXaW5kb3dNZXRob2QsIHJlaW50ZXJwcmV0X2Nhc3Q8SU1QPihyZXBsYWNl ZFJ1bk1vZGFsRm9yV2luZG93KSk7CisKKyAgICBOU05vdGlmaWNhdGlvbkNlbnRlciAqZGVmYXVs dENlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXTsKKworICAgIC8v IFRyYWNrIHdoZW4gYW55IENvY29hIHdpbmRvdyBpcyBhYm91dCB0byBiZSBiZSBzaG93bi4KKyAg ICBpZCBvcmRlck9uU2NyZWVuT2JzZXJ2ZXIgPSBbZGVmYXVsdENlbnRlciBhZGRPYnNlcnZlckZv ck5hbWU6V0tXaW5kb3dXaWxsT3JkZXJPblNjcmVlbk5vdGlmaWNhdGlvbigpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0Om5p bAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBxdWV1ZTpuaWwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICpub3RpZmljYXRp b24pIHsgZnVsbHNjcmVlbldpbmRvd1RyYWNrZXIoKS53aW5kb3dTaG93bihbbm90aWZpY2F0aW9u IG9iamVjdF0pOyB9XTsKKyAgICAvLyBUcmFjayB3aGVuIGFueSBDb2NvYSB3aW5kb3cgaXMgYWJv dXQgdG8gYmUgaGlkZGVuLgorICAgIGlkIG9yZGVyT2ZmU2NyZWVuT2JzZXJ2ZXIgPSBbZGVmYXVs dENlbnRlciBhZGRPYnNlcnZlckZvck5hbWU6V0tXaW5kb3dXaWxsT3JkZXJPZmZTY3JlZW5Ob3Rp ZmljYXRpb24oKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBvYmplY3Q6bmlsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBxdWV1ZTpuaWwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1c2luZ0Jsb2NrOl4oTlNOb3Rp ZmljYXRpb24gKm5vdGlmaWNhdGlvbikgeyBmdWxsc2NyZWVuV2luZG93VHJhY2tlcigpLndpbmRv d0hpZGRlbihbbm90aWZpY2F0aW9uIG9iamVjdF0pOyB9XTsKKworICAgIC8vIExlYWsgdGhlIHR3 byBvYnNlcnZlcnMgc28gdGhhdCB0aGV5IG9ic2VydmUgbm90aWZpY2F0aW9ucyBmb3IgdGhlIGxp ZmV0aW1lIG9mIHRoZSBwcm9jZXNzLgorICAgIENGUmV0YWluKG9yZGVyT25TY3JlZW5PYnNlcnZl cik7CisgICAgQ0ZSZXRhaW4ob3JkZXJPZmZTY3JlZW5PYnNlcnZlcik7Cit9CisKIHZvaWQgUGx1 Z2luUHJvY2Vzczo6c2V0TW9kYWxXaW5kb3dJc1Nob3dpbmcoYm9vbCBtb2RhbFdpbmRvd0lzU2hv d2luZykKIHsKICAgICBtX2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OlBsdWdpblByb2Nlc3NQ cm94eTo6U2V0TW9kYWxXaW5kb3dJc1Nob3dpbmcobW9kYWxXaW5kb3dJc1Nob3dpbmcpLCAwKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nl c3NNYWluTWFjLm1tIGIvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJv Y2Vzc01haW5NYWMubW0KaW5kZXggNzMyY2ZmOC4uNDViNTZiOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01haW5NYWMubW0KKysrIGIv U291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01haW5NYWMubW0K QEAgLTExNiw4ICsxMTYsMTMgQEAgaW50IFBsdWdpblByb2Nlc3NNYWluKGNvbnN0IENvbW1hbmRM aW5lJiBjb21tYW5kTGluZSkKICAgICBXVEY6OmluaXRpYWxpemVNYWluVGhyZWFkKCk7CiAgICAg UnVuTG9vcDo6aW5pdGlhbGl6ZU1haW5SdW5Mb29wKCk7CiAKLSAgICAvLyBJbml0aWFsaXplIHRo ZSBzaGltLgorI2lmIGRlZmluZWQoX19pMzg2X18pCisgICAgLy8gSW5pdGlhbGl6ZSB0aGUgc2hp bSBmb3IgMzItYml0IG9ubHkuCiAgICAgUGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkuaW5pdGlhbGl6 ZVNoaW0oKTsKKyNlbmRpZgorCisgICAgLy8gSW5pdGlhbGl6ZSBDb2NvYSBvdmVycmlkZXMuIAor ICAgIFBsdWdpblByb2Nlc3M6OnNoYXJlZCgpLmluaXRpYWxpemVDb2NvYU92ZXJyaWRlcygpOwog CiAgICAgLy8gSW5pdGlhbGl6ZSB0aGUgcGx1Zy1pbiBwcm9jZXNzIGNvbm5lY3Rpb24uCiAgICAg UGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkuaW5pdGlhbGl6ZShDb3JlSVBDOjpDb25uZWN0aW9uOjpJ ZGVudGlmaWVyKHNlcnZlclBvcnQpLCBSdW5Mb29wOjptYWluKCkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc1NoaW0uaCBiL1NvdXJj ZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLmgKaW5kZXggYjAy MWEzYS4uYjViNTk3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9t YWMvUGx1Z2luUHJvY2Vzc1NoaW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNz L21hYy9QbHVnaW5Qcm9jZXNzU2hpbS5oCkBAIC0zNiw4ICszNiw4IEBAIHN0cnVjdCBQbHVnaW5Q cm9jZXNzU2hpbUNhbGxiYWNrcyB7CiAgICAgYm9vbCAoKnNob3VsZENhbGxSZWFsRGVidWdnZXIp KCk7CiAgICAgYm9vbCAoKmlzV2luZG93QWN0aXZlKShXaW5kb3dSZWYsIGJvb2wmIHJlc3VsdCk7 CiAgICAgVUludDMyICgqZ2V0Q3VycmVudEV2ZW50QnV0dG9uU3RhdGUpKCk7Ci0gICAgdm9pZCAo KmNvY29hV2luZG93U2hvd24pKE5TV2luZG93ICopOwotICAgIHZvaWQgKCpjb2NvYVdpbmRvd0hp ZGRlbikoTlNXaW5kb3cgKik7CisgICAgdm9pZCAoKmJlZ2luTW9kYWwpKCk7CisgICAgdm9pZCAo KmVuZE1vZGFsKSgpOwogICAgIHZvaWQgKCpjYXJib25XaW5kb3dTaG93bikoV2luZG93UmVmKTsK ICAgICB2b2lkICgqY2FyYm9uV2luZG93SGlkZGVuKShXaW5kb3dSZWYpOwogICAgIHZvaWQgKCpz ZXRNb2RhbCkoYm9vbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNz L21hYy9QbHVnaW5Qcm9jZXNzU2hpbS5tbSBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3Mv bWFjL1BsdWdpblByb2Nlc3NTaGltLm1tCmluZGV4IGZjZWI5OWIuLjk4NDc2NTMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGltLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NTaGlt Lm1tCkBAIC00MiwzNSArNDIsNiBAQCBleHRlcm4gIkMiIHZvaWQgV2ViS2l0UGx1Z2luUHJvY2Vz c1NoaW1Jbml0aWFsaXplKGNvbnN0IFBsdWdpblByb2Nlc3NTaGltQ2FsbGJhYwogCiBzdGF0aWMg UGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MgcGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3M7CiAK LXN0YXRpYyBJTVAgTlNBcHBsaWNhdGlvbl9SdW5Nb2RhbEZvcldpbmRvdzsKLXN0YXRpYyB1bnNp Z25lZCBtb2RhbENvdW50ID0gMDsKLQotc3RhdGljIHZvaWQgYmVnaW5Nb2RhbCgpCi17Ci0gICAg Ly8gTWFrZSBzdXJlIHRvIG1ha2Ugb3Vyc2VsdmVzIHRoZSBmcm9udCBwcm9jZXNzCi0gICAgUHJv Y2Vzc1NlcmlhbE51bWJlciBwc247Ci0gICAgR2V0Q3VycmVudFByb2Nlc3MoJnBzbik7Ci0gICAg U2V0RnJvbnRQcm9jZXNzKCZwc24pOwotICAgIAotICAgIGlmICghbW9kYWxDb3VudCsrKQotICAg ICAgICBwbHVnaW5Qcm9jZXNzU2hpbUNhbGxiYWNrcy5zZXRNb2RhbCh0cnVlKTsKLX0KLQotc3Rh dGljIHZvaWQgZW5kTW9kYWwoKQotewotICAgIGlmICghLS1tb2RhbENvdW50KQotICAgICAgICBw bHVnaW5Qcm9jZXNzU2hpbUNhbGxiYWNrcy5zZXRNb2RhbChmYWxzZSk7Ci19ICAgIAotCi1zdGF0 aWMgTlNJbnRlZ2VyIHNoaW1fTlNBcHBsaWNhdGlvbl9SdW5Nb2RhbEZvcldpbmRvdyhpZCBzZWxm LCBTRUwgX2NtZCwgTlNXaW5kb3cqIHdpbmRvdykKLXsKLSAgICBiZWdpbk1vZGFsKCk7Ci0gICAg TlNJbnRlZ2VyIHJlc3VsdCA9ICgoTlNJbnRlZ2VyICgqKShpZCwgU0VMLCBOU1dpbmRvdyAqKSlO U0FwcGxpY2F0aW9uX1J1bk1vZGFsRm9yV2luZG93KShzZWxmLCBfY21kLCB3aW5kb3cpOwotICAg IGVuZE1vZGFsKCk7Ci0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCiAjaWZuZGVmIF9fTFA2NF9f CiAKICNpZiBDT01QSUxFUihDTEFORykKQEAgLTEwMiwxNiArNzMsMTYgQEAgc3RhdGljIEJvb2xl YW4gc2hpbUlzV2luZG93QWN0aXZlKFdpbmRvd1JlZiB3aW5kb3cpCiAKIHN0YXRpYyB2b2lkIHNo aW1Nb2RhbERpYWxvZyhNb2RhbEZpbHRlclVQUCBtb2RhbEZpbHRlciwgRGlhbG9nSXRlbUluZGV4 ICppdGVtSGl0KQogewotICAgIGJlZ2luTW9kYWwoKTsKKyAgICBwbHVnaW5Qcm9jZXNzU2hpbUNh bGxiYWNrcy5iZWdpbk1vZGFsKCk7CiAgICAgTW9kYWxEaWFsb2cobW9kYWxGaWx0ZXIsIGl0ZW1I aXQpOwotICAgIGVuZE1vZGFsKCk7CisgICAgcGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MuZW5k TW9kYWwoKTsKIH0KIAogc3RhdGljIERpYWxvZ0l0ZW1JbmRleCBzaGltQWxlcnQoU0ludDE2IGFs ZXJ0SUQsIE1vZGFsRmlsdGVyVVBQIG1vZGFsRmlsdGVyKQogewotICAgIGJlZ2luTW9kYWwoKTsK KyAgICBwbHVnaW5Qcm9jZXNzU2hpbUNhbGxiYWNrcy5iZWdpbk1vZGFsKCk7CiAgICAgRGlhbG9n SXRlbUluZGV4IGluZGV4ID0gQWxlcnQoYWxlcnRJRCwgbW9kYWxGaWx0ZXIpOwotICAgIGVuZE1v ZGFsKCk7CisgICAgcGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MuZW5kTW9kYWwoKTsKICAgICAK ICAgICByZXR1cm4gaW5kZXg7CiB9CkBAIC0xNDYsMjcgKzExNyw2IEBAIF9fYXR0cmlidXRlX18o KHZpc2liaWxpdHkoImRlZmF1bHQiKSkpCiB2b2lkIFdlYktpdFBsdWdpblByb2Nlc3NTaGltSW5p dGlhbGl6ZShjb25zdCBQbHVnaW5Qcm9jZXNzU2hpbUNhbGxiYWNrcyYgY2FsbGJhY2tzKQogewog ICAgIHBsdWdpblByb2Nlc3NTaGltQ2FsbGJhY2tzID0gY2FsbGJhY2tzOwotCi0gICAgLy8gT3Zl cnJpZGUgLVtOU0FwcGxpY2F0aW9uIHJ1bk1vZGFsRm9yV2luZG93Ol0KLSAgICBNZXRob2QgcnVu TW9kYWxGb3JXaW5kb3dNZXRob2QgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChvYmpjX2dldENs YXNzKCJOU0FwcGxpY2F0aW9uIiksIEBzZWxlY3RvcihydW5Nb2RhbEZvcldpbmRvdzopKTsKLSAg ICBOU0FwcGxpY2F0aW9uX1J1bk1vZGFsRm9yV2luZG93ID0gbWV0aG9kX3NldEltcGxlbWVudGF0 aW9uKHJ1bk1vZGFsRm9yV2luZG93TWV0aG9kLCByZWludGVycHJldF9jYXN0PElNUD4oc2hpbV9O U0FwcGxpY2F0aW9uX1J1bk1vZGFsRm9yV2luZG93KSk7Ci0KLSAgICBOU05vdGlmaWNhdGlvbkNl bnRlciAqZGVmYXVsdENlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVy XTsKLQotICAgIC8vIFRyYWNrIHdoZW4gYW55IENvY29hIHdpbmRvdyBpcyBhYm91dCB0byBiZSBi ZSBzaG93bi4KLSAgICBpZCBvcmRlck9uU2NyZWVuT2JzZXJ2ZXIgPSBbZGVmYXVsdENlbnRlciBh ZGRPYnNlcnZlckZvck5hbWU6V0tXaW5kb3dXaWxsT3JkZXJPblNjcmVlbk5vdGlmaWNhdGlvbigp Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgb2JqZWN0Om5pbAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBxdWV1ZTpuaWwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9u ICpub3RpZmljYXRpb24pIHsgcGx1Z2luUHJvY2Vzc1NoaW1DYWxsYmFja3MuY29jb2FXaW5kb3dT aG93bihbbm90aWZpY2F0aW9uIG9iamVjdF0pOyB9XTsKLSAgICAvLyBUcmFjayB3aGVuIGFueSBj b2NvYSB3aW5kb3cgaXMgYWJvdXQgdG8gYmUgaGlkZGVuLgotICAgIGlkIG9yZGVyT2ZmU2NyZWVu T2JzZXJ2ZXIgPSBbZGVmYXVsdENlbnRlciBhZGRPYnNlcnZlckZvck5hbWU6V0tXaW5kb3dXaWxs T3JkZXJPZmZTY3JlZW5Ob3RpZmljYXRpb24oKQotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvYmplY3Q6bmlsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBxdWV1ZTpuaWwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1 c2luZ0Jsb2NrOl4oTlNOb3RpZmljYXRpb24gKm5vdGlmaWNhdGlvbikgeyBwbHVnaW5Qcm9jZXNz U2hpbUNhbGxiYWNrcy5jb2NvYVdpbmRvd0hpZGRlbihbbm90aWZpY2F0aW9uIG9iamVjdF0pOyB9 XTsKLQotICAgIC8vIExlYWsgdGhlIHR3byBvYnNlcnZlcnMgc28gdGhhdCB0aGV5IG9ic2VydmUg bm90aWZpY2F0aW9ucyBmb3IgdGhlIGxpZmV0aW1lIG9mIHRoZSBwcm9jZXNzLgotICAgIENGUmV0 YWluKG9yZGVyT25TY3JlZW5PYnNlcnZlcik7Ci0gICAgQ0ZSZXRhaW4ob3JkZXJPZmZTY3JlZW5P YnNlcnZlcik7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=