101496 2012-11-07 11:38:41 -0800 [EFL][WK2] Allow client to override setWindowFrame() / getWindowFrame() 2012-11-07 13:08:42 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez gyuyoung.kim kenneth laszlo.gombos rakuco tonikitoo webkit.review.bot oldest_to_newest 760932 0 cdumez 2012-11-07 11:38:41 -0800 We currently have a default implementation of setWindowFrame() / getWindowFrame() in PageUIClientEfl which interacts with the Ecore_Evas containing the view. This default implementation no longer works for MiniBrowser since we ported to Elementary and since the browser is using elm_win. It is therefore needed to add smart functions to ewk_view API allowing the client to provide its own implementation. 760943 1 172852 cdumez 2012-11-07 11:49:00 -0800 Created attachment 172852 Patch 760957 2 172857 cdumez 2012-11-07 12:12:54 -0800 Created attachment 172857 Patch Fixed EwkViewImpl method names. 760998 3 172857 webkit.review.bot 2012-11-07 13:08:38 -0800 Comment on attachment 172857 Patch Clearing flags on attachment: 172857 Committed r133798: <http://trac.webkit.org/changeset/133798> 760999 4 webkit.review.bot 2012-11-07 13:08:42 -0800 All reviewed patches have been landed. Closing bug. 172852 2012-11-07 11:49:00 -0800 2012-11-07 12:12:54 -0800 Patch 101496_window_frame_override.patch text/plain 8820 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0ZTUyNjc2Li5jOGVlMTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMTEtMDcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFsbG93IGNsaWVudCB0byBvdmVycmlkZSBzZXRX aW5kb3dGcmFtZSgpIC8gZ2V0V2luZG93RnJhbWUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHdpbmRvd19nZW9tZXRyeV9zZXQoKSAvIHdpbmRv d19nZW9tZXRyeV9nZXQoKSBzbWFydCBmdW5jdGlvbnMgdG8KKyAgICAgICAgZXdrX3ZpZXcgYWxs b3dpbmcgdGhlIGNsaWVudCB0byBwcm92aWRlIGl0cyBvd24gaW1wbGVtZW50YXRpb24gZm9yCisg ICAgICAgIHRob3NlLgorCisgICAgICAgIFRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBpZiB0 aGUgYXBwbGljYXRpb24gdXNlcyBlbG1fd2luIGJlY2F1c2UKKyAgICAgICAgdGhlIGRlZmF1bHQg aW1wbGVtZW50YXRpb24gd2lsbCBub3QgYmVoYXZlIGNvcnJlY3RseSBpbiB0aGlzIGNhc2UuCisg ICAgICAgIFRoaXMgaXMgZHVlIHRvIHRoZSBmYWN0IHRoYXQgdGhlIGRlZmF1bHQgaW1wbGVtZW50 YXRpb24gaW50ZXJhY3RzCisgICAgICAgIHdpdGggdGhlIEVjb3JlX0V2YXMgdGhhdCBjb250YWlu cyB0aGUgdmlldyBhbmQgaXMgbm90IGF3YXJlIG9mIHRoZQorICAgICAgICBwYXJlbnQgd2luZG93 IHdpZGdldC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcDoK KyAgICAgICAgKEV3a1ZpZXdJbXBsOjpnZW9tZXRyeSk6CisgICAgICAgIChFd2tWaWV3SW1wbDo6 c2V0R2VvbWV0cnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmg6 CisgICAgICAgIChFd2tWaWV3SW1wbCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlBhZ2VVSUNsaWVudEVmbDo6Z2V0V2luZG93RnJhbWUpOgorICAgICAg ICAoV2ViS2l0OjpQYWdlVUlDbGllbnRFZmw6OnNldFdpbmRvd0ZyYW1lKToKKwogMjAxMi0xMS0w NyAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KIAog ICAgICAgICBbRUZMXVtXSzJdIEFkZCBld2tfc2V0dGluZ3NfcHJlZmVycmVkX21pbmltdW1fY29u dGVudHNfd2lkdGhfZ2V0L3NldCBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL0V3a1ZpZXdJbXBsLmNwcAppbmRleCA0MjE2NmM5Li5mZDU0ZWMyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCkBAIC0zNTIs NiArMzUyLDI5IEBAIHZvaWQgRXdrVmlld0ltcGw6OmV4aXRGdWxsU2NyZWVuKCkKIH0KICNlbmRp ZgogCitXS1JlY3QgRXdrVmlld0ltcGw6Omdlb21ldHJ5KCkgY29uc3QKK3sKKyAgICBFdmFzX0Nv b3JkIHgsIHksIHdpZHRoLCBoZWlnaHQ7CisgICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QgPSBz bWFydERhdGEoKTsKKworICAgIGlmICghc2QtPmFwaS0+d2luZG93X2dlb21ldHJ5X2dldCB8fCAh c2QtPmFwaS0+d2luZG93X2dlb21ldHJ5X2dldChzZCwgJngsICZ5LCAmd2lkdGgsICZoZWlnaHQp KSB7CisgICAgICAgIEVjb3JlX0V2YXMqIGVlID0gZWNvcmVfZXZhc19lY29yZV9ldmFzX2dldChz ZC0+YmFzZS5ldmFzKTsKKyAgICAgICAgZWNvcmVfZXZhc19yZXF1ZXN0X2dlb21ldHJ5X2dldChl ZSwgJngsICZ5LCAmd2lkdGgsICZoZWlnaHQpOworICAgIH0KKworICAgIHJldHVybiBXS1JlY3RN YWtlKHgsIHksIHdpZHRoLCBoZWlnaHQpOworfQorCit2b2lkIEV3a1ZpZXdJbXBsOjpzZXRHZW9t ZXRyeShjb25zdCBXS1JlY3QmIHJlY3QpCit7CisgICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc2Qg PSBzbWFydERhdGEoKTsKKworICAgIGlmICghc2QtPmFwaS0+d2luZG93X2dlb21ldHJ5X3NldCB8 fCAhc2QtPmFwaS0+d2luZG93X2dlb21ldHJ5X3NldChzZCwgcmVjdC5vcmlnaW4ueCwgcmVjdC5v cmlnaW4ueSwgcmVjdC5zaXplLndpZHRoLCByZWN0LnNpemUuaGVpZ2h0KSkgeworICAgICAgICBF Y29yZV9FdmFzKiBlZSA9IGVjb3JlX2V2YXNfZWNvcmVfZXZhc19nZXQoc2QtPmJhc2UuZXZhcyk7 CisgICAgICAgIGVjb3JlX2V2YXNfbW92ZV9yZXNpemUoZWUsIHJlY3Qub3JpZ2luLngsIHJlY3Qu b3JpZ2luLnksIHJlY3Quc2l6ZS53aWR0aCwgcmVjdC5zaXplLmhlaWdodCk7CisgICAgfQorfQor CiB2b2lkIEV3a1ZpZXdJbXBsOjpzZXRJbWFnZURhdGEodm9pZCogaW1hZ2VEYXRhLCBjb25zdCBJ bnRTaXplJiBzaXplKQogewogICAgIEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNkID0gc21hcnREYXRh KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3 SW1wbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuaApp bmRleCBjMTkwN2JhLi5mYWJkZDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL0V3a1ZpZXdJbXBsLmgKQEAgLTI0LDYgKzI0LDcgQEAKICNpbmNsdWRlICJFd2tWaWV3 Q2FsbGJhY2tzLmgiCiAjaW5jbHVkZSAiUmVmUHRyRWZsLmgiCiAjaW5jbHVkZSAiV0tFaW5hU2hh cmVkU3RyaW5nLmgiCisjaW5jbHVkZSAiV0tHZW9tZXRyeS5oIgogI2luY2x1ZGUgIldLUmV0YWlu UHRyLmgiCiAjaW5jbHVkZSA8RXZhcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgpA QCAtMTM3LDYgKzEzOCw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGV4aXRGdWxsU2NyZWVuKCk7CiAj ZW5kaWYKIAorICAgIFdLUmVjdCBnZW9tZXRyeSgpIGNvbnN0OworICAgIHZvaWQgc2V0R2VvbWV0 cnkoY29uc3QgV0tSZWN0Jik7CisKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAg ICAgYm9vbCBjcmVhdGVHTFN1cmZhY2UoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgdmlld1NpemUp OwogICAgIGJvb2wgZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXggMTc1YzI4Yy4uMzM1ODM5 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCkBAIC0x MjcsNiArMTI3LDggQEAgc3RydWN0IEV3a19WaWV3X1NtYXJ0X0NsYXNzIHsKICAgICBFaW5hX0Jv b2wgKCptb3VzZV9tb3ZlKShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgY29uc3QgRXZhc19FdmVu dF9Nb3VzZV9Nb3ZlICpldik7CiAgICAgRWluYV9Cb29sICgqa2V5X2Rvd24pKEV3a19WaWV3X1Nt YXJ0X0RhdGEgKnNkLCBjb25zdCBFdmFzX0V2ZW50X0tleV9Eb3duICpldik7CiAgICAgRWluYV9C b29sICgqa2V5X3VwKShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgY29uc3QgRXZhc19FdmVudF9L ZXlfVXAgKmV2KTsKKyAgICBFaW5hX0Jvb2wgKCp3aW5kb3dfZ2VvbWV0cnlfc2V0KShFd2tfVmll d19TbWFydF9EYXRhICpzZCwgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV2YXNfQ29vcmQg d2lkdGgsIEV2YXNfQ29vcmQgaGVpZ2h0KTsKKyAgICBFaW5hX0Jvb2wgKCp3aW5kb3dfZ2VvbWV0 cnlfZ2V0KShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgRXZhc19Db29yZCAqeCwgRXZhc19Db29y ZCAqeSwgRXZhc19Db29yZCAqd2lkdGgsIEV2YXNfQ29vcmQgKmhlaWdodCk7CiAKICAgICAvLyBq YXZhc2NyaXB0IHBvcHVwOgogICAgIC8vICAgLSBBbGwgc3RyaW5ncyBzaG91bGQgYmUgZ3VhcmFu dGVlZCB0byBiZSBzdHJpbmdzaGFyZWQuCkBAIC0xNDgsNyArMTUwLDcgQEAgc3RydWN0IEV3a19W aWV3X1NtYXJ0X0NsYXNzIHsKICAqIFRoZSB2ZXJzaW9uIHlvdSBoYXZlIHRvIHB1dCBpbnRvIHRo ZSB2ZXJzaW9uIGZpZWxkCiAgKiBpbiB0aGUgQGEgRXdrX1ZpZXdfU21hcnRfQ2xhc3Mgc3RydWN0 dXJlLgogICovCi0jZGVmaW5lIEVXS19WSUVXX1NNQVJUX0NMQVNTX1ZFUlNJT04gNlVMCisjZGVm aW5lIEVXS19WSUVXX1NNQVJUX0NMQVNTX1ZFUlNJT04gN1VMCiAKIC8qKgogICogSW5pdGlhbGl6 ZXIgZm9yIHdob2xlIEV3a19WaWV3X1NtYXJ0X0NsYXNzIHN0cnVjdHVyZS4KQEAgLTE2MCw3ICsx NjIsNyBAQCBzdHJ1Y3QgRXdrX1ZpZXdfU21hcnRfQ2xhc3MgewogICogQHNlZSBFV0tfVklFV19T TUFSVF9DTEFTU19JTklUX1ZFUlNJT04KICAqIEBzZWUgRVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5J VF9OQU1FX1ZFUlNJT04KICAqLwotI2RlZmluZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUKHNt YXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0LCBFV0tfVklFV19TTUFSVF9DTEFTU19W RVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwfQorI2RlZmluZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQp IHtzbWFydF9jbGFzc19pbml0LCBFV0tfVklFV19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQogCiAv KioKICAqIEluaXRpYWxpemVyIHRvIHplcm8gYSB3aG9sZSBFd2tfVmlld19TbWFydF9DbGFzcyBz dHJ1Y3R1cmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VV SUNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVu dEVmbC5jcHAKaW5kZXggYzE4NDRmOS4uNzNmY2JjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcApAQCAtMTExLDE4ICsxMTEsMTIgQEAg dm9pZCBQYWdlVUlDbGllbnRFZmw6OnRha2VGb2N1cyhXS1BhZ2VSZWYsIFdLRm9jdXNEaXJlY3Rp b24sIGNvbnN0IHZvaWQqIGNsaWVudEkKIAogV0tSZWN0IFBhZ2VVSUNsaWVudEVmbDo6Z2V0V2lu ZG93RnJhbWUoV0tQYWdlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewotICAgIGludCB4 LCB5LCB3aWR0aCwgaGVpZ2h0OwotCi0gICAgRWNvcmVfRXZhcyogZWUgPSBlY29yZV9ldmFzX2Vj b3JlX2V2YXNfZ2V0KGV2YXNfb2JqZWN0X2V2YXNfZ2V0KHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVu dEluZm8pLT5tX3ZpZXdJbXBsLT52aWV3KCkpKTsKLSAgICBlY29yZV9ldmFzX3JlcXVlc3RfZ2Vv bWV0cnlfZ2V0KGVlLCAmeCwgJnksICZ3aWR0aCwgJmhlaWdodCk7Ci0KLSAgICByZXR1cm4gV0tS ZWN0TWFrZSh4LCB5LCB3aWR0aCwgaGVpZ2h0KTsKKyAgICByZXR1cm4gdG9QYWdlVUlDbGllbnRF ZmwoY2xpZW50SW5mbyktPm1fdmlld0ltcGwtPmdlb21ldHJ5KCk7CiB9CiAKIHZvaWQgUGFnZVVJ Q2xpZW50RWZsOjpzZXRXaW5kb3dGcmFtZShXS1BhZ2VSZWYsIFdLUmVjdCBmcmFtZSwgY29uc3Qg dm9pZCogY2xpZW50SW5mbykKIHsKLSAgICBFY29yZV9FdmFzKiBlZSA9IGVjb3JlX2V2YXNfZWNv cmVfZXZhc19nZXQoZXZhc19vYmplY3RfZXZhc19nZXQodG9QYWdlVUlDbGllbnRFZmwoY2xpZW50 SW5mbyktPm1fdmlld0ltcGwtPnZpZXcoKSkpOwotICAgIGVjb3JlX2V2YXNfbW92ZV9yZXNpemUo ZWUsIGZyYW1lLm9yaWdpbi54LCBmcmFtZS5vcmlnaW4ueSwgZnJhbWUuc2l6ZS53aWR0aCwgZnJh bWUuc2l6ZS5oZWlnaHQpOworICAgIHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3Zp ZXdJbXBsLT5zZXRHZW9tZXRyeShmcmFtZSk7CiB9CiAKIHZvaWQgUGFnZVVJQ2xpZW50RWZsOjpy dW5PcGVuUGFuZWwoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS09wZW5QYW5lbFBhcmFtZXRlcnNS ZWYgcGFyYW1ldGVycywgV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclJlZiBsaXN0ZW5lciwgY29u c3Qgdm9pZCogY2xpZW50SW5mbykKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCBhNjBiMmE0Li5mYjU0NmY0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMTEtMDcg IENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAg ICBbRUZMXVtXSzJdIEFsbG93IGNsaWVudCB0byBvdmVycmlkZSBzZXRXaW5kb3dGcmFtZSgpIC8g Z2V0V2luZG93RnJhbWUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAxNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUHJvdmlkZSBpbXBsZW1lbnRhdGlvbiBmb3Igb25fd2luZG93X2dlb21ldHJ5X2dl dCgpIC8gb25fd2luZG93X2dlb21ldHJ5X3NldCgpCisgICAgICAgIHNtYXJ0IGZ1bmN0aW9ucyB0 aGF0IGludGVyYWN0IHdpdGggdGhlIGVsbV93aW4gd2lkZ2V0LgorCisgICAgICAgICogTWluaUJy b3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX3dpbmRvd19nZW9tZXRyeV9nZXQpOgorICAg ICAgICAob25fd2luZG93X2dlb21ldHJ5X3NldCk6CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToK KwogMjAxMi0xMS0wNyAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lh LmNvbT4KIAogICAgICAgICBbUXRdIE9wZW4gbGluayBpbiB0aGlzIHdpbmRvdyBhY3Rpb24KZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jCmluZGV4IGJlZjEzNTUuLjFjZTRkMmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpA QCAtNjU1LDYgKzY1NSwyNSBAQCBvbl9qYXZhc2NyaXB0X3Byb21wdChFd2tfVmlld19TbWFydF9E YXRhICpzbWFydERhdGEsIGNvbnN0IGNoYXIgKm1lc3NhZ2UsIGNvbnN0CiAgICAgcmV0dXJuIHBy b21wdF90ZXh0OwogfQogCitzdGF0aWMgRWluYV9Cb29sIG9uX3dpbmRvd19nZW9tZXRyeV9nZXQo RXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgKngsIEV2YXNfQ29vcmQgKnksIEV2 YXNfQ29vcmQgKndpZHRoLCBFdmFzX0Nvb3JkICpoZWlnaHQpCit7CisgICAgQnJvd3Nlcl9XaW5k b3cgKndpbmRvdyA9IGJyb3dzZXJfdmlld19maW5kKHNkLT5zZWxmKTsKKworICAgIGV2YXNfb2Jq ZWN0X2dlb21ldHJ5X2dldCh3aW5kb3ctPndpbmRvdywgeCwgeSwgd2lkdGgsIGhlaWdodCk7CisK KyAgICByZXR1cm4gRUlOQV9UUlVFOworfQorCitzdGF0aWMgRWluYV9Cb29sIG9uX3dpbmRvd19n ZW9tZXRyeV9zZXQoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19D b29yZCB5LCBFdmFzX0Nvb3JkIHdpZHRoLCBFdmFzX0Nvb3JkIGhlaWdodCkKK3sKKyAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93ID0gYnJvd3Nlcl92aWV3X2ZpbmQoc2QtPnNlbGYpOworCisgICAg ZXZhc19vYmplY3RfbW92ZSh3aW5kb3ctPndpbmRvdywgeCwgeSk7CisgICAgZXZhc19vYmplY3Rf cmVzaXplKHdpbmRvdy0+d2luZG93LCB3aWR0aCwgaGVpZ2h0KTsKKworICAgIHJldHVybiBFSU5B X1RSVUU7Cit9CisKIHR5cGVkZWYgc3RydWN0IHsKICAgICBFdmFzX09iamVjdCAqcG9wdXA7CiAg ICAgRXdrX0F1dGhfUmVxdWVzdCAqcmVxdWVzdDsKQEAgLTkyNSw2ICs5NDQsOCBAQCBzdGF0aWMg QnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJsKQogICAgIGV3a1Zp ZXdDbGFzcy0+cnVuX2phdmFzY3JpcHRfYWxlcnQgPSBvbl9qYXZhc2NyaXB0X2FsZXJ0OwogICAg IGV3a1ZpZXdDbGFzcy0+cnVuX2phdmFzY3JpcHRfY29uZmlybSA9IG9uX2phdmFzY3JpcHRfY29u ZmlybTsKICAgICBld2tWaWV3Q2xhc3MtPnJ1bl9qYXZhc2NyaXB0X3Byb21wdCA9IG9uX2phdmFz Y3JpcHRfcHJvbXB0OworICAgIGV3a1ZpZXdDbGFzcy0+d2luZG93X2dlb21ldHJ5X2dldCA9IG9u X3dpbmRvd19nZW9tZXRyeV9nZXQ7CisgICAgZXdrVmlld0NsYXNzLT53aW5kb3dfZ2VvbWV0cnlf c2V0ID0gb25fd2luZG93X2dlb21ldHJ5X3NldDsKIAogICAgIEV2YXMgKmV2YXMgPSBldmFzX29i amVjdF9ldmFzX2dldChhcHBfZGF0YS0+d2luZG93KTsKICAgICBFdmFzX1NtYXJ0ICpzbWFydCA9 IGV2YXNfc21hcnRfY2xhc3NfbmV3KCZld2tWaWV3Q2xhc3MtPnNjKTsK 172857 2012-11-07 12:12:54 -0800 2012-11-07 13:08:38 -0800 Patch 101496_window_frame_override.patch text/plain 8868 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0ZTUyNjc2Li44NWNiNGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMTEtMDcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFsbG93IGNsaWVudCB0byBvdmVycmlkZSBzZXRX aW5kb3dGcmFtZSgpIC8gZ2V0V2luZG93RnJhbWUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHdpbmRvd19nZW9tZXRyeV9zZXQoKSAvIHdpbmRv d19nZW9tZXRyeV9nZXQoKSBzbWFydCBmdW5jdGlvbnMgdG8KKyAgICAgICAgZXdrX3ZpZXcgYWxs b3dpbmcgdGhlIGNsaWVudCB0byBwcm92aWRlIGl0cyBvd24gaW1wbGVtZW50YXRpb24gZm9yCisg ICAgICAgIHRob3NlLgorCisgICAgICAgIFRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBpZiB0 aGUgYXBwbGljYXRpb24gdXNlcyBlbG1fd2luIGJlY2F1c2UKKyAgICAgICAgdGhlIGRlZmF1bHQg aW1wbGVtZW50YXRpb24gd2lsbCBub3QgYmVoYXZlIGNvcnJlY3RseSBpbiB0aGlzIGNhc2UuCisg ICAgICAgIFRoaXMgaXMgZHVlIHRvIHRoZSBmYWN0IHRoYXQgdGhlIGRlZmF1bHQgaW1wbGVtZW50 YXRpb24gaW50ZXJhY3RzCisgICAgICAgIHdpdGggdGhlIEVjb3JlX0V2YXMgdGhhdCBjb250YWlu cyB0aGUgdmlldyBhbmQgaXMgbm90IGF3YXJlIG9mIHRoZQorICAgICAgICBwYXJlbnQgd2luZG93 IHdpZGdldC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcDoK KyAgICAgICAgKEV3a1ZpZXdJbXBsOjp3aW5kb3dHZW9tZXRyeSk6CisgICAgICAgIChFd2tWaWV3 SW1wbDo6c2V0V2luZG93R2VvbWV0cnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3 a1ZpZXdJbXBsLmg6CisgICAgICAgIChFd2tWaWV3SW1wbCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVu dEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VVSUNsaWVudEVmbDo6Z2V0V2luZG93RnJh bWUpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVUlDbGllbnRFZmw6OnNldFdpbmRvd0ZyYW1lKToK KwogMjAxMi0xMS0wNyAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGlu dGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIEFkZCBld2tfc2V0dGluZ3NfcHJlZmVycmVk X21pbmltdW1fY29udGVudHNfd2lkdGhfZ2V0L3NldCBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcAppbmRleCA0MjE2NmM5Li45MzYyMGI2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1w bC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwu Y3BwCkBAIC0zNTIsNiArMzUyLDI5IEBAIHZvaWQgRXdrVmlld0ltcGw6OmV4aXRGdWxsU2NyZWVu KCkKIH0KICNlbmRpZgogCitXS1JlY3QgRXdrVmlld0ltcGw6OndpbmRvd0dlb21ldHJ5KCkgY29u c3QKK3sKKyAgICBFdmFzX0Nvb3JkIHgsIHksIHdpZHRoLCBoZWlnaHQ7CisgICAgRXdrX1ZpZXdf U21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKKworICAgIGlmICghc2QtPmFwaS0+d2luZG93 X2dlb21ldHJ5X2dldCB8fCAhc2QtPmFwaS0+d2luZG93X2dlb21ldHJ5X2dldChzZCwgJngsICZ5 LCAmd2lkdGgsICZoZWlnaHQpKSB7CisgICAgICAgIEVjb3JlX0V2YXMqIGVlID0gZWNvcmVfZXZh c19lY29yZV9ldmFzX2dldChzZC0+YmFzZS5ldmFzKTsKKyAgICAgICAgZWNvcmVfZXZhc19yZXF1 ZXN0X2dlb21ldHJ5X2dldChlZSwgJngsICZ5LCAmd2lkdGgsICZoZWlnaHQpOworICAgIH0KKwor ICAgIHJldHVybiBXS1JlY3RNYWtlKHgsIHksIHdpZHRoLCBoZWlnaHQpOworfQorCit2b2lkIEV3 a1ZpZXdJbXBsOjpzZXRXaW5kb3dHZW9tZXRyeShjb25zdCBXS1JlY3QmIHJlY3QpCit7CisgICAg RXdrX1ZpZXdfU21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKKworICAgIGlmICghc2QtPmFw aS0+d2luZG93X2dlb21ldHJ5X3NldCB8fCAhc2QtPmFwaS0+d2luZG93X2dlb21ldHJ5X3NldChz ZCwgcmVjdC5vcmlnaW4ueCwgcmVjdC5vcmlnaW4ueSwgcmVjdC5zaXplLndpZHRoLCByZWN0LnNp emUuaGVpZ2h0KSkgeworICAgICAgICBFY29yZV9FdmFzKiBlZSA9IGVjb3JlX2V2YXNfZWNvcmVf ZXZhc19nZXQoc2QtPmJhc2UuZXZhcyk7CisgICAgICAgIGVjb3JlX2V2YXNfbW92ZV9yZXNpemUo ZWUsIHJlY3Qub3JpZ2luLngsIHJlY3Qub3JpZ2luLnksIHJlY3Quc2l6ZS53aWR0aCwgcmVjdC5z aXplLmhlaWdodCk7CisgICAgfQorfQorCiB2b2lkIEV3a1ZpZXdJbXBsOjpzZXRJbWFnZURhdGEo dm9pZCogaW1hZ2VEYXRhLCBjb25zdCBJbnRTaXplJiBzaXplKQogewogICAgIEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNkID0gc21hcnREYXRhKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvRXdrVmlld0ltcGwuaAppbmRleCBjMTkwN2JhLi40YjQwZGI3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgKQEAgLTI0LDYgKzI0 LDcgQEAKICNpbmNsdWRlICJFd2tWaWV3Q2FsbGJhY2tzLmgiCiAjaW5jbHVkZSAiUmVmUHRyRWZs LmgiCiAjaW5jbHVkZSAiV0tFaW5hU2hhcmVkU3RyaW5nLmgiCisjaW5jbHVkZSAiV0tHZW9tZXRy eS5oIgogI2luY2x1ZGUgIldLUmV0YWluUHRyLmgiCiAjaW5jbHVkZSA8RXZhcy5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgpAQCAtMTM3LDYgKzEzOCw5IEBAIHB1YmxpYzoKICAgICB2 b2lkIGV4aXRGdWxsU2NyZWVuKCk7CiAjZW5kaWYKIAorICAgIFdLUmVjdCB3aW5kb3dHZW9tZXRy eSgpIGNvbnN0OworICAgIHZvaWQgc2V0V2luZG93R2VvbWV0cnkoY29uc3QgV0tSZWN0Jik7CisK ICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgYm9vbCBjcmVhdGVHTFN1cmZh Y2UoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgdmlld1NpemUpOwogICAgIGJvb2wgZW50ZXJBY2Nl bGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmgKaW5kZXggMTc1YzI4Yy4uMzM1ODM5ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCkBAIC0xMjcsNiArMTI3LDggQEAgc3RydWN0 IEV3a19WaWV3X1NtYXJ0X0NsYXNzIHsKICAgICBFaW5hX0Jvb2wgKCptb3VzZV9tb3ZlKShFd2tf Vmlld19TbWFydF9EYXRhICpzZCwgY29uc3QgRXZhc19FdmVudF9Nb3VzZV9Nb3ZlICpldik7CiAg ICAgRWluYV9Cb29sICgqa2V5X2Rvd24pKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBjb25zdCBF dmFzX0V2ZW50X0tleV9Eb3duICpldik7CiAgICAgRWluYV9Cb29sICgqa2V5X3VwKShFd2tfVmll d19TbWFydF9EYXRhICpzZCwgY29uc3QgRXZhc19FdmVudF9LZXlfVXAgKmV2KTsKKyAgICBFaW5h X0Jvb2wgKCp3aW5kb3dfZ2VvbWV0cnlfc2V0KShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgRXZh c19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV2YXNfQ29vcmQgd2lkdGgsIEV2YXNfQ29vcmQgaGVp Z2h0KTsKKyAgICBFaW5hX0Jvb2wgKCp3aW5kb3dfZ2VvbWV0cnlfZ2V0KShFd2tfVmlld19TbWFy dF9EYXRhICpzZCwgRXZhc19Db29yZCAqeCwgRXZhc19Db29yZCAqeSwgRXZhc19Db29yZCAqd2lk dGgsIEV2YXNfQ29vcmQgKmhlaWdodCk7CiAKICAgICAvLyBqYXZhc2NyaXB0IHBvcHVwOgogICAg IC8vICAgLSBBbGwgc3RyaW5ncyBzaG91bGQgYmUgZ3VhcmFudGVlZCB0byBiZSBzdHJpbmdzaGFy ZWQuCkBAIC0xNDgsNyArMTUwLDcgQEAgc3RydWN0IEV3a19WaWV3X1NtYXJ0X0NsYXNzIHsKICAq IFRoZSB2ZXJzaW9uIHlvdSBoYXZlIHRvIHB1dCBpbnRvIHRoZSB2ZXJzaW9uIGZpZWxkCiAgKiBp biB0aGUgQGEgRXdrX1ZpZXdfU21hcnRfQ2xhc3Mgc3RydWN0dXJlLgogICovCi0jZGVmaW5lIEVX S19WSUVXX1NNQVJUX0NMQVNTX1ZFUlNJT04gNlVMCisjZGVmaW5lIEVXS19WSUVXX1NNQVJUX0NM QVNTX1ZFUlNJT04gN1VMCiAKIC8qKgogICogSW5pdGlhbGl6ZXIgZm9yIHdob2xlIEV3a19WaWV3 X1NtYXJ0X0NsYXNzIHN0cnVjdHVyZS4KQEAgLTE2MCw3ICsxNjIsNyBAQCBzdHJ1Y3QgRXdrX1Zp ZXdfU21hcnRfQ2xhc3MgewogICogQHNlZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUX1ZFUlNJ T04KICAqIEBzZWUgRVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVF9OQU1FX1ZFUlNJT04KICAqLwot I2RlZmluZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFy dF9jbGFzc19pbml0LCBFV0tfVklFV19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQorI2RlZmluZSBFV0tfVklF V19TTUFSVF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0LCBF V0tfVklFV19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQogCiAvKioKICAqIEluaXRpYWxpemVyIHRv IHplcm8gYSB3aG9sZSBFd2tfVmlld19TbWFydF9DbGFzcyBzdHJ1Y3R1cmUuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHAKaW5kZXggYzE4NDRm OS4uZjhhZDlkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdl VUlDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVVJ Q2xpZW50RWZsLmNwcApAQCAtMTExLDE4ICsxMTEsMTIgQEAgdm9pZCBQYWdlVUlDbGllbnRFZmw6 OnRha2VGb2N1cyhXS1BhZ2VSZWYsIFdLRm9jdXNEaXJlY3Rpb24sIGNvbnN0IHZvaWQqIGNsaWVu dEkKIAogV0tSZWN0IFBhZ2VVSUNsaWVudEVmbDo6Z2V0V2luZG93RnJhbWUoV0tQYWdlUmVmLCBj b25zdCB2b2lkKiBjbGllbnRJbmZvKQogewotICAgIGludCB4LCB5LCB3aWR0aCwgaGVpZ2h0Owot Ci0gICAgRWNvcmVfRXZhcyogZWUgPSBlY29yZV9ldmFzX2Vjb3JlX2V2YXNfZ2V0KGV2YXNfb2Jq ZWN0X2V2YXNfZ2V0KHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsLT52 aWV3KCkpKTsKLSAgICBlY29yZV9ldmFzX3JlcXVlc3RfZ2VvbWV0cnlfZ2V0KGVlLCAmeCwgJnks ICZ3aWR0aCwgJmhlaWdodCk7Ci0KLSAgICByZXR1cm4gV0tSZWN0TWFrZSh4LCB5LCB3aWR0aCwg aGVpZ2h0KTsKKyAgICByZXR1cm4gdG9QYWdlVUlDbGllbnRFZmwoY2xpZW50SW5mbyktPm1fdmll d0ltcGwtPndpbmRvd0dlb21ldHJ5KCk7CiB9CiAKIHZvaWQgUGFnZVVJQ2xpZW50RWZsOjpzZXRX aW5kb3dGcmFtZShXS1BhZ2VSZWYsIFdLUmVjdCBmcmFtZSwgY29uc3Qgdm9pZCogY2xpZW50SW5m bykKIHsKLSAgICBFY29yZV9FdmFzKiBlZSA9IGVjb3JlX2V2YXNfZWNvcmVfZXZhc19nZXQoZXZh c19vYmplY3RfZXZhc19nZXQodG9QYWdlVUlDbGllbnRFZmwoY2xpZW50SW5mbyktPm1fdmlld0lt cGwtPnZpZXcoKSkpOwotICAgIGVjb3JlX2V2YXNfbW92ZV9yZXNpemUoZWUsIGZyYW1lLm9yaWdp bi54LCBmcmFtZS5vcmlnaW4ueSwgZnJhbWUuc2l6ZS53aWR0aCwgZnJhbWUuc2l6ZS5oZWlnaHQp OworICAgIHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsLT5zZXRXaW5k b3dHZW9tZXRyeShmcmFtZSk7CiB9CiAKIHZvaWQgUGFnZVVJQ2xpZW50RWZsOjpydW5PcGVuUGFu ZWwoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS09wZW5QYW5lbFBhcmFtZXRlcnNSZWYgcGFyYW1l dGVycywgV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclJlZiBsaXN0ZW5lciwgY29uc3Qgdm9pZCog Y2xpZW50SW5mbykKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCBhNjBiMmE0Li5mYjU0NmY0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMTEtMDcgIENocmlzdG9w aGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbRUZMXVtX SzJdIEFsbG93IGNsaWVudCB0byBvdmVycmlkZSBzZXRXaW5kb3dGcmFtZSgpIC8gZ2V0V2luZG93 RnJhbWUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAxNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UHJvdmlkZSBpbXBsZW1lbnRhdGlvbiBmb3Igb25fd2luZG93X2dlb21ldHJ5X2dldCgpIC8gb25f d2luZG93X2dlb21ldHJ5X3NldCgpCisgICAgICAgIHNtYXJ0IGZ1bmN0aW9ucyB0aGF0IGludGVy YWN0IHdpdGggdGhlIGVsbV93aW4gd2lkZ2V0LgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZs L21haW4uYzoKKyAgICAgICAgKG9uX3dpbmRvd19nZW9tZXRyeV9nZXQpOgorICAgICAgICAob25f d2luZG93X2dlb21ldHJ5X3NldCk6CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToKKwogMjAxMi0x MS0wNyAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KIAog ICAgICAgICBbUXRdIE9wZW4gbGluayBpbiB0aGlzIHdpbmRvdyBhY3Rpb24KZGlmZiAtLWdpdCBh L1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFp bi5jCmluZGV4IGJlZjEzNTUuLjFjZTRkMmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2Vy L2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtNjU1LDYg KzY1NSwyNSBAQCBvbl9qYXZhc2NyaXB0X3Byb21wdChFd2tfVmlld19TbWFydF9EYXRhICpzbWFy dERhdGEsIGNvbnN0IGNoYXIgKm1lc3NhZ2UsIGNvbnN0CiAgICAgcmV0dXJuIHByb21wdF90ZXh0 OwogfQogCitzdGF0aWMgRWluYV9Cb29sIG9uX3dpbmRvd19nZW9tZXRyeV9nZXQoRXdrX1ZpZXdf U21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgKngsIEV2YXNfQ29vcmQgKnksIEV2YXNfQ29vcmQg KndpZHRoLCBFdmFzX0Nvb3JkICpoZWlnaHQpCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRv dyA9IGJyb3dzZXJfdmlld19maW5kKHNkLT5zZWxmKTsKKworICAgIGV2YXNfb2JqZWN0X2dlb21l dHJ5X2dldCh3aW5kb3ctPndpbmRvdywgeCwgeSwgd2lkdGgsIGhlaWdodCk7CisKKyAgICByZXR1 cm4gRUlOQV9UUlVFOworfQorCitzdGF0aWMgRWluYV9Cb29sIG9uX3dpbmRvd19nZW9tZXRyeV9z ZXQoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBF dmFzX0Nvb3JkIHdpZHRoLCBFdmFzX0Nvb3JkIGhlaWdodCkKK3sKKyAgICBCcm93c2VyX1dpbmRv dyAqd2luZG93ID0gYnJvd3Nlcl92aWV3X2ZpbmQoc2QtPnNlbGYpOworCisgICAgZXZhc19vYmpl Y3RfbW92ZSh3aW5kb3ctPndpbmRvdywgeCwgeSk7CisgICAgZXZhc19vYmplY3RfcmVzaXplKHdp bmRvdy0+d2luZG93LCB3aWR0aCwgaGVpZ2h0KTsKKworICAgIHJldHVybiBFSU5BX1RSVUU7Cit9 CisKIHR5cGVkZWYgc3RydWN0IHsKICAgICBFdmFzX09iamVjdCAqcG9wdXA7CiAgICAgRXdrX0F1 dGhfUmVxdWVzdCAqcmVxdWVzdDsKQEAgLTkyNSw2ICs5NDQsOCBAQCBzdGF0aWMgQnJvd3Nlcl9X aW5kb3cgKndpbmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJsKQogICAgIGV3a1ZpZXdDbGFzcy0+ cnVuX2phdmFzY3JpcHRfYWxlcnQgPSBvbl9qYXZhc2NyaXB0X2FsZXJ0OwogICAgIGV3a1ZpZXdD bGFzcy0+cnVuX2phdmFzY3JpcHRfY29uZmlybSA9IG9uX2phdmFzY3JpcHRfY29uZmlybTsKICAg ICBld2tWaWV3Q2xhc3MtPnJ1bl9qYXZhc2NyaXB0X3Byb21wdCA9IG9uX2phdmFzY3JpcHRfcHJv bXB0OworICAgIGV3a1ZpZXdDbGFzcy0+d2luZG93X2dlb21ldHJ5X2dldCA9IG9uX3dpbmRvd19n ZW9tZXRyeV9nZXQ7CisgICAgZXdrVmlld0NsYXNzLT53aW5kb3dfZ2VvbWV0cnlfc2V0ID0gb25f d2luZG93X2dlb21ldHJ5X3NldDsKIAogICAgIEV2YXMgKmV2YXMgPSBldmFzX29iamVjdF9ldmFz X2dldChhcHBfZGF0YS0+d2luZG93KTsKICAgICBFdmFzX1NtYXJ0ICpzbWFydCA9IGV2YXNfc21h cnRfY2xhc3NfbmV3KCZld2tWaWV3Q2xhc3MtPnNjKTsK