37421 2010-04-11 16:29:10 -0700 [Haiku] Fix PasteboardHaiku and flesh out implementation 2010-04-13 10:46:57 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 superstippi webkit-unassigned commit-queue oldest_to_newest 211451 0 superstippi 2010-04-11 16:29:10 -0700 Patch improves the following: * Use the system clipboard instead of a private one to interact with other apps. * Implement more methods. * Use the proper messaging protocol (Add/FindData() with B_MIME_TYPE). * Don't leak the global Pasteboard instance. 211452 1 53117 superstippi 2010-04-11 16:30:03 -0700 Created attachment 53117 [Haiku] Patch for PasteboardHaiku.cpp 211935 2 53245 superstippi 2010-04-13 07:12:38 -0700 Created attachment 53245 [Haiku] Patch for PasteboardHaiku.cpp Sorry, the original patch was still lacking the correct bug number. Nothing else changed. 212003 3 53245 commit-queue 2010-04-13 10:46:53 -0700 Comment on attachment 53245 [Haiku] Patch for PasteboardHaiku.cpp Clearing flags on attachment: 53245 Committed r57522: <http://trac.webkit.org/changeset/57522> 212004 4 commit-queue 2010-04-13 10:46:57 -0700 All reviewed patches have been landed. Closing bug. 53117 2010-04-11 16:30:03 -0700 2010-04-13 07:12:38 -0700 [Haiku] Patch for PasteboardHaiku.cpp PasteboardHaiku.diff text/plain 9004 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQ1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzYgQEAKKzIwMTAtMDQtMTEgIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtIYWlrdV0gVXNlIHRoZSBzeXN0ZW0gY2xpcGJvYXJkIGluc3RlYWQgb2YgYSBwcml2YXRlIGNs aXBib2FyZC4KKyAgICAgICAgICAgICAgICBGaXggdmFyaW91cyBwcm9ibGVtcyBpbiB0aGUgcHJl dmlvdXMgaW1wbGVtZW50YXRpb24uCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPVhYWFgKKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisg ICAgICAgICogcGxhdGZvcm0vaGFpa3UvUGFzdGVib2FyZEhhaWt1LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBhc3RlYm9hcmQ6On5QYXN0ZWJvYXJkKToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3Rl Ym9hcmQ6OmdlbmVyYWxQYXN0ZWJvYXJkKToKKyAgICAgICAgICAgIC0gRG9uJ3QgbGVhayB0aGUg cGFzdGVib2FyZCBhdCBwcm9ncmFtIGV4aXQuCisgICAgICAgIChXZWJDb3JlOjpBdXRvQ2xpcGJv YXJkTG9ja2VyOjpBdXRvQ2xpcGJvYXJkTG9ja2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkF1dG9D bGlwYm9hcmRMb2NrZXI6On5BdXRvQ2xpcGJvYXJkTG9ja2VyKToKKyAgICAgICAgKFdlYkNvcmU6 OkF1dG9DbGlwYm9hcmRMb2NrZXI6OmlzTG9ja2VkKToKKyAgICAgICAgICAgIC0gaGVscGVyIGNs YXNzIGZvciBsb2NraW5nIGEgQkNsaXBib2FyZC4KKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9h cmQ6OndyaXRlU2VsZWN0aW9uKToKKyAgICAgICAgICAgIC0gVXNlIEFkZERhdGEoQl9NSU1FX1RZ UEUpIGFzIHJlcXVpcmVkIGJ5IGNsaXBib2FyZCBwcm90b2NvbC4KKyAgICAgICAgICAgIC0gTWFr ZSBzdXJlIHdlIGRvbid0IGVuZCB1cCB3aXRoIHVud2FudGVkIFVURi04IGNoYXJhY3RlcnMgZm9y CisgICAgICAgICAgICAgIHJlZ3VsYXIgbGluZSBicmVha3MuCisgICAgICAgIChXZWJDb3JlOjpQ YXN0ZWJvYXJkOjp3cml0ZVBsYWluVGV4dCk6CisgICAgICAgICAgICAtIFVzZSBBZGREYXRhKEJf TUlNRV9UWVBFKSBhcyByZXF1aXJlZCBieSBjbGlwYm9hcmQgcHJvdG9jb2wuCisgICAgICAgIChX ZWJDb3JlOjpQYXN0ZWJvYXJkOjpwbGFpblRleHQpOgorICAgICAgICAgICAgLSBVc2UgRmluZERh dGEoQl9NSU1FX1RZUEUpIGFzIHJlcXVpcmVkIGJ5IGNsaXBib2FyZCBwcm90b2NvbC4KKyAgICAg ICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmRvY3VtZW50RnJhZ21lbnQpOgorICAgICAgICAgICAg LSBJbXBsZW1lbnRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OndyaXRlVVJMKToK KyAgICAgICAgICAgIC0gTmVlZHMgdG8gdXNlIEFkZERhdGEoQl9NSU1FX1RZUEUpIGluc3RlYWQg b2YgQWRkU3RyaW5nKCkuCisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpjbGVhcik6CisK IDIwMTAtMDQtMTAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLiAgUmVuYW1lIG1fZm9yY2VTYW5kYm94RmxhZ3MgdG8gbV9mb3JjZWRTYW5kb3hG bGFncywgYXMKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vaGFpa3UvUGFzdGVib2FyZEhhaWt1LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L1Bhc3RlYm9hcmRIYWlrdS5j cHAJKHJldmlzaW9uIDU3Mjc0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9oYWlrdS9QYXN0ZWJvYXJk SGFpa3UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNyBAQAogLyoKICAqIENvcHlyaWdo dCAoQykgMjAwNiBaYWNrIFJ1c2luIDx6YWNrQGtkZS5vcmc+CiAgKiBDb3B5cmlnaHQgKEMpIDIw MDcgUnlhbiBMZWF2ZW5nb29kIDxsZWF2ZW5nb29kQGdtYWlsLmNvbT4KKyAqIENvcHlyaWdodCAo QykgMjAxMCBTdGVwaGFuIEHDn211cyA8c3VwZXJzdGlwcGlAZ214LmRlPgogICoKICAqIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCkBAIC0yMSw3ICsyMiw3IEBACiAgKiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCiAgKiBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKICAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCisgKiBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICov CiAKICNpbmNsdWRlICJjb25maWcuaCIKQEAgLTMyLDExICszMywxMyBAQAogI2luY2x1ZGUgIkZy YW1lLmgiCiAjaW5jbHVkZSAiS1VSTC5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCisj aW5jbHVkZSAiVGV4dFJlc291cmNlRGVjb2Rlci5oIgogI2luY2x1ZGUgIm1hcmt1cC5oIgogI2lu Y2x1ZGUgPHN1cHBvcnQvTG9ja2VyLmg+CiAjaW5jbHVkZSA8Q2xpcGJvYXJkLmg+CiAjaW5jbHVk ZSA8TWVzc2FnZS5oPgogI2luY2x1ZGUgPFN0cmluZy5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NT dHJpbmcuaD4KIAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC00NSw0NCArNDgsODAgQEAgUGFz dGVib2FyZDo6UGFzdGVib2FyZCgpCiB7CiB9CiAKK1Bhc3RlYm9hcmQ6On5QYXN0ZWJvYXJkKCkK K3sKK30KKwogUGFzdGVib2FyZCogUGFzdGVib2FyZDo6Z2VuZXJhbFBhc3RlYm9hcmQoKQogewot ICAgIHN0YXRpYyBQYXN0ZWJvYXJkKiBwYXN0ZWJvYXJkID0gbmV3IFBhc3RlYm9hcmQoKTsKLSAg ICByZXR1cm4gcGFzdGVib2FyZDsKKyAgICBzdGF0aWMgUGFzdGVib2FyZCBwYXN0ZWJvYXJkOwor ICAgIHJldHVybiAmcGFzdGVib2FyZDsKIH0KIAorLy8gQkNsaXBib2FyZCB1bmZvcnR1bmF0ZWx5 IGRvZXMgbm90IGRlcml2ZSBmcm9tIEJMb2NrZXIsIHNvIHdlIGNhbm5vdCB1c2UgQkF1dG9sb2Nr LgorY2xhc3MgQXV0b0NsaXBib2FyZExvY2tlciB7CitwdWJsaWM6CisgICAgQXV0b0NsaXBib2Fy ZExvY2tlcihCQ2xpcGJvYXJkKiBjbGlwYm9hcmQpCisgICAgICAgIDogbV9jbGlwYm9hcmQoY2xp cGJvYXJkKQorICAgICAgICAsIG1faXNMb2NrZWQoY2xpcGJvYXJkICYmIGNsaXBib2FyZC0+TG9j aygpKQorICAgIHsKKyAgICB9CisKKyAgICB+QXV0b0NsaXBib2FyZExvY2tlcigpCisgICAgewor ICAgICAgICBpZiAobV9pc0xvY2tlZCkKKyAgICAgICAgICAgIG1fY2xpcGJvYXJkLT5VbmxvY2so KTsKKyAgICB9CisKKyAgICBib29sIGlzTG9ja2VkKCkgY29uc3QKKyAgICB7CisgICAgICAgIHJl dHVybiBtX2lzTG9ja2VkOworICAgIH0KKworcHJpdmF0ZToKKyAgICBCQ2xpcGJvYXJkKiBtX2Ns aXBib2FyZDsKKyAgICBib29sIG1faXNMb2NrZWQ7Cit9OworCiB2b2lkIFBhc3RlYm9hcmQ6Ondy aXRlU2VsZWN0aW9uKFJhbmdlKiBzZWxlY3RlZFJhbmdlLCBib29sIGNhblNtYXJ0Q29weU9yRGVs ZXRlLCBGcmFtZSogZnJhbWUpCiB7Ci0gICAgQkNsaXBib2FyZCBjbGlwYm9hcmQoIldlYktpdCIp OwotICAgIGlmICghY2xpcGJvYXJkLkxvY2soKSkKKyAgICBBdXRvQ2xpcGJvYXJkTG9ja2VyIGxv Y2tlcihiZV9jbGlwYm9hcmQpOworICAgIGlmICghbG9ja2VyLmlzTG9ja2VkKCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIGNsaXBib2FyZC5DbGVhcigpOwotICAgIEJNZXNzYWdlKiBkYXRhID0g Y2xpcGJvYXJkLkRhdGEoKTsKKyAgICBiZV9jbGlwYm9hcmQtPkNsZWFyKCk7CisgICAgQk1lc3Nh Z2UqIGRhdGEgPSBiZV9jbGlwYm9hcmQtPkRhdGEoKTsKICAgICBpZiAoIWRhdGEpCiAgICAgICAg IHJldHVybjsKIAotICAgIGRhdGEtPkFkZFN0cmluZygidGV4dC9wbGFpbiIsIEJTdHJpbmcoZnJh bWUtPnNlbGVjdGVkVGV4dCgpKSk7Ci0gICAgY2xpcGJvYXJkLkNvbW1pdCgpOworICAgIEJTdHJp bmcgc3RyaW5nKGZyYW1lLT5zZWxlY3RlZFRleHQoKSk7CisKKyAgICAvLyBSZXBsYWNlIHVud2Fu dGVkIHJlcHJlc2VudGF0aW9uIG9mIGJsYW5rIGxpbmVzCisgICAgY29uc3QgY2hhciogdXRmOEJs YW5rTGluZSA9ICJcMzAyXDI0MFxuIjsKKyAgICBzdHJpbmcuUmVwbGFjZUFsbCh1dGY4QmxhbmtM aW5lLCAiXG4iKTsKIAotICAgIGNsaXBib2FyZC5VbmxvY2soKTsKKyAgICBkYXRhLT5BZGREYXRh KCJ0ZXh0L3BsYWluIiwgQl9NSU1FX1RZUEUsIHN0cmluZy5TdHJpbmcoKSwgc3RyaW5nLkxlbmd0 aCgpKTsKKworICAgIEJTdHJpbmcgbWFya3VwU3RyaW5nKGNyZWF0ZU1hcmt1cChzZWxlY3RlZFJh bmdlLCAwLCBBbm5vdGF0ZUZvckludGVyY2hhbmdlKSk7CisgICAgZGF0YS0+QWRkRGF0YSgidGV4 dC9odG1sIiwgQl9NSU1FX1RZUEUsIG1hcmt1cFN0cmluZy5TdHJpbmcoKSwgbWFya3VwU3RyaW5n Lkxlbmd0aCgpKTsKKworICAgIGJlX2NsaXBib2FyZC0+Q29tbWl0KCk7CiB9CiAKIHZvaWQgUGFz dGVib2FyZDo6d3JpdGVQbGFpblRleHQoY29uc3QgU3RyaW5nJiB0ZXh0KQogewotICAgIEJDbGlw Ym9hcmQgY2xpcGJvYXJkKCJXZWJLaXQiKTsKLSAgICBpZiAoIWNsaXBib2FyZC5Mb2NrKCkpCisg ICAgQXV0b0NsaXBib2FyZExvY2tlciBsb2NrZXIoYmVfY2xpcGJvYXJkKTsKKyAgICBpZiAoIWxv Y2tlci5pc0xvY2tlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBjbGlwYm9hcmQuQ2xlYXIo KTsKLSAgICBCTWVzc2FnZSogZGF0YSA9IGNsaXBib2FyZC5EYXRhKCk7CisgICAgYmVfY2xpcGJv YXJkLT5DbGVhcigpOworICAgIEJNZXNzYWdlKiBkYXRhID0gYmVfY2xpcGJvYXJkLT5EYXRhKCk7 CiAgICAgaWYgKCFkYXRhKQogICAgICAgICByZXR1cm47CiAKLSAgICBkYXRhLT5BZGRTdHJpbmco InRleHQvcGxhaW4iLCBCU3RyaW5nKHRleHQpKTsKLSAgICBjbGlwYm9hcmQuQ29tbWl0KCk7Ci0K LSAgICBjbGlwYm9hcmQuVW5sb2NrKCk7CisgICAgQlN0cmluZyBzdHJpbmcodGV4dCk7CisgICAg ZGF0YS0+QWRkRGF0YSgidGV4dC9wbGFpbiIsIEJfTUlNRV9UWVBFLCBzdHJpbmcuU3RyaW5nKCks IHN0cmluZy5MZW5ndGgoKSk7CisgICAgYmVfY2xpcGJvYXJkLT5Db21taXQoKTsKIH0KIAogYm9v bCBQYXN0ZWJvYXJkOjpjYW5TbWFydFJlcGxhY2UoKQpAQCAtOTMsMTggKzEzMiwxOSBAQCBib29s IFBhc3RlYm9hcmQ6OmNhblNtYXJ0UmVwbGFjZSgpCiAKIFN0cmluZyBQYXN0ZWJvYXJkOjpwbGFp blRleHQoRnJhbWUqIGZyYW1lKQogewotICAgIEJDbGlwYm9hcmQgY2xpcGJvYXJkKCJXZWJLaXQi KTsKLSAgICBpZiAoIWNsaXBib2FyZC5Mb2NrKCkpCisgICAgQXV0b0NsaXBib2FyZExvY2tlciBs b2NrZXIoYmVfY2xpcGJvYXJkKTsKKyAgICBpZiAoIWxvY2tlci5pc0xvY2tlZCgpKQogICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CiAKLSAgICBCTWVzc2FnZSogZGF0YSA9IGNsaXBib2FyZC5EYXRh KCk7CisgICAgQk1lc3NhZ2UqIGRhdGEgPSBiZV9jbGlwYm9hcmQtPkRhdGEoKTsKICAgICBpZiAo IWRhdGEpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKIAorICAgIGNvbnN0IGNoYXIqIGJ1ZmZl ciA9IDA7CisgICAgc3NpemVfdCBidWZmZXJMZW5ndGg7CiAgICAgQlN0cmluZyBzdHJpbmc7Ci0g ICAgZGF0YS0+RmluZFN0cmluZygidGV4dC9wbGFpbiIsICZzdHJpbmcpOwotCi0gICAgY2xpcGJv YXJkLlVubG9jaygpOworICAgIGlmIChkYXRhLT5GaW5kRGF0YSgidGV4dC9wbGFpbiIsIEJfTUlN RV9UWVBFLCByZWludGVycHJldF9jYXN0PGNvbnN0IHZvaWQqKj4oJmJ1ZmZlciksICZidWZmZXJM ZW5ndGgpID09IEJfT0spCisgICAgICAgIHN0cmluZy5BcHBlbmQoYnVmZmVyLCBidWZmZXJMZW5n dGgpOwogCiAgICAgcmV0dXJuIHN0cmluZzsKIH0KQEAgLTExMiwyNiArMTUyLDYwIEBAIFN0cmlu ZyBQYXN0ZWJvYXJkOjpwbGFpblRleHQoRnJhbWUqIGZyYW0KIFBhc3NSZWZQdHI8RG9jdW1lbnRG cmFnbWVudD4gUGFzdGVib2FyZDo6ZG9jdW1lbnRGcmFnbWVudChGcmFtZSogZnJhbWUsIFBhc3NS ZWZQdHI8UmFuZ2U+IGNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBhbGxvd1BsYWluVGV4dCwgYm9vbCYgY2hvc2VQ bGFpblRleHQpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBjaG9zZVBsYWluVGV4dCA9 IGZhbHNlOworCisgICAgQXV0b0NsaXBib2FyZExvY2tlciBsb2NrZXIoYmVfY2xpcGJvYXJkKTsK KyAgICBpZiAoIWxvY2tlci5pc0xvY2tlZCgpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIEJN ZXNzYWdlKiBkYXRhID0gYmVfY2xpcGJvYXJkLT5EYXRhKCk7CisgICAgaWYgKCFkYXRhKQorICAg ICAgICByZXR1cm4gMDsKKworICAgIGNvbnN0IGNoYXIqIGJ1ZmZlciA9IDA7CisgICAgc3NpemVf dCBidWZmZXJMZW5ndGg7CisgICAgaWYgKGRhdGEtPkZpbmREYXRhKCJ0ZXh0L2h0bWwiLCBCX01J TUVfVFlQRSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB2b2lkKio+KCZidWZmZXIpLCAmYnVmZmVy TGVuZ3RoKSA9PSBCX09LKSB7CisgICAgICAgIFJlZlB0cjxUZXh0UmVzb3VyY2VEZWNvZGVyPiBk ZWNvZGVyID0gVGV4dFJlc291cmNlRGVjb2Rlcjo6Y3JlYXRlKCJ0ZXh0L3BsYWluIiwgIlVURi04 IiwgdHJ1ZSk7CisgICAgICAgIFN0cmluZyBodG1sID0gZGVjb2Rlci0+ZGVjb2RlKGJ1ZmZlciwg YnVmZmVyTGVuZ3RoKTsKKyAgICAgICAgaHRtbCArPSBkZWNvZGVyLT5mbHVzaCgpOworCisgICAg ICAgIGlmICghaHRtbC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIFJlZlB0cjxEb2N1bWVudEZy YWdtZW50PiBmcmFnbWVudCA9IGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cChmcmFtZS0+ZG9jdW1l bnQoKSwgaHRtbCwgIiIsIEZyYWdtZW50U2NyaXB0aW5nTm90QWxsb3dlZCk7CisgICAgICAgICAg ICBpZiAoZnJhZ21lbnQpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZyYWdtZW50LnJlbGVhc2Uo KTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGlmICghYWxsb3dQbGFpblRleHQpCisgICAgICAg IHJldHVybiAwOworCisgICAgaWYgKGRhdGEtPkZpbmREYXRhKCJ0ZXh0L3BsYWluIiwgQl9NSU1F X1RZUEUsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qgdm9pZCoqPigmYnVmZmVyKSwgJmJ1ZmZlckxl bmd0aCkgPT0gQl9PSykgeworICAgICAgICBCU3RyaW5nIHBsYWluVGV4dChidWZmZXIsIGJ1ZmZl ckxlbmd0aCk7CisKKyAgICAgICAgY2hvc2VQbGFpblRleHQgPSB0cnVlOworICAgICAgICBSZWZQ dHI8RG9jdW1lbnRGcmFnbWVudD4gZnJhZ21lbnQgPSBjcmVhdGVGcmFnbWVudEZyb21UZXh0KGNv bnRleHQuZ2V0KCksIHBsYWluVGV4dCk7CisgICAgICAgIGlmIChmcmFnbWVudCkKKyAgICAgICAg ICAgIHJldHVybiBmcmFnbWVudC5yZWxlYXNlKCk7CisgICAgfQorCiAgICAgcmV0dXJuIDA7CiB9 CiAKIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVVUkwoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJp bmcmLCBGcmFtZSopCiB7Ci0gICAgQkNsaXBib2FyZCBjbGlwYm9hcmQoIldlYktpdCIpOwotICAg IGlmICghY2xpcGJvYXJkLkxvY2soKSkKKyAgICBBdXRvQ2xpcGJvYXJkTG9ja2VyIGxvY2tlcihi ZV9jbGlwYm9hcmQpOworICAgIGlmICghbG9ja2VyLmlzTG9ja2VkKCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGNsaXBib2FyZC5DbGVhcigpOworICAgIGJlX2NsaXBib2FyZC0+Q2xlYXIoKTsK IAotICAgIEJNZXNzYWdlKiBkYXRhID0gY2xpcGJvYXJkLkRhdGEoKTsKKyAgICBCTWVzc2FnZSog ZGF0YSA9IGJlX2NsaXBib2FyZC0+RGF0YSgpOwogICAgIGlmICghZGF0YSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgZGF0YS0+QWRkU3RyaW5nKCJ0ZXh0L3BsYWluIiwgdXJsLnN0cmluZygpKTsK LSAgICBjbGlwYm9hcmQuQ29tbWl0KCk7Ci0KLSAgICBjbGlwYm9hcmQuVW5sb2NrKCk7CisgICAg QlN0cmluZyBzdHJpbmcodXJsLnN0cmluZygpKTsKKyAgICBkYXRhLT5BZGREYXRhKCJ0ZXh0L3Bs YWluIiwgQl9NSU1FX1RZUEUsIHN0cmluZy5TdHJpbmcoKSwgc3RyaW5nLkxlbmd0aCgpKTsKKyAg ICBiZV9jbGlwYm9hcmQtPkNvbW1pdCgpOwogfQogCiB2b2lkIFBhc3RlYm9hcmQ6OndyaXRlSW1h Z2UoTm9kZSosIGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmKQpAQCAtMTQxLDE0ICsyMTUsMTIg QEAgdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZUltYWdlKE5vZGUqLCBjb25zdAogCiB2b2lkIFBhc3Rl Ym9hcmQ6OmNsZWFyKCkKIHsKLSAgICBCQ2xpcGJvYXJkIGNsaXBib2FyZCgiV2ViS2l0Iik7Ci0g ICAgaWYgKCFjbGlwYm9hcmQuTG9jaygpKQorICAgIEF1dG9DbGlwYm9hcmRMb2NrZXIgbG9ja2Vy KGJlX2NsaXBib2FyZCk7CisgICAgaWYgKCFsb2NrZXIuaXNMb2NrZWQoKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgY2xpcGJvYXJkLkNsZWFyKCk7Ci0gICAgY2xpcGJvYXJkLkNvbW1pdCgpOwot Ci0gICAgY2xpcGJvYXJkLlVubG9jaygpOworICAgIGJlX2NsaXBib2FyZC0+Q2xlYXIoKTsKKyAg ICBiZV9jbGlwYm9hcmQtPkNvbW1pdCgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 53245 2010-04-13 07:12:38 -0700 2010-04-13 10:46:53 -0700 [Haiku] Patch for PasteboardHaiku.cpp PasteboardHaiku.diff text/plain 9005 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQ1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzYgQEAKKzIwMTAtMDQtMTEgIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtIYWlrdV0gVXNlIHRoZSBzeXN0ZW0gY2xpcGJvYXJkIGluc3RlYWQgb2YgYSBwcml2YXRlIGNs aXBib2FyZC4KKyAgICAgICAgICAgICAgICBGaXggdmFyaW91cyBwcm9ibGVtcyBpbiB0aGUgcHJl dmlvdXMgaW1wbGVtZW50YXRpb24uCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM3NDIxCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZC4KKwor ICAgICAgICAqIHBsYXRmb3JtL2hhaWt1L1Bhc3RlYm9hcmRIYWlrdS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpQYXN0ZWJvYXJkOjp+UGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0 ZWJvYXJkOjpnZW5lcmFsUGFzdGVib2FyZCk6CisgICAgICAgICAgICAtIERvbid0IGxlYWsgdGhl IHBhc3RlYm9hcmQgYXQgcHJvZ3JhbSBleGl0LgorICAgICAgICAoV2ViQ29yZTo6QXV0b0NsaXBi b2FyZExvY2tlcjo6QXV0b0NsaXBib2FyZExvY2tlcik6CisgICAgICAgIChXZWJDb3JlOjpBdXRv Q2xpcGJvYXJkTG9ja2VyOjp+QXV0b0NsaXBib2FyZExvY2tlcik6CisgICAgICAgIChXZWJDb3Jl OjpBdXRvQ2xpcGJvYXJkTG9ja2VyOjppc0xvY2tlZCk6CisgICAgICAgICAgICAtIGhlbHBlciBj bGFzcyBmb3IgbG9ja2luZyBhIEJDbGlwYm9hcmQuCisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJv YXJkOjp3cml0ZVNlbGVjdGlvbik6CisgICAgICAgICAgICAtIFVzZSBBZGREYXRhKEJfTUlNRV9U WVBFKSBhcyByZXF1aXJlZCBieSBjbGlwYm9hcmQgcHJvdG9jb2wuCisgICAgICAgICAgICAtIE1h a2Ugc3VyZSB3ZSBkb24ndCBlbmQgdXAgd2l0aCB1bndhbnRlZCBVVEYtOCBjaGFyYWN0ZXJzIGZv cgorICAgICAgICAgICAgICByZWd1bGFyIGxpbmUgYnJlYWtzLgorICAgICAgICAoV2ViQ29yZTo6 UGFzdGVib2FyZDo6d3JpdGVQbGFpblRleHQpOgorICAgICAgICAgICAgLSBVc2UgQWRkRGF0YShC X01JTUVfVFlQRSkgYXMgcmVxdWlyZWQgYnkgY2xpcGJvYXJkIHByb3RvY29sLgorICAgICAgICAo V2ViQ29yZTo6UGFzdGVib2FyZDo6cGxhaW5UZXh0KToKKyAgICAgICAgICAgIC0gVXNlIEZpbmRE YXRhKEJfTUlNRV9UWVBFKSBhcyByZXF1aXJlZCBieSBjbGlwYm9hcmQgcHJvdG9jb2wuCisgICAg ICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpkb2N1bWVudEZyYWdtZW50KToKKyAgICAgICAgICAg IC0gSW1wbGVtZW50ZWQuCisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp3cml0ZVVSTCk6 CisgICAgICAgICAgICAtIE5lZWRzIHRvIHVzZSBBZGREYXRhKEJfTUlNRV9UWVBFKSBpbnN0ZWFk IG9mIEFkZFN0cmluZygpLgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6Y2xlYXIpOgor CiAyMDEwLTA0LTEwICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAg VW5yZXZpZXdlZC4gIFJlbmFtZSBtX2ZvcmNlU2FuZGJveEZsYWdzIHRvIG1fZm9yY2VkU2FuZG94 RmxhZ3MsIGFzCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2hhaWt1L1Bhc3RlYm9hcmRIYWlrdS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9oYWlrdS9QYXN0ZWJvYXJkSGFpa3Uu Y3BwCShyZXZpc2lvbiA1NzI3NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vaGFpa3UvUGFzdGVib2Fy ZEhhaWt1LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmln aHQgKEMpIDIwMDYgWmFjayBSdXNpbiA8emFja0BrZGUub3JnPgogICogQ29weXJpZ2h0IChDKSAy MDA3IFJ5YW4gTGVhdmVuZ29vZCA8bGVhdmVuZ29vZEBnbWFpbC5jb20+CisgKiBDb3B5cmlnaHQg KEMpIDIwMTAgU3RlcGhhbiBBw59tdXMgPHN1cGVyc3RpcHBpQGdteC5kZT4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjEsNyArMjIsNyBAQAogICogUFJPRklUUzsgT1IgQlVT SU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQogICog T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCiAgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAorICogT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAq LwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCkBAIC0zMiwxMSArMzMsMTMgQEAKICNpbmNsdWRlICJG cmFtZS5oIgogI2luY2x1ZGUgIktVUkwuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgor I2luY2x1ZGUgIlRleHRSZXNvdXJjZURlY29kZXIuaCIKICNpbmNsdWRlICJtYXJrdXAuaCIKICNp bmNsdWRlIDxzdXBwb3J0L0xvY2tlci5oPgogI2luY2x1ZGUgPENsaXBib2FyZC5oPgogI2luY2x1 ZGUgPE1lc3NhZ2UuaD4KICNpbmNsdWRlIDxTdHJpbmcuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9D U3RyaW5nLmg+CiAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDUsNDQgKzQ4LDgwIEBAIFBh c3RlYm9hcmQ6OlBhc3RlYm9hcmQoKQogewogfQogCitQYXN0ZWJvYXJkOjp+UGFzdGVib2FyZCgp Cit7Cit9CisKIFBhc3RlYm9hcmQqIFBhc3RlYm9hcmQ6OmdlbmVyYWxQYXN0ZWJvYXJkKCkKIHsK LSAgICBzdGF0aWMgUGFzdGVib2FyZCogcGFzdGVib2FyZCA9IG5ldyBQYXN0ZWJvYXJkKCk7Ci0g ICAgcmV0dXJuIHBhc3RlYm9hcmQ7CisgICAgc3RhdGljIFBhc3RlYm9hcmQgcGFzdGVib2FyZDsK KyAgICByZXR1cm4gJnBhc3RlYm9hcmQ7CiB9CiAKKy8vIEJDbGlwYm9hcmQgdW5mb3J0dW5hdGVs eSBkb2VzIG5vdCBkZXJpdmUgZnJvbSBCTG9ja2VyLCBzbyB3ZSBjYW5ub3QgdXNlIEJBdXRvbG9j ay4KK2NsYXNzIEF1dG9DbGlwYm9hcmRMb2NrZXIgeworcHVibGljOgorICAgIEF1dG9DbGlwYm9h cmRMb2NrZXIoQkNsaXBib2FyZCogY2xpcGJvYXJkKQorICAgICAgICA6IG1fY2xpcGJvYXJkKGNs aXBib2FyZCkKKyAgICAgICAgLCBtX2lzTG9ja2VkKGNsaXBib2FyZCAmJiBjbGlwYm9hcmQtPkxv Y2soKSkKKyAgICB7CisgICAgfQorCisgICAgfkF1dG9DbGlwYm9hcmRMb2NrZXIoKQorICAgIHsK KyAgICAgICAgaWYgKG1faXNMb2NrZWQpCisgICAgICAgICAgICBtX2NsaXBib2FyZC0+VW5sb2Nr KCk7CisgICAgfQorCisgICAgYm9vbCBpc0xvY2tlZCgpIGNvbnN0CisgICAgeworICAgICAgICBy ZXR1cm4gbV9pc0xvY2tlZDsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgQkNsaXBib2FyZCogbV9j bGlwYm9hcmQ7CisgICAgYm9vbCBtX2lzTG9ja2VkOworfTsKKwogdm9pZCBQYXN0ZWJvYXJkOjp3 cml0ZVNlbGVjdGlvbihSYW5nZSogc2VsZWN0ZWRSYW5nZSwgYm9vbCBjYW5TbWFydENvcHlPckRl bGV0ZSwgRnJhbWUqIGZyYW1lKQogewotICAgIEJDbGlwYm9hcmQgY2xpcGJvYXJkKCJXZWJLaXQi KTsKLSAgICBpZiAoIWNsaXBib2FyZC5Mb2NrKCkpCisgICAgQXV0b0NsaXBib2FyZExvY2tlciBs b2NrZXIoYmVfY2xpcGJvYXJkKTsKKyAgICBpZiAoIWxvY2tlci5pc0xvY2tlZCgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBjbGlwYm9hcmQuQ2xlYXIoKTsKLSAgICBCTWVzc2FnZSogZGF0YSA9 IGNsaXBib2FyZC5EYXRhKCk7CisgICAgYmVfY2xpcGJvYXJkLT5DbGVhcigpOworICAgIEJNZXNz YWdlKiBkYXRhID0gYmVfY2xpcGJvYXJkLT5EYXRhKCk7CiAgICAgaWYgKCFkYXRhKQogICAgICAg ICByZXR1cm47CiAKLSAgICBkYXRhLT5BZGRTdHJpbmcoInRleHQvcGxhaW4iLCBCU3RyaW5nKGZy YW1lLT5zZWxlY3RlZFRleHQoKSkpOwotICAgIGNsaXBib2FyZC5Db21taXQoKTsKKyAgICBCU3Ry aW5nIHN0cmluZyhmcmFtZS0+c2VsZWN0ZWRUZXh0KCkpOworCisgICAgLy8gUmVwbGFjZSB1bndh bnRlZCByZXByZXNlbnRhdGlvbiBvZiBibGFuayBsaW5lcworICAgIGNvbnN0IGNoYXIqIHV0ZjhC bGFua0xpbmUgPSAiXDMwMlwyNDBcbiI7CisgICAgc3RyaW5nLlJlcGxhY2VBbGwodXRmOEJsYW5r TGluZSwgIlxuIik7CiAKLSAgICBjbGlwYm9hcmQuVW5sb2NrKCk7CisgICAgZGF0YS0+QWRkRGF0 YSgidGV4dC9wbGFpbiIsIEJfTUlNRV9UWVBFLCBzdHJpbmcuU3RyaW5nKCksIHN0cmluZy5MZW5n dGgoKSk7CisKKyAgICBCU3RyaW5nIG1hcmt1cFN0cmluZyhjcmVhdGVNYXJrdXAoc2VsZWN0ZWRS YW5nZSwgMCwgQW5ub3RhdGVGb3JJbnRlcmNoYW5nZSkpOworICAgIGRhdGEtPkFkZERhdGEoInRl eHQvaHRtbCIsIEJfTUlNRV9UWVBFLCBtYXJrdXBTdHJpbmcuU3RyaW5nKCksIG1hcmt1cFN0cmlu Zy5MZW5ndGgoKSk7CisKKyAgICBiZV9jbGlwYm9hcmQtPkNvbW1pdCgpOwogfQogCiB2b2lkIFBh c3RlYm9hcmQ6OndyaXRlUGxhaW5UZXh0KGNvbnN0IFN0cmluZyYgdGV4dCkKIHsKLSAgICBCQ2xp cGJvYXJkIGNsaXBib2FyZCgiV2ViS2l0Iik7Ci0gICAgaWYgKCFjbGlwYm9hcmQuTG9jaygpKQor ICAgIEF1dG9DbGlwYm9hcmRMb2NrZXIgbG9ja2VyKGJlX2NsaXBib2FyZCk7CisgICAgaWYgKCFs b2NrZXIuaXNMb2NrZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgY2xpcGJvYXJkLkNsZWFy KCk7Ci0gICAgQk1lc3NhZ2UqIGRhdGEgPSBjbGlwYm9hcmQuRGF0YSgpOworICAgIGJlX2NsaXBi b2FyZC0+Q2xlYXIoKTsKKyAgICBCTWVzc2FnZSogZGF0YSA9IGJlX2NsaXBib2FyZC0+RGF0YSgp OwogICAgIGlmICghZGF0YSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZGF0YS0+QWRkU3RyaW5n KCJ0ZXh0L3BsYWluIiwgQlN0cmluZyh0ZXh0KSk7Ci0gICAgY2xpcGJvYXJkLkNvbW1pdCgpOwot Ci0gICAgY2xpcGJvYXJkLlVubG9jaygpOworICAgIEJTdHJpbmcgc3RyaW5nKHRleHQpOworICAg IGRhdGEtPkFkZERhdGEoInRleHQvcGxhaW4iLCBCX01JTUVfVFlQRSwgc3RyaW5nLlN0cmluZygp LCBzdHJpbmcuTGVuZ3RoKCkpOworICAgIGJlX2NsaXBib2FyZC0+Q29tbWl0KCk7CiB9CiAKIGJv b2wgUGFzdGVib2FyZDo6Y2FuU21hcnRSZXBsYWNlKCkKQEAgLTkzLDE4ICsxMzIsMTkgQEAgYm9v bCBQYXN0ZWJvYXJkOjpjYW5TbWFydFJlcGxhY2UoKQogCiBTdHJpbmcgUGFzdGVib2FyZDo6cGxh aW5UZXh0KEZyYW1lKiBmcmFtZSkKIHsKLSAgICBCQ2xpcGJvYXJkIGNsaXBib2FyZCgiV2ViS2l0 Iik7Ci0gICAgaWYgKCFjbGlwYm9hcmQuTG9jaygpKQorICAgIEF1dG9DbGlwYm9hcmRMb2NrZXIg bG9ja2VyKGJlX2NsaXBib2FyZCk7CisgICAgaWYgKCFsb2NrZXIuaXNMb2NrZWQoKSkKICAgICAg ICAgcmV0dXJuIFN0cmluZygpOwogCi0gICAgQk1lc3NhZ2UqIGRhdGEgPSBjbGlwYm9hcmQuRGF0 YSgpOworICAgIEJNZXNzYWdlKiBkYXRhID0gYmVfY2xpcGJvYXJkLT5EYXRhKCk7CiAgICAgaWYg KCFkYXRhKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAKKyAgICBjb25zdCBjaGFyKiBidWZm ZXIgPSAwOworICAgIHNzaXplX3QgYnVmZmVyTGVuZ3RoOwogICAgIEJTdHJpbmcgc3RyaW5nOwot ICAgIGRhdGEtPkZpbmRTdHJpbmcoInRleHQvcGxhaW4iLCAmc3RyaW5nKTsKLQotICAgIGNsaXBi b2FyZC5VbmxvY2soKTsKKyAgICBpZiAoZGF0YS0+RmluZERhdGEoInRleHQvcGxhaW4iLCBCX01J TUVfVFlQRSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB2b2lkKio+KCZidWZmZXIpLCAmYnVmZmVy TGVuZ3RoKSA9PSBCX09LKQorICAgICAgICBzdHJpbmcuQXBwZW5kKGJ1ZmZlciwgYnVmZmVyTGVu Z3RoKTsKIAogICAgIHJldHVybiBzdHJpbmc7CiB9CkBAIC0xMTIsMjYgKzE1Miw2MCBAQCBTdHJp bmcgUGFzdGVib2FyZDo6cGxhaW5UZXh0KEZyYW1lKiBmcmFtCiBQYXNzUmVmUHRyPERvY3VtZW50 RnJhZ21lbnQ+IFBhc3RlYm9hcmQ6OmRvY3VtZW50RnJhZ21lbnQoRnJhbWUqIGZyYW1lLCBQYXNz UmVmUHRyPFJhbmdlPiBjb250ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgYWxsb3dQbGFpblRleHQsIGJvb2wmIGNob3Nl UGxhaW5UZXh0KQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgY2hvc2VQbGFpblRleHQg PSBmYWxzZTsKKworICAgIEF1dG9DbGlwYm9hcmRMb2NrZXIgbG9ja2VyKGJlX2NsaXBib2FyZCk7 CisgICAgaWYgKCFsb2NrZXIuaXNMb2NrZWQoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBC TWVzc2FnZSogZGF0YSA9IGJlX2NsaXBib2FyZC0+RGF0YSgpOworICAgIGlmICghZGF0YSkKKyAg ICAgICAgcmV0dXJuIDA7CisKKyAgICBjb25zdCBjaGFyKiBidWZmZXIgPSAwOworICAgIHNzaXpl X3QgYnVmZmVyTGVuZ3RoOworICAgIGlmIChkYXRhLT5GaW5kRGF0YSgidGV4dC9odG1sIiwgQl9N SU1FX1RZUEUsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qgdm9pZCoqPigmYnVmZmVyKSwgJmJ1ZmZl ckxlbmd0aCkgPT0gQl9PSykgeworICAgICAgICBSZWZQdHI8VGV4dFJlc291cmNlRGVjb2Rlcj4g ZGVjb2RlciA9IFRleHRSZXNvdXJjZURlY29kZXI6OmNyZWF0ZSgidGV4dC9wbGFpbiIsICJVVEYt OCIsIHRydWUpOworICAgICAgICBTdHJpbmcgaHRtbCA9IGRlY29kZXItPmRlY29kZShidWZmZXIs IGJ1ZmZlckxlbmd0aCk7CisgICAgICAgIGh0bWwgKz0gZGVjb2Rlci0+Zmx1c2goKTsKKworICAg ICAgICBpZiAoIWh0bWwuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBSZWZQdHI8RG9jdW1lbnRG cmFnbWVudD4gZnJhZ21lbnQgPSBjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAoZnJhbWUtPmRvY3Vt ZW50KCksIGh0bWwsICIiLCBGcmFnbWVudFNjcmlwdGluZ05vdEFsbG93ZWQpOworICAgICAgICAg ICAgaWYgKGZyYWdtZW50KQorICAgICAgICAgICAgICAgIHJldHVybiBmcmFnbWVudC5yZWxlYXNl KCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoIWFsbG93UGxhaW5UZXh0KQorICAgICAg ICByZXR1cm4gMDsKKworICAgIGlmIChkYXRhLT5GaW5kRGF0YSgidGV4dC9wbGFpbiIsIEJfTUlN RV9UWVBFLCByZWludGVycHJldF9jYXN0PGNvbnN0IHZvaWQqKj4oJmJ1ZmZlciksICZidWZmZXJM ZW5ndGgpID09IEJfT0spIHsKKyAgICAgICAgQlN0cmluZyBwbGFpblRleHQoYnVmZmVyLCBidWZm ZXJMZW5ndGgpOworCisgICAgICAgIGNob3NlUGxhaW5UZXh0ID0gdHJ1ZTsKKyAgICAgICAgUmVm UHRyPERvY3VtZW50RnJhZ21lbnQ+IGZyYWdtZW50ID0gY3JlYXRlRnJhZ21lbnRGcm9tVGV4dChj b250ZXh0LmdldCgpLCBwbGFpblRleHQpOworICAgICAgICBpZiAoZnJhZ21lbnQpCisgICAgICAg ICAgICByZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOworICAgIH0KKwogICAgIHJldHVybiAwOwog fQogCiB2b2lkIFBhc3RlYm9hcmQ6OndyaXRlVVJMKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3Ry aW5nJiwgRnJhbWUqKQogewotICAgIEJDbGlwYm9hcmQgY2xpcGJvYXJkKCJXZWJLaXQiKTsKLSAg ICBpZiAoIWNsaXBib2FyZC5Mb2NrKCkpCisgICAgQXV0b0NsaXBib2FyZExvY2tlciBsb2NrZXIo YmVfY2xpcGJvYXJkKTsKKyAgICBpZiAoIWxvY2tlci5pc0xvY2tlZCgpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBjbGlwYm9hcmQuQ2xlYXIoKTsKKyAgICBiZV9jbGlwYm9hcmQtPkNsZWFyKCk7 CiAKLSAgICBCTWVzc2FnZSogZGF0YSA9IGNsaXBib2FyZC5EYXRhKCk7CisgICAgQk1lc3NhZ2Uq IGRhdGEgPSBiZV9jbGlwYm9hcmQtPkRhdGEoKTsKICAgICBpZiAoIWRhdGEpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGRhdGEtPkFkZFN0cmluZygidGV4dC9wbGFpbiIsIHVybC5zdHJpbmcoKSk7 Ci0gICAgY2xpcGJvYXJkLkNvbW1pdCgpOwotCi0gICAgY2xpcGJvYXJkLlVubG9jaygpOworICAg IEJTdHJpbmcgc3RyaW5nKHVybC5zdHJpbmcoKSk7CisgICAgZGF0YS0+QWRkRGF0YSgidGV4dC9w bGFpbiIsIEJfTUlNRV9UWVBFLCBzdHJpbmcuU3RyaW5nKCksIHN0cmluZy5MZW5ndGgoKSk7Cisg ICAgYmVfY2xpcGJvYXJkLT5Db21taXQoKTsKIH0KIAogdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZUlt YWdlKE5vZGUqLCBjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5nJikKQEAgLTE0MSwxNCArMjE1LDEy IEBAIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVJbWFnZShOb2RlKiwgY29uc3QKIAogdm9pZCBQYXN0 ZWJvYXJkOjpjbGVhcigpCiB7Ci0gICAgQkNsaXBib2FyZCBjbGlwYm9hcmQoIldlYktpdCIpOwot ICAgIGlmICghY2xpcGJvYXJkLkxvY2soKSkKKyAgICBBdXRvQ2xpcGJvYXJkTG9ja2VyIGxvY2tl cihiZV9jbGlwYm9hcmQpOworICAgIGlmICghbG9ja2VyLmlzTG9ja2VkKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGNsaXBib2FyZC5DbGVhcigpOwotICAgIGNsaXBib2FyZC5Db21taXQoKTsK LQotICAgIGNsaXBib2FyZC5VbmxvY2soKTsKKyAgICBiZV9jbGlwYm9hcmQtPkNsZWFyKCk7Cisg ICAgYmVfY2xpcGJvYXJkLT5Db21taXQoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=