7587 2006-03-04 01:51:27 -0800 make image loads work on win32 2006-03-06 22:39:26 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ PC Windows XP RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 35033 0 mjs 2006-03-04 01:51:27 -0800 This implements TransferJobWin for win32, enough to make file loads work. 35034 1 6839 mjs 2006-03-04 01:52:12 -0800 Created attachment 6839 do it 35037 2 6839 eric 2006-03-04 02:26:58 -0800 Comment on attachment 6839 do it we discussed this over IRC. Mjs fixed the tabs, and a few other minor comments. There are some things we want to change long term here (like TransferJob internals and the way that ciaro contexts get passed around in the image functions) but those will be for later. r=me. 35350 3 darin 2006-03-06 22:39:26 -0800 Maciej landed this on Saturday. 6839 2006-03-04 01:52:12 -0800 2006-03-04 02:26:58 -0800 do it load-image-from-file.patch.txt text/plain 14393 mjs SW5kZXg6IHBsYXRmb3JtL1RyYW5zZmVySm9iSW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0 Zm9ybS9UcmFuc2ZlckpvYkludGVybmFsLmgJKHJldmlzaW9uIDEzMTIzKQorKysgcGxhdGZvcm0v VHJhbnNmZXJKb2JJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw5IEBACiAK ICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSAiZm9ybWRhdGEuaCIKKyNpZiBXSU4zMgorI2lu Y2x1ZGUgIndpbmRvd3MuaCIKKyNlbmRpZgogCiAvLyBUaGUgYWxsb2NhdGlvbnMgYW5kIHJlbGVh c2VzIGluIFRyYW5zZmVySm9iSW50ZXJuYWwgYXJlCiAvLyBkZWZpbml0ZWx5IENvY29hLWV4Y2Vw dGlvbi1mcmVlIChlaXRoZXIgc2ltcGxlIEZvdW5kYXRpb24KQEAgLTQwLDIxICs0MywyNSBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgVHJhbnNmZXJKb2JJbnRlcm5hbAogICAgIHsK ICAgICBwdWJsaWM6Ci0gICAgICAgIFRyYW5zZmVySm9iSW50ZXJuYWwoVHJhbnNmZXJKb2JDbGll bnQqIGMsIGNvbnN0IFN0cmluZyYgbWV0aG9kLCBjb25zdCBLVVJMJiB1KQorICAgICAgICBUcmFu c2ZlckpvYkludGVybmFsKFRyYW5zZmVySm9iKiBqb2IsIFRyYW5zZmVySm9iQ2xpZW50KiBjLCBj b25zdCBTdHJpbmcmIG1ldGhvZCwgY29uc3QgS1VSTCYgdSkKICAgICAgICAgICAgIDogY2xpZW50 KGMpCi0gICAgICAgICAgICAgICwgc3RhdHVzKDApCi0gICAgICAgICAgICAgICwgVVJMKHUpCi0g ICAgICAgICAgICAgICwgbWV0aG9kKG1ldGhvZCkKLSAgICAgICAgICAgICAgLCBhc3NlbWJsZWRS ZXNwb25zZUhlYWRlcnModHJ1ZSkKLSAgICAgICAgICAgICAgLCByZXRyaWV2ZWRDaGFyc2V0KHRy dWUpCisJICAgICwgc3RhdHVzKDApCisJICAgICwgVVJMKHUpCisJICAgICwgbWV0aG9kKG1ldGhv ZCkKKwkgICAgLCBhc3NlbWJsZWRSZXNwb25zZUhlYWRlcnModHJ1ZSkKKwkgICAgLCByZXRyaWV2 ZWRDaGFyc2V0KHRydWUpCiAjaWYgX19BUFBMRV9fCi0gICAgICAgICAgICAgICwgbG9hZGVyKG5p bCkKLSAgICAgICAgICAgICAgLCByZXNwb25zZShuaWwpCisJICAgICwgbG9hZGVyKG5pbCkKKwkg ICAgLCByZXNwb25zZShuaWwpCisjZW5kaWYKKyNpZiBXSU4zMgorCSAgICAsIG1fZmlsZUhhbmRs ZSgwKQorCQksIG1fZmlsZUxvYWRUaW1lcihqb2IsICZUcmFuc2ZlckpvYjo6ZmlsZUxvYWRUaW1l cikKICNlbmRpZgogICAgICAgICB7CiAgICAgICAgIH0KICAgICAgICAgCi0gICAgICAgIFRyYW5z ZmVySm9iSW50ZXJuYWwoVHJhbnNmZXJKb2JDbGllbnQqIGMsIGNvbnN0IFN0cmluZyYgbWV0aG9k LCBjb25zdCBLVVJMJiB1LCBjb25zdCBGb3JtRGF0YSYgcCkKKyAgICAgICAgVHJhbnNmZXJKb2JJ bnRlcm5hbChUcmFuc2ZlckpvYiogam9iLCBUcmFuc2ZlckpvYkNsaWVudCogYywgY29uc3QgU3Ry aW5nJiBtZXRob2QsIGNvbnN0IEtVUkwmIHUsIGNvbnN0IEZvcm1EYXRhJiBwKQogICAgICAgICAg ICAgOiBjbGllbnQoYykKICAgICAgICAgICAgICwgc3RhdHVzKDApCiAgICAgICAgICAgICAsIFVS TCh1KQpAQCAtNjYsNiArNzMsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAg LCBsb2FkZXIobmlsKQogICAgICAgICAgICAgLCByZXNwb25zZShuaWwpCiAjZW5kaWYKKyNpZiBX SU4zMgorCQkgICAgLCBtX2ZpbGVIYW5kbGUoMCkKKwkJICAgICwgbV9maWxlTG9hZFRpbWVyKGpv YiwgJlRyYW5zZmVySm9iOjpmaWxlTG9hZFRpbWVyKQorI2VuZGlmCiAgICAgICAgIHsKICAgICAg ICAgfQogCkBAIC04Nyw3ICs5OCwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEtX UVJlc291cmNlTG9hZGVyKiBsb2FkZXI7CiAgICAgICAgIE5TVVJMUmVzcG9uc2UqIHJlc3BvbnNl OwogI2VuZGlmCi0gICAgfTsKKyNpZiBXSU4zMgorCQlIQU5ETEUgbV9maWxlSGFuZGxlOworCQlU aW1lcjxUcmFuc2ZlckpvYj4gbV9maWxlTG9hZFRpbWVyOworI2VuZGlmCisJfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQogCkluZGV4OiBwbGF0Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0dWJz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0dWJzLmNwcAko cmV2aXNpb24gMTMxMjMpCisrKyBwbGF0Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0dWJzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjExLDggKzIxMSw3IEBAIHZvaWQgRnJhbWVXaW46OnJlc3BvbmRU b0NoYW5nZWRDb250ZW50cygKIHZvaWQgRnJhbWVXaW46OnVuZm9jdXNXaW5kb3coKSB7IG5vdElt cGxlbWVudGVkKCk7IH0KIGJvb2wgRnJhbWVXaW46OmxvY2F0aW9uYmFyVmlzaWJsZSgpIHsgbm90 SW1wbGVtZW50ZWQoKTsgcmV0dXJuIDA7IH0KIHZvaWQgRnJhbWVXaW46OnJlc3BvbmRUb0NoYW5n ZWRTZWxlY3Rpb24oV2ViQ29yZTo6U2VsZWN0aW9uQ29udHJvbGxlciBjb25zdCYsYm9vbCkgeyBu b3RJbXBsZW1lbnRlZCgpOyB9Ci12b2lkIEZyYW1lV2luOjpjbGVhclVuZG9SZWRvT3BlcmF0aW9u cygpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQotdm9pZCBGcmFtZVdpbjo6aXNzdWVSZWRvQ29tbWFu ZCgpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQordm9pZCBGcmFtZVdpbjo6aXNzdWVSZWRvQ29tbWFu ZCh2b2lkKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KIEtKUzo6QmluZGluZ3M6Okluc3RhbmNlICog RnJhbWVXaW46OmdldE9iamVjdEluc3RhbmNlRm9yV2lkZ2V0KFdpZGdldCAqKSB7IG5vdEltcGxl bWVudGVkKCk7IHJldHVybiAwOyB9CiBLSlM6OkJpbmRpbmdzOjpJbnN0YW5jZSAqIEZyYW1lV2lu OjpnZXRFbWJlZEluc3RhbmNlRm9yV2lkZ2V0KFdpZGdldCAqKSB7IG5vdEltcGxlbWVudGVkKCk7 IHJldHVybiAwOyB9CiBib29sIEZyYW1lV2luOjpjYW5SZWRvKCkgY29uc3QgeyBub3RJbXBsZW1l bnRlZCgpOyByZXR1cm4gMDsgfQpAQCAtMjI0LDcgKzIyMyw2IEBAIHZvaWQgRnJhbWVXaW46OnJ1 bkphdmFTY3JpcHRBbGVydChTdHJpbmcKIGJvb2wgRnJhbWVXaW46OnJ1bkphdmFTY3JpcHRDb25m aXJtKFN0cmluZyBjb25zdCYpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIDA7IH0KIGJvb2wg RnJhbWVXaW46Om9wZW5VUkwoS1VSTCBjb25zdCYpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJu IDA7IH0KIHZvaWQgRnJhbWVXaW46OnVybFNlbGVjdGVkKEtVUkwgY29uc3QmLHN0cnVjdCBXZWJD b3JlOjpVUkxBcmdzIGNvbnN0JikgeyBub3RJbXBsZW1lbnRlZCgpOyB9Ci12b2lkIEZyYW1lV2lu OjpzYXZlRG9jdW1lbnRTdGF0ZSgpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQogdm9pZCBGcmFtZVdp bjo6cHJpbnQoKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KIEtKUzo6QmluZGluZ3M6Okluc3RhbmNl ICogRnJhbWVXaW46OmdldEFwcGxldEluc3RhbmNlRm9yV2lkZ2V0KFdpZGdldCAqKSB7IG5vdElt cGxlbWVudGVkKCk7IHJldHVybiAwOyB9CiBib29sIEZyYW1lV2luOjpwYXNzTW91c2VEb3duRXZl bnRUb1dpZGdldChXaWRnZXQgKikgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gMDsgfQpAQCAt MjczLDcgKzI3MSw2IEBAIHZvaWQgUVRleHRFZGl0OjpzZXRXcml0aW5nRGlyZWN0aW9uKGVudW0K IEdyYXBoaWNzQ29udGV4dDo6R3JhcGhpY3NDb250ZXh0KCkgeyBub3RJbXBsZW1lbnRlZCgpOyB9 CiB2b2lkIFdlYkNvcmU6OlRyYW5zZmVySm9iOjpyZXRyaWV2ZUNoYXJzZXQoKSBjb25zdCB7IG5v dEltcGxlbWVudGVkKCk7IH0KIHZvaWQgV2ViQ29yZTo6VHJhbnNmZXJKb2I6OmFzc2VtYmxlUmVz cG9uc2VIZWFkZXJzKCkgY29uc3QgeyBub3RJbXBsZW1lbnRlZCgpOyB9Ci1XZWJDb3JlOjpUcmFu c2ZlckpvYjo6flRyYW5zZmVySm9iKCkgeyBub3RJbXBsZW1lbnRlZCgpOyB9CiAKIC8vIENvbXBs ZXRlbHkgZW1wdHkgc3R1YnMgKG1vc3RseSB0byBhbGxvdyBEUlQgdG8gcnVuKToKIGJvb2wgV2Vi Q29yZTo6aGlzdG9yeUNvbnRhaW5zKFFTdHJpbmcgY29uc3QmKSB7IHJldHVybiBmYWxzZTsgfQpA QCAtMzEyLDcgKzMwOSw4IEBAIGJvb2wgRnJhbWVXaW46OnNob3VsZENoYW5nZVNlbGVjdGlvbihT ZWwKIHN0YXRpYyBpbnQgZnJhbWVOdW1iZXIgPSAwOwogU3RyaW5nIEZyYW1lV2luOjpnZW5lcmF0 ZUZyYW1lTmFtZSgpIHsgcmV0dXJuIFFTdHJpbmc6Om51bWJlcihmcmFtZU51bWJlcisrKTsgfQog RnJhbWUqIEZyYW1lV2luOjpjcmVhdGVGcmFtZShLVVJMIGNvbnN0JixRU3RyaW5nIGNvbnN0JixS ZW5kZXJQYXJ0KixTdHJpbmcgY29uc3QmKSB7IHJldHVybiAwOyB9Ci0KK3ZvaWQgRnJhbWVXaW46 OnNhdmVEb2N1bWVudFN0YXRlKHZvaWQpIHsgfQordm9pZCBGcmFtZVdpbjo6Y2xlYXJVbmRvUmVk b09wZXJhdGlvbnModm9pZCkge30KIAogQnJvd3NlckV4dGVuc2lvbldpbjo6QnJvd3NlckV4dGVu c2lvbldpbihXZWJDb3JlOjpGcmFtZSopIHsgfQogCkBAIC0zMzYsOCArMzM0LDYgQEAgaW50IFNj cm9sbFZpZXc6OmNvbnRlbnRzV2lkdGgoKSBjb25zdCB7IAogdm9pZCBTY3JvbGxWaWV3Ojp2aWV3 cG9ydFRvQ29udGVudHMoaW50IHgxLCBpbnQgeTEsIGludCYgeDIsIGludCYgeTIpIHsgeDIgPSB4 MTsgeTIgPSB5MTsgfQogdm9pZCBTY3JvbGxWaWV3OjpzZXRTdGF0aWNCYWNrZ3JvdW5kKGJvb2wp IHsgfQogCi1ib29sIFRyYW5zZmVySm9iOjpzdGFydChjbGFzcyBXZWJDb3JlOjpEb2NMb2FkZXIg Kil7IHJldHVybiBmYWxzZTsgfQotCiBGb250IGNvbnN0JiBHcmFwaGljc0NvbnRleHQ6OmZvbnQo KSBjb25zdCB7IHJldHVybiBsb2NhbEZvbnQ7IH0KIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRG b250KEZvbnQgY29uc3QmKSB7IH0KIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3VGV4dChpbnQs aW50LGludCxpbnQsaW50LGludCxpbnQsUVN0cmluZyBjb25zdCYpIHsgfQpJbmRleDogcGxhdGZv cm0vd2luL1RyYW5zZmVySm9iV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS93aW4vVHJh bnNmZXJKb2JXaW4uY3BwCShyZXZpc2lvbiAxMzEyMykKKysrIHBsYXRmb3JtL3dpbi9UcmFuc2Zl ckpvYldpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzLDEyMSArMjMsNjQgQEAKICAqIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuIAogICovCiAKLSNpbXBvcnQgImNvbmZpZy5oIgotI2ltcG9ydCAiVHJhbnNmZXJKb2Iu aCIKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJUcmFuc2ZlckpvYi5oIgogCi0jaW1w b3J0ICJUcmFuc2ZlckpvYkludGVybmFsLmgiCi0KLSNpbXBvcnQgIkZvdW5kYXRpb25FeHRyYXMu aCIKLSNpbXBvcnQgIktVUkwuaCIKLSNpbXBvcnQgIktXUUV4Y2VwdGlvbnMuaCIKLSNpbXBvcnQg IktXUUxvYWRlci5oIgotI2ltcG9ydCAiTG9nZ2luZy5oIgotI2ltcG9ydCAiS1dRUmVzb3VyY2VM b2FkZXIuaCIKLSNpbXBvcnQgImZvcm1kYXRhLmgiCi0jaW1wb3J0ICJNYWNGcmFtZS5oIgotI2lt cG9ydCAiV2ViQ29yZUZyYW1lQnJpZGdlLmgiCi0jaW1wb3J0ICJEb2NMb2FkZXIuaCIKLSNpbXBv cnQgIktXUUZvcm1EYXRhLmgiCi0jaW1wb3J0ICJLV1FMb2FkZXIuaCIKKyNpbmNsdWRlICJUcmFu c2ZlckpvYkludGVybmFsLmgiCisjaW5jbHVkZSAiS1VSTC5oIgorI2luY2x1ZGUgImZvcm1kYXRh LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAKIFRyYW5zZmVySm9iSW50ZXJuYWw6On5U cmFuc2ZlckpvYkludGVybmFsKCkKIHsKLSAgICBLV1FSZWxlYXNlKHJlc3BvbnNlKTsKLSAgICBL V1FSZWxlYXNlKGxvYWRlcik7CisJaWYgKG1fZmlsZUhhbmRsZSkKKwkJQ2xvc2VIYW5kbGUobV9m aWxlSGFuZGxlKTsKIH0KIAogVHJhbnNmZXJKb2I6On5UcmFuc2ZlckpvYigpCiB7Ci0gICAgLy8g VGhpcyB3aWxsIGNhbmNlbCB0aGUgaGFuZGxlLCBhbmQgd2hvIGtub3dzIHdoYXQgdGhhdCBjb3Vs ZCBkbwotICAgIEtXUV9CTE9DS19FWENFUFRJT05TOwotICAgIFtkLT5sb2FkZXIgam9iV2lsbEJl RGVhbGxvY2F0ZWRdOwotICAgIEtXUV9VTkJMT0NLX0VYQ0VQVElPTlM7Ci0gICAgZGVsZXRlIGQ7 CiB9CiAKIGJvb2wgVHJhbnNmZXJKb2I6OnN0YXJ0KERvY0xvYWRlciogZG9jTG9hZGVyKQogewot ICAgIE1hY0ZyYW1lICpmcmFtZSA9IE1hYyhkb2NMb2FkZXItPmZyYW1lKCkpOwotICAgIAotICAg IGlmICghZnJhbWUpIHsKLSAgICAgICAgZGVsZXRlIHRoaXM7Ci0gICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICBpZiAoZC0+VVJMLmlzTG9jYWxGaWxlKCkpIHsKKyAgICAgICAgUVN0cmluZyBwYXRo ID0gZC0+VVJMLnBhdGgoKTsKKyAgICAgICAgLy8gd2luMzIgZG9lcyBub3QgZW5kam95IGEgbGVh ZGluZyBzbGFzaAorICAgICAgICBpZiAocGF0aFswXSA9PSAnLycpCisJICAgICAgICBwYXRoID0g cGF0aC5taWQoMSk7CisJICAgIGQtPm1fZmlsZUhhbmRsZSA9IENyZWF0ZUZpbGVBKHBhdGguYXNj aWkoKSwgR0VORVJJQ19SRUFELCAwLCBOVUxMLCBPUEVOX0VYSVNUSU5HLCBGSUxFX0FUVFJJQlVU RV9OT1JNQUwsIE5VTEwpOwogICAgIH0KLSAgICAKLSAgICBXZWJDb3JlRnJhbWVCcmlkZ2UqIGJy aWRnZSA9IGZyYW1lLT5icmlkZ2UoKTsKLQotICAgIGZyYW1lLT5kaWRUZWxsQnJpZGdlQWJvdXRM b2FkKHVybCgpLnVybCgpKTsKIAotICAgIEtXUV9CTE9DS19FWENFUFRJT05TOwotICAgIEtXUVJl c291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciA9IFtbS1dRUmVzb3VyY2VMb2FkZXIgYWxsb2Nd IGluaXRXaXRoSm9iOnRoaXNdOwotCi0gICAgaWQgPFdlYkNvcmVSZXNvdXJjZUhhbmRsZT4gaGFu ZGxlOwotCi0gICAgTlNEaWN0aW9uYXJ5KiBoZWFkZXJEaWN0ID0gbmlsOwotICAgIFFTdHJpbmcg aGVhZGVyU3RyaW5nID0gcXVlcnlNZXRhRGF0YSgiY3VzdG9tSFRUUEhlYWRlciIpOwotCi0gICAg aWYgKCFoZWFkZXJTdHJpbmcuaXNFbXB0eSgpKQotICAgICAgICBoZWFkZXJEaWN0ID0gW05TRGlj dGlvbmFyeSBfd2ViY29yZV9kaWN0aW9uYXJ5V2l0aEhlYWRlclN0cmluZzpoZWFkZXJTdHJpbmcu Z2V0TlNTdHJpbmcoKV07Ci0KLSAgICBpZiAocG9zdERhdGEoKS5jb3VudCgpID4gMCkgewotICAg ICAgICBoYW5kbGUgPSBbYnJpZGdlIHN0YXJ0TG9hZGluZ1Jlc291cmNlOnJlc291cmNlTG9hZGVy IHdpdGhNZXRob2Q6bWV0aG9kKCkgVVJMOnVybCgpLmdldE5TVVJMKCkgY3VzdG9tSGVhZGVyczpo ZWFkZXJEaWN0Ci0gICAgICAgICAgICBwb3N0RGF0YTphcnJheUZyb21Gb3JtRGF0YShwb3N0RGF0 YSgpKV07Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgaGFuZGxlID0gW2JyaWRnZSBzdGFydExvYWRp bmdSZXNvdXJjZTpyZXNvdXJjZUxvYWRlciB3aXRoTWV0aG9kOm1ldGhvZCgpIFVSTDp1cmwoKS5n ZXROU1VSTCgpIGN1c3RvbUhlYWRlcnM6aGVhZGVyRGljdF07CisgICAgaWYgKGQtPm1fZmlsZUhh bmRsZSA9PSBJTlZBTElEX0hBTkRMRV9WQUxVRSkgeworICAgICAgICBkZWxldGUgdGhpczsKKwkg ICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLSAgICBbcmVzb3VyY2VMb2FkZXIgc2V0SGFuZGxlOmhh bmRsZV07Ci0gICAgW3Jlc291cmNlTG9hZGVyIHJlbGVhc2VdOwotICAgIHJldHVybiBoYW5kbGUg IT0gbmlsOwotICAgIEtXUV9VTkJMT0NLX0VYQ0VQVElPTlM7CiAKKyAgICBkLT5tX2ZpbGVMb2Fk VGltZXIuc3RhcnRPbmVTaG90KDAuMCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgVHJh bnNmZXJKb2I6OmFzc2VtYmxlUmVzcG9uc2VIZWFkZXJzKCkgY29uc3QKK3ZvaWQgVHJhbnNmZXJK b2I6OmZpbGVMb2FkVGltZXIoVGltZXI8VHJhbnNmZXJKb2I+KiB0aW1lcikKIHsKLSAgICBpZiAo IWQtPmFzc2VtYmxlZFJlc3BvbnNlSGVhZGVycykgewotICAgICAgICBpZiAoW2QtPnJlc3BvbnNl IGlzS2luZE9mQ2xhc3M6W05TSFRUUFVSTFJlc3BvbnNlIGNsYXNzXV0pIHsKLSAgICAgICAgICAg IE5TSFRUUFVSTFJlc3BvbnNlICpodHRwUmVzcG9uc2UgPSAoTlNIVFRQVVJMUmVzcG9uc2UgKilk LT5yZXNwb25zZTsKLSAgICAgICAgICAgIE5TRGljdGlvbmFyeSAqaGVhZGVycyA9IFtodHRwUmVz cG9uc2UgYWxsSGVhZGVyRmllbGRzXTsKLSAgICAgICAgICAgIGQtPnJlc3BvbnNlSGVhZGVycyA9 IFFTdHJpbmc6OmZyb21OU1N0cmluZyhLV1FIZWFkZXJTdHJpbmdGcm9tRGljdGlvbmFyeShoZWFk ZXJzLCBbaHR0cFJlc3BvbnNlIHN0YXR1c0NvZGVdKSk7Ci0gICAgICAgIH0KLQlkLT5hc3NlbWJs ZWRSZXNwb25zZUhlYWRlcnMgPSB0cnVlOwotICAgIH0KLX0KKyAgICBib29sIHJlc3VsdCA9IGZh bHNlOworICAgIERXT1JEIGJ5dGVzUmVhZCA9IDA7CiAKLXZvaWQgVHJhbnNmZXJKb2I6OnJldHJp ZXZlQ2hhcnNldCgpIGNvbnN0Ci17Ci0gICAgaWYgKCFkLT5yZXRyaWV2ZWRDaGFyc2V0KSB7Ci0g ICAgICAgIE5TU3RyaW5nICpjaGFyc2V0ID0gW2QtPnJlc3BvbnNlIHRleHRFbmNvZGluZ05hbWVd OwotICAgICAgICBpZiAoY2hhcnNldCkKLSAgICAgICAgICAgIGQtPm1ldGFEYXRhLnNldCgiY2hh cnNldCIsIGNoYXJzZXQpOwotICAgICAgICBkLT5yZXRyaWV2ZWRDaGFyc2V0ID0gdHJ1ZTsKLSAg ICB9Ci19CisgICAgZG8geworICAgICAgICBjb25zdCBpbnQgYnVmZmVyU2l6ZSA9IDgxOTI7CisJ Y2hhciBidWZmZXJbYnVmZmVyU2l6ZV07CisJcmVzdWx0ID0gUmVhZEZpbGUoZC0+bV9maWxlSGFu ZGxlLCAmYnVmZmVyLCBidWZmZXJTaXplLCAmYnl0ZXNSZWFkLCBOVUxMKTsgCisJZC0+Y2xpZW50 LT5yZWNlaXZlZERhdGEodGhpcywgYnVmZmVyLCBieXRlc1JlYWQpOworCS8vIENoZWNrIGZvciBl bmQgb2YgZmlsZS4gCisgICAgfSB3aGlsZSAoIXJlc3VsdCB8fCBieXRlc1JlYWQpOwogCi12b2lk IFRyYW5zZmVySm9iOjpzZXRMb2FkZXIoS1dRUmVzb3VyY2VMb2FkZXIgKmxvYWRlcikKLXsKLSAg ICBLV1FSZXRhaW4obG9hZGVyKTsKLSAgICBLV1FSZWxlYXNlKGQtPmxvYWRlcik7Ci0gICAgZC0+ bG9hZGVyID0gbG9hZGVyOwotfQotCi12b2lkIFRyYW5zZmVySm9iOjpyZWNlaXZlZFJlc3BvbnNl KE5TVVJMUmVzcG9uc2UqIHJlc3BvbnNlKQotewotICAgIGQtPmFzc2VtYmxlZFJlc3BvbnNlSGVh ZGVycyA9IGZhbHNlOwotICAgIGQtPnJldHJpZXZlZENoYXJzZXQgPSBmYWxzZTsKLSAgICBkLT5y ZXNwb25zZSA9IHJlc3BvbnNlOwotICAgIEtXUVJldGFpbihkLT5yZXNwb25zZSk7Ci0gICAgaWYg KGQtPmNsaWVudCkKLSAgICAgICAgZC0+Y2xpZW50LT5yZWNlaXZlZFJlc3BvbnNlKHRoaXMsIHJl c3BvbnNlKTsKKyAgICBDbG9zZUhhbmRsZShkLT5tX2ZpbGVIYW5kbGUpOworICAgIGQtPm1fZmls ZUhhbmRsZSA9IDA7CiB9CiAKIHZvaWQgVHJhbnNmZXJKb2I6OmNhbmNlbCgpCiB7Ci0gICAgW2Qt PmxvYWRlciBqb2JDYW5jZWxlZExvYWRdOworICAgIGQtPm1fZmlsZUxvYWRUaW1lci5zdG9wKCk7 CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IHBsYXRmb3JtL1RyYW5zZmVySm9i LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vVHJhbnNmZXJKb2IuaAkocmV2aXNpb24gMTMxMjMp CisrKyBwbGF0Zm9ybS9UcmFuc2ZlckpvYi5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3 IEBACiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKICNpbmNsdWRlICJUcmFuc2ZlckpvYkNs aWVudC5oIiAvLyBmb3IgUGxhdGZvcm1SZXNwb25zZQogI2luY2x1ZGUgPGt4bWxjb3JlL0hhc2hN YXAuaD4KKyNpbmNsdWRlICJUaW1lci5oIgogCiAjaWYgX19BUFBMRV9fCiAjaWZkZWYgX19PQkpD X18KQEAgLTcwLDYgKzcxLDkgQEAgcHVibGljOgogI2lmIF9fQVBQTEVfXwogICAgIHZvaWQgc2V0 TG9hZGVyKEtXUVJlc291cmNlTG9hZGVyKik7CiAjZW5kaWYKKyNpZiBXSU4zMgorICAgIHZvaWQg VHJhbnNmZXJKb2I6OmZpbGVMb2FkVGltZXIoVGltZXI8VHJhbnNmZXJKb2I+KiB0aW1lcik7Cisj ZW5kaWYKIAogICAgIHZvaWQgY2FuY2VsKCk7CiAgICAgCkluZGV4OiBwbGF0Zm9ybS9jYWlyby9H cmFwaGljc0NvbnRleHRDYWlyby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vY2Fpcm8vR3Jh cGhpY3NDb250ZXh0Q2Fpcm8uY3BwCShyZXZpc2lvbiAxMzEyMykKKysrIHBsYXRmb3JtL2NhaXJv L0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEzLDYgKzQxMyw5 IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Q29udmV4UG9seWdvbigKIHZvaWQgR3JhcGhp Y3NDb250ZXh0OjpkcmF3RmxvYXRJbWFnZShJbWFnZSogaW1hZ2UsIGZsb2F0IHgsIGZsb2F0IHks IGZsb2F0IHcsIGZsb2F0IGgsIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxvYXQg c3gsIGZsb2F0IHN5LCBmbG9hdCBzdywgZmxvYXQgc2gsIEltYWdlOjpDb21wb3NpdGVPcGVyYXRv ciBjb21wb3NpdGVPcGVyYXRvciwgdm9pZCogY29udGV4dCkKIHsKKwlpZiAoIWNvbnRleHQpCisJ CWNvbnRleHQgPSBtX2RhdGEtPmNvbnRleHQ7CisKICAgICBpZiAobV9kYXRhLT5zdGF0ZS5wYWlu dGluZ0Rpc2FibGVkKQogICAgICAgICByZXR1cm47CiAKSW5kZXg6IHBsYXRmb3JtL1RyYW5zZmVy Sm9iLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9UcmFuc2ZlckpvYi5jcHAJKHJldmlzaW9u IDEzMTIzKQorKysgcGxhdGZvcm0vVHJhbnNmZXJKb2IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z NywxMiArMzcsMTIgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogVHJhbnNmZXJKb2I6OlRyYW5z ZmVySm9iKFRyYW5zZmVySm9iQ2xpZW50KiBjbGllbnQsIGNvbnN0IFN0cmluZyYgbWV0aG9kLCBj b25zdCBLVVJMJiB1cmwpCi0gICAgOiBkKG5ldyBUcmFuc2ZlckpvYkludGVybmFsKGNsaWVudCwg bWV0aG9kLCB1cmwpKQorICAgIDogZChuZXcgVHJhbnNmZXJKb2JJbnRlcm5hbCh0aGlzLCBjbGll bnQsIG1ldGhvZCwgdXJsKSkKIHsKIH0KIAogVHJhbnNmZXJKb2I6OlRyYW5zZmVySm9iKFRyYW5z ZmVySm9iQ2xpZW50KiBjbGllbnQsIGNvbnN0IFN0cmluZyYgbWV0aG9kLCBjb25zdCBLVVJMJiB1 cmwsIGNvbnN0IEZvcm1EYXRhJiBwb3N0RGF0YSkKLSAgICA6IGQobmV3IFRyYW5zZmVySm9iSW50 ZXJuYWwoY2xpZW50LCBtZXRob2QsIHVybCwgcG9zdERhdGEpKQorICAgIDogZChuZXcgVHJhbnNm ZXJKb2JJbnRlcm5hbCh0aGlzLCBjbGllbnQsIG1ldGhvZCwgdXJsLCBwb3N0RGF0YSkpCiB7CiB9 CiAKSW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEz MTIzKQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDAgQEAKKzIwMDYt MDMtMDQgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gbWFrZSBUcmFuc2ZlckpvYldpbiBo YW5kbGUgZmlsZTogVVJMcywgYW5kIGZpeCBvdGhlciBidWdzCisJYXMgbmVlZGVkIHRvIG1ha2Ug bG9jYWwgZmlsZSBpbWFnZSBsb2FkcyB3b3JrCisKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9X ZWJDb3JlL1dlYkNvcmUudmNwcm9qOiBhZGQgVHJhbnNmZXJKb2JXaW4KKwl0byBidWlsZC4KKyAg ICAgICAgKiBicmlkZ2Uvd2luL0ZyYW1lV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l V2luOjpGcmFtZVdpbik6IFNldCBhdXRvTG9hZEltYWdlcyB0byB0cnVlLgorICAgICAgICAqIHBs YXRmb3JtL1RyYW5zZmVySm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRyYW5zZmVySm9iOjpU cmFuc2ZlckpvYik6IFBhc3MgdGhpcyB0byBpbnRlcm5hbAorCWNvbnN0cnVjdG9yLCBzbyB3aW5k b3dzIHZlcnNpb24gY2FuIGluaXRpYWxpemUgdGltZXIKKyAgICAgICAgKiBwbGF0Zm9ybS9UcmFu c2ZlckpvYi5oOgorICAgICAgICAqIHBsYXRmb3JtL1RyYW5zZmVySm9iSW50ZXJuYWwuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlRyYW5zZmVySm9iSW50ZXJuYWw6OlRyYW5zZmVySm9iSW50ZXJuYWwp OiBPbiB3aW5kb3dzLAorCXByZXBhcmUgYSB0aW1lciBmb3IgZmlsZSBsb2Fkcy4KKyAgICAgICAg KiBwbGF0Zm9ybS9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHA6CisgICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdGbG9hdEltYWdlKTogSWYgcGFzc2VkLWluIGNvbnRl eHQKKwlpcyBudWxsLCB1c2Ugb3VyIGJ1aWx0LWluIGNvbnRleHQgKHRoaXMgaXMgcHJvYmFibHkg bm90IHRoZSBiZXN0LAorCWJ1dCBzaG91bGQgd29yayBmb3Igbm93KS4KKyAgICAgICAgKiBwbGF0 Zm9ybS93aW4vVGVtcG9yYXJ5TGlua1N0dWJzLmNwcDoKKyAgICAgICAgKEZyYW1lV2luOjppc3N1 ZVJlZG9Db21tYW5kKTogRG9uJ3QgYnJlYWsuCisgICAgICAgIChXZWJDb3JlOjpUcmFuc2Zlckpv Yjo6YXNzZW1ibGVSZXNwb25zZUhlYWRlcnMpOiBkaXR0bworICAgICAgICAoRnJhbWVXaW46OnNh dmVEb2N1bWVudFN0YXRlKTogZGl0dG8KKyAgICAgICAgKEZyYW1lV2luOjpjbGVhclVuZG9SZWRv T3BlcmF0aW9ucyk6IGRpdHRvCisgICAgICAgICogcGxhdGZvcm0vd2luL1RyYW5zZmVySm9iV2lu LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRyYW5zZmVySm9iSW50ZXJuYWw6On5UcmFuc2Zlckpv YkludGVybmFsKTogQ2xvc2UgZmlsZQorCWhhbmRsZSBpZiB3ZSBoYXZlIG9uZS4KKyAgICAgICAg KFdlYkNvcmU6OlRyYW5zZmVySm9iOjp+VHJhbnNmZXJKb2IpOiBFbXB0eS4KKyAgICAgICAgKFdl YkNvcmU6OlRyYW5zZmVySm9iOjpzdGFydCk6IE9wZW4gYSB3aW5kb3dzIGZpbGUgaGFuZGxlLgor ICAgICAgICAoV2ViQ29yZTo6VHJhbnNmZXJKb2I6OmZpbGVMb2FkVGltZXIpOiBMb2FkIGZyb20g d2luZG93cyBmaWxlCisJaGFuZGxlLgorICAgICAgICAoV2ViQ29yZTo6VHJhbnNmZXJKb2I6OmNh bmNlbCk6IFN0b3AgdGltZXIgYW5kIGNsb3NlIHdpbmRvd3MgZmlsZSAKKwloYW5kbGUgaWYgcHJl c2VudC4KKwogMjAwNi0wMy0wMyAgRXJpYyBTZWlkZWwgIDxlc2VpZGVsQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBoeWF0dC4KSW5kZXg6IFdlYkNvcmUudmNwcm9qL1dlYkNvcmUv V2ViQ29yZS52Y3Byb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS9XZWJD b3JlLnZjcHJvagkocmV2aXNpb24gMTMxMjMpCisrKyBXZWJDb3JlLnZjcHJvai9XZWJDb3JlL1dl YkNvcmUudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0xODMyLDYgKzE4MzIsMTAgQEAKIAkJCQkJ Pg0KIAkJCQk8L0ZpbGU+DQogCQkJCTxGaWxlDQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXC4uXHBs YXRmb3JtXHdpblxUcmFuc2ZlckpvYldpbi5jcHAiDQorCQkJCQk+DQorCQkJCTwvRmlsZT4NCisJ CQkJPEZpbGUNCiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5cLi5ccGxhdGZvcm1cd2luXFdpZGdldFdp bi5jcHAiDQogCQkJCQk+DQogCQkJCTwvRmlsZT4NCkluZGV4OiBicmlkZ2Uvd2luL0ZyYW1lV2lu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBicmlkZ2Uvd2luL0ZyYW1lV2luLmNwcAkocmV2aXNpb24gMTMx MjMpCisrKyBicmlkZ2Uvd2luL0ZyYW1lV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNyAr MzksOSBAQCBGcmFtZVdpbjo6RnJhbWVXaW4oUGFnZSogcGFnZSwgUmVuZGVyUGFyCiAgICAgOiBG cmFtZShwYWdlLCByZW5kZXJQYXJ0KQogewogICAgIGQtPm1fZXh0ZW5zaW9uID0gbmV3IEJyb3dz ZXJFeHRlbnNpb25XaW4odGhpcyk7Ci0gICAgc2V0U2V0dGluZ3MobmV3IEtIVE1MU2V0dGluZ3Mo KSk7CisJS0hUTUxTZXR0aW5ncyogc2V0dGluZ3MgPSBuZXcgS0hUTUxTZXR0aW5ncygpOworCXNl dHRpbmdzLT5zZXRBdXRvTG9hZEltYWdlcyh0cnVlKTsKKwlzZXRTZXR0aW5ncyhzZXR0aW5ncyk7 CiB9CiAKIEZyYW1lV2luOjp+RnJhbWVXaW4oKQo=