10561 2006-08-25 04:08:26 -0700 Qt doesn't build at the moment. 2006-08-25 11:45:24 -0700 1 1 1 Unclassified WebKit Platform 420+ Other OS X 10.4 RESOLVED FIXED P2 Normal --- 1 zimmermann webkit-unassigned oldest_to_newest 53515 0 zimmermann 2006-08-25 04:08:26 -0700 Some fixes regarding EditCommandPtr are needed, the patch changed platform/mac and platform/gdk, but Qt was forgotten :-) 53516 1 10215 zimmermann 2006-08-25 04:08:49 -0700 Created attachment 10215 Initial patch 53523 2 zimmermann 2006-08-25 06:49:10 -0700 Hmpf, there is much more needed to get it build again, the whole Widget/Screen/Page changes have to be done :/ Will take me some hours if I'm back home and able to hack again - stay tuned... 53658 3 10221 zimmermann 2006-08-25 10:55:27 -0700 Created attachment 10221 Updated patch 53660 4 10223 zimmermann 2006-08-25 11:12:06 -0700 Created attachment 10223 Updated patch II Made a mistake while preparing the patch, now I double-checked it applies :-) 53661 5 10223 aroben 2006-08-25 11:15:06 -0700 Comment on attachment 10223 Updated patch II r=me 53663 6 10223 aroben 2006-08-25 11:17:52 -0700 Comment on attachment 10223 Updated patch II Landed as r16035. Clearing review flag. 10215 2006-08-25 04:08:49 -0700 2006-08-25 10:55:27 -0700 Initial patch make-it-compile.diff text/plain 1796 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShSZXZpc2lvbiAxNjAzMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCShBcmJlaXRza29waWUpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDYtMDgtMjUgIE5pa29sYXMgWmltbWVybWFubiAgPHppbW1lcm1h bm5Aa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDb21waWxlIGFmdGVyIHRoZSBFZGl0Q29tbWFuZFB0ciBjaGFuZ2VzLgorCisgICAgICAg ICogcGxhdGZvcm0vcXQvRnJhbWVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVF0Ojpy ZWdpc3RlckNvbW1hbmRGb3JVbmRvKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lUXQ6OnJlZ2lz dGVyQ29tbWFuZEZvclJlZG8pOgorICAgICAgICAqIHBsYXRmb3JtL3F0L0ZyYW1lUXQuaDoKKwog MjAwNi0wOC0yNCAgRGF2aWQgSGFycmlzb24gIDxoYXJyaXNvbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgSnVzdGluLgpJbmRleDogRnJhbWVRdC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g RnJhbWVRdC5jcHAJKFJldmlzaW9uIDE2MDMyKQorKysgRnJhbWVRdC5jcHAJKEFyYmVpdHNrb3Bp ZSkKQEAgLTM4MSwxMiArMzgxLDEyIEBACiAgICAgcmV0dXJuIDA7CiB9CiAKLXZvaWQgRnJhbWVR dDo6cmVnaXN0ZXJDb21tYW5kRm9yVW5kbyhjb25zdCBFZGl0Q29tbWFuZFB0ciYpCit2b2lkIEZy YW1lUXQ6OnJlZ2lzdGVyQ29tbWFuZEZvclVuZG8oUGFzc1JlZlB0cjxFZGl0Q29tbWFuZD4pCiB7 CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotdm9pZCBGcmFtZVF0OjpyZWdpc3RlckNvbW1h bmRGb3JSZWRvKGNvbnN0IEVkaXRDb21tYW5kUHRyJikKK3ZvaWQgRnJhbWVRdDo6cmVnaXN0ZXJD b21tYW5kRm9yUmVkbyhQYXNzUmVmUHRyPEVkaXRDb21tYW5kPikKIHsKICAgICBub3RJbXBsZW1l bnRlZCgpOwogfQpJbmRleDogRnJhbWVRdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEZyYW1lUXQuaAkoUmV2 aXNpb24gMTYwMzIpCisrKyBGcmFtZVF0LmgJKEFyYmVpdHNrb3BpZSkKQEAgLTEwOSw4ICsxMDks OCBAQAogICAgIHZpcnR1YWwgS0pTOjpCaW5kaW5nczo6SW5zdGFuY2UqIGdldE9iamVjdEluc3Rh bmNlRm9yV2lkZ2V0KFdpZGdldCopOwogICAgIHZpcnR1YWwgS0pTOjpCaW5kaW5nczo6SW5zdGFu Y2UqIGdldEFwcGxldEluc3RhbmNlRm9yV2lkZ2V0KFdpZGdldCopOwogCi0gICAgdmlydHVhbCB2 b2lkIHJlZ2lzdGVyQ29tbWFuZEZvclVuZG8oY29uc3QgRWRpdENvbW1hbmRQdHImKTsKLSAgICB2 aXJ0dWFsIHZvaWQgcmVnaXN0ZXJDb21tYW5kRm9yUmVkbyhjb25zdCBFZGl0Q29tbWFuZFB0ciYp OworICAgIHZpcnR1YWwgdm9pZCByZWdpc3RlckNvbW1hbmRGb3JVbmRvKFBhc3NSZWZQdHI8RWRp dENvbW1hbmQ+KTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0ZXJDb21tYW5kRm9yUmVkbyhQYXNz UmVmUHRyPEVkaXRDb21tYW5kPik7CiAgICAgdmlydHVhbCB2b2lkIGNsZWFyVW5kb1JlZG9PcGVy YXRpb25zKCk7CiAgICAgdmlydHVhbCB2b2lkIGlzc3VlVW5kb0NvbW1hbmQoKTsKICAgICB2aXJ0 dWFsIHZvaWQgaXNzdWVSZWRvQ29tbWFuZCgpOwo= 10221 2006-08-25 10:55:27 -0700 2006-08-25 11:12:06 -0700 Updated patch make-it-compile.diff text/plain 5235 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShSZXZpc2lvbiAxNjAzMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCShBcmJlaXRza29waWUpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDYtMDgtMjUgIE5pa29sYXMgWmltbWVybWFubiAgPHppbW1lcm1h bm5Aa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXhlczogaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDU2MQorICAgICAgICBRdCBwbGF0Zm9ybSBidWlsZCBmaXhlcy4KKworICAgICAgICAqIHBs YXRmb3JtL3F0L0ZyYW1lUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVRdDo6cmVnaXN0 ZXJDb21tYW5kRm9yVW5kbyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVF0OjpyZWdpc3RlckNv bW1hbmRGb3JSZWRvKToKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9GcmFtZVF0Lmg6CisgICAgICAg ICogcGxhdGZvcm0vcXQvU2NyZWVuUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cXdpZGdldEZv clBhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuUmVjdCk6CisgICAgICAgIChXZWJDb3Jl OjpzY3JlZW5EZXB0aCk6CisgICAgICAgIChXZWJDb3JlOjp1c2FibGVTY3JlZW5SZWN0KToKKyAg ICAgICAgKFdlYkNvcmU6OnNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9UZW1w b3JhcnlMaW5rU3R1YnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuRGVwdGhQZXJDb21w b25lbnQpOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuSXNNb25vY2hyb21lKToKKyAgICAgICAg KiBwbGF0Zm9ybS9xdC9XaWRnZXRRdC5jcHA6CisKIDIwMDYtMDgtMjQgIERhdmlkIEhhcnJpc29u ICA8aGFycmlzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEp1c3Rpbi4KSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vcXQvRnJhbWVRdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vcXQvRnJhbWVRdC5oCShSZXZpc2lvbiAxNjAzMikKKysrIFdlYkNvcmUvcGxhdGZv cm0vcXQvRnJhbWVRdC5oCShBcmJlaXRza29waWUpCkBAIC0xMDksOCArMTA5LDggQEAKICAgICB2 aXJ0dWFsIEtKUzo6QmluZGluZ3M6Okluc3RhbmNlKiBnZXRPYmplY3RJbnN0YW5jZUZvcldpZGdl dChXaWRnZXQqKTsKICAgICB2aXJ0dWFsIEtKUzo6QmluZGluZ3M6Okluc3RhbmNlKiBnZXRBcHBs ZXRJbnN0YW5jZUZvcldpZGdldChXaWRnZXQqKTsKIAotICAgIHZpcnR1YWwgdm9pZCByZWdpc3Rl ckNvbW1hbmRGb3JVbmRvKGNvbnN0IEVkaXRDb21tYW5kUHRyJik7Ci0gICAgdmlydHVhbCB2b2lk IHJlZ2lzdGVyQ29tbWFuZEZvclJlZG8oY29uc3QgRWRpdENvbW1hbmRQdHImKTsKKyAgICB2aXJ0 dWFsIHZvaWQgcmVnaXN0ZXJDb21tYW5kRm9yVW5kbyhQYXNzUmVmUHRyPEVkaXRDb21tYW5kPik7 CisgICAgdmlydHVhbCB2b2lkIHJlZ2lzdGVyQ29tbWFuZEZvclJlZG8oUGFzc1JlZlB0cjxFZGl0 Q29tbWFuZD4pOwogICAgIHZpcnR1YWwgdm9pZCBjbGVhclVuZG9SZWRvT3BlcmF0aW9ucygpOwog ICAgIHZpcnR1YWwgdm9pZCBpc3N1ZVVuZG9Db21tYW5kKCk7CiAgICAgdmlydHVhbCB2b2lkIGlz c3VlUmVkb0NvbW1hbmQoKTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vcXQvVGVtcG9yYXJ5TGlu a1N0dWJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3F0L1RlbXBvcmFyeUxp bmtTdHVicy5jcHAJKFJldmlzaW9uIDE2MDMyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9xdC9UZW1w b3JhcnlMaW5rU3R1YnMuY3BwCShBcmJlaXRza29waWUpCkBAIC0xNTcsOCArMTU3LDggQEAKIAog dm9pZCBGcmFtZTo6c2V0TmVlZHNSZWFwcGx5U3R5bGVzKCkgeyBub3RJbXBsZW1lbnRlZCgpOyB9 CiAKLWludCBXZWJDb3JlOjpzY3JlZW5EZXB0aFBlckNvbXBvbmVudChXaWRnZXQqKSB7IG5vdElt cGxlbWVudGVkKCk7IHJldHVybiAwOyB9Ci1ib29sIFdlYkNvcmU6OnNjcmVlbklzTW9ub2Nocm9t ZShXaWRnZXQqKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBmYWxzZTsgfQoraW50IFdlYkNv cmU6OnNjcmVlbkRlcHRoUGVyQ29tcG9uZW50KGNvbnN0IFBhZ2UqKSB7IG5vdEltcGxlbWVudGVk KCk7IHJldHVybiAwOyB9Citib29sIFdlYkNvcmU6OnNjcmVlbklzTW9ub2Nocm9tZShjb25zdCBQ YWdlKikgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gZmFsc2U7IH0KIAogU3RyaW5nIFdlYkNv cmU6OnNlYXJjaGFibGVJbmRleEludHJvZHVjdGlvbigpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0 dXJuIFN0cmluZygpOyB9CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vcXQvRnJhbWVRdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9xdC9GcmFtZVF0LmNwcAkoUmV2aXNpb24g MTYwMzIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3F0L0ZyYW1lUXQuY3BwCShBcmJlaXRza29waWUp CkBAIC0zODEsMTIgKzM4MSwxMiBAQAogICAgIHJldHVybiAwOwogfQogCi12b2lkIEZyYW1lUXQ6 OnJlZ2lzdGVyQ29tbWFuZEZvclVuZG8oY29uc3QgRWRpdENvbW1hbmRQdHImKQordm9pZCBGcmFt ZVF0OjpyZWdpc3RlckNvbW1hbmRGb3JVbmRvKFBhc3NSZWZQdHI8RWRpdENvbW1hbmQ+KQogewog ICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgRnJhbWVRdDo6cmVnaXN0ZXJDb21tYW5k Rm9yUmVkbyhjb25zdCBFZGl0Q29tbWFuZFB0ciYpCit2b2lkIEZyYW1lUXQ6OnJlZ2lzdGVyQ29t bWFuZEZvclJlZG8oUGFzc1JlZlB0cjxFZGl0Q29tbWFuZD4pCiB7CiAgICAgbm90SW1wbGVtZW50 ZWQoKTsKIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vcXQvU2NyZWVuUXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vcXQvU2NyZWVuUXQuY3BwCShSZXZpc2lvbiAxNjAzMikK KysrIFdlYkNvcmUvcGxhdGZvcm0vcXQvU2NyZWVuUXQuY3BwCShBcmJlaXRza29waWUpCkBAIC0y OSw2ICsyOSw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2NyZWVuLmgiCiAK KyNpbmNsdWRlICJQYWdlLmgiCisjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJXaWRnZXQu aCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCkBAIC0zOCw5 ICs0MCwyMCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUZsb2F0UmVjdCBzY3JlZW5SZWN0 KFdpZGdldCogd2lkZ2V0KQorc3RhdGljIFFXaWRnZXQqIHF3aWRnZXRGb3JQYWdlKGNvbnN0IFBh Z2UqIHBhZ2UpCiB7Ci0gICAgUVdpZGdldCogcXcgPSB3aWRnZXQtPnF3aWRnZXQoKTsKKyAgICBG cmFtZSogZnJhbWUgPSAocGFnZSA/IHBhZ2UtPm1haW5GcmFtZSgpIDogMCk7CisgICAgRnJhbWVW aWV3KiBmcmFtZVZpZXcgPSAoZnJhbWUgPyBmcmFtZS0+dmlldygpIDogMCk7CisKKyAgICBpZiAo IWZyYW1lVmlldykKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gZnJhbWVWaWV3LT5x d2lkZ2V0KCk7Cit9CisgICAgCitGbG9hdFJlY3Qgc2NyZWVuUmVjdChjb25zdCBQYWdlKiBwYWdl KQoreworICAgIFFXaWRnZXQqIHF3ID0gcXdpZGdldEZvclBhZ2UocGFnZSk7CiAgICAgaWYgKCFx dykKICAgICAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOwogCkBAIC00OSwyMSArNjIsMjEgQEAKICAg ICBpZiAoIWR3KQogICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKLSAgICByZXR1cm4gKElu dFJlY3QpIGR3LT5zY3JlZW5HZW9tZXRyeShxdyk7CisgICAgcmV0dXJuIEludFJlY3QoZHctPnNj cmVlbkdlb21ldHJ5KHF3KSk7CiB9CiAKLWludCBzY3JlZW5EZXB0aChXaWRnZXQqIHdpZGdldCkK K2ludCBzY3JlZW5EZXB0aChjb25zdCBQYWdlKiBwYWdlKQogewotICAgIFFXaWRnZXQqIHF3ID0g d2lkZ2V0LT5xd2lkZ2V0KCk7CisgICAgUVdpZGdldCogcXcgPSBxd2lkZ2V0Rm9yUGFnZShwYWdl KTsKICAgICBpZiAoIXF3KQogICAgICAgICByZXR1cm4gMzI7CiAKICAgICByZXR1cm4gcXctPmRl cHRoKCk7CiB9CiAKLUZsb2F0UmVjdCB1c2FibGVTY3JlZW5SZWN0KFdpZGdldCogd2lkZ2V0KQor RmxvYXRSZWN0IHVzYWJsZVNjcmVlblJlY3QoY29uc3QgUGFnZSogcGFnZSkKIHsKLSAgICBRV2lk Z2V0KiBxdyA9IHdpZGdldC0+cXdpZGdldCgpOworICAgIFFXaWRnZXQqIHF3ID0gcXdpZGdldEZv clBhZ2UocGFnZSk7CiAgICAgaWYgKCFxdykKICAgICAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOwog CkBAIC03Miw5ICs4NSwxNCBAQAogICAgIGlmICghZHcpCiAgICAgICAgIHJldHVybiBGbG9hdFJl Y3QoKTsKIAotICAgIHJldHVybiAoSW50UmVjdCkgZHctPmF2YWlsYWJsZUdlb21ldHJ5KHF3KTsK KyAgICByZXR1cm4gSW50UmVjdChkdy0+YXZhaWxhYmxlR2VvbWV0cnkocXcpKTsKIH0KIAorZmxv YXQgc2NhbGVGYWN0b3IoY29uc3QgUGFnZSogcGFnZSkKK3sKKyAgICByZXR1cm4gMS4wZjsKIH0K IAorfQorCiAvLyB2aW06IHRzPTQgc3c9NCBldApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9xdC9X aWRnZXRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9xdC9XaWRnZXRRdC5j cHAJKFJldmlzaW9uIDE2MDMyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9xdC9XaWRnZXRRdC5jcHAJ KEFyYmVpdHNrb3BpZSkKQEAgLTE2OSwxMSArMTY5LDYgQEAKICAgICByZXR1cm4gZGF0YS0+bV93 aWRnZXQtPm1hcEZyb21HbG9iYWwocCk7CiB9CiAKLWZsb2F0IFdpZGdldDo6c2NhbGVGYWN0b3Io KSBjb25zdAotewotICAgIHJldHVybiAxLjBmOwotfQotCiBHcmFwaGljc0NvbnRleHQqIFdpZGdl dDo6bG9ja0RyYXdpbmdGb2N1cygpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsK 10223 2006-08-25 11:12:06 -0700 2006-08-25 11:17:52 -0700 Updated patch II make-it-compile.diff text/plain 4375 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShSZXZpc2lvbiAxNjAzNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCShBcmJlaXRza29waWUpCkBA IC0xLDUgKzEsMjMgQEAKIDIwMDYtMDgtMjUgIE5pa29sYXMgWmltbWVybWFubiAgPHppbW1lcm1h bm5Aa2RlLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXhlczogaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDU2MQorICAgICAgICBRdCBwbGF0Zm9ybSBidWlsZCBmaXhlcy4KKworICAgICAgICAqIHBs YXRmb3JtL3F0L0ZyYW1lUXQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9TY3JlZW5RdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpxd2lkZ2V0Rm9yUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpz Y3JlZW5SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OnNjcmVlbkRlcHRoKToKKyAgICAgICAgKFdl YkNvcmU6OnVzYWJsZVNjcmVlblJlY3QpOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1RlbXBvcmFy eUxpbmtTdHVicy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5EZXB0aFBlckNvbXBvbmVu dCk6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5Jc01vbm9jaHJvbWUpOgorICAgICAgICAqIHBs YXRmb3JtL3F0L1dpZGdldFF0LmNwcDoKKworMjAwNi0wOC0yNSAgTmlrb2xhcyBaaW1tZXJtYW5u ICA8emltbWVybWFubkBrZGUub3JnPgorCiAgICAgICAgIFJldmlld2VkL2xhbmRlZCBieSBBZGFt LgogCiAgICAgICAgIEZpbmFsbHkgZml4IGZvbnQgY2FjaGluZy4gV2ViS2l0K1F0IG5vdyB3b3Jr cwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9xdC9GcmFtZVF0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9xdC9GcmFtZVF0LmgJKFJldmlzaW9uIDE2MDM0KQorKysgV2ViQ29yZS9w bGF0Zm9ybS9xdC9GcmFtZVF0LmgJKEFyYmVpdHNrb3BpZSkKQEAgLTEwOSw4ICsxMDksOCBAQAog ICAgIHZpcnR1YWwgS0pTOjpCaW5kaW5nczo6SW5zdGFuY2UqIGdldE9iamVjdEluc3RhbmNlRm9y V2lkZ2V0KFdpZGdldCopOwogICAgIHZpcnR1YWwgS0pTOjpCaW5kaW5nczo6SW5zdGFuY2UqIGdl dEFwcGxldEluc3RhbmNlRm9yV2lkZ2V0KFdpZGdldCopOwogCi0gICAgdmlydHVhbCB2b2lkIHJl Z2lzdGVyQ29tbWFuZEZvclVuZG8oY29uc3QgRWRpdENvbW1hbmRQdHImKTsKLSAgICB2aXJ0dWFs IHZvaWQgcmVnaXN0ZXJDb21tYW5kRm9yUmVkbyhjb25zdCBFZGl0Q29tbWFuZFB0ciYpOworICAg IHZpcnR1YWwgdm9pZCByZWdpc3RlckNvbW1hbmRGb3JVbmRvKFBhc3NSZWZQdHI8RWRpdENvbW1h bmQ+KTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0ZXJDb21tYW5kRm9yUmVkbyhQYXNzUmVmUHRy PEVkaXRDb21tYW5kPik7CiAgICAgdmlydHVhbCB2b2lkIGNsZWFyVW5kb1JlZG9PcGVyYXRpb25z KCk7CiAgICAgdmlydHVhbCB2b2lkIGlzc3VlVW5kb0NvbW1hbmQoKTsKICAgICB2aXJ0dWFsIHZv aWQgaXNzdWVSZWRvQ29tbWFuZCgpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9xdC9UZW1wb3Jh cnlMaW5rU3R1YnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vcXQvVGVtcG9y YXJ5TGlua1N0dWJzLmNwcAkoUmV2aXNpb24gMTYwMzQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3F0 L1RlbXBvcmFyeUxpbmtTdHVicy5jcHAJKEFyYmVpdHNrb3BpZSkKQEAgLTE1Nyw4ICsxNTcsOCBA QAogCiB2b2lkIEZyYW1lOjpzZXROZWVkc1JlYXBwbHlTdHlsZXMoKSB7IG5vdEltcGxlbWVudGVk KCk7IH0KIAotaW50IFdlYkNvcmU6OnNjcmVlbkRlcHRoUGVyQ29tcG9uZW50KFdpZGdldCopIHsg bm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIDA7IH0KLWJvb2wgV2ViQ29yZTo6c2NyZWVuSXNNb25v Y2hyb21lKFdpZGdldCopIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGZhbHNlOyB9CitpbnQg V2ViQ29yZTo6c2NyZWVuRGVwdGhQZXJDb21wb25lbnQoY29uc3QgUGFnZSopIHsgbm90SW1wbGVt ZW50ZWQoKTsgcmV0dXJuIDA7IH0KK2Jvb2wgV2ViQ29yZTo6c2NyZWVuSXNNb25vY2hyb21lKGNv bnN0IFBhZ2UqKSB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiBmYWxzZTsgfQogCiBTdHJpbmcg V2ViQ29yZTo6c2VhcmNoYWJsZUluZGV4SW50cm9kdWN0aW9uKCkgeyBub3RJbXBsZW1lbnRlZCgp OyByZXR1cm4gU3RyaW5nKCk7IH0KIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3JlZW5R dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3JlZW5RdC5jcHAJKFJl dmlzaW9uIDE2MDM0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3JlZW5RdC5jcHAJKEFyYmVp dHNrb3BpZSkKQEAgLTI5LDYgKzI5LDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl ICJTY3JlZW4uaCIKIAorI2luY2x1ZGUgIlBhZ2UuaCIKKyNpbmNsdWRlICJGcmFtZS5oIgogI2lu Y2x1ZGUgIldpZGdldC5oIgogI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRlICJGbG9hdFJl Y3QuaCIKQEAgLTM4LDkgKzQwLDIwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotRmxvYXRS ZWN0IHNjcmVlblJlY3QoV2lkZ2V0KiB3aWRnZXQpCitzdGF0aWMgUVdpZGdldCogcXdpZGdldEZv clBhZ2UoY29uc3QgUGFnZSogcGFnZSkKIHsKLSAgICBRV2lkZ2V0KiBxdyA9IHdpZGdldC0+cXdp ZGdldCgpOworICAgIEZyYW1lKiBmcmFtZSA9IChwYWdlID8gcGFnZS0+bWFpbkZyYW1lKCkgOiAw KTsKKyAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IChmcmFtZSA/IGZyYW1lLT52aWV3KCkgOiAw KTsKKworICAgIGlmICghZnJhbWVWaWV3KQorICAgICAgICByZXR1cm4gMDsKKworICAgIHJldHVy biBmcmFtZVZpZXctPnF3aWRnZXQoKTsKK30KKyAgICAKK0Zsb2F0UmVjdCBzY3JlZW5SZWN0KGNv bnN0IFBhZ2UqIHBhZ2UpCit7CisgICAgUVdpZGdldCogcXcgPSBxd2lkZ2V0Rm9yUGFnZShwYWdl KTsKICAgICBpZiAoIXF3KQogICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKQEAgLTUyLDE4 ICs2NSwxOCBAQAogICAgIHJldHVybiBJbnRSZWN0KGR3LT5zY3JlZW5HZW9tZXRyeShxdykpOwog fQogCi1pbnQgc2NyZWVuRGVwdGgoV2lkZ2V0KiB3aWRnZXQpCitpbnQgc2NyZWVuRGVwdGgoY29u c3QgUGFnZSogcGFnZSkKIHsKLSAgICBRV2lkZ2V0KiBxdyA9IHdpZGdldC0+cXdpZGdldCgpOwor ICAgIFFXaWRnZXQqIHF3ID0gcXdpZGdldEZvclBhZ2UocGFnZSk7CiAgICAgaWYgKCFxdykKICAg ICAgICAgcmV0dXJuIDMyOwogCiAgICAgcmV0dXJuIHF3LT5kZXB0aCgpOwogfQogCi1GbG9hdFJl Y3QgdXNhYmxlU2NyZWVuUmVjdChXaWRnZXQqIHdpZGdldCkKK0Zsb2F0UmVjdCB1c2FibGVTY3Jl ZW5SZWN0KGNvbnN0IFBhZ2UqIHBhZ2UpCiB7Ci0gICAgUVdpZGdldCogcXcgPSB3aWRnZXQtPnF3 aWRnZXQoKTsKKyAgICBRV2lkZ2V0KiBxdyA9IHF3aWRnZXRGb3JQYWdlKHBhZ2UpOwogICAgIGlm ICghcXcpCiAgICAgICAgIHJldHVybiBGbG9hdFJlY3QoKTsKIApAQCAtNzUsNiArODgsMTEgQEAK ICAgICByZXR1cm4gSW50UmVjdChkdy0+YXZhaWxhYmxlR2VvbWV0cnkocXcpKTsKIH0KIAorZmxv YXQgc2NhbGVGYWN0b3IoY29uc3QgUGFnZSopCit7CisgICAgcmV0dXJuIDEuMGY7CiB9CiAKK30K KwogLy8gdmltOiB0cz00IHN3PTQgZXQKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vcXQvV2lkZ2V0 UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vcXQvV2lkZ2V0UXQuY3BwCShS ZXZpc2lvbiAxNjAzNCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vcXQvV2lkZ2V0UXQuY3BwCShBcmJl aXRza29waWUpCkBAIC0xNjksMTEgKzE2OSw2IEBACiAgICAgcmV0dXJuIGRhdGEtPm1fd2lkZ2V0 LT5tYXBGcm9tR2xvYmFsKHApOwogfQogCi1mbG9hdCBXaWRnZXQ6OnNjYWxlRmFjdG9yKCkgY29u c3QKLXsKLSAgICByZXR1cm4gMS4wZjsKLX0KLQogR3JhcGhpY3NDb250ZXh0KiBXaWRnZXQ6Omxv Y2tEcmF3aW5nRm9jdXMoKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7Cg==