67002 2011-08-25 17:26:41 -0700 Move Windows-specific WebPageProxy code to WebPageProxyWin.cpp 2011-08-25 17:51:10 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 jeffm jeffm oldest_to_newest 457282 0 jeffm 2011-08-25 17:26:41 -0700 Move Windows-specific WebPageProxy code to WebPageProxyWin.cpp 457284 1 105281 jeffm 2011-08-25 17:29:28 -0700 Created attachment 105281 Patch 457288 2 105281 bweinstein 2011-08-25 17:32:18 -0700 Comment on attachment 105281 Patch rs=me 457300 3 jeffm 2011-08-25 17:51:10 -0700 Committed r93843: <http://trac.webkit.org/changeset/93843> 105281 2011-08-25 17:29:28 -0700 2011-08-25 17:32:18 -0700 Patch bug-67002-20110825172925.patch text/plain 12645 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzODM4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDgtMjUgIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgV2luZG93cy1zcGVjaWZpYyBX ZWJQYWdlUHJveHkgY29kZSB0byBXZWJQYWdlUHJveHlXaW4uY3BwCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NzAwMgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHA6IE1vdmVkIFdpbmRvd3Mtb25seSBmdW5jdGlvbnMgdG8gV2ViUGFnZVByb3h5V2luLmNwcC4K KyAgICAgICAgCisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJQYWdlUHJveHlXaW4uY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmZpcnN0UmVjdEZvckNoYXJhY3RlckluU2Vs ZWN0ZWRSYW5nZSk6IE1vdmVkIGZyb20gV2ViUGFnZVByb3h5LmNwcC4KKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpnZXRTZWxlY3RlZFRleHQpOiBNb3ZlZCBmcm9tIFdlYlBhZ2VQcm94 eS5jcHAuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z2VzdHVyZVdpbGxCZWdpbik6 IE1vdmVkIGZyb20gV2ViUGFnZVByb3h5LmNwcC4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpnZXN0dXJlRGlkU2Nyb2xsKTogTW92ZWQgZnJvbSBXZWJQYWdlUHJveHkuY3BwLgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Omdlc3R1cmVEaWRFbmQpOiBNb3ZlZCBmcm9tIFdl YlBhZ2VQcm94eS5jcHAuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0R2VzdHVy ZVJlYWNoZWRTY3JvbGxpbmdMaW1pdCk6IE1vdmVkIGZyb20gV2ViUGFnZVByb3h5LmNwcC4KKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzdGFydERyYWdEcm9wKTogTW92ZWQgZnJvbSBX ZWJQYWdlUHJveHkuY3BwLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZENoYW5n ZUNvbXBvc2l0aW9uU2VsZWN0aW9uKTogTW92ZWQgZnJvbSBXZWJQYWdlUHJveHkuY3BwLgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbmZpcm1Db21wb3NpdGlvbik6IE1vdmVkIGZy b20gV2ViUGFnZVByb3h5LmNwcC4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRD b21wb3NpdGlvbik6IE1vdmVkIGZyb20gV2ViUGFnZVByb3h5LmNwcC4KKwogMjAxMS0wOC0yNSAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEZhY3RvciBj b2RlIHRvIHNlbmQgYSBrZXktZG93biBldmVudCB0byB0aGUgcGx1Zy1pbiBvdXQgaW50byBhIG5l dyBmdW5jdGlvbgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAJKHJldmlzaW9uIDkzNzgxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc5LDE1ICs3OSw2IEBACiAjaW5jbHVkZSA8V2Vi Q29yZS9XaW5kb3dGZWF0dXJlcy5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CiAKLSNpZiBQTEFURk9S TShXSU4pCi0jaW5jbHVkZSAiV2ViRHJhZ1NvdXJjZS5oIgotI2luY2x1ZGUgPFdlYkNvcmUvQml0 bWFwSW5mby5oPgotI2luY2x1ZGUgPFdlYkNvcmUvQ2xpcGJvYXJkVXRpbGl0aWVzV2luLmg+Ci0j aW5jbHVkZSA8V2ViQ29yZS9DT01QdHIuaD4KLSNpbmNsdWRlIDxXZWJDb3JlL1dDRGF0YU9iamVj dC5oPgotI2luY2x1ZGUgPHNobG9iai5oPgotI2VuZGlmCi0KICNpZiBQTEFURk9STShRVCkKICNp bmNsdWRlICJBcmd1bWVudENvZGVyc1F0LmgiCiAjZW5kaWYKQEAgLTczNyw0NCArNzI4LDYgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmV4ZWN1dGVFZGl0Q29tbWFuZChjbwogICAgIHByb2Nlc3MoKS0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RXhlY3V0ZUVkaXRDb21tYW5kKGNvbW1hbmROYW1lKSwg bV9wYWdlSUQpOwogfQogICAgIAotI2lmIFBMQVRGT1JNKFdJTikKLUludFJlY3QgV2ViUGFnZVBy b3h5OjpmaXJzdFJlY3RGb3JDaGFyYWN0ZXJJblNlbGVjdGVkUmFuZ2UoaW50IGNoYXJhY3RlclBv c2l0aW9uKQotewotICAgIEludFJlY3QgcmVzdWx0UmVjdDsKLSAgICBwcm9jZXNzKCktPnNlbmRT eW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpGaXJzdFJlY3RGb3JDaGFyYWN0ZXJJblNlbGVjdGVkUmFu Z2UoY2hhcmFjdGVyUG9zaXRpb24pLCBNZXNzYWdlczo6V2ViUGFnZTo6Rmlyc3RSZWN0Rm9yQ2hh cmFjdGVySW5TZWxlY3RlZFJhbmdlOjpSZXBseShyZXN1bHRSZWN0KSwgbV9wYWdlSUQpOwotICAg IHJldHVybiByZXN1bHRSZWN0OwotfQotCi1TdHJpbmcgV2ViUGFnZVByb3h5OjpnZXRTZWxlY3Rl ZFRleHQoKQotewotICAgIFN0cmluZyB0ZXh0OwotICAgIHByb2Nlc3MoKS0+c2VuZFN5bmMoTWVz c2FnZXM6OldlYlBhZ2U6OkdldFNlbGVjdGVkVGV4dCgpLCBNZXNzYWdlczo6V2ViUGFnZTo6R2V0 U2VsZWN0ZWRUZXh0OjpSZXBseSh0ZXh0KSwgbV9wYWdlSUQpOwotICAgIHJldHVybiB0ZXh0Owot fQotCi1ib29sIFdlYlBhZ2VQcm94eTo6Z2VzdHVyZVdpbGxCZWdpbihjb25zdCBJbnRQb2ludCYg cG9pbnQpCi17Ci0gICAgYm9vbCBjYW5CZWdpblBhbm5pbmcgPSBmYWxzZTsKLSAgICBwcm9jZXNz KCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXN0dXJlV2lsbEJlZ2luKHBvaW50KSwg TWVzc2FnZXM6OldlYlBhZ2U6Okdlc3R1cmVXaWxsQmVnaW46OlJlcGx5KGNhbkJlZ2luUGFubmlu ZyksIG1fcGFnZUlEKTsKLSAgICByZXR1cm4gY2FuQmVnaW5QYW5uaW5nOwotfQotCi12b2lkIFdl YlBhZ2VQcm94eTo6Z2VzdHVyZURpZFNjcm9sbChjb25zdCBJbnRTaXplJiBzaXplKQotewotICAg IHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R2VzdHVyZURpZFNjcm9sbChzaXpl KSwgbV9wYWdlSUQpOwotfQotCi12b2lkIFdlYlBhZ2VQcm94eTo6Z2VzdHVyZURpZEVuZCgpCi17 Ci0gICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXN0dXJlRGlkRW5kKCks IG1fcGFnZUlEKTsKLX0KLQotdm9pZCBXZWJQYWdlUHJveHk6OnNldEdlc3R1cmVSZWFjaGVkU2Ny b2xsaW5nTGltaXQoYm9vbCBsaW1pdFJlYWNoZWQpCi17Ci0gICAgbV9wYWdlQ2xpZW50LT5zZXRH ZXN0dXJlUmVhY2hlZFNjcm9sbGluZ0xpbWl0KGxpbWl0UmVhY2hlZCk7Ci19Ci0jZW5kaWYKLQog I2lmIEVOQUJMRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogdm9pZCBXZWJQYWdlUHJveHk6OnNldEZp eGVkVmlzaWJsZUNvbnRlbnRSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CkBAIC04MjgsNjgg Kzc4MSw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtRHJhZ0NvbnRyb2wKICAgICBt X2N1cnJlbnREcmFnT3BlcmF0aW9uID0gc3RhdGljX2Nhc3Q8RHJhZ09wZXJhdGlvbj4ocmVzdWx0 T3BlcmF0aW9uKTsKIH0KIAotI2lmIFBMQVRGT1JNKFdJTikKLQotdm9pZCBXZWJQYWdlUHJveHk6 OnN0YXJ0RHJhZ0Ryb3AoY29uc3QgSW50UG9pbnQmIGltYWdlT3JpZ2luLCBjb25zdCBJbnRQb2lu dCYgZHJhZ1BvaW50LCB1aW50NjRfdCBva0VmZmVjdCwgY29uc3QgSGFzaE1hcDxVSU5ULCBWZWN0 b3I8U3RyaW5nPiA+JiBkYXRhTWFwLCB1aW50NjRfdCBmaWxlU2l6ZSwgY29uc3QgU3RyaW5nJiBw YXRobmFtZSwgY29uc3QgU2hhcmVkTWVtb3J5OjpIYW5kbGUmIGZpbGVDb250ZW50SGFuZGxlLCBj b25zdCBJbnRTaXplJiBkcmFnSW1hZ2VTaXplLCBjb25zdCBTaGFyZWRNZW1vcnk6OkhhbmRsZSYg ZHJhZ0ltYWdlSGFuZGxlLCBib29sIGlzTGlua0RyYWcpCi17Ci0gICAgQ09NUHRyPFdDRGF0YU9i amVjdD4gZGF0YU9iamVjdDsKLSAgICBXQ0RhdGFPYmplY3Q6OmNyZWF0ZUluc3RhbmNlKCZkYXRh T2JqZWN0LCBkYXRhTWFwKTsKLQotICAgIGlmIChmaWxlU2l6ZSkgewotICAgICAgICBSZWZQdHI8 U2hhcmVkTWVtb3J5PiBmaWxlQ29udGVudEJ1ZmZlciA9IFNoYXJlZE1lbW9yeTo6Y3JlYXRlKGZp bGVDb250ZW50SGFuZGxlLCBTaGFyZWRNZW1vcnk6OlJlYWRPbmx5KTsKLSAgICAgICAgc2V0Rmls ZURlc2NyaXB0b3JEYXRhKGRhdGFPYmplY3QuZ2V0KCksIGZpbGVTaXplLCBwYXRobmFtZSk7Ci0g ICAgICAgIHNldEZpbGVDb250ZW50RGF0YShkYXRhT2JqZWN0LmdldCgpLCBmaWxlU2l6ZSwgZmls ZUNvbnRlbnRCdWZmZXItPmRhdGEoKSk7Ci0gICAgfQotCi0gICAgUmVmUHRyPFNoYXJlZE1lbW9y eT4gbWVtb3J5QnVmZmVyID0gU2hhcmVkTWVtb3J5OjpjcmVhdGUoZHJhZ0ltYWdlSGFuZGxlLCBT aGFyZWRNZW1vcnk6OlJlYWRPbmx5KTsKLSAgICBpZiAoIW1lbW9yeUJ1ZmZlcikKLSAgICAgICAg cmV0dXJuOwotCi0gICAgUmVmUHRyPFdlYkRyYWdTb3VyY2U+IHNvdXJjZSA9IFdlYkRyYWdTb3Vy Y2U6OmNyZWF0ZUluc3RhbmNlKCk7Ci0gICAgaWYgKCFzb3VyY2UpCi0gICAgICAgIHJldHVybjsK LQotICAgIENPTVB0cjxJRHJhZ1NvdXJjZUhlbHBlcj4gaGVscGVyOwotICAgIGlmIChGQUlMRUQo OjpDb0NyZWF0ZUluc3RhbmNlKENMU0lEX0RyYWdEcm9wSGVscGVyLCAwLCBDTFNDVFhfSU5QUk9D X1NFUlZFUiwgSUlEX0lEcmFnU291cmNlSGVscGVyLCByZWludGVycHJldF9jYXN0PExQVk9JRCo+ KCZoZWxwZXIpKSkpCi0gICAgICAgIHJldHVybjsKLQotICAgIEJpdG1hcEluZm8gYml0bWFwSW5m byA9IEJpdG1hcEluZm86OmNyZWF0ZShkcmFnSW1hZ2VTaXplKTsKLSAgICB2b2lkKiBiaXRzOwot ICAgIE93blB0cjxIQklUTUFQPiBoYm1wID0gYWRvcHRQdHIoOjpDcmVhdGVESUJTZWN0aW9uKDAs ICZiaXRtYXBJbmZvLCBESUJfUkdCX0NPTE9SUywgJmJpdHMsIDAsIDApKTsKLSAgICBtZW1jcHko Yml0cywgbWVtb3J5QnVmZmVyLT5kYXRhKCksIG1lbW9yeUJ1ZmZlci0+c2l6ZSgpKTsKLQotICAg IFNIRFJBR0lNQUdFIHNkaTsKLSAgICBzZGkuc2l6ZURyYWdJbWFnZS5jeCA9IGJpdG1hcEluZm8u Ym1pSGVhZGVyLmJpV2lkdGg7Ci0gICAgc2RpLnNpemVEcmFnSW1hZ2UuY3kgPSBiaXRtYXBJbmZv LmJtaUhlYWRlci5iaUhlaWdodDsKLSAgICBzZGkuY3JDb2xvcktleSA9IDB4ZmZmZmZmZmY7Ci0g ICAgc2RpLmhibXBEcmFnSW1hZ2UgPSBoYm1wLmxlYWtQdHIoKTsKLSAgICBzZGkucHRPZmZzZXQu eCA9IGRyYWdQb2ludC54KCkgLSBpbWFnZU9yaWdpbi54KCk7Ci0gICAgc2RpLnB0T2Zmc2V0Lnkg PSBkcmFnUG9pbnQueSgpIC0gaW1hZ2VPcmlnaW4ueSgpOwotICAgIGlmIChpc0xpbmtEcmFnKQot ICAgICAgICBzZGkucHRPZmZzZXQueSA9IGJpdG1hcEluZm8uYm1pSGVhZGVyLmJpSGVpZ2h0IC0g c2RpLnB0T2Zmc2V0Lnk7Ci0KLSAgICBoZWxwZXItPkluaXRpYWxpemVGcm9tQml0bWFwKCZzZGks IGRhdGFPYmplY3QuZ2V0KCkpOwotCi0gICAgRFdPUkQgZWZmZWN0ID0gRFJPUEVGRkVDVF9OT05F OwotCi0gICAgRHJhZ09wZXJhdGlvbiBvcGVyYXRpb24gPSBEcmFnT3BlcmF0aW9uTm9uZTsKLSAg ICBpZiAoOjpEb0RyYWdEcm9wKGRhdGFPYmplY3QuZ2V0KCksIHNvdXJjZS5nZXQoKSwgb2tFZmZl Y3QsICZlZmZlY3QpID09IERSQUdEUk9QX1NfRFJPUCkgewotICAgICAgICBpZiAoZWZmZWN0ICYg RFJPUEVGRkVDVF9DT1BZKQotICAgICAgICAgICAgb3BlcmF0aW9uID0gRHJhZ09wZXJhdGlvbkNv cHk7Ci0gICAgICAgIGVsc2UgaWYgKGVmZmVjdCAmIERST1BFRkZFQ1RfTElOSykKLSAgICAgICAg ICAgIG9wZXJhdGlvbiA9IERyYWdPcGVyYXRpb25MaW5rOwotICAgICAgICBlbHNlIGlmIChlZmZl Y3QgJiBEUk9QRUZGRUNUX01PVkUpCi0gICAgICAgICAgICBvcGVyYXRpb24gPSBEcmFnT3BlcmF0 aW9uTW92ZTsKLSAgICB9Ci0gICAgUE9JTlQgZ2xvYmFsUG9pbnQ7Ci0gICAgOjpHZXRDdXJzb3JQ b3MoJmdsb2JhbFBvaW50KTsKLSAgICBQT0lOVCBsb2NhbFBvaW50ID0gZ2xvYmFsUG9pbnQ7Ci0g ICAgOjpTY3JlZW5Ub0NsaWVudChtX3BhZ2VDbGllbnQtPm5hdGl2ZVdpbmRvdygpLCAmbG9jYWxQ b2ludCk7Ci0KLSAgICBkcmFnRW5kZWQobG9jYWxQb2ludCwgZ2xvYmFsUG9pbnQsIG9wZXJhdGlv bik7Ci19Ci0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKFFUKQogdm9pZCBXZWJQYWdlUHJveHk6OnN0 YXJ0RHJhZyhjb25zdCBEcmFnRGF0YSYgZHJhZ0RhdGEsIGNvbnN0IFNoYXJlYWJsZUJpdG1hcDo6 SGFuZGxlJiBkcmFnSW1hZ2VIYW5kbGUpCiB7CkBAIC0yMzA5LDIzICsyMjAwLDYgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmVkaXRvclN0YXRlQ2hhbmdlZChjbwogI2VuZGlmCiB9CiAKLSNpZiBQTEFU Rk9STShXSU4pCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlQ29tcG9zaXRpb25TZWxlY3Rp b24oYm9vbCBoYXNDb21wb3NpdGlvbikKLXsKLSAgICBtX3BhZ2VDbGllbnQtPmNvbXBvc2l0aW9u U2VsZWN0aW9uQ2hhbmdlZChoYXNDb21wb3NpdGlvbik7Ci19Ci0KLXZvaWQgV2ViUGFnZVByb3h5 Ojpjb25maXJtQ29tcG9zaXRpb24oY29uc3QgU3RyaW5nJiBjb21wb3NpdGlvblN0cmluZykKLXsK LSAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNvbmZpcm1Db21wb3NpdGlv bihjb21wb3NpdGlvblN0cmluZyksIG1fcGFnZUlEKTsKLX0KLQotdm9pZCBXZWJQYWdlUHJveHk6 OnNldENvbXBvc2l0aW9uKGNvbnN0IFN0cmluZyYgY29tcG9zaXRpb25TdHJpbmcsIFZlY3RvcjxD b21wb3NpdGlvblVuZGVybGluZT4mIHVuZGVybGluZXMsIGludCBjdXJzb3JQb3NpdGlvbikKLXsK LSAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldENvbXBvc2l0aW9uKGNv bXBvc2l0aW9uU3RyaW5nLCB1bmRlcmxpbmVzLCBjdXJzb3JQb3NpdGlvbiksIG1fcGFnZUlEKTsK LX0KLSNlbmRpZgotICAgIAogLy8gVW5kbyBtYW5hZ2VtZW50CiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpyZWdpc3RlckVkaXRDb21tYW5kRm9yVW5kbyh1aW50NjRfdCBjb21tYW5kSUQsIHVpbnQzMl90 IGVkaXRBY3Rpb24pCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlBhZ2VQ cm94eVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9X ZWJQYWdlUHJveHlXaW4uY3BwCShyZXZpc2lvbiA5Mzc4MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy93aW4vV2ViUGFnZVByb3h5V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsMTIg KzI3LDE5IEBACiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAKICNpbmNsdWRlICJQYWdlQ2xp ZW50LmgiCisjaW5jbHVkZSAiV2ViRHJhZ1NvdXJjZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VNZXNz YWdlcy5oIgogI2luY2x1ZGUgIldlYlBvcHVwTWVudVByb3h5V2luLmgiCisjaW5jbHVkZSAiV2Vi UHJvY2Vzc1Byb3h5LmgiCiAKICNpbmNsdWRlICJyZXNvdXJjZS5oIgotI2luY2x1ZGUgPHRjaGFy Lmg+CisjaW5jbHVkZSA8V2ViQ29yZS9CaXRtYXBJbmZvLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9D T01QdHIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0NsaXBib2FyZFV0aWxpdGllc1dpbi5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvU3lzdGVtSW5mby5oPgorI2luY2x1ZGUgPFdlYkNvcmUvV0NEYXRhT2Jq ZWN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9XZWJDb3JlSW5zdGFuY2VIYW5kbGUuaD4KKyNpbmNs dWRlIDx0Y2hhci5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9TdHJpbmdDb25jYXRlbmF0ZS5oPgogCkBAIC04MCw0ICs4NywxMTUgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZEluc3RhbGxPclVuaW5zdGFsbAogICAgIG1fcGFnZUNsaWVudC0+ZGlk SW5zdGFsbE9yVW5pbnN0YWxsUGFnZU92ZXJsYXkoZGlkSW5zdGFsbCk7CiB9CiAKK0ludFJlY3Qg V2ViUGFnZVByb3h5OjpmaXJzdFJlY3RGb3JDaGFyYWN0ZXJJblNlbGVjdGVkUmFuZ2UoaW50IGNo YXJhY3RlclBvc2l0aW9uKQoreworICAgIEludFJlY3QgcmVzdWx0UmVjdDsKKyAgICBwcm9jZXNz KCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpGaXJzdFJlY3RGb3JDaGFyYWN0ZXJJblNl bGVjdGVkUmFuZ2UoY2hhcmFjdGVyUG9zaXRpb24pLCBNZXNzYWdlczo6V2ViUGFnZTo6Rmlyc3RS ZWN0Rm9yQ2hhcmFjdGVySW5TZWxlY3RlZFJhbmdlOjpSZXBseShyZXN1bHRSZWN0KSwgbV9wYWdl SUQpOworICAgIHJldHVybiByZXN1bHRSZWN0OworfQorCitTdHJpbmcgV2ViUGFnZVByb3h5Ojpn ZXRTZWxlY3RlZFRleHQoKQoreworICAgIFN0cmluZyB0ZXh0OworICAgIHByb2Nlc3MoKS0+c2Vu ZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2U6OkdldFNlbGVjdGVkVGV4dCgpLCBNZXNzYWdlczo6V2Vi UGFnZTo6R2V0U2VsZWN0ZWRUZXh0OjpSZXBseSh0ZXh0KSwgbV9wYWdlSUQpOworICAgIHJldHVy biB0ZXh0OworfQorCitib29sIFdlYlBhZ2VQcm94eTo6Z2VzdHVyZVdpbGxCZWdpbihjb25zdCBJ bnRQb2ludCYgcG9pbnQpCit7CisgICAgYm9vbCBjYW5CZWdpblBhbm5pbmcgPSBmYWxzZTsKKyAg ICBwcm9jZXNzKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXN0dXJlV2lsbEJlZ2lu KHBvaW50KSwgTWVzc2FnZXM6OldlYlBhZ2U6Okdlc3R1cmVXaWxsQmVnaW46OlJlcGx5KGNhbkJl Z2luUGFubmluZyksIG1fcGFnZUlEKTsKKyAgICByZXR1cm4gY2FuQmVnaW5QYW5uaW5nOworfQor Cit2b2lkIFdlYlBhZ2VQcm94eTo6Z2VzdHVyZURpZFNjcm9sbChjb25zdCBJbnRTaXplJiBzaXpl KQoreworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R2VzdHVyZURpZFNj cm9sbChzaXplKSwgbV9wYWdlSUQpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6Z2VzdHVyZURp ZEVuZCgpCit7CisgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXN0dXJl RGlkRW5kKCksIG1fcGFnZUlEKTsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OnNldEdlc3R1cmVS ZWFjaGVkU2Nyb2xsaW5nTGltaXQoYm9vbCBsaW1pdFJlYWNoZWQpCit7CisgICAgbV9wYWdlQ2xp ZW50LT5zZXRHZXN0dXJlUmVhY2hlZFNjcm9sbGluZ0xpbWl0KGxpbWl0UmVhY2hlZCk7Cit9CisK K3ZvaWQgV2ViUGFnZVByb3h5OjpzdGFydERyYWdEcm9wKGNvbnN0IEludFBvaW50JiBpbWFnZU9y aWdpbiwgY29uc3QgSW50UG9pbnQmIGRyYWdQb2ludCwgdWludDY0X3Qgb2tFZmZlY3QsIGNvbnN0 IEhhc2hNYXA8VUlOVCwgVmVjdG9yPFN0cmluZz4gPiYgZGF0YU1hcCwgdWludDY0X3QgZmlsZVNp emUsIGNvbnN0IFN0cmluZyYgcGF0aG5hbWUsIGNvbnN0IFNoYXJlZE1lbW9yeTo6SGFuZGxlJiBm aWxlQ29udGVudEhhbmRsZSwgY29uc3QgSW50U2l6ZSYgZHJhZ0ltYWdlU2l6ZSwgY29uc3QgU2hh cmVkTWVtb3J5OjpIYW5kbGUmIGRyYWdJbWFnZUhhbmRsZSwgYm9vbCBpc0xpbmtEcmFnKQorewor ICAgIENPTVB0cjxXQ0RhdGFPYmplY3Q+IGRhdGFPYmplY3Q7CisgICAgV0NEYXRhT2JqZWN0Ojpj cmVhdGVJbnN0YW5jZSgmZGF0YU9iamVjdCwgZGF0YU1hcCk7CisKKyAgICBpZiAoZmlsZVNpemUp IHsKKyAgICAgICAgUmVmUHRyPFNoYXJlZE1lbW9yeT4gZmlsZUNvbnRlbnRCdWZmZXIgPSBTaGFy ZWRNZW1vcnk6OmNyZWF0ZShmaWxlQ29udGVudEhhbmRsZSwgU2hhcmVkTWVtb3J5OjpSZWFkT25s eSk7CisgICAgICAgIHNldEZpbGVEZXNjcmlwdG9yRGF0YShkYXRhT2JqZWN0LmdldCgpLCBmaWxl U2l6ZSwgcGF0aG5hbWUpOworICAgICAgICBzZXRGaWxlQ29udGVudERhdGEoZGF0YU9iamVjdC5n ZXQoKSwgZmlsZVNpemUsIGZpbGVDb250ZW50QnVmZmVyLT5kYXRhKCkpOworICAgIH0KKworICAg IFJlZlB0cjxTaGFyZWRNZW1vcnk+IG1lbW9yeUJ1ZmZlciA9IFNoYXJlZE1lbW9yeTo6Y3JlYXRl KGRyYWdJbWFnZUhhbmRsZSwgU2hhcmVkTWVtb3J5OjpSZWFkT25seSk7CisgICAgaWYgKCFtZW1v cnlCdWZmZXIpCisgICAgICAgIHJldHVybjsKKworICAgIFJlZlB0cjxXZWJEcmFnU291cmNlPiBz b3VyY2UgPSBXZWJEcmFnU291cmNlOjpjcmVhdGVJbnN0YW5jZSgpOworICAgIGlmICghc291cmNl KQorICAgICAgICByZXR1cm47CisKKyAgICBDT01QdHI8SURyYWdTb3VyY2VIZWxwZXI+IGhlbHBl cjsKKyAgICBpZiAoRkFJTEVEKDo6Q29DcmVhdGVJbnN0YW5jZShDTFNJRF9EcmFnRHJvcEhlbHBl ciwgMCwgQ0xTQ1RYX0lOUFJPQ19TRVJWRVIsIElJRF9JRHJhZ1NvdXJjZUhlbHBlciwgcmVpbnRl cnByZXRfY2FzdDxMUFZPSUQqPigmaGVscGVyKSkpKQorICAgICAgICByZXR1cm47CisKKyAgICBC aXRtYXBJbmZvIGJpdG1hcEluZm8gPSBCaXRtYXBJbmZvOjpjcmVhdGUoZHJhZ0ltYWdlU2l6ZSk7 CisgICAgdm9pZCogYml0czsKKyAgICBPd25QdHI8SEJJVE1BUD4gaGJtcCA9IGFkb3B0UHRyKDo6 Q3JlYXRlRElCU2VjdGlvbigwLCAmYml0bWFwSW5mbywgRElCX1JHQl9DT0xPUlMsICZiaXRzLCAw LCAwKSk7CisgICAgbWVtY3B5KGJpdHMsIG1lbW9yeUJ1ZmZlci0+ZGF0YSgpLCBtZW1vcnlCdWZm ZXItPnNpemUoKSk7CisKKyAgICBTSERSQUdJTUFHRSBzZGk7CisgICAgc2RpLnNpemVEcmFnSW1h Z2UuY3ggPSBiaXRtYXBJbmZvLmJtaUhlYWRlci5iaVdpZHRoOworICAgIHNkaS5zaXplRHJhZ0lt YWdlLmN5ID0gYml0bWFwSW5mby5ibWlIZWFkZXIuYmlIZWlnaHQ7CisgICAgc2RpLmNyQ29sb3JL ZXkgPSAweGZmZmZmZmZmOworICAgIHNkaS5oYm1wRHJhZ0ltYWdlID0gaGJtcC5sZWFrUHRyKCk7 CisgICAgc2RpLnB0T2Zmc2V0LnggPSBkcmFnUG9pbnQueCgpIC0gaW1hZ2VPcmlnaW4ueCgpOwor ICAgIHNkaS5wdE9mZnNldC55ID0gZHJhZ1BvaW50LnkoKSAtIGltYWdlT3JpZ2luLnkoKTsKKyAg ICBpZiAoaXNMaW5rRHJhZykKKyAgICAgICAgc2RpLnB0T2Zmc2V0LnkgPSBiaXRtYXBJbmZvLmJt aUhlYWRlci5iaUhlaWdodCAtIHNkaS5wdE9mZnNldC55OworCisgICAgaGVscGVyLT5Jbml0aWFs aXplRnJvbUJpdG1hcCgmc2RpLCBkYXRhT2JqZWN0LmdldCgpKTsKKworICAgIERXT1JEIGVmZmVj dCA9IERST1BFRkZFQ1RfTk9ORTsKKworICAgIERyYWdPcGVyYXRpb24gb3BlcmF0aW9uID0gRHJh Z09wZXJhdGlvbk5vbmU7CisgICAgaWYgKDo6RG9EcmFnRHJvcChkYXRhT2JqZWN0LmdldCgpLCBz b3VyY2UuZ2V0KCksIG9rRWZmZWN0LCAmZWZmZWN0KSA9PSBEUkFHRFJPUF9TX0RST1ApIHsKKyAg ICAgICAgaWYgKGVmZmVjdCAmIERST1BFRkZFQ1RfQ09QWSkKKyAgICAgICAgICAgIG9wZXJhdGlv biA9IERyYWdPcGVyYXRpb25Db3B5OworICAgICAgICBlbHNlIGlmIChlZmZlY3QgJiBEUk9QRUZG RUNUX0xJTkspCisgICAgICAgICAgICBvcGVyYXRpb24gPSBEcmFnT3BlcmF0aW9uTGluazsKKyAg ICAgICAgZWxzZSBpZiAoZWZmZWN0ICYgRFJPUEVGRkVDVF9NT1ZFKQorICAgICAgICAgICAgb3Bl cmF0aW9uID0gRHJhZ09wZXJhdGlvbk1vdmU7CisgICAgfQorICAgIFBPSU5UIGdsb2JhbFBvaW50 OworICAgIDo6R2V0Q3Vyc29yUG9zKCZnbG9iYWxQb2ludCk7CisgICAgUE9JTlQgbG9jYWxQb2lu dCA9IGdsb2JhbFBvaW50OworICAgIDo6U2NyZWVuVG9DbGllbnQobV9wYWdlQ2xpZW50LT5uYXRp dmVXaW5kb3coKSwgJmxvY2FsUG9pbnQpOworCisgICAgZHJhZ0VuZGVkKGxvY2FsUG9pbnQsIGds b2JhbFBvaW50LCBvcGVyYXRpb24pOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdl Q29tcG9zaXRpb25TZWxlY3Rpb24oYm9vbCBoYXNDb21wb3NpdGlvbikKK3sKKyAgICBtX3BhZ2VD bGllbnQtPmNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlZChoYXNDb21wb3NpdGlvbik7Cit9CisK K3ZvaWQgV2ViUGFnZVByb3h5Ojpjb25maXJtQ29tcG9zaXRpb24oY29uc3QgU3RyaW5nJiBjb21w b3NpdGlvblN0cmluZykKK3sKKyAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OkNvbmZpcm1Db21wb3NpdGlvbihjb21wb3NpdGlvblN0cmluZyksIG1fcGFnZUlEKTsKK30KKwor dm9pZCBXZWJQYWdlUHJveHk6OnNldENvbXBvc2l0aW9uKGNvbnN0IFN0cmluZyYgY29tcG9zaXRp b25TdHJpbmcsIFZlY3RvcjxDb21wb3NpdGlvblVuZGVybGluZT4mIHVuZGVybGluZXMsIGludCBj dXJzb3JQb3NpdGlvbikKK3sKKyAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OlNldENvbXBvc2l0aW9uKGNvbXBvc2l0aW9uU3RyaW5nLCB1bmRlcmxpbmVzLCBjdXJzb3JQb3Np dGlvbiksIG1fcGFnZUlEKTsKK30KKworCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK