148619 2015-08-30 12:02:27 -0700 [GTK] expose MediaKeys directory 2017-03-11 10:47:24 -0800 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Unspecified NEW P2 Normal --- 1 mathstuf webkit-unassigned berto bugs-noreply cgarcia commit-queue gustavo mcatanzaro mrobinson oldest_to_newest 1122070 0 260248 mathstuf 2015-08-30 12:02:27 -0700 Created attachment 260248 Expose mediakeys-storage-directory property I'm guessing this isn't exposed for now because GTK doesn't support it? If so, this can wait. 1122071 1 commit-queue 2015-08-30 12:05:07 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1122076 2 260252 mathstuf 2015-08-30 12:35:33 -0700 Created attachment 260252 Expose mediakeys-storage-directory property The only thing I saw to change was to add a test and to add it to the doc -sections.txt file. 1122136 3 cgarcia 2015-08-30 23:19:43 -0700 Yes, I think media keys is a mac only thing, but I don't know what it is. 260248 2015-08-30 12:02:27 -0700 2015-08-30 12:35:33 -0700 Expose mediakeys-storage-directory property 0002-WebKitWebsiteDataManager-expose-mediakeys-storage-di.patch text/plain 5482 mathstuf RnJvbSA4ODVkY2Q4OGJlNDdjZWMyNjk2NGM0NmEzOWM0N2M1M2YyNWNjZDNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW4gQm9lY2tlbCA8bWF0aHN0dWZAZ21haWwuY29tPgpEYXRl OiBTdW4sIDMwIEF1ZyAyMDE1IDE0OjUzOjExIC0wNDAwClN1YmplY3Q6IFtQQVRDSCAyLzJdIFdl YktpdFdlYnNpdGVEYXRhTWFuYWdlcjogZXhwb3NlIG1lZGlha2V5cyBzdG9yYWdlCiBkaXJlY3Rv cnkKCi0tLQogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYnNpdGVEYXRhTWFuYWdlci5j cHAgfCAzNSArKysrKysrKysrKysrKysrKysrKy0tCiAuLi4vVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2Vic2l0ZURhdGFNYW5hZ2VyLmggICB8ICAzICsrCiAyIGZpbGVzIGNoYW5nZWQsIDM2IGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYnNpdGVEYXRhTWFuYWdlci5jcHAKaW5k ZXggOWQ2MTgzNy4uNzY4MzY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXIuY3BwCkBAIC02Niw3 ICs2Niw4IEBAIGVudW0gewogICAgIFBST1BfRElTS19DQUNIRV9ESVJFQ1RPUlksCiAgICAgUFJP UF9BUFBMSUNBVElPTl9DQUNIRV9ESVJFQ1RPUlksCiAgICAgUFJPUF9JTkRFWEVEREJfRElSRUNU T1JZLAotICAgIFBST1BfV0VCU1FMX0RJUkVDVE9SWQorICAgIFBST1BfV0VCU1FMX0RJUkVDVE9S WSwKKyAgICBQUk9QX01FRElBS0VZU19TVE9SQUdFX0RJUkVDVE9SWQogfTsKIAogc3RydWN0IF9X ZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXJQcml2YXRlIHsKQEAgLTc4LDYgKzc5LDcgQEAgc3RydWN0 IF9XZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXJQcml2YXRlIHsKICAgICBHVW5pcXVlUHRyPGNoYXI+ IGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnk7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiBpbmRleGVk REJEaXJlY3Rvcnk7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiB3ZWJTUUxEaXJlY3Rvcnk7CisgICAg R1VuaXF1ZVB0cjxjaGFyPiBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5OwogfTsKIAogV0VCS0lU X0RFRklORV9UWVBFKFdlYktpdFdlYnNpdGVEYXRhTWFuYWdlciwgd2Via2l0X3dlYnNpdGVfZGF0 YV9tYW5hZ2VyLCBHX1RZUEVfT0JKRUNUKQpAQCAtMTA4LDYgKzExMCw5IEBAIHN0YXRpYyB2b2lk IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3Vp bnQgcHJvcElELCBHCiAgICAgY2FzZSBQUk9QX1dFQlNRTF9ESVJFQ1RPUlk6CiAgICAgICAgIGdf dmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF93 ZWJzcWxfZGlyZWN0b3J5KG1hbmFnZXIpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9Q X01FRElBS0VZU19TVE9SQUdFX0RJUkVDVE9SWToKKyAgICAgICAgZ192YWx1ZV9zZXRfc3RyaW5n KHZhbHVlLCB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZ2V0X21lZGlha2V5c19zdG9yYWdl X2RpcmVjdG9yeShtYW5hZ2VyKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAg ICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJRCwgcGFy YW1TcGVjKTsKICAgICB9CkBAIC0xMzksNiArMTQ0LDkgQEAgc3RhdGljIHZvaWQgd2Via2l0V2Vi c2l0ZURhdGFNYW5hZ2VyU2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSUQs IGMKICAgICBjYXNlIFBST1BfV0VCU1FMX0RJUkVDVE9SWToKICAgICAgICAgbWFuYWdlci0+cHJp di0+d2ViU1FMRGlyZWN0b3J5LnJlc2V0KGdfdmFsdWVfZHVwX3N0cmluZyh2YWx1ZSkpOwogICAg ICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfTUVESUFLRVlTX1NUT1JBR0VfRElSRUNUT1JZOgor ICAgICAgICBtYW5hZ2VyLT5wcml2LT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5LnJlc2V0KGdf dmFsdWVfZHVwX3N0cmluZyh2YWx1ZSkpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0Ogog ICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSUQs IHBhcmFtU3BlYyk7CiAgICAgfQpAQCAtMTU2LDYgKzE2NCw4IEBAIHN0YXRpYyB2b2lkIHdlYmtp dFdlYnNpdGVEYXRhTWFuYWdlckNvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKICAgICAgICAg ICAgIHByaXYtPmluZGV4ZWREQkRpcmVjdG9yeS5yZXNldChnX2J1aWxkX2ZpbGVuYW1lKHByaXYt PmJhc2VEYXRhRGlyZWN0b3J5LmdldCgpLCAiZGF0YWJhc2VzIiwgImluZGV4ZWRkYiIsIG51bGxw dHIpKTsKICAgICAgICAgaWYgKCFwcml2LT53ZWJTUUxEaXJlY3RvcnkpCiAgICAgICAgICAgICBw cml2LT53ZWJTUUxEaXJlY3RvcnkucmVzZXQoZ19idWlsZF9maWxlbmFtZShwcml2LT5iYXNlRGF0 YURpcmVjdG9yeS5nZXQoKSwgImRhdGFiYXNlcyIsIG51bGxwdHIpKTsKKyAgICAgICAgaWYgKCFw cml2LT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KQorICAgICAgICAgICAgcHJpdi0+bWVkaWFL ZXlzU3RvcmFnZURpcmVjdG9yeS5yZXNldChnX2J1aWxkX2ZpbGVuYW1lKHByaXYtPmJhc2VEYXRh RGlyZWN0b3J5LmdldCgpLCAibWVkaWFrZXlzIiwgbnVsbHB0cikpOwogICAgIH0KIAogICAgIGlm IChwcml2LT5iYXNlQ2FjaGVEaXJlY3RvcnkpIHsKQEAgLTMxNyw3ICszMjcsOCBAQCBBUEk6Oldl YnNpdGVEYXRhU3RvcmUmIHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9yZShXZWJL aXRXZWJzaXRlRGF0YU1hbgogICAgICAgICAgICAgQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZh dWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpIDogV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmlu Zyhwcml2LT5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LmdldCgpKTsKICAgICAgICAgY29uZmln dXJhdGlvbi53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSA9ICFwcml2LT53ZWJTUUxEaXJlY3Rvcnkg PwogICAgICAgICAgICAgQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0V2ViU1FMRGF0YWJh c2VEaXJlY3RvcnkoKSA6IFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcocHJpdi0+d2ViU1FMRGly ZWN0b3J5LmdldCgpKTsKLSAgICAgICAgY29uZmlndXJhdGlvbi5tZWRpYUtleXNTdG9yYWdlRGly ZWN0b3J5ID0gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURp cmVjdG9yeSgpOworICAgICAgICBjb25maWd1cmF0aW9uLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rv cnkgPSAhcHJpdi0+bWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSA/CisgICAgICAgICAgICBBUEk6 OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkgOiBX ZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKHByaXYtPm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnku Z2V0KCkpOwogICAgICAgICBwcml2LT53ZWJzaXRlRGF0YVN0b3JlID0gQVBJOjpXZWJzaXRlRGF0 YVN0b3JlOjpjcmVhdGUoV1RGOjptb3ZlKGNvbmZpZ3VyYXRpb24pKTsKICAgICB9CiAKQEAgLTQ4 MywzICs0OTQsMjMgQEAgY29uc3QgZ2NoYXIqIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9n ZXRfd2Vic3FsX2RpcmVjdG9yeShXZWJLaXRXZWJzaXRlRGF0YU0KICAgICAgICAgcHJpdi0+d2Vi U1FMRGlyZWN0b3J5LnJlc2V0KGdfc3RyZHVwKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVs dFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkudXRmOCgpLmRhdGEoKSkpOwogICAgIHJldHVybiBw cml2LT53ZWJTUUxEaXJlY3RvcnkuZ2V0KCk7CiB9CisKKy8qKgorICogd2Via2l0X3dlYnNpdGVf ZGF0YV9tYW5hZ2VyX2dldF9tZWRpYWtleXNfc3RvcmFnZV9kaXJlY3Rvcnk6CisgKiBAbWFuYWdl cjogYSAjV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyCisgKgorICogR2V0IHRoZSAjV2ViS2l0V2Vi c2l0ZURhdGFNYW5hZ2VyOm1lZGlha2V5cy1zdG9yYWdlLWRpcmVjdG9yeSBwcm9wZXJ0eS4KKyAq CisgKiBSZXR1cm5zOiB0aGUgZGlyZWN0b3J5IHdoZXJlIG1lZGlhIGtleXMgZm9yIEVNRSBwbHVn aW5zIGFyZSBzdG9yZWQuCisgKgorICogU2luY2U6IDIuMTAKKyAqLworY29uc3QgZ2NoYXIqIHdl YmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRfd2Vic3FsX2RpcmVjdG9yeShXZWJLaXRXZWJz aXRlRGF0YU1hbmFnZXIqIG1hbmFnZXIpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQlNJVEVfREFUQV9NQU5BR0VSKG1hbmFnZXIpLCBudWxscHRyKTsKKworICAgIFdl YktpdFdlYnNpdGVEYXRhTWFuYWdlclByaXZhdGUqIHByaXYgPSBtYW5hZ2VyLT5wcml2OworICAg IGlmICghcHJpdi0+bWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSkKKyAgICAgICAgcHJpdi0+bWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeS5yZXNldChnX3N0cmR1cChBUEk6OldlYnNpdGVEYXRhU3Rv cmU6OmRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkudXRmOCgpLmRhdGEoKSkpOwor ICAgIHJldHVybiBwcml2LT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5LmdldCgpOworfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vic2l0ZURh dGFNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJz aXRlRGF0YU1hbmFnZXIuaAppbmRleCBlOWQ4NTkxLi5hNzNkZmRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXIuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJzaXRlRGF0YU1h bmFnZXIuaApAQCAtODIsNiArODIsOSBAQCB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZ2V0 X2luZGV4ZWRkYl9kaXJlY3RvcnkgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJzaQogV0VCS0lU X0FQSSBjb25zdCBnY2hhciAqCiB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZ2V0X3dlYnNx bF9kaXJlY3RvcnkgICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXIg Km1hbmFnZXIpOwogCitXRUJLSVRfQVBJIGNvbnN0IGdjaGFyICoKK3dlYmtpdF93ZWJzaXRlX2Rh dGFfbWFuYWdlcl9nZXRfbWVkaWFrZXlzX3N0b3JhZ2VfZGlyZWN0b3J5ICAgICAgICAgKFdlYktp dFdlYnNpdGVEYXRhTWFuYWdlciAqbWFuYWdlcik7CisKIEdfRU5EX0RFQ0xTCiAKICNlbmRpZgot LSAKMi41LjAKCg== 260252 2015-08-30 12:35:33 -0700 2015-08-30 12:35:33 -0700 Expose mediakeys-storage-directory property 0002-WebKitWebsiteDataManager-expose-mediakeys-storage-di.patch text/plain 7502 mathstuf RnJvbSBjYzkyNjNlZDJlNTYyNDBiODYxYTA5MjA3N2RjZWY0OWFjNTAwODg3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW4gQm9lY2tlbCA8bWF0aHN0dWZAZ21haWwuY29tPgpEYXRl OiBTdW4sIDMwIEF1ZyAyMDE1IDE0OjUzOjExIC0wNDAwClN1YmplY3Q6IFtQQVRDSCAyLzNdIFdl YktpdFdlYnNpdGVEYXRhTWFuYWdlcjogZXhwb3NlIG1lZGlha2V5cyBzdG9yYWdlCiBkaXJlY3Rv cnkKCi0tLQogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYnNpdGVEYXRhTWFuYWdlci5j cHAgfCAzNSArKysrKysrKysrKysrKysrKysrKy0tCiAuLi4vVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2Vic2l0ZURhdGFNYW5hZ2VyLmggICB8ICAzICsrCiAuLi4vQVBJL2d0ay9kb2NzL3dlYmtp dDJndGstNC4wLXNlY3Rpb25zLnR4dCAgICAgICB8ICAxICsKIC4uLi9UZXN0cy9XZWJLaXQyR3Rr L1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcCAgICAgIHwgIDQgKysrCiA0IGZpbGVzIGNoYW5nZWQs IDQxIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYnNpdGVEYXRhTWFuYWdlci5j cHAKaW5kZXggOWQ2MTgzNy4uNzY4MzY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXIuY3BwCkBA IC02Niw3ICs2Niw4IEBAIGVudW0gewogICAgIFBST1BfRElTS19DQUNIRV9ESVJFQ1RPUlksCiAg ICAgUFJPUF9BUFBMSUNBVElPTl9DQUNIRV9ESVJFQ1RPUlksCiAgICAgUFJPUF9JTkRFWEVEREJf RElSRUNUT1JZLAotICAgIFBST1BfV0VCU1FMX0RJUkVDVE9SWQorICAgIFBST1BfV0VCU1FMX0RJ UkVDVE9SWSwKKyAgICBQUk9QX01FRElBS0VZU19TVE9SQUdFX0RJUkVDVE9SWQogfTsKIAogc3Ry dWN0IF9XZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXJQcml2YXRlIHsKQEAgLTc4LDYgKzc5LDcgQEAg c3RydWN0IF9XZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXJQcml2YXRlIHsKICAgICBHVW5pcXVlUHRy PGNoYXI+IGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnk7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiBp bmRleGVkREJEaXJlY3Rvcnk7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiB3ZWJTUUxEaXJlY3Rvcnk7 CisgICAgR1VuaXF1ZVB0cjxjaGFyPiBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5OwogfTsKIAog V0VCS0lUX0RFRklORV9UWVBFKFdlYktpdFdlYnNpdGVEYXRhTWFuYWdlciwgd2Via2l0X3dlYnNp dGVfZGF0YV9tYW5hZ2VyLCBHX1RZUEVfT0JKRUNUKQpAQCAtMTA4LDYgKzExMCw5IEBAIHN0YXRp YyB2b2lkIHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldFByb3BlcnR5KEdPYmplY3QqIG9iamVj dCwgZ3VpbnQgcHJvcElELCBHCiAgICAgY2FzZSBQUk9QX1dFQlNRTF9ESVJFQ1RPUlk6CiAgICAg ICAgIGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2Vy X2dldF93ZWJzcWxfZGlyZWN0b3J5KG1hbmFnZXIpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBQUk9QX01FRElBS0VZU19TVE9SQUdFX0RJUkVDVE9SWToKKyAgICAgICAgZ192YWx1ZV9zZXRf c3RyaW5nKHZhbHVlLCB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZ2V0X21lZGlha2V5c19z dG9yYWdlX2RpcmVjdG9yeShtYW5hZ2VyKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6 CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJ RCwgcGFyYW1TcGVjKTsKICAgICB9CkBAIC0xMzksNiArMTQ0LDkgQEAgc3RhdGljIHZvaWQgd2Vi a2l0V2Vic2l0ZURhdGFNYW5hZ2VyU2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBw cm9wSUQsIGMKICAgICBjYXNlIFBST1BfV0VCU1FMX0RJUkVDVE9SWToKICAgICAgICAgbWFuYWdl ci0+cHJpdi0+d2ViU1FMRGlyZWN0b3J5LnJlc2V0KGdfdmFsdWVfZHVwX3N0cmluZyh2YWx1ZSkp OwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfTUVESUFLRVlTX1NUT1JBR0VfRElSRUNU T1JZOgorICAgICAgICBtYW5hZ2VyLT5wcml2LT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5LnJl c2V0KGdfdmFsdWVfZHVwX3N0cmluZyh2YWx1ZSkpOworICAgICAgICBicmVhazsKICAgICBkZWZh dWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBw cm9wSUQsIHBhcmFtU3BlYyk7CiAgICAgfQpAQCAtMTU2LDYgKzE2NCw4IEBAIHN0YXRpYyB2b2lk IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckNvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKICAg ICAgICAgICAgIHByaXYtPmluZGV4ZWREQkRpcmVjdG9yeS5yZXNldChnX2J1aWxkX2ZpbGVuYW1l KHByaXYtPmJhc2VEYXRhRGlyZWN0b3J5LmdldCgpLCAiZGF0YWJhc2VzIiwgImluZGV4ZWRkYiIs IG51bGxwdHIpKTsKICAgICAgICAgaWYgKCFwcml2LT53ZWJTUUxEaXJlY3RvcnkpCiAgICAgICAg ICAgICBwcml2LT53ZWJTUUxEaXJlY3RvcnkucmVzZXQoZ19idWlsZF9maWxlbmFtZShwcml2LT5i YXNlRGF0YURpcmVjdG9yeS5nZXQoKSwgImRhdGFiYXNlcyIsIG51bGxwdHIpKTsKKyAgICAgICAg aWYgKCFwcml2LT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KQorICAgICAgICAgICAgcHJpdi0+ bWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeS5yZXNldChnX2J1aWxkX2ZpbGVuYW1lKHByaXYtPmJh c2VEYXRhRGlyZWN0b3J5LmdldCgpLCAibWVkaWFrZXlzIiwgbnVsbHB0cikpOwogICAgIH0KIAog ICAgIGlmIChwcml2LT5iYXNlQ2FjaGVEaXJlY3RvcnkpIHsKQEAgLTMxNyw3ICszMjcsOCBAQCBB UEk6OldlYnNpdGVEYXRhU3RvcmUmIHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9y ZShXZWJLaXRXZWJzaXRlRGF0YU1hbgogICAgICAgICAgICAgQVBJOjpXZWJzaXRlRGF0YVN0b3Jl OjpkZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpIDogV2ViQ29yZTo6ZmlsZW5hbWVU b1N0cmluZyhwcml2LT5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LmdldCgpKTsKICAgICAgICAg Y29uZmlndXJhdGlvbi53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSA9ICFwcml2LT53ZWJTUUxEaXJl Y3RvcnkgPwogICAgICAgICAgICAgQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0V2ViU1FM RGF0YWJhc2VEaXJlY3RvcnkoKSA6IFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcocHJpdi0+d2Vi U1FMRGlyZWN0b3J5LmdldCgpKTsKLSAgICAgICAgY29uZmlndXJhdGlvbi5tZWRpYUtleXNTdG9y YWdlRGlyZWN0b3J5ID0gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TWVkaWFLZXlzU3Rv cmFnZURpcmVjdG9yeSgpOworICAgICAgICBjb25maWd1cmF0aW9uLm1lZGlhS2V5c1N0b3JhZ2VE aXJlY3RvcnkgPSAhcHJpdi0+bWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSA/CisgICAgICAgICAg ICBBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5 KCkgOiBXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKHByaXYtPm1lZGlhS2V5c1N0b3JhZ2VEaXJl Y3RvcnkuZ2V0KCkpOwogICAgICAgICBwcml2LT53ZWJzaXRlRGF0YVN0b3JlID0gQVBJOjpXZWJz aXRlRGF0YVN0b3JlOjpjcmVhdGUoV1RGOjptb3ZlKGNvbmZpZ3VyYXRpb24pKTsKICAgICB9CiAK QEAgLTQ4MywzICs0OTQsMjMgQEAgY29uc3QgZ2NoYXIqIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFu YWdlcl9nZXRfd2Vic3FsX2RpcmVjdG9yeShXZWJLaXRXZWJzaXRlRGF0YU0KICAgICAgICAgcHJp di0+d2ViU1FMRGlyZWN0b3J5LnJlc2V0KGdfc3RyZHVwKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6 ZGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkudXRmOCgpLmRhdGEoKSkpOwogICAgIHJl dHVybiBwcml2LT53ZWJTUUxEaXJlY3RvcnkuZ2V0KCk7CiB9CisKKy8qKgorICogd2Via2l0X3dl YnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9tZWRpYWtleXNfc3RvcmFnZV9kaXJlY3Rvcnk6CisgKiBA bWFuYWdlcjogYSAjV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyCisgKgorICogR2V0IHRoZSAjV2Vi S2l0V2Vic2l0ZURhdGFNYW5hZ2VyOm1lZGlha2V5cy1zdG9yYWdlLWRpcmVjdG9yeSBwcm9wZXJ0 eS4KKyAqCisgKiBSZXR1cm5zOiB0aGUgZGlyZWN0b3J5IHdoZXJlIG1lZGlhIGtleXMgZm9yIEVN RSBwbHVnaW5zIGFyZSBzdG9yZWQuCisgKgorICogU2luY2U6IDIuMTAKKyAqLworY29uc3QgZ2No YXIqIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRfd2Vic3FsX2RpcmVjdG9yeShXZWJL aXRXZWJzaXRlRGF0YU1hbmFnZXIqIG1hbmFnZXIpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2Zh aWwoV0VCS0lUX0lTX1dFQlNJVEVfREFUQV9NQU5BR0VSKG1hbmFnZXIpLCBudWxscHRyKTsKKwor ICAgIFdlYktpdFdlYnNpdGVEYXRhTWFuYWdlclByaXZhdGUqIHByaXYgPSBtYW5hZ2VyLT5wcml2 OworICAgIGlmICghcHJpdi0+bWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSkKKyAgICAgICAgcHJp di0+bWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeS5yZXNldChnX3N0cmR1cChBUEk6OldlYnNpdGVE YXRhU3RvcmU6OmRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkudXRmOCgpLmRhdGEo KSkpOworICAgIHJldHVybiBwcml2LT5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5LmdldCgpOwor fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi c2l0ZURhdGFNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJzaXRlRGF0YU1hbmFnZXIuaAppbmRleCBlOWQ4NTkxLi5hNzNkZmRjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJzaXRlRGF0YU1hbmFn ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJzaXRl RGF0YU1hbmFnZXIuaApAQCAtODIsNiArODIsOSBAQCB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFn ZXJfZ2V0X2luZGV4ZWRkYl9kaXJlY3RvcnkgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJzaQog V0VCS0lUX0FQSSBjb25zdCBnY2hhciAqCiB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZ2V0 X3dlYnNxbF9kaXJlY3RvcnkgICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJzaXRlRGF0YU1h bmFnZXIgKm1hbmFnZXIpOwogCitXRUJLSVRfQVBJIGNvbnN0IGdjaGFyICoKK3dlYmtpdF93ZWJz aXRlX2RhdGFfbWFuYWdlcl9nZXRfbWVkaWFrZXlzX3N0b3JhZ2VfZGlyZWN0b3J5ICAgICAgICAg KFdlYktpdFdlYnNpdGVEYXRhTWFuYWdlciAqbWFuYWdlcik7CisKIEdfRU5EX0RFQ0xTCiAKICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93 ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dAppbmRleCAzMjc0OTk1Li4zMjk5 NmY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dl YmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dApAQCAtMTIwNCw2ICsxMjA0 LDcgQEAgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9kaXNrX2NhY2hlX2RpcmVjdG9y eQogd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9vZmZsaW5lX2FwcGxpY2F0aW9uX2Nh Y2hlX2RpcmVjdG9yeQogd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9pbmRleGVkZGJf ZGlyZWN0b3J5CiB3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfZ2V0X3dlYnNxbF9kaXJlY3Rv cnkKK3dlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRfbWVkaWFrZXlzX3N0b3JhZ2VfZGly ZWN0b3J5CiAKIDxTVUJTRUNUSU9OIFN0YW5kYXJkPgogV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2Vy Q2xhc3MKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9U ZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDJHdGsvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IDk2YTM0YjEuLjA3NTE4NDggMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0 V2ViQ29udGV4dC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3Rr L1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtNzQsNiArNzQsMTAgQEAgc3RhdGljIHZvaWQg dGVzdFdlYkNvbnRleHRDb25maWd1cmF0aW9uKFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2lu dGVyKQogICAgIHRlc3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxGaW5pc2hlZCgiZGIgPSBv cGVuRGF0YWJhc2UoXCJUZXN0RGF0YWJhc2VcIiwgXCIxLjBcIiwgXCJUZXN0RGF0YWJhc2VcIiwg MSk7IiwgbnVsbHB0cik7CiAgICAgZ19hc3NlcnQoZ19maWxlX3Rlc3Qod2ViU1FMRGlyZWN0b3J5 LmdldCgpLCBHX0ZJTEVfVEVTVF9JU19ESVIpKTsKIAorICAgIEdVbmlxdWVQdHI8Y2hhcj4gbWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeShnX2J1aWxkX2ZpbGVuYW1lKFRlc3Q6OmRhdGFEaXJlY3Rv cnkoKSwgIm1lZGlha2V5cyIsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIobWVkaWFL ZXlzU3RvcmFnZURpcmVjdG9yeS5nZXQoKSwgPT0sIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdl cl9nZXRfbWVkaWFrZXlzX3N0b3JhZ2VfZGlyZWN0b3J5KG1hbmFnZXIpKTsKKyAgICBnX2Fzc2Vy dChnX2ZpbGVfdGVzdChtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5LmdldCgpLCBHX0ZJTEVfVEVT VF9JU19ESVIpKTsKKwogICAgIEdVbmlxdWVQdHI8Y2hhcj4gZGlza0NhY2hlRGlyZWN0b3J5KGdf YnVpbGRfZmlsZW5hbWUoVGVzdDo6ZGF0YURpcmVjdG9yeSgpLCAiZGlzay1jYWNoZSIsIG51bGxw dHIpKTsKICAgICBnX2Fzc2VydF9jbXBzdHIoZGlza0NhY2hlRGlyZWN0b3J5LmdldCgpLCA9PSwg d2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9kaXNrX2NhY2hlX2RpcmVjdG9yeShtYW5h Z2VyKSk7CiAgICAgZ19hc3NlcnQoZ19maWxlX3Rlc3QoZGlza0NhY2hlRGlyZWN0b3J5LmdldCgp LCBHX0ZJTEVfVEVTVF9JU19ESVIpKTsKLS0gCjIuNS4wCgo=