86947 2012-05-19 12:11:54 -0700 Fix build errors found when disabling ENABLE_DRAG_SUPPORT 2012-05-19 12:28:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aestes aestes oldest_to_newest 628466 0 aestes 2012-05-19 12:11:54 -0700 Fix build errors found when disabling ENABLE_DRAG_SUPPORT 628467 1 142876 aestes 2012-05-19 12:14:05 -0700 Created attachment 142876 Patch 628469 2 aestes 2012-05-19 12:19:48 -0700 Jon Honeycutt reviewed this in person. 628470 3 142876 aestes 2012-05-19 12:19:58 -0700 Comment on attachment 142876 Patch Jon Honeycutt 628472 4 aestes 2012-05-19 12:28:43 -0700 Committed r117695: <http://trac.webkit.org/changeset/117695> 142876 2012-05-19 12:14:05 -0700 2012-05-19 12:19:58 -0700 Patch bug-86947-20120519121404.patch text/plain 21077 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWE3ZjczZDRmYzUyZmQ4 MjNjNWYzNDViN2NiZmYzMzYyMzg2MmM1Yi4uMTA3MjNjYjRjZWU3NGZmNzk5OWE0NjcxNDhiZmZj MTllMzc2YTNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA1LTE5ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggYnVpbGQgZXJyb3JzIGZv dW5kIHdoZW4gZGlzYWJsaW5nIEVOQUJMRV9EUkFHX1NVUFBPUlQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2OTQ3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL21hYy9FdmVudEhhbmRsZXJNYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnBhc3NNb3VzZU1vdmVFdmVudFRv U3ViZnJhbWUpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW06CisgICAg ICAgIChXZWJDb3JlKToKKwogMjAxMi0wNS0xOSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0 Lm9yZz4KIAogICAgICAgICBUb3VjaCBJbnRlcm5hbHMuKiBpbiBhbiBhdHRlbXB0IHRvIGZpeCBX aW5kb3dzIGJ1aWxkcyBhZnRlciByMTE3NjQ2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDBkZTk0Nzcz OTllZTI1MzRiMGI0NmQxMzRhYzljN2FkNGMyNTNlMzMuLjQ4YzBjMmVjN2ZkM2U0ZjMyNzMxYWY5 ODU4ZTg3NDBjOWViMDJlN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAx Mi0wNS0xOSAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGJ1 aWxkIGVycm9ycyBmb3VuZCB3aGVuIGRpc2FibGluZyBFTkFCTEVfRFJBR19TVVBQT1JUCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njk0NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvV2ViRHJhZ0NsaWVudC5oOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGll bnQubW06CisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToKKyAgICAgICAgKiBXZWJWaWV3 L1dlYkZyYW1lSW50ZXJuYWwuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1lVmlldy5tbToK KyAgICAgICAgKC1bV2ViRnJhbWVWaWV3IF9zZXREb2N1bWVudFZpZXc6XSk6CisgICAgICAgICog V2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1bV2ViSFRNTFZpZXcgYWNjZXB0c0Zp cnN0TW91c2U6XSk6CisgICAgICAgICgtW1dlYkhUTUxWaWV3IHNob3VsZERlbGF5V2luZG93T3Jk ZXJpbmdGb3JFdmVudDpdKToKKyAgICAgICAgKG1hdGNoZXNFeHRlbnNpb25PckVxdWl2YWxlbnQp OgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfY29t bW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYW1lOmdyb3VwTmFtZTpdKToKKyAgICAgICAgKC1b V2ViVmlldyBtb3ZlRHJhZ0NhcmV0VG9Qb2ludDpdKToKKyAgICAgICAgKC1bV2ViVmlldyByZW1v dmVEcmFnQ2FyZXRdKToKKwogMjAxMi0wNC0yNyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUu Y29tPgogCiAgICAgICAgIERGRyBzaG91bGQgaGF2ZSBjb250cm9sIGZsb3cgZ3JhcGggc2ltcGxp ZmljYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0ZGJiYTI1OTI1MmMyYTI1YTk2ODI4NTY5ZTJjNTFmZjI5 NWM4MDVjLi5mNDkzOTdhZDdiZmFlMDJmYmEzMmNmZjU2MmUyNTVkZjI0NDQxM2NlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTItMDUtMTkgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBw bGUuY29tPgogCisgICAgICAgIEZpeCBidWlsZCBlcnJvcnMgZm91bmQgd2hlbiBkaXNhYmxpbmcg RU5BQkxFX0RSQUdfU1VQUE9SVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODY5NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKGNyZWF0 ZVNhbmRib3hFeHRlbnNpb25zRm9yRmlsZVVwbG9hZCk6CisgICAgICAgICgtW1dLVmlldyBwZXJm b3JtRHJhZ09wZXJhdGlvbjpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkRyYWdDbGllbnQuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRHJhZ0NsaWVudC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFj L1dlYkRyYWdDbGllbnRNYWMubW06CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToKKyAgICAgICAgKFdl YktpdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzaG91bGREZWxheVdpbmRvd09yZGVyaW5nRXZlbnQp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjphY2NlcHRzRmlyc3RNb3VzZSk6CisKKzIwMTIt MDUtMTkgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCiAgICAgICAgIFBsdWctaW4g cHJvY2VzcyBzaG91bGQgb25seSBiZSBlbmFibGVkIGlmIE5ldHNjYXBlIHBsdWctaW4gQVBJIGlz IGVuYWJsZWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTg2OTQ1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxl ck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQppbmRl eCA2ZGM1MTExYjc3MGI2NjVkMDEwMmE3MjBmY2I0Y2ZlYTk4Y2ZkZGEwLi5kZmVlMDQ0YWJlM2Ix N2QwN2VhN2YxNDg1NDllZjlhMTlmNGY2MzZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMv RXZlbnRIYW5kbGVyTWFjLm1tCkBAIC02MzQsOSArNjM0LDEyIEBAIGJvb2wgRXZlbnRIYW5kbGVy OjpwYXNzTW91c2VNb3ZlRXZlbnRUb1N1YmZyYW1lKE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3Vs dHMmIG1lCiAgICAgaWYgKGZyYW1lSGFzUGxhdGZvcm1XaWRnZXQobV9mcmFtZSkpCiAgICAgICAg IHJldHVybiBwYXNzU3ViZnJhbWVFdmVudFRvU3ViZnJhbWUobWV2LCBzdWJmcmFtZSwgaG92ZXJl ZE5vZGUpOwogCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICAvLyBXZWJLaXQyIGNvZGUg cGF0aC4KICAgICBpZiAobV9tb3VzZURvd25NYXlTdGFydERyYWcgJiYgIW1fbW91c2VEb3duV2Fz SW5TdWJmcmFtZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCisKICAgICBzdWJmcmFt ZS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZU1vdXNlTW92ZUV2ZW50KG1ldi5ldmVudCgpLCBob3Zl cmVkTm9kZSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL0NsaXBib2FyZE1hYy5tbQppbmRleCBlZmM3NmFjODgwZWVjNjdhN2Q2ZmY1OTk4NDRjNjMy YTBjNmI3ZjE3Li4yMGVjMmZiYTJmZjhkOGM0NTA5OTY4M2ViYzdhNGVjZDY1Mjk4NWRkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW0KQEAgLTQ2LDEwICs0 NiwxMiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JU KQogUGFzc1JlZlB0cjxDbGlwYm9hcmQ+IENsaXBib2FyZDo6Y3JlYXRlKENsaXBib2FyZEFjY2Vz c1BvbGljeSBwb2xpY3ksIERyYWdEYXRhKiBkcmFnRGF0YSwgRnJhbWUqIGZyYW1lKQogewogICAg IHJldHVybiBDbGlwYm9hcmRNYWM6OmNyZWF0ZShEcmFnQW5kRHJvcCwgZHJhZ0RhdGEtPnBhc3Rl Ym9hcmROYW1lKCksIHBvbGljeSwgZHJhZ0RhdGEtPmNvbnRhaW5zRmlsZXMoKSA/IENsaXBib2Fy ZE1hYzo6RHJhZ0FuZERyb3BGaWxlcyA6IENsaXBib2FyZE1hYzo6RHJhZ0FuZERyb3BEYXRhLCBm cmFtZSk7CiB9CisjZW5kaWYKIAogQ2xpcGJvYXJkTWFjOjpDbGlwYm9hcmRNYWMoQ2xpcGJvYXJk VHlwZSBjbGlwYm9hcmRUeXBlLCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lLCBDbGlwYm9h cmRBY2Nlc3NQb2xpY3kgcG9saWN5LCBDbGlwYm9hcmRDb250ZW50cyBjbGlwYm9hcmRDb250ZW50 cywgRnJhbWUgKmZyYW1lKQogICAgIDogQ2xpcGJvYXJkKHBvbGljeSwgY2xpcGJvYXJkVHlwZSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGll bnQuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaApp bmRleCA5ZDk2YjgyYzVkNThlNDQ5OWQ0NzI4YmI3OTE1MDAwMmY1ZmM5YjUxLi5hN2QwZTY5YWY2 M2Q1MjFkYTllYWNlZDVmNTkyY2M0MTM2NzcxYWQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5oCkBAIC0yMyw2ICsyMyw4IEBACiAgKiBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLiAKICAqLwogCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKKwogI2ltcG9ydCA8 V2ViQ29yZS9EcmFnQ2xpZW50Lmg+CiAKIEBjbGFzcyBXZWJWaWV3OwpAQCAtNDAsMyArNDIsNSBA QCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFdlYlZpZXcqIG1fd2ViVmlldzsKIH07CisKKyNlbmRp ZiAvLyBFTkFCTEUoRFJBR19TVVBQT1JUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNv cmVTdXBwb3J0L1dlYkRyYWdDbGllbnQubW0KaW5kZXggYWZmN2VjMmNmYTcxYThjZmViZTg2MGY4 ODFmYTI2NjY2ZDcxZTBhZi4uOTc1NTgwZjhlOGUxMzI3MWZkOTExOTIxZjU4N2QwNDQ4ZTRiMGVl MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0Ns aWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xp ZW50Lm1tCkBAIC0yNSw2ICsyNSw4IEBACiAKICNpbXBvcnQgIldlYkRyYWdDbGllbnQuaCIKIAor I2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCisKICNpbXBvcnQgIldlYkFyY2hpdmUuaCIKICNpbXBv cnQgIldlYkRPTU9wZXJhdGlvbnMuaCIKICNpbXBvcnQgIldlYkZyYW1lLmgiCkBAIC0xMzQsMyAr MTM2LDUgQEAgdm9pZCBXZWJEcmFnQ2xpZW50OjpkcmFnQ29udHJvbGxlckRlc3Ryb3llZCgpCiB7 CiAgICAgZGVsZXRlIHRoaXM7CiB9CisKKyNlbmRpZiAvLyBFTkFCTEUoRFJBR19TVVBQT1JUKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbSBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KaW5kZXggZTJmMWRmNmNiY2Y3OGZmYTJl ZmNjYWFiYmIzMzJiN2E4ZjBiYzUxZi4uYWNmN2I3MWY2YjQzMzU3NDFiNmVjYzVmZDk3YjE5NDQ0 ZjYyZTIyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCkBAIC03OTcsNiAr Nzk3LDcgQEAgc3RhdGljIGlubGluZSBXZWJEYXRhU291cmNlICpkYXRhU291cmNlKERvY3VtZW50 TG9hZGVyKiBsb2FkZXIpCiAgICAgX3ByaXZhdGUtPmNvcmVGcmFtZS0+ZWRpdG9yKCktPmNvbXB1 dGVBbmRTZXRUeXBpbmdTdHlsZShjb3JlKHN0eWxlKS0+Y29weSgpLmdldCgpLCB1bmRvQWN0aW9u KTsKIH0KIAorI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAtICh2b2lkKV9kcmFnU291cmNlRW5k ZWRBdDooTlNQb2ludCl3aW5kb3dMb2Mgb3BlcmF0aW9uOihOU0RyYWdPcGVyYXRpb24pb3BlcmF0 aW9uCiB7CiAgICAgaWYgKCFfcHJpdmF0ZS0+Y29yZUZyYW1lKQpAQCAtODA5LDYgKzgxMCw3IEBA IHN0YXRpYyBpbmxpbmUgV2ViRGF0YVNvdXJjZSAqZGF0YVNvdXJjZShEb2N1bWVudExvYWRlciog bG9hZGVyKQogICAgICAgICBMZWZ0QnV0dG9uLCBQbGF0Zm9ybUV2ZW50OjpNb3VzZU1vdmVkLCAw LCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgY3VycmVudFRpbWUoKSk7CiAgICAgX3ByaXZh dGUtPmNvcmVGcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmRyYWdTb3VyY2VFbmRlZEF0KGV2ZW50LCAo RHJhZ09wZXJhdGlvbilvcGVyYXRpb24pOwogfQorI2VuZGlmCiAKIC0gKEJPT0wpX2NhblByb3Zp ZGVEb2N1bWVudFNvdXJjZQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJGcmFtZUludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1l SW50ZXJuYWwuaAppbmRleCA1NWY0ZjIzMzQ2ZTM1ZDEzNWRiMWQ1NTczNTU2ZDBlMTYwYjgzZmY4 Li43NjA4YmQ0NTczYjJjMjBjNzljMDY5OTMwNTk2ODM5OGQ0MzM5YTgxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwuaApAQCAtMTU1LDcgKzE1NSw5IEBA IFdlYlZpZXcgKmdldFdlYlZpZXcoV2ViRnJhbWUgKndlYkZyYW1lKTsKIC0gKERPTUNTU1N0eWxl RGVjbGFyYXRpb24gKilfdHlwaW5nU3R5bGU7CiAtICh2b2lkKV9zZXRUeXBpbmdTdHlsZTooRE9N Q1NTU3R5bGVEZWNsYXJhdGlvbiAqKXN0eWxlIHdpdGhVbmRvQWN0aW9uOihXZWJDb3JlOjpFZGl0 QWN0aW9uKXVuZG9BY3Rpb247CiAKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogLSAodm9pZClf ZHJhZ1NvdXJjZUVuZGVkQXQ6KE5TUG9pbnQpd2luZG93TG9jIG9wZXJhdGlvbjooTlNEcmFnT3Bl cmF0aW9uKW9wZXJhdGlvbjsKKyNlbmRpZgogCiAtIChCT09MKV9jYW5Qcm92aWRlRG9jdW1lbnRT b3VyY2U7CiAtIChCT09MKV9jYW5TYXZlQXNXZWJBcmNoaXZlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYkZyYW1lVmlldy5tbQppbmRleCAxZDQ4ZDQ5OWEwMDc3MmUzNWIwNzFiM2ExNGIz M2QxMjZjOTBmYzc3Li43YTA5ZTRlMDY1OWMxYThkMTk4OGY4MDBlYzRiOTYyMmYyYTY5ZjQwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5tbQpAQCAtMTMxLDcgKzEz MSwxMCBAQCBlbnVtIHsKIC0gKHZvaWQpX3NldERvY3VtZW50VmlldzooTlNWaWV3IDxXZWJEb2N1 bWVudFZpZXc+ICopdmlldwogewogICAgIFdlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyAqc3YgPSBb c2VsZiBfc2Nyb2xsVmlld107CisgICAgCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICBj b3JlKFtzZWxmIF93ZWJWaWV3XSktPmRyYWdDb250cm9sbGVyKCktPnNldERpZEluaXRpYXRlRHJh ZyhmYWxzZSk7CisjZW5kaWYKICAgICAKICAgICBbc3Ygc2V0U3VwcHJlc3NMYXlvdXQ6WUVTXTsK ICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcu bW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCmluZGV4IDJhMTIx MGI0ZjExOTQwNWEzNDRhNjA0YzIzODliYTJmNGU5ZDQxNDMuLjE3ZDMwOTNjZDBiZWNlZDNhNzJm Nzk1YTRlY2VkZDlhYTZmMDdlYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSFRNTFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1M Vmlldy5tbQpAQCAtMjI4NSwxNSArMjI4NSw2IEBAIHN0YXRpYyBib29sIG1vdXNlRXZlbnRJc1Bh cnRPZkNsaWNrT3JEcmFnKE5TRXZlbnQgKmV2ZW50KQogCiBAZW5kCiAKLXN0YXRpYyBib29sIG1h dGNoZXNFeHRlbnNpb25PckVxdWl2YWxlbnQoTlNTdHJpbmcgKmZpbGVuYW1lLCBOU1N0cmluZyAq ZXh0ZW5zaW9uKQotewotICAgIE5TU3RyaW5nICpleHRlbnNpb25Bc1N1ZmZpeCA9IFtAIi4iIHN0 cmluZ0J5QXBwZW5kaW5nU3RyaW5nOmV4dGVuc2lvbl07Ci0gICAgcmV0dXJuIFtmaWxlbmFtZSBf d2Via2l0X2hhc0Nhc2VJbnNlbnNpdGl2ZVN1ZmZpeDpleHRlbnNpb25Bc1N1ZmZpeF0KLSAgICAg ICAgfHwgKFtleHRlbnNpb24gX3dlYmtpdF9pc0Nhc2VJbnNlbnNpdGl2ZUVxdWFsVG9TdHJpbmc6 QCJqcGVnIl0KLSAgICAgICAgICAgICYmIFtmaWxlbmFtZSBfd2Via2l0X2hhc0Nhc2VJbnNlbnNp dGl2ZVN1ZmZpeDpAIi5qcGciXSk7Ci19Ci0KLQogQGltcGxlbWVudGF0aW9uIFdlYkhUTUxWaWV3 CiAKICsgKHZvaWQpaW5pdGlhbGl6ZQpAQCAtMzUyNiw4ICszNTE3LDEwIEBAIHN0YXRpYyB2b2lk IHNldE1lbnVUYXJnZXRzKE5TTWVudSogbWVudSkKICAgICAgICAgICAgIGNvcmVGcmFtZS0+ZXZl bnRIYW5kbGVyKCktPnNldEFjdGl2YXRpb25FdmVudE51bWJlcihbZXZlbnQgZXZlbnROdW1iZXJd KTsKICAgICAgICAgICAgIFtoaXRIVE1MVmlldyBfc2V0TW91c2VEb3duRXZlbnQ6ZXZlbnRdOwog ICAgICAgICAgICAgaWYgKFtoaXRIVE1MVmlldyBfaXNTZWxlY3Rpb25FdmVudDpldmVudF0pIHsK KyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgICAgICAgICAgICAgIGlmIChQYWdlKiBwYWdl ID0gY29yZUZyYW1lLT5wYWdlKCkpCiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IGNvcmVG cmFtZS0+ZXZlbnRIYW5kbGVyKCktPmV2ZW50TWF5U3RhcnREcmFnKFBsYXRmb3JtRXZlbnRGYWN0 b3J5OjpjcmVhdGVQbGF0Zm9ybU1vdXNlRXZlbnQoZXZlbnQsIHBhZ2UtPmNocm9tZSgpLT5wbGF0 Zm9ybVBhZ2VDbGllbnQoKSkpOworI2VuZGlmCiAgICAgICAgICAgICB9IGVsc2UgaWYgKFtoaXRI VE1MVmlldyBfaXNTY3JvbGxCYXJFdmVudDpldmVudF0pCiAgICAgICAgICAgICAgICAgcmVzdWx0 ID0gdHJ1ZTsKICAgICAgICAgICAgIFtoaXRIVE1MVmlldyBfc2V0TW91c2VEb3duRXZlbnQ6bmls XTsKQEAgLTM1NDksMTIgKzM1NDIsMTQgQEAgc3RhdGljIHZvaWQgc2V0TWVudVRhcmdldHMoTlNN ZW51KiBtZW51KQogICAgIGlmIChoaXRIVE1MVmlldykgewogICAgICAgICBib29sIHJlc3VsdCA9 IGZhbHNlOwogICAgICAgICBpZiAoW2hpdEhUTUxWaWV3IF9pc1NlbGVjdGlvbkV2ZW50OmV2ZW50 XSkgeworICAgICAgICAgICAgW2hpdEhUTUxWaWV3IF9zZXRNb3VzZURvd25FdmVudDpldmVudF07 CisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICAgICAgICAgIGlmIChGcmFtZSogY29yZUZy YW1lID0gY29yZShbaGl0SFRNTFZpZXcgX2ZyYW1lXSkpIHsKLSAgICAgICAgICAgICAgICBbaGl0 SFRNTFZpZXcgX3NldE1vdXNlRG93bkV2ZW50OmV2ZW50XTsKICAgICAgICAgICAgICAgICBpZiAo UGFnZSogcGFnZSA9IGNvcmVGcmFtZS0+cGFnZSgpKQogICAgICAgICAgICAgICAgICAgICByZXN1 bHQgPSBjb3JlRnJhbWUtPmV2ZW50SGFuZGxlcigpLT5ldmVudE1heVN0YXJ0RHJhZyhQbGF0Zm9y bUV2ZW50RmFjdG9yeTo6Y3JlYXRlUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50LCBwYWdlLT5jaHJv bWUoKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpKTsKLSAgICAgICAgICAgICAgICBbaGl0SFRNTFZp ZXcgX3NldE1vdXNlRG93bkV2ZW50Om5pbF07CiAgICAgICAgICAgICB9CisjZW5kaWYKKyAgICAg ICAgICAgIFtoaXRIVE1MVmlldyBfc2V0TW91c2VEb3duRXZlbnQ6bmlsXTsKICAgICAgICAgfQog ICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KQEAgLTM1OTgsNiArMzU5Myw3IEBAIGRvbmU6 CiAgICAgX3ByaXZhdGUtPmhhbmRsaW5nTW91c2VEb3duRXZlbnQgPSBOTzsKIH0KIAorI2lmIEVO QUJMRShEUkFHX1NVUFBPUlQpCiAtICh2b2lkKWRyYWdJbWFnZTooTlNJbWFnZSAqKWRyYWdJbWFn ZQogICAgICAgICAgICAgICAgYXQ6KE5TUG9pbnQpYXQKICAgICAgICAgICAgb2Zmc2V0OihOU1Np emUpb2Zmc2V0CkBAIC0zNjc0LDYgKzM2NzAsMTQgQEAgZG9uZToKICAgICBbc2VsZiBtb3VzZVVw OmZha2VFdmVudF07IC8vIFRoaXMgd2lsbCBhbHNvIHVwZGF0ZSB0aGUgbW91c2VvdmVyIHN0YXRl LgogfQogCitzdGF0aWMgYm9vbCBtYXRjaGVzRXh0ZW5zaW9uT3JFcXVpdmFsZW50KE5TU3RyaW5n ICpmaWxlbmFtZSwgTlNTdHJpbmcgKmV4dGVuc2lvbikKK3sKKyAgICBOU1N0cmluZyAqZXh0ZW5z aW9uQXNTdWZmaXggPSBbQCIuIiBzdHJpbmdCeUFwcGVuZGluZ1N0cmluZzpleHRlbnNpb25dOwor ICAgIHJldHVybiBbZmlsZW5hbWUgX3dlYmtpdF9oYXNDYXNlSW5zZW5zaXRpdmVTdWZmaXg6ZXh0 ZW5zaW9uQXNTdWZmaXhdCisgICAgfHwgKFtleHRlbnNpb24gX3dlYmtpdF9pc0Nhc2VJbnNlbnNp dGl2ZUVxdWFsVG9TdHJpbmc6QCJqcGVnIl0KKyAgICAgICAgJiYgW2ZpbGVuYW1lIF93ZWJraXRf aGFzQ2FzZUluc2Vuc2l0aXZlU3VmZml4OkAiLmpwZyJdKTsKK30KKwogLSAoTlNBcnJheSAqKW5h bWVzT2ZQcm9taXNlZEZpbGVzRHJvcHBlZEF0RGVzdGluYXRpb246KE5TVVJMICopZHJvcERlc3Rp bmF0aW9uCiB7CiAgICAgTlNGaWxlV3JhcHBlciAqd3JhcHBlciA9IG5pbDsKQEAgLTM3MzEsNiAr MzczNSw3IEBAIG5vUHJvbWlzZWREYXRhOgogICAgIAogICAgIHJldHVybiBbTlNBcnJheSBhcnJh eVdpdGhPYmplY3Q6W3BhdGggbGFzdFBhdGhDb21wb25lbnRdXTsKIH0KKyNlbmRpZgogCiAtICh2 b2lkKW1vdXNlVXA6KE5TRXZlbnQgKilldmVudAogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJW aWV3Lm1tCmluZGV4IGFkNzBiZmFiYTFjM2QwNDg5ZDQwN2M2NDg5MjhmMzRkM2RmZDc0YmMuLjgy MzEwNDA5ZTFmZGMwMzRiZjQ4YmEyZTg5YWVkYmY2YThmMTQ4MzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZXcubW0KQEAgLTc0Niw3ICs3NDYsOSBAQCBzdGF0aWMgYm9vbCBzaG91bGRS ZXNwZWN0UHJpb3JpdHlJbkNTU0F0dHJpYnV0ZVNldHRlcnMoKQogICAgIHBhZ2VDbGllbnRzLmNo cm9tZUNsaWVudCA9IG5ldyBXZWJDaHJvbWVDbGllbnQoc2VsZik7CiAgICAgcGFnZUNsaWVudHMu Y29udGV4dE1lbnVDbGllbnQgPSBuZXcgV2ViQ29udGV4dE1lbnVDbGllbnQoc2VsZik7CiAgICAg cGFnZUNsaWVudHMuZWRpdG9yQ2xpZW50ID0gbmV3IFdlYkVkaXRvckNsaWVudChzZWxmKTsKKyNp ZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHBhZ2VDbGllbnRzLmRyYWdDbGllbnQgPSBuZXcg V2ViRHJhZ0NsaWVudChzZWxmKTsKKyNlbmRpZgogICAgIHBhZ2VDbGllbnRzLmluc3BlY3RvckNs aWVudCA9IG5ldyBXZWJJbnNwZWN0b3JDbGllbnQoc2VsZik7CiAgICAgcGFnZUNsaWVudHMuYWx0 ZXJuYXRpdmVUZXh0Q2xpZW50ID0gbmV3IFdlYkFsdGVybmF0aXZlVGV4dENsaWVudChzZWxmKTsK ICAgICBfcHJpdmF0ZS0+cGFnZSA9IG5ldyBQYWdlKHBhZ2VDbGllbnRzKTsKQEAgLTE5NTUsMTIg KzE5NTcsMTQgQEAgc3RhdGljIGlubGluZSBJTVAgZ2V0TWV0aG9kKGlkIG8sIFNFTCBzKQogICAg ICAgICAgICAgICAgICAgICAgICAgdHlwZXM6dHlwZXNdOwogfQogCisjaWYgRU5BQkxFKERSQUdf U1VQUE9SVCkKIC0gKHZvaWQpX3NldEluaXRpYXRlZERyYWc6KEJPT0wpaW5pdGlhdGVkRHJhZwog ewogICAgIGlmICghX3ByaXZhdGUtPnBhZ2UpCiAgICAgICAgIHJldHVybjsKICAgICBfcHJpdmF0 ZS0+cGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+c2V0RGlkSW5pdGlhdGVEcmFnKGluaXRpYXRlZERy YWcpOwogfQorI2VuZGlmCiAKICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCiAKQEAgLTQw MTUsNiArNDAxOSw3IEBAIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGJhY2tpbmdQcm9wZXJ0eU9s ZFNjYWxlRmFjdG9yS2V5ID0gQCJOU0JhY2tpbmdQcm9wZXJ0eU9sCiAgICAgcmV0dXJuIFtzZWxm IF9lbGVtZW50QXRXaW5kb3dQb2ludDpbc2VsZiBjb252ZXJ0UG9pbnQ6cG9pbnQgdG9WaWV3Om5p bF1dOwogfQogCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKIC8vIFRoZSBmb2xsb3dpbmcgMiBp bnRlcm5hbCBOU1ZpZXcgbWV0aG9kcyBhcmUgY2FsbGVkIG9uIHRoZSBkcmFnIGRlc3RpbmF0aW9u IHRvIG1ha2Ugc2Nyb2xsaW5nIHdoaWxlIGRyYWdnaW5nIHdvcmsuCiAvLyBTY3JvbGxpbmcgd2hp bGUgZHJhZ2dpbmcgd2lsbCBvbmx5IHdvcmsgaWYgdGhlIGRyYWcgZGVzdGluYXRpb24gaXMgaW4g YSBzY3JvbGwgdmlldy4gVGhlIFdlYlZpZXcgaXMgdGhlIGRyYWcgZGVzdGluYXRpb24uIAogLy8g V2hlbiBkcmFnZ2luZyB0byBhIFdlYlZpZXcsIHRoZSBkb2N1bWVudCBzdWJ2aWV3IHNob3VsZCBz Y3JvbGwsIGJ1dCBpdCBkb2Vzbid0IGJlY2F1c2UgaXQgaXMgbm90IHRoZSBkcmFnIGRlc3RpbmF0 aW9uLiAKQEAgLTQwOTcsNiArNDEwMiw3IEBAIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGJhY2tp bmdQcm9wZXJ0eU9sZFNjYWxlRmFjdG9yS2V5ID0gQCJOU0JhY2tpbmdQcm9wZXJ0eU9sCiAgICAg ICAgIHJldHVybiBzZWxmOwogICAgIHJldHVybiBoaXRWaWV3OwogfQorI2VuZGlmCiAKIC0gKEJP T0wpYWNjZXB0c0ZpcnN0UmVzcG9uZGVyCiB7CkBAIC00MjU3LDE0ICs0MjYzLDE4IEBAIHN0YXRp YyBXZWJGcmFtZSAqaW5jcmVtZW50RnJhbWUoV2ViRnJhbWUgKmZyYW1lLCBXZWJGaW5kT3B0aW9u cyBvcHRpb25zID0gMCkKIAogLSAodm9pZCltb3ZlRHJhZ0NhcmV0VG9Qb2ludDooTlNQb2ludClw b2ludAogeworI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBj b3JlKHNlbGYpKQogICAgICAgICBwYWdlLT5kcmFnQ29udHJvbGxlcigpLT5wbGFjZURyYWdDYXJl dChJbnRQb2ludChbc2VsZiBjb252ZXJ0UG9pbnQ6cG9pbnQgdG9WaWV3Om5pbF0pKTsKKyNlbmRp ZgogfQogCiAtICh2b2lkKXJlbW92ZURyYWdDYXJldAogeworI2lmIEVOQUJMRShEUkFHX1NVUFBP UlQpCiAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBjb3JlKHNlbGYpKQogICAgICAgICBwYWdlLT5kcmFn Q29udHJvbGxlcigpLT5kcmFnRW5kZWQoKTsKKyNlbmRpZgogfQogCiAtICh2b2lkKXNldE1haW5G cmFtZVVSTDooTlNTdHJpbmcgKilVUkxTdHJpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlldy5tbQppbmRleCA3M2VlMDhkNzg1MDk5NTNjOTA1MzM1ZmE2OGQ2ZWEzMzU0 MTQ5Nzg0Li41ZmQzMDZjNGFjNWJlNWI2YzRlMzI4MzkyMTZhZWNjNDZmZmY2MDQ5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC0xNjIzLDYgKzE2MjMs NyBAQCBzdGF0aWMgdm9pZCBleHRyYWN0VW5kZXJsaW5lcyhOU0F0dHJpYnV0ZWRTdHJpbmcgKnN0 cmluZywgVmVjdG9yPENvbXBvc2l0aW9uVW5kZQogICAgIHJldHVybiBzdGF0aWNfY2FzdDxEcmFn QXBwbGljYXRpb25GbGFncz4oZmxhZ3MpOwogfQogCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkK IC0gKE5TRHJhZ09wZXJhdGlvbilkcmFnZ2luZ0VudGVyZWQ6KGlkIDxOU0RyYWdnaW5nSW5mbz4p ZHJhZ2dpbmdJbmZvCiB7CiAgICAgSW50UG9pbnQgY2xpZW50KFtzZWxmIGNvbnZlcnRQb2ludDpb ZHJhZ2dpbmdJbmZvIGRyYWdnaW5nTG9jYXRpb25dIGZyb21WaWV3Om5pbF0pOwpAQCAtMTY5OSw3 ICsxNzAwLDcgQEAgc3RhdGljIHZvaWQgY3JlYXRlU2FuZGJveEV4dGVuc2lvbnNGb3JGaWxlVXBs b2FkKE5TUGFzdGVib2FyZCAqcGFzdGVib2FyZCwgU2FuZGIKICAgICBOU0FycmF5ICp0eXBlcyA9 IFtwYXN0ZWJvYXJkIHR5cGVzXTsKICAgICBpZiAoIVt0eXBlcyBjb250YWluc09iamVjdDpOU0Zp bGVuYW1lc1Bib2FyZFR5cGVdKQogICAgICAgICByZXR1cm47Ci0gICAgCisKICAgICBOU0FycmF5 ICpmaWxlcyA9IFtwYXN0ZWJvYXJkIHByb3BlcnR5TGlzdEZvclR5cGU6TlNGaWxlbmFtZXNQYm9h cmRUeXBlXTsKICAgICBoYW5kbGVzLmFsbG9jYXRlKFtmaWxlcyBjb3VudF0pOwogICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBbZmlsZXMgY291bnRdOyBpKyspIHsKQEAgLTE3MTYsMTcgKzE3 MTcsMTcgQEAgc3RhdGljIHZvaWQgY3JlYXRlU2FuZGJveEV4dGVuc2lvbnNGb3JGaWxlVXBsb2Fk KE5TUGFzdGVib2FyZCAqcGFzdGVib2FyZCwgU2FuZGIKICAgICBJbnRQb2ludCBjbGllbnQoW3Nl bGYgY29udmVydFBvaW50OltkcmFnZ2luZ0luZm8gZHJhZ2dpbmdMb2NhdGlvbl0gZnJvbVZpZXc6 bmlsXSk7CiAgICAgSW50UG9pbnQgZ2xvYmFsKGdsb2JhbFBvaW50KFtkcmFnZ2luZ0luZm8gZHJh Z2dpbmdMb2NhdGlvbl0sIFtzZWxmIHdpbmRvd10pKTsKICAgICBEcmFnRGF0YSBkcmFnRGF0YShk cmFnZ2luZ0luZm8sIGNsaWVudCwgZ2xvYmFsLCBzdGF0aWNfY2FzdDxEcmFnT3BlcmF0aW9uPihb ZHJhZ2dpbmdJbmZvIGRyYWdnaW5nU291cmNlT3BlcmF0aW9uTWFza10pLCBbc2VsZiBhcHBsaWNh dGlvbkZsYWdzOmRyYWdnaW5nSW5mb10pOwotCisgICAgCiAgICAgU2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlIHNhbmRib3hFeHRlbnNpb25IYW5kbGU7CiAgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9u ID0gbWF5YmVDcmVhdGVTYW5kYm94RXh0ZW5zaW9uRnJvbVBhc3RlYm9hcmQoW2RyYWdnaW5nSW5m byBkcmFnZ2luZ1Bhc3RlYm9hcmRdLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBpZiAo Y3JlYXRlZEV4dGVuc2lvbikKICAgICAgICAgX2RhdGEtPl9wYWdlLT5wcm9jZXNzKCktPndpbGxB Y3F1aXJlVW5pdmVyc2FsRmlsZVJlYWRTYW5kYm94RXh0ZW5zaW9uKCk7Ci0KKyAgICAKICAgICBT YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBzYW5kYm94RXh0ZW5zaW9uRm9yVXBsb2FkOwog ICAgIGNyZWF0ZVNhbmRib3hFeHRlbnNpb25zRm9yRmlsZVVwbG9hZChbZHJhZ2dpbmdJbmZvIGRy YWdnaW5nUGFzdGVib2FyZF0sIHNhbmRib3hFeHRlbnNpb25Gb3JVcGxvYWQpOwogICAgIAogICAg IF9kYXRhLT5fcGFnZS0+cGVyZm9ybURyYWcoJmRyYWdEYXRhLCBbW2RyYWdnaW5nSW5mbyBkcmFn Z2luZ1Bhc3RlYm9hcmRdIG5hbWVdLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBzYW5kYm94RXh0 ZW5zaW9uRm9yVXBsb2FkKTsKLQorICAgIAogICAgIHJldHVybiBZRVM7CiB9CiAKQEAgLTE3Mzks NiArMTc0MCw3IEBAIHN0YXRpYyB2b2lkIGNyZWF0ZVNhbmRib3hFeHRlbnNpb25zRm9yRmlsZVVw bG9hZChOU1Bhc3RlYm9hcmQgKnBhc3RlYm9hcmQsIFNhbmRiCiAgICAgICAgIHJldHVybiBzZWxm OwogICAgIHJldHVybiBuaWw7CiB9CisjZW5kaWYgLy8gRU5BQkxFKERSQUdfU1VQUE9SVCkKIAog LSAoQk9PTClfd2luZG93UmVzaXplTW91c2VMb2NhdGlvbklzSW5WaXNpYmxlU2Nyb2xsZXJUaHVt YjooTlNQb2ludClsb2MKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuY3BwCmluZGV4IGY3NmYyYWU2NzNmNGUy ZWU0MjRiNDk4YWIxYmYzZDZjMDBjMzA5NTkuLjE4NGU2ODBhM2FhOTg3OTk1NzQ3MTk4ZTQxZDQ0 ZTM2ODkyODI4ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50LmNwcApAQCAtMjYsNiArMjYsOCBAQAogI2lu Y2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYkRyYWdDbGllbnQuaCIKIAorI2lmIEVOQUJM RShEUkFHX1NVUFBPUlQpCisKICNpbmNsdWRlICJXZWJQYWdlLmgiCiAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwpAQCAtNjYsMyArNjgsNSBAQCB2b2lkIFdlYkRyYWdDbGllbnQ6OmRyYWdDb250 cm9sbGVyRGVzdHJveWVkKCkKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZiAv LyBFTkFCTEUoRFJBR19TVVBQT1JUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaAppbmRleCBiY2VlNjkzNjJkZDhm NDgxNThhMTZmZjg2ZDEzYmI1NGM1MDk5Njc3Li5lNzAzZmQyYWY3ODY4YTM1NWQ5MTIzY2Q2YjY2 MzA2MGM2NWVhM2NkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaApAQCAtMjYsNiArMjYsOCBAQAogI2lmbmRl ZiBXZWJEcmFnQ2xpZW50X2gKICNkZWZpbmUgV2ViRHJhZ0NsaWVudF9oCiAKKyNpZiBFTkFCTEUo RFJBR19TVVBQT1JUKQorCiAjaW5jbHVkZSA8V2ViQ29yZS9EcmFnQ2xpZW50Lmg+CiAKIG5hbWVz cGFjZSBXZWJLaXQgewpAQCAtNTgsNCArNjAsNiBAQCBwcml2YXRlOgogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKIAorI2VuZGlmIC8vIEVOQUJMRShEUkFHX1NVUFBPUlQpCisKICNlbmRpZiAvLyBX ZWJEcmFnQ2xpZW50X2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvbWFjL1dlYkRyYWdDbGllbnRNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJEcmFnQ2xpZW50TWFjLm1tCmluZGV4IDFiYjIw OWQyZTAxM2E3OGRiYjhkMzRiOTM3YzIxYTdjOTIzMGE4OTcuLjM0ZjEzOTBjZWY2YTVmMjc5NTUw ODE0NzBhZjNiY2JmZDg4NGM2NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkRyYWdDbGllbnRNYWMubW0KKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRHJhZ0NsaWVudE1hYy5tbQpA QCAtMjYsNiArMjYsOCBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJXZWJEcmFnQ2xp ZW50LmgiCiAKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQorCiAjaW1wb3J0ICJQYXN0ZWJvYXJk VHlwZXMuaCIKICNpbXBvcnQgIlNoYXJlYWJsZUJpdG1hcC5oIgogI2ltcG9ydCAiV2ViQ29yZUFy Z3VtZW50Q29kZXJzLmgiCkBAIC0xNDUsMyArMTQ3LDUgQEAgdm9pZCBXZWJEcmFnQ2xpZW50Ojpk ZWNsYXJlQW5kV3JpdGVEcmFnSW1hZ2UoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgRE9N RWwKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZiAvLyBFTkFCTEUoRFJBR19T VVBQT1JUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CmluZGV4IDM1NzNiMGFmMDY5ZDA5M2FlMzA1NTQ4ODJlNDBhYjhlNmZlMWMxOGEuLmU4MzFhMTYy YThjNmQ5NWQzMTg5MWIyYTg2NWJiNzY2NDJlNGFmYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI0MCw3ICsyNDAsOSBAQCBXZWJQYWdl OjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cyYgcGFyYW1ldGVycykKICAgICBwYWdlQ2xpZW50cy5jb250ZXh0TWVudUNsaWVudCA9IG5ldyBX ZWJDb250ZXh0TWVudUNsaWVudCh0aGlzKTsKICNlbmRpZgogICAgIHBhZ2VDbGllbnRzLmVkaXRv ckNsaWVudCA9IG5ldyBXZWJFZGl0b3JDbGllbnQodGhpcyk7CisjaWYgRU5BQkxFKERSQUdfU1VQ UE9SVCkKICAgICBwYWdlQ2xpZW50cy5kcmFnQ2xpZW50ID0gbmV3IFdlYkRyYWdDbGllbnQodGhp cyk7CisjZW5kaWYKICAgICBwYWdlQ2xpZW50cy5iYWNrRm9yd2FyZENsaWVudCA9IFdlYkJhY2tG b3J3YXJkTGlzdFByb3h5OjpjcmVhdGUodGhpcyk7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKICAg ICBwYWdlQ2xpZW50cy5pbnNwZWN0b3JDbGllbnQgPSBuZXcgV2ViSW5zcGVjdG9yQ2xpZW50KHRo aXMpOwpAQCAtMjEwMCw2ICsyMTAyLDggQEAgYm9vbCBXZWJQYWdlOjpoYW5kbGVFZGl0aW5nS2V5 Ym9hcmRFdmVudChLZXlib2FyZEV2ZW50KiBldnQpCiB9CiAjZW5kaWYKIAorI2lmIEVOQUJMRShE UkFHX1NVUFBPUlQpCisKICNpZiBQTEFURk9STShXSU4pCiB2b2lkIFdlYlBhZ2U6OnBlcmZvcm1E cmFnQ29udHJvbGxlckFjdGlvbih1aW50NjRfdCBhY3Rpb24sIFdlYkNvcmU6OkludFBvaW50IGNs aWVudFBvc2l0aW9uLCBXZWJDb3JlOjpJbnRQb2ludCBnbG9iYWxQb3NpdGlvbiwgdWludDY0X3Qg ZHJhZ2dpbmdTb3VyY2VPcGVyYXRpb25NYXNrLCBjb25zdCBXZWJDb3JlOjpEcmFnRGF0YU1hcCYg ZGF0YU1hcCwgdWludDMyX3QgZmxhZ3MpCiB7CkBAIC0yMjUyLDYgKzIyNTYsOCBAQCB2b2lkIFdl YlBhZ2U6Om1heVBlcmZvcm1VcGxvYWREcmFnRGVzdGluYXRpb25BY3Rpb24oKQogICAgICAgICBt X3BlbmRpbmdEcm9wRXh0ZW5zaW9uc0ZvckZpbGVVcGxvYWRbaV0tPmNvbnN1bWVQZXJtYW5lbnRs eSgpOwogICAgIG1fcGVuZGluZ0Ryb3BFeHRlbnNpb25zRm9yRmlsZVVwbG9hZC5jbGVhcigpOwog fQorICAgIAorI2VuZGlmIC8vIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAKIFdlYlVuZG9TdGVwKiBX ZWJQYWdlOjp3ZWJVbmRvU3RlcCh1aW50NjRfdCBzdGVwSUQpCiB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0gYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KaW5kZXggYzZiYTAx MjU1MDhlMDJkZTVmZmM4MDUxZWYwM2Y2NDM3MjIxNDVmNS4uOWUwYzEzNzc1ZDI2ZjAwY2YyZDg5 NzhiNmM3ZmZhOTIxYWZhZGNlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQpAQCAtNzEwLDkgKzcxMCwxMSBAQCB2b2lkIFdl YlBhZ2U6OnNob3VsZERlbGF5V2luZG93T3JkZXJpbmdFdmVudChjb25zdCBXZWJLaXQ6OldlYk1v dXNlRXZlbnQmIGV2ZW50LAogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKIAorI2lm IEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgSGl0VGVzdFJlc3VsdCBoaXRSZXN1bHQgPSBmcmFt ZS0+ZXZlbnRIYW5kbGVyKCktPmhpdFRlc3RSZXN1bHRBdFBvaW50KGZyYW1lLT52aWV3KCktPndp bmRvd1RvQ29udGVudHMoZXZlbnQucG9zaXRpb24oKSksIHRydWUpOwogICAgIGlmIChoaXRSZXN1 bHQuaXNTZWxlY3RlZCgpKQogICAgICAgICByZXN1bHQgPSBmcmFtZS0+ZXZlbnRIYW5kbGVyKCkt PmV2ZW50TWF5U3RhcnREcmFnKHBsYXRmb3JtKGV2ZW50KSk7CisjZW5kaWYKIH0KIAogdm9pZCBX ZWJQYWdlOjphY2NlcHRzRmlyc3RNb3VzZShpbnQgZXZlbnROdW1iZXIsIGNvbnN0IFdlYktpdDo6 V2ViTW91c2VFdmVudCYgZXZlbnQsIGJvb2wmIHJlc3VsdCkKQEAgLTcyNCw5ICs3MjYsMTEgQEAg dm9pZCBXZWJQYWdlOjphY2NlcHRzRmlyc3RNb3VzZShpbnQgZXZlbnROdW1iZXIsIGNvbnN0IFdl YktpdDo6V2ViTW91c2VFdmVudCYgZXYKICAgICAKICAgICBIaXRUZXN0UmVzdWx0IGhpdFJlc3Vs dCA9IGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+aGl0VGVzdFJlc3VsdEF0UG9pbnQoZnJhbWUtPnZp ZXcoKS0+d2luZG93VG9Db250ZW50cyhldmVudC5wb3NpdGlvbigpKSwgdHJ1ZSk7CiAgICAgZnJh bWUtPmV2ZW50SGFuZGxlcigpLT5zZXRBY3RpdmF0aW9uRXZlbnROdW1iZXIoZXZlbnROdW1iZXIp OworI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgaWYgKGhpdFJlc3VsdC5pc1NlbGVjdGVk KCkpCiAgICAgICAgIHJlc3VsdCA9IGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+ZXZlbnRNYXlTdGFy dERyYWcocGxhdGZvcm0oZXZlbnQpKTsKLSAgICBlbHNlIAorICAgIGVsc2UKKyNlbmRpZgogICAg ICAgICByZXN1bHQgPSAhIWhpdFJlc3VsdC5zY3JvbGxiYXIoKTsKIH0KIAo=