234021 2021-12-08 10:57:33 -0800 [Win] WebCore::cfHDropFormat implementation is not CF specific 2021-12-08 12:48:43 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 175336 1 don.olmstead don.olmstead achristensen webkit-bug-importer oldest_to_newest 1821633 0 don.olmstead 2021-12-08 10:57:33 -0800 Drop the USE(CF) guards. 1821639 1 446389 don.olmstead 2021-12-08 11:05:29 -0800 Created attachment 446389 Patch 1821642 2 446389 don.olmstead 2021-12-08 11:06:31 -0800 Comment on attachment 446389 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446389&action=review > Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp:56 > +#if USE(CF) > + There is some additional CF specific code in this file that will be removed in a subsequent patch. 1821644 3 446389 achristensen 2021-12-08 11:09:17 -0800 Comment on attachment 446389 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446389&action=review > Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp:49 > FORMATETC* cfHDropFormat() Could we rename these to things like "dropFormat"? > Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp:737 > void getCFData(IDataObject* data, FORMATETC* format, Vector<String>& dataStrings) ditto > Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp:791 > void setCFData(IDataObject* data, FORMATETC* format, const Vector<String>& dataStrings) ditto 1821651 4 446389 don.olmstead 2021-12-08 11:14:12 -0800 Comment on attachment 446389 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446389&action=review >> Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp:49 >> FORMATETC* cfHDropFormat() > > Could we rename these to things like "dropFormat"? This actually corresponds to https://docs.microsoft.com/en-us/windows/win32/shell/clipboard#cf_hdrop so the name does have a specific meaning to Windows code. 1821652 5 achristensen 2021-12-08 11:15:05 -0800 oh, cool. CFData is not though 1821664 6 446395 don.olmstead 2021-12-08 11:28:27 -0800 Created attachment 446395 Patch 1821729 7 ews-feeder 2021-12-08 12:47:53 -0800 Committed r286708 (244985@main): <https://commits.webkit.org/244985@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446395. 1821733 8 webkit-bug-importer 2021-12-08 12:48:43 -0800 <rdar://problem/86225180> 446389 2021-12-08 11:05:29 -0800 2021-12-08 11:28:27 -0800 Patch bug-234021.diff text/plain 7141 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyY2VkOGRmZTI0MjIuLjA5MDAyYTE2ZjRhNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI2IEBACisyMDIxLTEyLTA4ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29u eS5jb20+CisKKyAgICAgICAgW1dpbl0gV2ViQ29yZTo6Y2ZIRHJvcEZvcm1hdCBpbXBsZW1lbnRh dGlvbiBpcyBub3QgQ0Ygc3BlY2lmaWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNDAyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSBpbXBsZW1lbnRhdGlvbiBvZiBjZkhEcm9wRm9ybWF0IHdhcyBn dWFyZGVkIGJ5IFVTRShDRikgYnV0IHRoZXJlIGlzIG5vdGhpbmcgQ0Ygc3BlY2lmaWMgYWJvdXQg dGhlCisgICAgICAgIGltcGxlbWVudGF0aW9uLiBEcm9wIHRoZSBndWFyZHMgYXJvdW5kIGl0IGFu ZCBhbnkgb2YgaXRzIGNhbGxlcnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vQ2xpcGJvYXJk VXRpbGl0aWVzV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldFdlYkxvY0RhdGEpOgorICAg ICAgICAoV2ViQ29yZTo6Z2V0Q0ZEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OnNldENGRGF0YSk6 CisgICAgICAgIChXZWJDb3JlOjpnZXRDbGlwYm9hcmRNYXApOgorICAgICAgICAqIHBsYXRmb3Jt L3dpbi9EcmFnRGF0YVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEcmFnRGF0YTo6Y29udGFp bnNGaWxlcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEcmFnRGF0YTo6bnVtYmVyT2ZGaWxl cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEcmFnRGF0YTo6YXNGaWxlbmFtZXMgY29uc3Qp OgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBhc3RlYm9hcmQ6OnJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVGaWxlVG9E YXRhT2JqZWN0KToKKwogMjAyMS0xMi0wOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5j b20+CiAKICAgICAgICAgW0NTUyBDYXNjYWRlIExheWVyc10gVXBkYXRlIENTU09NIHRvIHRoZSBz cGVjCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkVXRp bGl0aWVzV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRVdGls aXRpZXNXaW4uY3BwCmluZGV4IDNlOTdlODA0ZTExNS4uMGM2M2QzNTQxMWM1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkVXRpbGl0aWVzV2luLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkVXRpbGl0aWVzV2luLmNw cApAQCAtNDYsMTMgKzQ2LDE0IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmIFVTRShD RikKIEZPUk1BVEVUQyogY2ZIRHJvcEZvcm1hdCgpCiB7CiAgICAgc3RhdGljIEZPUk1BVEVUQyB1 cmxGb3JtYXQgPSB7Q0ZfSERST1AsIDAsIERWQVNQRUNUX0NPTlRFTlQsIC0xLCBUWU1FRF9IR0xP QkFMfTsKICAgICByZXR1cm4gJnVybEZvcm1hdDsKIH0KIAorI2lmIFVTRShDRikKKwogc3RhdGlj IGJvb2wgdXJsRnJvbVBhdGgoQ0ZTdHJpbmdSZWYgcGF0aCwgU3RyaW5nJiB1cmwpCiB7CiAgICAg aWYgKCFwYXRoKQpAQCAtODQsNyArODUsNiBAQCBzdGF0aWMgYm9vbCBnZXREYXRhTWFwSXRlbShj b25zdCBEcmFnRGF0YU1hcCogZGF0YU9iamVjdCwgRk9STUFURVRDKiBmb3JtYXQsIFN0cgogc3Rh dGljIGJvb2wgZ2V0V2ViTG9jRGF0YShJRGF0YU9iamVjdCogZGF0YU9iamVjdCwgU3RyaW5nJiB1 cmwsIFN0cmluZyogdGl0bGUpIAogewogICAgIGJvb2wgc3VjY2VlZGVkID0gZmFsc2U7Ci0jaWYg VVNFKENGKQogICAgIFdDSEFSIGZpbGVuYW1lW01BWF9QQVRIXTsKICAgICBXQ0hBUiB1cmxCdWZm ZXJbSU5URVJORVRfTUFYX1VSTF9MRU5HVEhdOwogCkBAIC0xMTgsMTMgKzExOCwxMSBAQCBleGl0 OgogICAgIC8vIEZyZWUgdXAgbWVtb3J5LgogICAgIERyYWdGaW5pc2goaGRyb3ApOwogICAgIEds b2JhbFVubG9jayhtZWRpdW0uaEdsb2JhbCk7Ci0jZW5kaWYKICAgICByZXR1cm4gc3VjY2VlZGVk OwogfQogCiBzdGF0aWMgYm9vbCBnZXRXZWJMb2NEYXRhKGNvbnN0IERyYWdEYXRhTWFwKiBkYXRh T2JqZWN0LCBTdHJpbmcmIHVybCwgU3RyaW5nKiB0aXRsZSkgCiB7Ci0jaWYgVVNFKENGKQogICAg IFdDSEFSIGZpbGVuYW1lW01BWF9QQVRIXTsKICAgICBXQ0hBUiB1cmxCdWZmZXJbSU5URVJORVRf TUFYX1VSTF9MRU5HVEhdOwogCkBAIC0xNDUsOSArMTQzLDYgQEAgc3RhdGljIGJvb2wgZ2V0V2Vi TG9jRGF0YShjb25zdCBEcmFnRGF0YU1hcCogZGF0YU9iamVjdCwgU3RyaW5nJiB1cmwsIFN0cmlu ZyogdGkKICAgICAKICAgICB1cmwgPSBTdHJpbmcodXJsQnVmZmVyKTsKICAgICByZXR1cm4gdHJ1 ZTsKLSNlbHNlCi0gICAgcmV0dXJuIGZhbHNlOwotI2VuZGlmCiB9CiAKIHN0YXRpYyBTdHJpbmcg ZXh0cmFjdFVSTChjb25zdCBTdHJpbmcgJmluVVJMLCBTdHJpbmcqIHRpdGxlKQpAQCAtNzM5LDcg KzczNCw2IEBAIHZvaWQgZ2V0VXRmOERhdGEoSURhdGFPYmplY3QqIGRhdGEsIEZPUk1BVEVUQyog Zm9ybWF0LCBWZWN0b3I8U3RyaW5nPiYgZGF0YVN0cmluCiAgICAgUmVsZWFzZVN0Z01lZGl1bSgm c3RvcmUpOwogfQogCi0jaWYgVVNFKENGKQogdm9pZCBnZXRDRkRhdGEoSURhdGFPYmplY3QqIGRh dGEsIEZPUk1BVEVUQyogZm9ybWF0LCBWZWN0b3I8U3RyaW5nPiYgZGF0YVN0cmluZ3MpCiB7CiAg ICAgU1RHTUVESVVNIHN0b3JlOwpAQCAtNzYxLDcgKzc1NSw2IEBAIHZvaWQgZ2V0Q0ZEYXRhKElE YXRhT2JqZWN0KiBkYXRhLCBGT1JNQVRFVEMqIGZvcm1hdCwgVmVjdG9yPFN0cmluZz4mIGRhdGFT dHJpbmdzCiAgICAgR2xvYmFsVW5sb2NrKHN0b3JlLmhHbG9iYWwpOwogICAgIFJlbGVhc2VTdGdN ZWRpdW0oJnN0b3JlKTsKIH0KLSNlbmRpZgogCiAvLyBTZXR0ZXIgZnVuY3Rpb25zLgogCkBAIC03 OTUsNyArNzg4LDYgQEAgdm9pZCBzZXRVdGY4RGF0YShJRGF0YU9iamVjdCogZGF0YSwgRk9STUFU RVRDKiBmb3JtYXQsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkYXQKICAgICA6Okdsb2JhbEZyZWUo bWVkaXVtLmhHbG9iYWwpOwogfQogCi0jaWYgVVNFKENGKQogdm9pZCBzZXRDRkRhdGEoSURhdGFP YmplY3QqIGRhdGEsIEZPUk1BVEVUQyogZm9ybWF0LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZGF0 YVN0cmluZ3MpCiB7CiAgICAgU1RHTUVESVVNIG1lZGl1bSB7IH07CkBAIC04MTUsNyArODA3LDYg QEAgdm9pZCBzZXRDRkRhdGEoSURhdGFPYmplY3QqIGRhdGEsIEZPUk1BVEVUQyogZm9ybWF0LCBj b25zdCBWZWN0b3I8U3RyaW5nPiYgZGF0YVMKICAgICBkYXRhLT5TZXREYXRhKGZvcm1hdCwgJm1l ZGl1bSwgRkFMU0UpOwogICAgIDo6R2xvYmFsRnJlZShtZWRpdW0uaEdsb2JhbCk7CiB9Ci0jZW5k aWYKIAogc3RhdGljIGNvbnN0IENsaXBib2FyZEZvcm1hdE1hcCYgZ2V0Q2xpcGJvYXJkTWFwKCkK IHsKQEAgLTgyNSw5ICs4MTYsNyBAQCBzdGF0aWMgY29uc3QgQ2xpcGJvYXJkRm9ybWF0TWFwJiBn ZXRDbGlwYm9hcmRNYXAoKQogICAgICAgICBmb3JtYXRNYXAuYWRkKHRleHRodG1sRm9ybWF0KCkt PmNmRm9ybWF0LCBuZXcgQ2xpcGJvYXJkRGF0YUl0ZW0odGV4dGh0bWxGb3JtYXQoKSwgZ2V0U3Ry aW5nRGF0YTxVQ2hhcj4sIHNldFVDaGFyRGF0YSkpOwogICAgICAgICBmb3JtYXRNYXAuYWRkKHBs YWluVGV4dEZvcm1hdCgpLT5jZkZvcm1hdCwgIG5ldyBDbGlwYm9hcmREYXRhSXRlbShwbGFpblRl eHRGb3JtYXQoKSwgZ2V0U3RyaW5nRGF0YTxjaGFyPiwgc2V0VXRmOERhdGEpKTsKICAgICAgICAg Zm9ybWF0TWFwLmFkZChwbGFpblRleHRXRm9ybWF0KCktPmNmRm9ybWF0LCAgbmV3IENsaXBib2Fy ZERhdGFJdGVtKHBsYWluVGV4dFdGb3JtYXQoKSwgZ2V0U3RyaW5nRGF0YTxVQ2hhcj4sIHNldFVD aGFyRGF0YSkpOwotI2lmIFVTRShDRikKICAgICAgICAgZm9ybWF0TWFwLmFkZChjZkhEcm9wRm9y bWF0KCktPmNmRm9ybWF0LCAgbmV3IENsaXBib2FyZERhdGFJdGVtKGNmSERyb3BGb3JtYXQoKSwg Z2V0Q0ZEYXRhLCBzZXRDRkRhdGEpKTsKLSNlbmRpZgogICAgICAgICBmb3JtYXRNYXAuYWRkKGZp bGVuYW1lRm9ybWF0KCktPmNmRm9ybWF0LCAgbmV3IENsaXBib2FyZERhdGFJdGVtKGZpbGVuYW1l Rm9ybWF0KCksIGdldFN0cmluZ0RhdGE8Y2hhcj4sIHNldFV0ZjhEYXRhKSk7CiAgICAgICAgIGZv cm1hdE1hcC5hZGQoZmlsZW5hbWVXRm9ybWF0KCktPmNmRm9ybWF0LCAgbmV3IENsaXBib2FyZERh dGFJdGVtKGZpbGVuYW1lV0Zvcm1hdCgpLCBnZXRTdHJpbmdEYXRhPFVDaGFyPiwgc2V0VUNoYXJE YXRhKSk7CiAgICAgICAgIGZvcm1hdE1hcC5hZGQodXJsRm9ybWF0KCktPmNmRm9ybWF0LCAgbmV3 IENsaXBib2FyZERhdGFJdGVtKHVybEZvcm1hdCgpLCBnZXRTdHJpbmdEYXRhPGNoYXI+LCBzZXRV dGY4RGF0YSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0RyYWdE YXRhV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9EcmFnRGF0YVdpbi5jcHAK aW5kZXggNTc5YTExMjU3OWFmLi45ZWUxNzhjZDM3MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3dpbi9EcmFnRGF0YVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vd2luL0RyYWdEYXRhV2luLmNwcApAQCAtMTAzLDE2ICsxMDMsMTEgQEAgU3RyaW5nIERy YWdEYXRhOjphc1VSTChGaWxlbmFtZUNvbnZlcnNpb25Qb2xpY3kgZmlsZW5hbWVQb2xpY3ksIFN0 cmluZyogdGl0bGUpIGMKIAogYm9vbCBEcmFnRGF0YTo6Y29udGFpbnNGaWxlcygpIGNvbnN0CiB7 Ci0jaWYgVVNFKENGKQogICAgIHJldHVybiAobV9wbGF0Zm9ybURyYWdEYXRhKSA/IFNVQ0NFRURF RChtX3BsYXRmb3JtRHJhZ0RhdGEtPlF1ZXJ5R2V0RGF0YShjZkhEcm9wRm9ybWF0KCkpKSA6IG1f ZHJhZ0RhdGFNYXAuY29udGFpbnMoY2ZIRHJvcEZvcm1hdCgpLT5jZkZvcm1hdCk7Ci0jZWxzZQot ICAgIHJldHVybiBmYWxzZTsKLSNlbmRpZgogfQogCiB1bnNpZ25lZCBEcmFnRGF0YTo6bnVtYmVy T2ZGaWxlcygpIGNvbnN0CiB7Ci0jaWYgVVNFKENGKQogICAgIGlmICghbV9wbGF0Zm9ybURyYWdE YXRhKQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMTMxLDE2ICsxMjYsMTIgQEAgdW5zaWduZWQg RHJhZ0RhdGE6Om51bWJlck9mRmlsZXMoKSBjb25zdAogICAgIEdsb2JhbFVubG9jayhtZWRpdW0u aEdsb2JhbCk7CiAKICAgICByZXR1cm4gbnVtRmlsZXM7Ci0jZWxzZQotICAgIHJldHVybiAwOwot I2VuZGlmCiB9CiAKIFZlY3RvcjxTdHJpbmc+IERyYWdEYXRhOjphc0ZpbGVuYW1lcygpIGNvbnN0 CiB7CiAgICAgVmVjdG9yPFN0cmluZz4gcmVzdWx0OwogCi0jaWYgVVNFKENGKQogICAgIGlmICht X3BsYXRmb3JtRHJhZ0RhdGEpIHsKICAgICAgICAgV0NIQVIgZmlsZW5hbWVbTUFYX1BBVEhdOwog CkBAIC0xNjcsNyArMTU4LDYgQEAgVmVjdG9yPFN0cmluZz4gRHJhZ0RhdGE6OmFzRmlsZW5hbWVz KCkgY29uc3QKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAgcmVzdWx0ID0gbV9k cmFnRGF0YU1hcC5nZXQoY2ZIRHJvcEZvcm1hdCgpLT5jZkZvcm1hdCk7Ci0jZW5kaWYKIAogICAg IHJldHVybiByZXN1bHQ7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vUGFzdGVib2FyZFdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFzdGVi b2FyZFdpbi5jcHAKaW5kZXggYzU0NDUzODVhNzdhLi41OGZlOWIxZDcxY2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFzdGVib2FyZFdpbi5jcHAKQEAgLTM3MSw3ICszNzEs NiBAQCBQYXN0ZWJvYXJkOjpGaWxlQ29udGVudFN0YXRlIFBhc3RlYm9hcmQ6OmZpbGVDb250ZW50 U3RhdGUoKQogCiB2b2lkIFBhc3RlYm9hcmQ6OnJlYWQoUGFzdGVib2FyZEZpbGVSZWFkZXImIHJl YWRlciwgc3RkOjpvcHRpb25hbDxzaXplX3Q+KQogewotI2lmIFVTRShDRikKICAgICBpZiAobV9k YXRhT2JqZWN0KSB7CiAgICAgICAgIFNUR01FRElVTSBtZWRpdW07CiAgICAgICAgIGlmIChGQUlM RUQobV9kYXRhT2JqZWN0LT5HZXREYXRhKGNmSERyb3BGb3JtYXQoKSwgJm1lZGl1bSkpKQpAQCAt Mzk5LDExICszOTgsNiBAQCB2b2lkIFBhc3RlYm9hcmQ6OnJlYWQoUGFzdGVib2FyZEZpbGVSZWFk ZXImIHJlYWRlciwgc3RkOjpvcHRpb25hbDxzaXplX3Q+KQogCiAgICAgZm9yIChhdXRvJiBmaWxl bmFtZSA6IGxpc3QtPnZhbHVlKQogICAgICAgICByZWFkZXIucmVhZEZpbGVuYW1lKGZpbGVuYW1l KTsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKHJlYWRlcik7Ci0gICAgbm90SW1wbGVtZW50ZWQo KTsKLSAgICByZXR1cm47Ci0jZW5kaWYKIH0KIAogc3RhdGljIGJvb2wgd3JpdGVVUkwoV0NEYXRh T2JqZWN0ICpkYXRhLCBjb25zdCBVUkwmIHVybCwgU3RyaW5nIHRpdGxlLCBib29sIHdpdGhQbGFp blRleHQsIGJvb2wgd2l0aEhUTUwpCkBAIC02NzEsMTMgKzY2NSwxMSBAQCBzdGF0aWMgSFJFU1VM VCB3cml0ZUZpbGVUb0RhdGFPYmplY3QoSURhdGFPYmplY3QqIGRhdGFPYmplY3QsIEhHTE9CQUwg ZmlsZURlc2NyaQogICAgIGlmIChGQUlMRUQoaHIgPSBkYXRhT2JqZWN0LT5TZXREYXRhKGZlLCAm bWVkaXVtLCBUUlVFKSkpCiAgICAgICAgIGdvdG8gZXhpdDsKIAotI2lmIFVTRShDRikKICAgICAv LyBIRFJPUAogICAgIGlmIChoRHJvcENvbnRlbnQpIHsKICAgICAgICAgbWVkaXVtLmhHbG9iYWwg PSBoRHJvcENvbnRlbnQ7CiAgICAgICAgIGhyID0gZGF0YU9iamVjdC0+U2V0RGF0YShjZkhEcm9w Rm9ybWF0KCksICZtZWRpdW0sIFRSVUUpOwogICAgIH0KLSNlbmRpZgogCiBleGl0OgogICAgIGlm IChGQUlMRUQoaHIpKSB7Cg== 446395 2021-12-08 11:28:27 -0800 2021-12-08 12:47:55 -0800 Patch bug-234021.diff text/plain 7800 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyY2VkOGRmZTI0MjIuLmVkZTA3Njc5YjVhYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMxIEBACisyMDIxLTEyLTA4ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29u eS5jb20+CisKKyAgICAgICAgW1dpbl0gV2ViQ29yZTo6Y2ZIRHJvcEZvcm1hdCBpbXBsZW1lbnRh dGlvbiBpcyBub3QgQ0Ygc3BlY2lmaWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNDAyMQorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0 ZW5zZW4uCisKKyAgICAgICAgVGhlIGltcGxlbWVudGF0aW9uIG9mIGNmSERyb3BGb3JtYXQgd2Fz IGd1YXJkZWQgYnkgVVNFKENGKSBidXQgdGhlcmUgaXMgbm90aGluZyBDRiBzcGVjaWZpYworICAg ICAgICBhYm91dCB0aGUgaW1wbGVtZW50YXRpb24uIERyb3AgdGhlIGd1YXJkcyBhcm91bmQgaXQg YW5kIGFueSBvZiBpdHMgY2FsbGVycy4KKworICAgICAgICBSZW5hbWluZyBDRkRhdGEgZnVuY3Rp b25zIHRvIEhEcm9wRGF0YSB0byBiZXR0ZXIgcmVwcmVzZW50IHRoZSB1bmRlcmx5aW5nIFdpbmRv d3MgdHlwZSBmb3IKKyAgICAgICAgdGhlIGNsaXBib2FyZCBhbmQgbWFrZSBzdXJlIGl0cyBub3Qg bWlzdGFrZW4gZm9yIENvcmVGb3VuZGF0aW9uIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS93aW4vQ2xpcGJvYXJkVXRpbGl0aWVzV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmdldFdlYkxvY0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0SERyb3BEYXRhKToKKyAgICAg ICAgKFdlYkNvcmU6OnNldEhEcm9wRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpnZXRDbGlwYm9h cmRNYXApOgorICAgICAgICAoV2ViQ29yZTo6Z2V0Q0ZEYXRhKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OnNldENGRGF0YSk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vd2luL0Ry YWdEYXRhV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjpjb250YWluc0ZpbGVz IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjpudW1iZXJPZkZpbGVzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjphc0ZpbGVuYW1lcyBjb25zdCk6CisgICAg ICAgICogcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGFzdGVib2FyZDo6cmVhZCk6CisgICAgICAgIChXZWJDb3JlOjp3cml0ZUZpbGVUb0RhdGFPYmpl Y3QpOgorCiAyMDIxLTEyLTA4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAog ICAgICAgICBbQ1NTIENhc2NhZGUgTGF5ZXJzXSBVcGRhdGUgQ1NTT00gdG8gdGhlIHNwZWMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRVdGlsaXRpZXNX aW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0NsaXBib2FyZFV0aWxpdGllc1dp bi5jcHAKaW5kZXggM2U5N2U4MDRlMTE1Li4yNmQzOTI2NDFmNjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRVdGlsaXRpZXNXaW4uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRVdGlsaXRpZXNXaW4uY3BwCkBAIC00 NiwxMyArNDYsMTQgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0jaWYgVVNFKENGKQogRk9S TUFURVRDKiBjZkhEcm9wRm9ybWF0KCkKIHsKICAgICBzdGF0aWMgRk9STUFURVRDIHVybEZvcm1h dCA9IHtDRl9IRFJPUCwgMCwgRFZBU1BFQ1RfQ09OVEVOVCwgLTEsIFRZTUVEX0hHTE9CQUx9Owog ICAgIHJldHVybiAmdXJsRm9ybWF0OwogfQogCisjaWYgVVNFKENGKQorCiBzdGF0aWMgYm9vbCB1 cmxGcm9tUGF0aChDRlN0cmluZ1JlZiBwYXRoLCBTdHJpbmcmIHVybCkKIHsKICAgICBpZiAoIXBh dGgpCkBAIC04NCw3ICs4NSw2IEBAIHN0YXRpYyBib29sIGdldERhdGFNYXBJdGVtKGNvbnN0IERy YWdEYXRhTWFwKiBkYXRhT2JqZWN0LCBGT1JNQVRFVEMqIGZvcm1hdCwgU3RyCiBzdGF0aWMgYm9v bCBnZXRXZWJMb2NEYXRhKElEYXRhT2JqZWN0KiBkYXRhT2JqZWN0LCBTdHJpbmcmIHVybCwgU3Ry aW5nKiB0aXRsZSkgCiB7CiAgICAgYm9vbCBzdWNjZWVkZWQgPSBmYWxzZTsKLSNpZiBVU0UoQ0Yp CiAgICAgV0NIQVIgZmlsZW5hbWVbTUFYX1BBVEhdOwogICAgIFdDSEFSIHVybEJ1ZmZlcltJTlRF Uk5FVF9NQVhfVVJMX0xFTkdUSF07CiAKQEAgLTExOCwxMyArMTE4LDExIEBAIGV4aXQ6CiAgICAg Ly8gRnJlZSB1cCBtZW1vcnkuCiAgICAgRHJhZ0ZpbmlzaChoZHJvcCk7CiAgICAgR2xvYmFsVW5s b2NrKG1lZGl1bS5oR2xvYmFsKTsKLSNlbmRpZgogICAgIHJldHVybiBzdWNjZWVkZWQ7CiB9CiAK IHN0YXRpYyBib29sIGdldFdlYkxvY0RhdGEoY29uc3QgRHJhZ0RhdGFNYXAqIGRhdGFPYmplY3Qs IFN0cmluZyYgdXJsLCBTdHJpbmcqIHRpdGxlKSAKIHsKLSNpZiBVU0UoQ0YpCiAgICAgV0NIQVIg ZmlsZW5hbWVbTUFYX1BBVEhdOwogICAgIFdDSEFSIHVybEJ1ZmZlcltJTlRFUk5FVF9NQVhfVVJM X0xFTkdUSF07CiAKQEAgLTE0NSw5ICsxNDMsNiBAQCBzdGF0aWMgYm9vbCBnZXRXZWJMb2NEYXRh KGNvbnN0IERyYWdEYXRhTWFwKiBkYXRhT2JqZWN0LCBTdHJpbmcmIHVybCwgU3RyaW5nKiB0aQog ICAgIAogICAgIHVybCA9IFN0cmluZyh1cmxCdWZmZXIpOwogICAgIHJldHVybiB0cnVlOwotI2Vs c2UKLSAgICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKIH0KIAogc3RhdGljIFN0cmluZyBleHRyYWN0 VVJMKGNvbnN0IFN0cmluZyAmaW5VUkwsIFN0cmluZyogdGl0bGUpCkBAIC03MzksOCArNzM0LDcg QEAgdm9pZCBnZXRVdGY4RGF0YShJRGF0YU9iamVjdCogZGF0YSwgRk9STUFURVRDKiBmb3JtYXQs IFZlY3RvcjxTdHJpbmc+JiBkYXRhU3RyaW4KICAgICBSZWxlYXNlU3RnTWVkaXVtKCZzdG9yZSk7 CiB9CiAKLSNpZiBVU0UoQ0YpCi12b2lkIGdldENGRGF0YShJRGF0YU9iamVjdCogZGF0YSwgRk9S TUFURVRDKiBmb3JtYXQsIFZlY3RvcjxTdHJpbmc+JiBkYXRhU3RyaW5ncykKK3ZvaWQgZ2V0SERy b3BEYXRhKElEYXRhT2JqZWN0KiBkYXRhLCBGT1JNQVRFVEMqIGZvcm1hdCwgVmVjdG9yPFN0cmlu Zz4mIGRhdGFTdHJpbmdzKQogewogICAgIFNUR01FRElVTSBzdG9yZTsKICAgICBpZiAoRkFJTEVE KGRhdGEtPkdldERhdGEoZm9ybWF0LCAmc3RvcmUpKSkKQEAgLTc2MSw3ICs3NTUsNiBAQCB2b2lk IGdldENGRGF0YShJRGF0YU9iamVjdCogZGF0YSwgRk9STUFURVRDKiBmb3JtYXQsIFZlY3RvcjxT dHJpbmc+JiBkYXRhU3RyaW5ncwogICAgIEdsb2JhbFVubG9jayhzdG9yZS5oR2xvYmFsKTsKICAg ICBSZWxlYXNlU3RnTWVkaXVtKCZzdG9yZSk7CiB9Ci0jZW5kaWYKIAogLy8gU2V0dGVyIGZ1bmN0 aW9ucy4KIApAQCAtNzk1LDggKzc4OCw3IEBAIHZvaWQgc2V0VXRmOERhdGEoSURhdGFPYmplY3Qq IGRhdGEsIEZPUk1BVEVUQyogZm9ybWF0LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZGF0CiAgICAg OjpHbG9iYWxGcmVlKG1lZGl1bS5oR2xvYmFsKTsKIH0KIAotI2lmIFVTRShDRikKLXZvaWQgc2V0 Q0ZEYXRhKElEYXRhT2JqZWN0KiBkYXRhLCBGT1JNQVRFVEMqIGZvcm1hdCwgY29uc3QgVmVjdG9y PFN0cmluZz4mIGRhdGFTdHJpbmdzKQordm9pZCBzZXRIRHJvcERhdGEoSURhdGFPYmplY3QqIGRh dGEsIEZPUk1BVEVUQyogZm9ybWF0LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZGF0YVN0cmluZ3Mp CiB7CiAgICAgU1RHTUVESVVNIG1lZGl1bSB7IH07CiAgICAgbWVkaXVtLnR5bWVkID0gVFlNRURf SEdMT0JBTDsKQEAgLTgxNSw3ICs4MDcsNiBAQCB2b2lkIHNldENGRGF0YShJRGF0YU9iamVjdCog ZGF0YSwgRk9STUFURVRDKiBmb3JtYXQsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkYXRhUwogICAg IGRhdGEtPlNldERhdGEoZm9ybWF0LCAmbWVkaXVtLCBGQUxTRSk7CiAgICAgOjpHbG9iYWxGcmVl KG1lZGl1bS5oR2xvYmFsKTsKIH0KLSNlbmRpZgogCiBzdGF0aWMgY29uc3QgQ2xpcGJvYXJkRm9y bWF0TWFwJiBnZXRDbGlwYm9hcmRNYXAoKQogewpAQCAtODI1LDkgKzgxNiw3IEBAIHN0YXRpYyBj b25zdCBDbGlwYm9hcmRGb3JtYXRNYXAmIGdldENsaXBib2FyZE1hcCgpCiAgICAgICAgIGZvcm1h dE1hcC5hZGQodGV4dGh0bWxGb3JtYXQoKS0+Y2ZGb3JtYXQsIG5ldyBDbGlwYm9hcmREYXRhSXRl bSh0ZXh0aHRtbEZvcm1hdCgpLCBnZXRTdHJpbmdEYXRhPFVDaGFyPiwgc2V0VUNoYXJEYXRhKSk7 CiAgICAgICAgIGZvcm1hdE1hcC5hZGQocGxhaW5UZXh0Rm9ybWF0KCktPmNmRm9ybWF0LCAgbmV3 IENsaXBib2FyZERhdGFJdGVtKHBsYWluVGV4dEZvcm1hdCgpLCBnZXRTdHJpbmdEYXRhPGNoYXI+ LCBzZXRVdGY4RGF0YSkpOwogICAgICAgICBmb3JtYXRNYXAuYWRkKHBsYWluVGV4dFdGb3JtYXQo KS0+Y2ZGb3JtYXQsICBuZXcgQ2xpcGJvYXJkRGF0YUl0ZW0ocGxhaW5UZXh0V0Zvcm1hdCgpLCBn ZXRTdHJpbmdEYXRhPFVDaGFyPiwgc2V0VUNoYXJEYXRhKSk7Ci0jaWYgVVNFKENGKQotICAgICAg ICBmb3JtYXRNYXAuYWRkKGNmSERyb3BGb3JtYXQoKS0+Y2ZGb3JtYXQsICBuZXcgQ2xpcGJvYXJk RGF0YUl0ZW0oY2ZIRHJvcEZvcm1hdCgpLCBnZXRDRkRhdGEsIHNldENGRGF0YSkpOwotI2VuZGlm CisgICAgICAgIGZvcm1hdE1hcC5hZGQoY2ZIRHJvcEZvcm1hdCgpLT5jZkZvcm1hdCwgIG5ldyBD bGlwYm9hcmREYXRhSXRlbShjZkhEcm9wRm9ybWF0KCksIGdldEhEcm9wRGF0YSwgc2V0SERyb3BE YXRhKSk7CiAgICAgICAgIGZvcm1hdE1hcC5hZGQoZmlsZW5hbWVGb3JtYXQoKS0+Y2ZGb3JtYXQs ICBuZXcgQ2xpcGJvYXJkRGF0YUl0ZW0oZmlsZW5hbWVGb3JtYXQoKSwgZ2V0U3RyaW5nRGF0YTxj aGFyPiwgc2V0VXRmOERhdGEpKTsKICAgICAgICAgZm9ybWF0TWFwLmFkZChmaWxlbmFtZVdGb3Jt YXQoKS0+Y2ZGb3JtYXQsICBuZXcgQ2xpcGJvYXJkRGF0YUl0ZW0oZmlsZW5hbWVXRm9ybWF0KCks IGdldFN0cmluZ0RhdGE8VUNoYXI+LCBzZXRVQ2hhckRhdGEpKTsKICAgICAgICAgZm9ybWF0TWFw LmFkZCh1cmxGb3JtYXQoKS0+Y2ZGb3JtYXQsICBuZXcgQ2xpcGJvYXJkRGF0YUl0ZW0odXJsRm9y bWF0KCksIGdldFN0cmluZ0RhdGE8Y2hhcj4sIHNldFV0ZjhEYXRhKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRHJhZ0RhdGFXaW4uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vd2luL0RyYWdEYXRhV2luLmNwcAppbmRleCA1NzlhMTEyNTc5YWYuLjllZTE3 OGNkMzcwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0RyYWdEYXRh V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRHJhZ0RhdGFXaW4uY3Bw CkBAIC0xMDMsMTYgKzEwMywxMSBAQCBTdHJpbmcgRHJhZ0RhdGE6OmFzVVJMKEZpbGVuYW1lQ29u dmVyc2lvblBvbGljeSBmaWxlbmFtZVBvbGljeSwgU3RyaW5nKiB0aXRsZSkgYwogCiBib29sIERy YWdEYXRhOjpjb250YWluc0ZpbGVzKCkgY29uc3QKIHsKLSNpZiBVU0UoQ0YpCiAgICAgcmV0dXJu IChtX3BsYXRmb3JtRHJhZ0RhdGEpID8gU1VDQ0VFREVEKG1fcGxhdGZvcm1EcmFnRGF0YS0+UXVl cnlHZXREYXRhKGNmSERyb3BGb3JtYXQoKSkpIDogbV9kcmFnRGF0YU1hcC5jb250YWlucyhjZkhE cm9wRm9ybWF0KCktPmNmRm9ybWF0KTsKLSNlbHNlCi0gICAgcmV0dXJuIGZhbHNlOwotI2VuZGlm CiB9CiAKIHVuc2lnbmVkIERyYWdEYXRhOjpudW1iZXJPZkZpbGVzKCkgY29uc3QKIHsKLSNpZiBV U0UoQ0YpCiAgICAgaWYgKCFtX3BsYXRmb3JtRHJhZ0RhdGEpCiAgICAgICAgIHJldHVybiAwOwog CkBAIC0xMzEsMTYgKzEyNiwxMiBAQCB1bnNpZ25lZCBEcmFnRGF0YTo6bnVtYmVyT2ZGaWxlcygp IGNvbnN0CiAgICAgR2xvYmFsVW5sb2NrKG1lZGl1bS5oR2xvYmFsKTsKIAogICAgIHJldHVybiBu dW1GaWxlczsKLSNlbHNlCi0gICAgcmV0dXJuIDA7Ci0jZW5kaWYKIH0KIAogVmVjdG9yPFN0cmlu Zz4gRHJhZ0RhdGE6OmFzRmlsZW5hbWVzKCkgY29uc3QKIHsKICAgICBWZWN0b3I8U3RyaW5nPiBy ZXN1bHQ7CiAKLSNpZiBVU0UoQ0YpCiAgICAgaWYgKG1fcGxhdGZvcm1EcmFnRGF0YSkgewogICAg ICAgICBXQ0hBUiBmaWxlbmFtZVtNQVhfUEFUSF07CiAKQEAgLTE2Nyw3ICsxNTgsNiBAQCBWZWN0 b3I8U3RyaW5nPiBEcmFnRGF0YTo6YXNGaWxlbmFtZXMoKSBjb25zdAogICAgICAgICByZXR1cm4g cmVzdWx0OwogICAgIH0KICAgICByZXN1bHQgPSBtX2RyYWdEYXRhTWFwLmdldChjZkhEcm9wRm9y bWF0KCktPmNmRm9ybWF0KTsKLSNlbmRpZgogCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAppbmRleCBjNTQ0NTM4 NWE3N2EuLjU4ZmU5YjFkNzFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v d2luL1Bhc3RlYm9hcmRXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Q YXN0ZWJvYXJkV2luLmNwcApAQCAtMzcxLDcgKzM3MSw2IEBAIFBhc3RlYm9hcmQ6OkZpbGVDb250 ZW50U3RhdGUgUGFzdGVib2FyZDo6ZmlsZUNvbnRlbnRTdGF0ZSgpCiAKIHZvaWQgUGFzdGVib2Fy ZDo6cmVhZChQYXN0ZWJvYXJkRmlsZVJlYWRlciYgcmVhZGVyLCBzdGQ6Om9wdGlvbmFsPHNpemVf dD4pCiB7Ci0jaWYgVVNFKENGKQogICAgIGlmIChtX2RhdGFPYmplY3QpIHsKICAgICAgICAgU1RH TUVESVVNIG1lZGl1bTsKICAgICAgICAgaWYgKEZBSUxFRChtX2RhdGFPYmplY3QtPkdldERhdGEo Y2ZIRHJvcEZvcm1hdCgpLCAmbWVkaXVtKSkpCkBAIC0zOTksMTEgKzM5OCw2IEBAIHZvaWQgUGFz dGVib2FyZDo6cmVhZChQYXN0ZWJvYXJkRmlsZVJlYWRlciYgcmVhZGVyLCBzdGQ6Om9wdGlvbmFs PHNpemVfdD4pCiAKICAgICBmb3IgKGF1dG8mIGZpbGVuYW1lIDogbGlzdC0+dmFsdWUpCiAgICAg ICAgIHJlYWRlci5yZWFkRmlsZW5hbWUoZmlsZW5hbWUpOwotI2Vsc2UKLSAgICBVTlVTRURfUEFS QU0ocmVhZGVyKTsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybjsKLSNlbmRpZgog fQogCiBzdGF0aWMgYm9vbCB3cml0ZVVSTChXQ0RhdGFPYmplY3QgKmRhdGEsIGNvbnN0IFVSTCYg dXJsLCBTdHJpbmcgdGl0bGUsIGJvb2wgd2l0aFBsYWluVGV4dCwgYm9vbCB3aXRoSFRNTCkKQEAg LTY3MSwxMyArNjY1LDExIEBAIHN0YXRpYyBIUkVTVUxUIHdyaXRlRmlsZVRvRGF0YU9iamVjdChJ RGF0YU9iamVjdCogZGF0YU9iamVjdCwgSEdMT0JBTCBmaWxlRGVzY3JpCiAgICAgaWYgKEZBSUxF RChociA9IGRhdGFPYmplY3QtPlNldERhdGEoZmUsICZtZWRpdW0sIFRSVUUpKSkKICAgICAgICAg Z290byBleGl0OwogCi0jaWYgVVNFKENGKQogICAgIC8vIEhEUk9QCiAgICAgaWYgKGhEcm9wQ29u dGVudCkgewogICAgICAgICBtZWRpdW0uaEdsb2JhbCA9IGhEcm9wQ29udGVudDsKICAgICAgICAg aHIgPSBkYXRhT2JqZWN0LT5TZXREYXRhKGNmSERyb3BGb3JtYXQoKSwgJm1lZGl1bSwgVFJVRSk7 CiAgICAgfQotI2VuZGlmCiAKIGV4aXQ6CiAgICAgaWYgKEZBSUxFRChocikpIHsK