3318 2005-06-07 16:11:53 -0700 REGRESSION (412+): printing of images is broken 2005-06-18 22:56:49 -0700 1 1 1 Unclassified WebKit Printing 412 Mac OS X 10.4 VERIFIED FIXED P1 Major --- 1 sullivan darin oldest_to_newest 10815 0 sullivan 2005-06-07 16:11:53 -0700 To reproduce: 1. go to maps.google.com 2. search for some particular address (e.g. "Cupertino, CA") 3. Select Print from the File menu 4. click Preview (to avoid wasting paper) In the built-in Safari on Tiger (or 10.4.1), this works fine. In Safari on tip of tree, I get an error message from Preview ("File error. couldn't open the file."), and the Safari page changes to show the default maps.google.com image of the U.S. 10817 1 sullivan 2005-06-07 16:13:02 -0700 This is also in Radar as <rdar://problem/4141569> 11311 2 sullivan 2005-06-10 09:48:04 -0700 It turns out that all printing is broken, including Preview and Save as PDF. I suspect something broke in the SPI reshuffling just before we open-sourced WebKit. 11338 3 sullivan 2005-06-10 15:26:04 -0700 It turns out (it sure keeps turning) that not all printing is broken, but printing of images is broken. Printing a page consisting of nothing but text and form elements works fine. Printing a page with only a single image fails (even the missing image image). 11669 4 darin 2005-06-12 19:41:53 -0700 Turns out this is a bug due to a subtle issue with graphics contexts. If you retain a pointer to the graphics context, you break printing. And we were using autoreleased NSGraphicsContext pointers. Fix is simple. 11670 5 2282 darin 2005-06-12 19:49:36 -0700 Created attachment 2282 adds autorelease pools to fix the bug; also change tabs to spaces This patch fixes the bug, and also changes the various tabs in this file to spaces. 11708 6 mjs 2005-06-13 02:59:16 -0700 r=me 12582 7 c.petersen87 2005-06-18 22:56:49 -0700 Verified with TOT WebKit (6/18) under 10.4.1. Marking Verified. 2282 2005-06-12 19:49:36 -0700 2005-06-13 03:00:08 -0700 adds autorelease pools to fix the bug; also change tabs to spaces ImagePrintingPatch.txt text/plain 12142 darin SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViS2l0L0No YW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zMTg3CmRpZmYgLXAgLXUgLXAgLXUgLXIx LjMxODcgQ2hhbmdlTG9nCi0tLSBDaGFuZ2VMb2cJMTIgSnVuIDIwMDUgMjA6Mjc6MjQgLTAwMDAJ MS4zMTg3CisrKyBDaGFuZ2VMb2cJMTMgSnVuIDIwMDUgMDI6MzM6NDIgLTAwMDAKQEAgLTEsMyAr MSwxNiBAQAorMjAwNS0wNi0xMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBmaXhlZCA8cmRh cjovL3Byb2JsZW0vNDE0MTU2OT4gUkVHUkVTU0lPTiAoNDEyKyk6IHByaW50aW5nIGZhaWxzIG9u IGFueSBwYWdlIHdpdGggaW1hZ2VzLCBhbmQgZm9yIHN0YW5kYWxvbmUgaW1hZ2VzCisgICAgICAg ICAgYWxzbyA8aHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD0z MzE4PgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJJbWFnZURhdGEubTog R290IHJpZCBvZiB1c2Ugb2YgdGFicyBpbnN0ZWFkIG9mIHNwYWNlcyB0aHJvdWdob3V0IHRoZSBm aWxlLgorICAgICAgICAoLVtXZWJJbWFnZURhdGEgX2NoZWNrU29saWRDb2xvcjpdKTogV3JhcCB1 c2Ugb2YgTlNHcmFwaGljc0NvbnRleHQgd2l0aCBhbiBhdXRvcmVsZWFzZSBwb29sLgorICAgICAg ICAoLVtXZWJJbWFnZURhdGEgX2ZpbGxTb2xpZENvbG9ySW5SZWN0OmNvbXBvc2l0ZU9wZXJhdGlv bjpjb250ZXh0Ol0pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViSW1hZ2VEYXRhIHRpbGVJblJlY3Q6 ZnJvbVBvaW50OmNvbnRleHQ6XSk6IERpdHRvLgorICAgICAgICAoLVtXZWJJbWFnZURhdGEgX1BE RkRyYXdGcm9tUmVjdDp0b1JlY3Q6b3BlcmF0aW9uOmFscGhhOmZsaXBwZWQ6Y29udGV4dDpdKTog RGl0dG8uCisKIDIwMDUtMDYtMTIgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBCbHVtZW5iZXJnLgpJbmRleDogV2ViQ29yZVN1 cHBvcnQuc3VicHJvai9XZWJJbWFnZURhdGEubQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jv b3QvV2ViS2l0L1dlYkNvcmVTdXBwb3J0LnN1YnByb2ovV2ViSW1hZ2VEYXRhLm0sdgpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuMzcKZGlmZiAtcCAtdSAtcCAtdSAtcjEuMzcgV2ViQ29yZVN1cHBvcnQu c3VicHJvai9XZWJJbWFnZURhdGEubQotLS0gV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJJbWFn ZURhdGEubQk2IEp1biAyMDA1IDExOjEyOjMxIC0wMDAwCTEuMzcKKysrIFdlYkNvcmVTdXBwb3J0 LnN1YnByb2ovV2ViSW1hZ2VEYXRhLm0JMTMgSnVuIDIwMDUgMDI6MzM6NDUgLTAwMDAKQEAgLTk4 LDggKzk4LDggQEAKICAgICBbc2VsZiBfaW52YWxpZGF0ZUltYWdlUHJvcGVydGllc107CiAgICAg ICAgIAogICAgIGlmIChmaWxlUHJvcGVydGllcykKLQlDRlJlbGVhc2UgKGZpbGVQcm9wZXJ0aWVz KTsKLQkKKyAgICAgICAgQ0ZSZWxlYXNlIChmaWxlUHJvcGVydGllcyk7CisKICAgICBpZiAoaW1h Z2VTb3VyY2UpCiAgICAgICAgIENGUmVsZWFzZSAoaW1hZ2VTb3VyY2UpOyAKICAgICAgICAgCkBA IC0xNzIsOCArMTcyLDggQEAKIHsKICAgICBzaXplX3QgaTsKICAgICBmb3IgKGkgPSAwOyBpIDwg aW1hZ2VQcm9wZXJ0aWVzU2l6ZTsgaSsrKSB7Ci0JaWYgKGltYWdlUHJvcGVydGllc1tpXSkKLQkg ICAgQ0ZSZWxlYXNlIChpbWFnZVByb3BlcnRpZXNbaV0pOworICAgICAgICBpZiAoaW1hZ2VQcm9w ZXJ0aWVzW2ldKQorICAgICAgICAgICAgQ0ZSZWxlYXNlIChpbWFnZVByb3BlcnRpZXNbaV0pOwog ICAgIH0KICAgICBmcmVlIChpbWFnZVByb3BlcnRpZXMpOwogICAgIGltYWdlUHJvcGVydGllcyA9 IDA7CkBAIC0xODUsMTAgKzE4NSwxMCBAQAogICAgIHN0YXRpYyBDRkRpY3Rpb25hcnlSZWYgaW1h Z2VTb3VyY2VPcHRpb25zOwogICAgIGlmICghaW1hZ2VTb3VyY2VPcHRpb25zKSB7CiAgICAgICAg IGNvbnN0IHZvaWQgKiBrZXlzWzJdID0geyBrQ0dJbWFnZVNvdXJjZVNob3VsZENhY2hlLCAwIH07 Ci0JCWtleXNbMV0gPSBXS1ByZWZlclJHQjMyS2V5KCk7CisgICAgICAgIGtleXNbMV0gPSBXS1By ZWZlclJHQjMyS2V5KCk7CiAgICAgICAgIGNvbnN0IHZvaWQgKiB2YWx1ZXNbMl0gPSB7IGtDRkJv b2xlYW5UcnVlLCBrQ0ZCb29sZWFuVHJ1ZSB9OwotICAgICAgICBpbWFnZVNvdXJjZU9wdGlvbnMg PSBDRkRpY3Rpb25hcnlDcmVhdGUgKE5VTEwsIGtleXMsIHZhbHVlcywgMiwgCi0gICAgICAgICAg ICAgICAgJmtDRlR5cGVEaWN0aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NGVHlwZURpY3Rpb25hcnlW YWx1ZUNhbGxCYWNrcyk7CisgICAgICAgIGltYWdlU291cmNlT3B0aW9ucyA9IENGRGljdGlvbmFy eUNyZWF0ZShOVUxMLCBrZXlzLCB2YWx1ZXMsIDIsIAorICAgICAgICAgICAgJmtDRlR5cGVEaWN0 aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NGVHlwZURpY3Rpb25hcnlWYWx1ZUNhbGxCYWNrcyk7CiAg ICAgfQogICAgIHJldHVybiBpbWFnZVNvdXJjZU9wdGlvbnM7CiB9CkBAIC0xOTksMzAgKzE5OSwz MCBAQAogICAgIENHSW1hZ2VSZWYgbm9Db2xvckNvcnJlY3Rpb25JbWFnZSA9IDA7CiAKICAgICBp ZiAoIUNGRGljdGlvbmFyeUdldFZhbHVlIChwcm9wcywga0NHSW1hZ2VQcm9wZXJ0eVByb2ZpbGVO YW1lKSkgewotCUNGU3RyaW5nUmVmIGNvbG9yTW9kZWwgPSBDRkRpY3Rpb25hcnlHZXRWYWx1ZSAo cHJvcHMsIGtDR0ltYWdlUHJvcGVydHlDb2xvck1vZGVsKTsKLQkKLQlpZiAoY29sb3JNb2RlbCkg ewotCSAgICBpZiAoQ0ZTdHJpbmdDb21wYXJlIChjb2xvck1vZGVsLCBDRlNUUigiUkdCIiksIDAp ID09IGtDRkNvbXBhcmVFcXVhbFRvKQotCQl1bmNvcnJlY3RlZENvbG9yU3BhY2UgPSBXS0NyZWF0 ZVVuY29ycmVjdGVkUkdCQ29sb3JTcGFjZSgpOwotCSAgICBlbHNlIGlmIChDRlN0cmluZ0NvbXBh cmUgKGNvbG9yTW9kZWwsIENGU1RSKCJHcmF5IiksIDApID09IGtDRkNvbXBhcmVFcXVhbFRvKQot CQl1bmNvcnJlY3RlZENvbG9yU3BhY2UgPSBXS0NyZWF0ZVVuY29ycmVjdGVkR3JheUNvbG9yU3Bh Y2UoKTsKLQl9Ci0JCi0JaWYgKHVuY29ycmVjdGVkQ29sb3JTcGFjZSkgewotCSAgICBub0NvbG9y Q29ycmVjdGlvbkltYWdlID0gQ0dJbWFnZUNyZWF0ZUNvcHlXaXRoQ29sb3JTcGFjZSAoaW1hZ2Us IHVuY29ycmVjdGVkQ29sb3JTcGFjZSk7Ci0JICAgIENGUmVsZWFzZSAodW5jb3JyZWN0ZWRDb2xv clNwYWNlKTsKLQl9CisgICAgICAgIENGU3RyaW5nUmVmIGNvbG9yTW9kZWwgPSBDRkRpY3Rpb25h cnlHZXRWYWx1ZSAocHJvcHMsIGtDR0ltYWdlUHJvcGVydHlDb2xvck1vZGVsKTsKKworICAgICAg ICBpZiAoY29sb3JNb2RlbCkgeworICAgICAgICAgICAgaWYgKENGU3RyaW5nQ29tcGFyZSAoY29s b3JNb2RlbCwgQ0ZTVFIoIlJHQiIpLCAwKSA9PSBrQ0ZDb21wYXJlRXF1YWxUbykKKyAgICAgICAg ICAgICAgICB1bmNvcnJlY3RlZENvbG9yU3BhY2UgPSBXS0NyZWF0ZVVuY29ycmVjdGVkUkdCQ29s b3JTcGFjZSgpOworICAgICAgICAgICAgZWxzZSBpZiAoQ0ZTdHJpbmdDb21wYXJlIChjb2xvck1v ZGVsLCBDRlNUUigiR3JheSIpLCAwKSA9PSBrQ0ZDb21wYXJlRXF1YWxUbykKKyAgICAgICAgICAg ICAgICB1bmNvcnJlY3RlZENvbG9yU3BhY2UgPSBXS0NyZWF0ZVVuY29ycmVjdGVkR3JheUNvbG9y U3BhY2UoKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmICh1bmNvcnJlY3RlZENvbG9yU3BhY2Up IHsKKyAgICAgICAgICAgIG5vQ29sb3JDb3JyZWN0aW9uSW1hZ2UgPSBDR0ltYWdlQ3JlYXRlQ29w eVdpdGhDb2xvclNwYWNlIChpbWFnZSwgdW5jb3JyZWN0ZWRDb2xvclNwYWNlKTsKKyAgICAgICAg ICAgIENGUmVsZWFzZSAodW5jb3JyZWN0ZWRDb2xvclNwYWNlKTsKKyAgICAgICAgfQogICAgIH0K ICAgICByZXR1cm4gbm9Db2xvckNvcnJlY3Rpb25JbWFnZTsKIH0KLQkgICAgCisgICAgCiAtIChD R0ltYWdlUmVmKWltYWdlQXRJbmRleDooc2l6ZV90KWluZGV4CiB7CiAgICAgaWYgKGluZGV4ID49 IFtzZWxmIG51bWJlck9mSW1hZ2VzXSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAoIWlt YWdlcyB8fCBpbWFnZXNbaW5kZXhdID09IDApewotCVtzZWxmIF9jYWNoZUltYWdlczppbmRleCBh bGxJbWFnZXM6Tk9dOworICAgICAgICBbc2VsZiBfY2FjaGVJbWFnZXM6aW5kZXggYWxsSW1hZ2Vz Ok5PXTsKICAgICB9CiAgICAgCiAgICAgcmV0dXJuIGltYWdlc1tpbmRleF07CkBAIC0yMzEsNyAr MjMxLDcgQEAKIC0gKENGRGljdGlvbmFyeVJlZilmaWxlUHJvcGVydGllcwogewogICAgIGlmICgh ZmlsZVByb3BlcnRpZXMpIHsKLQlmaWxlUHJvcGVydGllcyA9IENHSW1hZ2VTb3VyY2VDb3B5UHJv cGVydGllcyAoaW1hZ2VTb3VyY2UsIFtzZWxmIF9pbWFnZVNvdXJjZU9wdGlvbnNdKTsKKyAgICAg ICAgZmlsZVByb3BlcnRpZXMgPSBDR0ltYWdlU291cmNlQ29weVByb3BlcnRpZXMgKGltYWdlU291 cmNlLCBbc2VsZiBfaW1hZ2VTb3VyY2VPcHRpb25zXSk7CiAgICAgfQogICAgIAogICAgIHJldHVy biBmaWxlUHJvcGVydGllczsKQEAgLTI0NCwxNCArMjQ0LDE0IEBACiAgICAgLy8gTnVtYmVyIG9m IGltYWdlcyBjaGFuZ2VkIQogICAgIGlmIChpbWFnZVByb3BlcnRpZXNTaXplICYmIG51bSA+IGlt YWdlUHJvcGVydGllc1NpemUpIHsKICAgICAgICAgLy8gQ2xlYXIgY2FjaGUuCi0JW3NlbGYgX2lu dmFsaWRhdGVJbWFnZVByb3BlcnRpZXNdOworICAgICAgICBbc2VsZiBfaW52YWxpZGF0ZUltYWdl UHJvcGVydGllc107CiAgICAgfQogCiAgICAgaWYgKGltYWdlUHJvcGVydGllcyA9PSAwICYmIG51 bSkgewogICAgICAgICBpbWFnZVByb3BlcnRpZXMgPSAoQ0ZEaWN0aW9uYXJ5UmVmICopbWFsbG9j IChudW0gKiBzaXplb2YoQ0ZEaWN0aW9uYXJ5UmVmKSk7CiAgICAgICAgIHNpemVfdCBpOwogICAg ICAgICBmb3IgKGkgPSAwOyBpIDwgbnVtOyBpKyspIHsKLSNpZiBVU0VfREVQUkVDQVRFRF9JTUFH RVNPVVJDRV9BUEkJCisjaWYgVVNFX0RFUFJFQ0FURURfSU1BR0VTT1VSQ0VfQVBJCiAgICAgICAg ICAgICBpbWFnZVByb3BlcnRpZXNbaV0gPSBDR0ltYWdlU291cmNlR2V0UHJvcGVydGllc0F0SW5k ZXggKGltYWdlU291cmNlLCBpLCBbc2VsZiBfaW1hZ2VTb3VyY2VPcHRpb25zXSk7CiAgICAgICAg ICAgICBpZiAoaW1hZ2VQcm9wZXJ0aWVzW2ldKQogICAgICAgICAgICAgICAgIENGUmV0YWluIChp bWFnZVByb3BlcnRpZXNbaV0pOwpAQCAtMjY2LDcgKzI2Niw3IEBACiAgICAgICAgIC8vIElmIGlt YWdlIHByb3BlcnRpZXMgYXJlIG5pbCwgdHJ5IHRvIGdldCB0aGVtIGFnYWluLiAgTWF5IGhhdmUg YXR0ZW1wdGVkIHRvCiAgICAgICAgIC8vIGdldCB0aGVtIGJlZm9yZSBlbm91Z2ggZGF0YSB3YXMg YXZhaWxhYmxlIGluIHRoZSBoZWFkZXIuCiAgICAgICAgIGlmIChpbWFnZVByb3BlcnRpZXNbaW5k ZXhdID09IDApIHsKLSNpZiBVU0VfREVQUkVDQVRFRF9JTUFHRVNPVVJDRV9BUEkJCisjaWYgVVNF X0RFUFJFQ0FURURfSU1BR0VTT1VSQ0VfQVBJCiAgICAgICAgICAgICBpbWFnZVByb3BlcnRpZXNb aW5kZXhdID0gQ0dJbWFnZVNvdXJjZUdldFByb3BlcnRpZXNBdEluZGV4IChpbWFnZVNvdXJjZSwg aW5kZXgsIFtzZWxmIF9pbWFnZVNvdXJjZU9wdGlvbnNdKTsKICAgICAgICAgICAgIGlmIChpbWFn ZVByb3BlcnRpZXNbaW5kZXhdKQogICAgICAgICAgICAgICAgIENGUmV0YWluIChpbWFnZVByb3Bl cnRpZXNbaW5kZXhdKTsKQEAgLTI5Niw3ICsyOTYsOSBAQAogICAgICAgICBDR0NvbnRleHRSZWYg Ym1hcCA9IENHQml0bWFwQ29udGV4dENyZWF0ZSgmcGl4ZWwsMSwxLDgqc2l6ZW9mKGZsb2F0KSxz aXplb2YocGl4ZWwpLHNwYWNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBrQ0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZExhc3QgfCBrQ0dCaXRtYXBG bG9hdENvbXBvbmVudHMpOwogICAgICAgICBpZiggYm1hcCApIHsKKyAgICAgICAgICAgIE5TQXV0 b3JlbGVhc2VQb29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07CiAg ICAgICAgICAgICBbW05TR3JhcGhpY3NDb250ZXh0IGdyYXBoaWNzQ29udGV4dFdpdGhHcmFwaGlj c1BvcnQ6Ym1hcCBmbGlwcGVkOk5PXSBzZXRDb21wb3NpdGluZ09wZXJhdGlvbjpOU0NvbXBvc2l0 ZUNvcHldOworICAgICAgICAgICAgW3Bvb2wgcmVsZWFzZV07CiAKICAgICAgICAgICAgIENHUmVj dCBkc3QgPSB7ezAsMH0sezEsMX19OwogICAgICAgICAgICAgQ0dDb250ZXh0RHJhd0ltYWdlKGJt YXAsZHN0LGltYWdlKTsKQEAgLTMyMSwxMiArMzIzLDEyIEBACiAgICAgc2l6ZV90IGZyb20sIHRv OwogICAgIAogICAgIGlmIChhbGxJbWFnZXMpIHsKLQlmcm9tID0gMDsKLQl0byA9IGltYWdlc1Np emU7CisgICAgICAgIGZyb20gPSAwOworICAgICAgICB0byA9IGltYWdlc1NpemU7CiAgICAgfQog ICAgIGVsc2UgewotCWZyb20gPSBvcHRpb25hbEluZGV4OwotCXRvID0gb3B0aW9uYWxJbmRleCsx OworICAgICAgICBmcm9tID0gb3B0aW9uYWxJbmRleDsKKyAgICAgICAgdG8gPSBvcHRpb25hbElu ZGV4KzE7CiAgICAgfQogICAgIGZvciAoaSA9IGZyb207IGkgPCB0bzsgaSsrKSB7CiAgICAgICAg IGlmICghaW1hZ2VzKSB7CkBAIC0zNTUsNyArMzU3LDcgQEAKICAgICBlbHNlIHsKICAgICAgICAg Ly8gVGhlIHdvcmsgb2YgZGVjb2RpbmcgaXMgYWN0dWFsbHkgdHJpZ2dlcmVkIGJ5IGltYWdlIGNy ZWF0aW9uLgogICAgICAgICBDR0ltYWdlU291cmNlVXBkYXRlRGF0YSAoaW1hZ2VTb3VyY2UsIGRh dGEsIGlzQ29tcGxldGUpOwotCVtzZWxmIF9pbnZhbGlkYXRlSW1hZ2VzXTsKKyAgICAgICAgW3Nl bGYgX2ludmFsaWRhdGVJbWFnZXNdOwogICAgICAgICBbc2VsZiBfY2FjaGVJbWFnZXM6MCBhbGxJ bWFnZXM6WUVTXTsKICAgICB9CiAgICAgICAgIApAQCAtNDQ3LDcgKzQ0OSw3IEBACiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICAgICAgZWxzZSB7Ci0JICAgIFtzZWxmIF9pbnZhbGlkYXRl SW1hZ2VzXTsKKyAgICAgICAgICAgIFtzZWxmIF9pbnZhbGlkYXRlSW1hZ2VzXTsKICAgICAgICAg ICAgIENHSW1hZ2VTb3VyY2VVcGRhdGVEYXRhIChpbWFnZVNvdXJjZSwgZGF0YSwgaXNDb21wbGV0 ZSk7CiAgICAgICAgIH0KICAgICB9CkBAIC00NzAsNyArNDcyLDkgQEAKICAgICBpZiggc29saWRD b2xvciApIHsKICAgICAgICAgQ0dDb250ZXh0U2F2ZUdTdGF0ZSAoYUNvbnRleHQpOwogICAgICAg ICBDR0NvbnRleHRTZXRGaWxsQ29sb3JXaXRoQ29sb3IoYUNvbnRleHQsIHNvbGlkQ29sb3IpOwot CVtbTlNHcmFwaGljc0NvbnRleHQgZ3JhcGhpY3NDb250ZXh0V2l0aEdyYXBoaWNzUG9ydDphQ29u dGV4dCBmbGlwcGVkOk5PXSBzZXRDb21wb3NpdGluZ09wZXJhdGlvbjpvcF07CisgICAgICAgIE5T QXV0b3JlbGVhc2VQb29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07 CisgICAgICAgIFtbTlNHcmFwaGljc0NvbnRleHQgZ3JhcGhpY3NDb250ZXh0V2l0aEdyYXBoaWNz UG9ydDphQ29udGV4dCBmbGlwcGVkOk5PXSBzZXRDb21wb3NpdGluZ09wZXJhdGlvbjpvcF07Cisg ICAgICAgIFtwb29sIHJlbGVhc2VdOwogICAgICAgICBDR0NvbnRleHRGaWxsUmVjdCAoYUNvbnRl eHQsIHJlY3QpOwogICAgICAgICBDR0NvbnRleHRSZXN0b3JlR1N0YXRlIChhQ29udGV4dCk7CiAg ICAgfQpAQCAtNTI0LDcgKzUyOCw5IEBACiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKICAg ICAgICAgICAgIC8vIEZsaXAgdGhlIGNvb3Jkcy4KKyAgICAgICAgICAgIE5TQXV0b3JlbGVhc2VQ b29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07CiAgICAgICAgICAg ICBbW05TR3JhcGhpY3NDb250ZXh0IGdyYXBoaWNzQ29udGV4dFdpdGhHcmFwaGljc1BvcnQ6YUNv bnRleHQgZmxpcHBlZDpOT10gc2V0Q29tcG9zaXRpbmdPcGVyYXRpb246b3BdOworICAgICAgICAg ICAgW3Bvb2wgcmVsZWFzZV07CiAgICAgICAgICAgICBDR0NvbnRleHRUcmFuc2xhdGVDVE0gKGFD b250ZXh0LCBpci5vcmlnaW4ueCwgaXIub3JpZ2luLnkpOwogICAgICAgICAgICAgQ0dDb250ZXh0 U2NhbGVDVE0gKGFDb250ZXh0LCAxLCAtMSk7CiAgICAgICAgICAgICBDR0NvbnRleHRUcmFuc2xh dGVDVE0gKGFDb250ZXh0LCAwLCAtaXIuc2l6ZS5oZWlnaHQpOwpAQCAtNjQ1LDcgKzY1MSw5IEBA IHN0YXRpYyBjb25zdCBDR1BhdHRlcm5DYWxsYmFja3MgcGF0dGVybkMKICAgICAgICAgICAgIGZs b2F0IHBhdHRlcm5BbHBoYSA9IDE7CiAgICAgICAgICAgICBDR0NvbnRleHRTZXRGaWxsUGF0dGVy bihhQ29udGV4dCwgcGF0dGVybiwgJnBhdHRlcm5BbHBoYSk7CiAKKyAgICAgICAgICAgIE5TQXV0 b3JlbGVhc2VQb29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07CiAg ICAgICAgICAgICBbW05TR3JhcGhpY3NDb250ZXh0IGdyYXBoaWNzQ29udGV4dFdpdGhHcmFwaGlj c1BvcnQ6YUNvbnRleHQgZmxpcHBlZDpOT10gc2V0Q29tcG9zaXRpbmdPcGVyYXRpb246TlNDb21w b3NpdGVTb3VyY2VPdmVyXTsKKyAgICAgICAgICAgIFtwb29sIHJlbGVhc2VdOwogCiAgICAgICAg ICAgICBDR0NvbnRleHRGaWxsUmVjdCAoYUNvbnRleHQsIHJlY3QpOwogCkBAIC03NDUsMTEgKzc1 MywxMSBAQCBzdGF0aWMgY29uc3QgQ0dQYXR0ZXJuQ2FsbGJhY2tzIHBhdHRlcm5DCiAgICAgfQog ICAgIAogICAgIGlmICh0eXBlKSB7Ci0JcHJvcGVydGllcyA9IENGRGljdGlvbmFyeUdldFZhbHVl IChwcm9wZXJ0aWVzLCB0eXBlKTsKLQlpZiAoIXByb3BlcnRpZXMpIHsKLQkgICAgW2RlY29kZUxv Y2sgdW5sb2NrXTsKLQkgICAgcmV0dXJuIDAuZjsKLQl9CisgICAgICAgIHByb3BlcnRpZXMgPSBD RkRpY3Rpb25hcnlHZXRWYWx1ZSAocHJvcGVydGllcywgdHlwZSk7CisgICAgICAgIGlmICghcHJv cGVydGllcykgeworICAgICAgICAgICAgW2RlY29kZUxvY2sgdW5sb2NrXTsKKyAgICAgICAgICAg IHJldHVybiAwLmY7CisgICAgICAgIH0KICAgICB9CiAgICAgCiAgICAgQ0ZOdW1iZXJSZWYgbnVt ID0gQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUgKHByb3BlcnRpZXMsIHByb3BlcnR5KTsKQEAgLTgyMCw4 ICs4MjgsOCBAQCBzdGF0aWMgY29uc3QgQ0dQYXR0ZXJuQ2FsbGJhY2tzIHBhdHRlcm5DCiAgICAg Ly8gQSBwcm9wZXJ0eSB3aXRoIHZhbHVlIDAgbWVhbnMgbG9vcHMgZm9yZXZlci4KICAgICBjb3Vu dCA9IFtzZWxmIF9mbG9hdEZpbGVQcm9wZXJ0eTprQ0dJbWFnZVByb3BlcnR5R0lGTG9vcENvdW50 IHR5cGU6a0NHSW1hZ2VQcm9wZXJ0eUdJRkRpY3Rpb25hcnkgaGFzUHJvcGVydHk6Jmhhc1Byb3Bl cnR5XTsKICAgICBpZiAoIWhhc1Byb3BlcnR5KQotCWNvdW50ID0gLTE7Ci0JCisgICAgICAgIGNv dW50ID0gLTE7CisKICAgICByZXR1cm4gY291bnQ7CiB9CiAKQEAgLTg0NCwxNyArODUyLDE3IEBA IHN0YXRpYyBOU011dGFibGVTZXQgKmFjdGl2ZUFuaW1hdGlvbnM7CiAgICAgLy8gYmVmb3JlIGFj dHVhbGx5IHN0b3BwaW5nIHRoZW0gYmVjYXVzZSB0aGUgcHJvY2VzcyBvZiBzdG9wcGluZyB0aGVt CiAgICAgLy8gd2lsbCBtb2RpZnkgdGhlIGFjdGl2ZSBhbmltYXRpb25zIGFuZCBhbmltYXRpbmcg cmVuZGVyZXIgY29sbGVjdGlvbnMuCiAgICAgd2hpbGUgKChhbmltYXRpb24gPSBbb2JqZWN0RW51 bWVyYXRvciBuZXh0T2JqZWN0XSkpIHsKLQlOU1NldCAqcmVuZGVyZXJzSW5WaWV3ID0gKE5TU2V0 ICopQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUgKGFuaW1hdGlvbi0+YW5pbWF0aW5nUmVuZGVyZXJzLCBh Vmlldyk7CisgICAgICAgIE5TU2V0ICpyZW5kZXJlcnNJblZpZXcgPSAoTlNTZXQgKilDRkRpY3Rp b25hcnlHZXRWYWx1ZSAoYW5pbWF0aW9uLT5hbmltYXRpbmdSZW5kZXJlcnMsIGFWaWV3KTsKICAg ICAgICAgaWYgKHJlbmRlcmVyc0luVmlldykgewotCQkJaWYgKCFyZW5kZXJlcnNUb1N0b3ApCi0J CQkJcmVuZGVyZXJzVG9TdG9wID0gW1tOU011dGFibGVTZXQgYWxsb2NdIGluaXRdOworICAgICAg ICAgICAgaWYgKCFyZW5kZXJlcnNUb1N0b3ApCisgICAgICAgICAgICAgICAgcmVuZGVyZXJzVG9T dG9wID0gW1tOU011dGFibGVTZXQgYWxsb2NdIGluaXRdOwogICAgICAgICAgICAgW3JlbmRlcmVy c1RvU3RvcCB1bmlvblNldDpyZW5kZXJlcnNJblZpZXddOwogICAgICAgICB9CiAgICAgfQogCiAg ICAgLy8gTm93IHRlbGwgdGhlbSBhbGwgdG8gc3RvcCBkcmF3aW5nLgogICAgIFtyZW5kZXJlcnNU b1N0b3AgbWFrZU9iamVjdHNQZXJmb3JtU2VsZWN0b3I6QHNlbGVjdG9yKHN0b3BBbmltYXRpb24p XTsKLQlbcmVuZGVyZXJzVG9TdG9wIHJlbGVhc2VdOworICAgIFtyZW5kZXJlcnNUb1N0b3AgcmVs ZWFzZV07CiB9CiAKIC0gKHZvaWQpYWRkQW5pbWF0aW5nUmVuZGVyZXI6KFdlYkltYWdlUmVuZGVy ZXIgKilyIGluVmlldzooTlNWaWV3ICopdmlldwpAQCAtODY2LDcgKzg3NCw3IEBAIHN0YXRpYyBO U011dGFibGVTZXQgKmFjdGl2ZUFuaW1hdGlvbnM7CiAgICAgaWYgKCFyZW5kZXJlcnMpIHsKICAg ICAgICAgcmVuZGVyZXJzID0gW1tOU011dGFibGVTZXQgYWxsb2NdIGluaXRdOwogICAgICAgICBD RkRpY3Rpb25hcnlBZGRWYWx1ZShhbmltYXRpbmdSZW5kZXJlcnMsIHZpZXcsIHJlbmRlcmVycyk7 Ci0JW3JlbmRlcmVycyByZWxlYXNlXTsKKyAgICAgICAgW3JlbmRlcmVycyByZWxlYXNlXTsKICAg ICB9CiAgICAgICAgICAgICAKICAgICBbcmVuZGVyZXJzIGFkZE9iamVjdDpyXTsKQEAgLTkyMyw3 ICs5MzEsNyBAQCBzdGF0aWMgTlNNdXRhYmxlU2V0ICphY3RpdmVBbmltYXRpb25zOwogICAgICAg ICByZXBldGl0aW9uc0NvbXBsZXRlICs9IDE7CiAgICAgICAgIGlmIChbc2VsZiBfcmVwZXRpdGlv bkNvdW50XSAmJiByZXBldGl0aW9uc0NvbXBsZXRlID49IFtzZWxmIF9yZXBldGl0aW9uQ291bnRd KSB7CiAgICAgICAgICAgICBhbmltYXRpb25GaW5pc2hlZCA9IFlFUzsKLQkgICAgY3VycmVudEZy YW1lLS07CisgICAgICAgICAgICBjdXJyZW50RnJhbWUtLTsKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogICAgICAgICBjdXJyZW50RnJhbWUgPSAwOwpAQCAtOTc3LDcgKzk4NSw3IEBA IHN0YXRpYyBOU011dGFibGVTZXQgKmFjdGl2ZUFuaW1hdGlvbnM7CiAgICAgICAgIAogICAgICAg ICBDR0NvbnRleHRTYXZlR1N0YXRlKGNvbnRleHQpOwogICAgICAgICAvLyBSb3RhdGUgdHJhbnNs YXRlIGltYWdlIGludG8gcG9zaXRpb24gYWNjb3JkaW5nIHRvIGRvYyBwcm9wZXJ0aWVzLgotICAg ICAgICBbX1BERkRvYyBhZGp1c3RDVE06Y29udGV4dF07CQorICAgICAgICBbX1BERkRvYyBhZGp1 c3RDVE06Y29udGV4dF07CiAKICAgICAgICAgLy8gTWVkaWEgYm94IG1heSBoYXZlIG5vbi16ZXJv IG9yaWdpbiB3aGljaCB3ZSBpZ25vcmUuIENHUERGRG9jdW1lbnRTaG93UGFnZSBwYWdlcyBzdGFy dAogICAgICAgICAvLyBhdCAxLCBub3QgMC4KQEAgLTk5Myw3ICsxMDAxLDkgQEAgc3RhdGljIE5T TXV0YWJsZVNldCAqYWN0aXZlQW5pbWF0aW9uczsKIAogICAgIENHQ29udGV4dFNhdmVHU3RhdGUo Y29udGV4dCk7CiAKKyAgICBOU0F1dG9yZWxlYXNlUG9vbCAqcG9vbCA9IFtbTlNBdXRvcmVsZWFz ZVBvb2wgYWxsb2NdIGluaXRdOwogICAgIFtbTlNHcmFwaGljc0NvbnRleHQgZ3JhcGhpY3NDb250 ZXh0V2l0aEdyYXBoaWNzUG9ydDpjb250ZXh0IGZsaXBwZWQ6Tk9dIHNldENvbXBvc2l0aW5nT3Bl cmF0aW9uOm9wXTsKKyAgICBbcG9vbCByZWxlYXNlXTsKIAogICAgIC8vIFNjYWxlIGFuZCB0cmFu c2xhdGUgc28gdGhlIGRvY3VtZW50IGlzIHJlbmRlcmVkIGluIHRoZSBjb3JyZWN0IGxvY2F0aW9u LgogICAgIGhTY2FsZSA9IGRzdFJlY3Quc2l6ZS53aWR0aCAgLyBzcmNSZWN0LnNpemUud2lkdGg7 Cg==