102122 2012-11-13 12:55:18 -0800 [EFL][WK2] New window size should consult the window attributes 2012-11-14 05:07:01 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yael webkit-unassigned cdumez gyuyoung.kim jinwoo7.song lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 765953 0 yael 2012-11-13 12:55:18 -0800 Currently, new window is always sized to 800x600, and only later resized to the desired size. This can lead to ugly flashing. Patch is coming. 765968 1 173962 yael 2012-11-13 13:09:27 -0800 Created attachment 173962 Patch 765998 2 173962 kenneth 2012-11-13 13:35:59 -0800 Comment on attachment 173962 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173962&action=review Nice! > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:841 > + WKRetainPtr<WKStringRef> widthStr(AdoptWK, WKStringCreateWithUTF8CString("width")); > + WKRetainPtr<WKStringRef> heightStr(AdoptWK, WKStringCreateWithUTF8CString("height")); > + Maybe a comment that we don't do everything here? for showModalDialog are they also called width and height or dialogWidth etc? > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:842 > + int width = 0; unsigned? > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:846 > + if (ref) > + width = WKDoubleGetValue(static_cast<WKDoubleRef>(ref)); unsigned width = ref ? WKDoubleGetValue(static_cast<WKDoubleRef>(ref)) : 0 ? > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:852 > + width = std::max(width, 0); > + height = std::max(height, 0); WebKit makes sure these are always bigger than 100px. You could assert 766034 3 yael 2012-11-13 14:04:55 -0800 (In reply to comment #2) > (From update of attachment 173962 [details]) Thanks for the review :) > View in context: https://bugs.webkit.org/attachment.cgi?id=173962&action=review > > Nice! > > > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:841 > > + WKRetainPtr<WKStringRef> widthStr(AdoptWK, WKStringCreateWithUTF8CString("width")); > > + WKRetainPtr<WKStringRef> heightStr(AdoptWK, WKStringCreateWithUTF8CString("height")); > > + > > Maybe a comment that we don't do everything here? for showModalDialog are they also called width and height or dialogWidth etc? > The dictionary is created in WebUIClient::createNewPage(), and always uses "width" and "height". > > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:842 > > + int width = 0; > > unsigned? > ok > > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:846 > > + if (ref) > > + width = WKDoubleGetValue(static_cast<WKDoubleRef>(ref)); > > unsigned width = ref ? WKDoubleGetValue(static_cast<WKDoubleRef>(ref)) : 0 ? > > > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:852 > > + width = std::max(width, 0); > > + height = std::max(height, 0); > > WebKit makes sure these are always bigger than 100px. You could assert WebKit does that only if a value was specified. But you are right, I will never get a negative value here. 766082 4 173996 yael 2012-11-13 14:50:21 -0800 Created attachment 173996 Patch Address comment #2. 766084 5 173996 kenneth 2012-11-13 14:59:22 -0800 Comment on attachment 173996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173996&action=review > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp:844 > + unsigned int width = ref ? WKDoubleGetValue(static_cast<WKDoubleRef>(ref)) : 0; style says to just use "unsigned" ie. no int > Tools/MiniBrowser/efl/main.c:187 > - Browser_Window *window = window_create(DEFAULT_URL); > + Browser_Window *window = window_create(DEFAULT_URL, 0, 0); // 0 equals default. 766145 6 174019 yael 2012-11-13 16:06:30 -0800 Created attachment 174019 Patch for landing. 766382 7 174019 webkit.review.bot 2012-11-13 21:06:14 -0800 Comment on attachment 174019 Patch for landing. Clearing flags on attachment: 174019 Committed r134534: <http://trac.webkit.org/changeset/134534> 766383 8 webkit.review.bot 2012-11-13 21:06:20 -0800 All reviewed patches have been landed. Closing bug. 766418 9 cdumez 2012-11-13 22:02:53 -0800 Shouldn't this patch take into consideration the window position as well? Or is it OK to move the window later on? 766440 10 jinwoo7.song 2012-11-13 22:22:36 -0800 Actually, I'm working on window features and will upload the patch for review soon. https://bugs.webkit.org/show_bug.cgi?id=99114 766767 11 yael 2012-11-14 05:07:01 -0800 (In reply to comment #9) > Shouldn't this patch take into consideration the window position as well? Or is it OK to move the window later on? Could be done in a separate patch, it seems that someone else is already working on it. 173962 2012-11-13 13:09:27 -0800 2012-11-13 14:50:21 -0800 Patch 102122.patch text/plain 9935 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1w bC5jcHAJKHJldmlzaW9uIDEzNDQyNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL0V3a1ZpZXdJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQsNiArMzQsOSBAQAogI2lu Y2x1ZGUgIlBhZ2VQb2xpY3lDbGllbnRFZmwuaCIKICNpbmNsdWRlICJQYWdlVUlDbGllbnRFZmwu aCIKICNpbmNsdWRlICJSZXNvdXJjZUxvYWRDbGllbnRFZmwuaCIKKyNpbmNsdWRlICJXS0RpY3Rp b25hcnkuaCIKKyNpbmNsdWRlICJXS0dlb21ldHJ5LmgiCisjaW5jbHVkZSAiV0tOdW1iZXIuaCIK ICNpbmNsdWRlICJXS1N0cmluZy5oIgogI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKICNpbmNsdWRl ICJXZWJQYWdlR3JvdXAuaCIKQEAgLTgyNiwxNCArODI5LDM0IEBACiAgICAgaW5mb3JtSWNvbkNo YW5nZSgpOwogfQogCi1XS1BhZ2VSZWYgRXdrVmlld0ltcGw6OmNyZWF0ZU5ld1BhZ2UoKQorV0tQ YWdlUmVmIEV3a1ZpZXdJbXBsOjpjcmVhdGVOZXdQYWdlKFdLRGljdGlvbmFyeVJlZiB3aW5kb3dG ZWF0dXJlcykKIHsKKyAgICBFd2tfVmlld19TbWFydF9EYXRhKiBzZCA9IHNtYXJ0RGF0YSgpOwor ICAgIEFTU0VSVChzZC0+YXBpKTsKKwogICAgIEV2YXNfT2JqZWN0KiBuZXdFd2tWaWV3ID0gMDsK LSAgICBzbWFydENhbGxiYWNrPENyZWF0ZVdpbmRvdz4oKS5jYWxsKCZuZXdFd2tWaWV3KTsKIAot ICAgIGlmICghbmV3RXdrVmlldykKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2lkdGhT dHIoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoIndpZHRoIikpOworICAg IFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBoZWlnaHRTdHIoQWRvcHRXSywgV0tTdHJpbmdDcmVh dGVXaXRoVVRGOENTdHJpbmcoImhlaWdodCIpKTsKKworICAgIGludCB3aWR0aCA9IDA7CisgICAg aW50IGhlaWdodCA9IDA7CisgICAgV0tUeXBlUmVmIHJlZiA9IFdLRGljdGlvbmFyeUdldEl0ZW1G b3JLZXkod2luZG93RmVhdHVyZXMsIHdpZHRoU3RyLmdldCgpKTsKKyAgICBpZiAocmVmKQorICAg ICAgICB3aWR0aCA9IFdLRG91YmxlR2V0VmFsdWUoc3RhdGljX2Nhc3Q8V0tEb3VibGVSZWY+KHJl ZikpOworICAgIHJlZiA9IFdLRGljdGlvbmFyeUdldEl0ZW1Gb3JLZXkod2luZG93RmVhdHVyZXMs IGhlaWdodFN0ci5nZXQoKSk7CisgICAgaWYgKHJlZikKKyAgICAgICAgaGVpZ2h0ID0gV0tEb3Vi bGVHZXRWYWx1ZShzdGF0aWNfY2FzdDxXS0RvdWJsZVJlZj4ocmVmKSk7CisKKyAgICB3aWR0aCA9 IHN0ZDo6bWF4KHdpZHRoLCAwKTsKKyAgICBoZWlnaHQgPSBzdGQ6Om1heChoZWlnaHQsIDApOwor CisgICAgaWYgKCFzZC0+YXBpLT53aW5kb3dfY3JlYXRlX25ldykKICAgICAgICAgcmV0dXJuIDA7 CiAKKyAgICBpZiAoIShuZXdFd2tWaWV3ID0gc2QtPmFwaS0+d2luZG93X2NyZWF0ZV9uZXcoc2Qs IHdpZHRoLCBoZWlnaHQpKSkKKyAgICAgICAgcmV0dXJuIDA7CisKICAgICBFd2tWaWV3SW1wbCog bmV3Vmlld0ltcGwgPSBFd2tWaWV3SW1wbDo6ZnJvbUV2YXNPYmplY3QobmV3RXdrVmlldyk7CiAg ICAgQVNTRVJUKG5ld1ZpZXdJbXBsKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5oCShyZXZpc2lvbiAxMzQ0MjYpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcsNiAr MTQ3LDEwIEBACiAgICAgLy8gc3RvcmFnZToKICAgICAvLyAgIC0gV2ViIGRhdGFiYXNlLgogICAg IHVuc2lnbmVkIGxvbmcgbG9uZyAoKmV4Y2VlZGVkX2RhdGFiYXNlX3F1b3RhKShFd2tfVmlld19T bWFydF9EYXRhICpzZCwgY29uc3QgY2hhciAqZGF0YWJhc2VOYW1lLCBjb25zdCBjaGFyICpkaXNw bGF5TmFtZSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnRRdW90YSwgdW5zaWduZWQgbG9uZyBs b25nIGN1cnJlbnRPcmlnaW5Vc2FnZSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnREYXRhYmFz ZVVzYWdlLCB1bnNpZ25lZCBsb25nIGxvbmcgZXhwZWN0ZWRVc2FnZSk7CisKKyAgICAvLyBuZXcg d2luZG93OgorICAgIC8vICAgLSBDcmVhdGUgYSBuZXcgd2luZG93IHdpdGggc3BlY2lmaWVkIHNp emUKKyAgICBFdmFzX09iamVjdCogKCp3aW5kb3dfY3JlYXRlX25ldykoRXdrX1ZpZXdfU21hcnRf RGF0YSAqc2QsIEV2YXNfQ29vcmQgd2lkdGgsIEV2YXNfQ29vcmQgaGVpZ2h0KTsKIH07CiAKIC8q KgpAQCAtMTY1LDcgKzE2OSw3IEBACiAgKiBAc2VlIEVXS19WSUVXX1NNQVJUX0NMQVNTX0lOSVRf VkVSU0lPTgogICogQHNlZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUX05BTUVfVkVSU0lPTgog ICovCi0jZGVmaW5lIEVXS19WSUVXX1NNQVJUX0NMQVNTX0lOSVQoc21hcnRfY2xhc3NfaW5pdCkg e3NtYXJ0X2NsYXNzX2luaXQsIEVXS19WSUVXX1NNQVJUX0NMQVNTX1ZFUlNJT04sIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDB9CisjZGVm aW5lIEVXS19WSUVXX1NNQVJUX0NMQVNTX0lOSVQoc21hcnRfY2xhc3NfaW5pdCkge3NtYXJ0X2Ns YXNzX2luaXQsIEVXS19WSUVXX1NNQVJUX0NMQVNTX1ZFUlNJT04sIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDB9CiAKIC8qKgogICog SW5pdGlhbGl6ZXIgdG8gemVybyBhIHdob2xlIEV3a19WaWV3X1NtYXJ0X0NsYXNzIHN0cnVjdHVy ZS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0lt cGwuaAkocmV2aXNpb24gMTM0NDI2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTU2LDcgKzE1Niw3IEBACiAgICAg dm9pZCBkaXNtaXNzQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCi0gICAgV0tQYWdlUmVmIGNyZWF0 ZU5ld1BhZ2UoKTsKKyAgICBXS1BhZ2VSZWYgY3JlYXRlTmV3UGFnZShXS0RpY3Rpb25hcnlSZWYg d2luZG93RmVhdHVyZXMpOwogICAgIHZvaWQgY2xvc2VQYWdlKCk7CiAKICAgICB2b2lkIHJlcXVl c3RQb3B1cE1lbnUoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eUVmbCosIGNvbnN0IFdlYkNvcmU6 OkludFJlY3QmLCBXZWJDb3JlOjpUZXh0RGlyZWN0aW9uLCBkb3VibGUgcGFnZVNjYWxlRmFjdG9y LCBjb25zdCBWZWN0b3I8V2ViS2l0OjpXZWJQb3B1cEl0ZW0+JiBpdGVtcywgaW50MzJfdCBzZWxl Y3RlZEluZGV4KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xp ZW50RWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1Bh Z2VVSUNsaWVudEVmbC5jcHAJKHJldmlzaW9uIDEzNDQyNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDksOSAr NDksOSBAQAogICAgIHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsLT5j bG9zZVBhZ2UoKTsKIH0KIAotV0tQYWdlUmVmIFBhZ2VVSUNsaWVudEVmbDo6Y3JlYXRlTmV3UGFn ZShXS1BhZ2VSZWYsIFdLVVJMUmVxdWVzdFJlZiwgV0tEaWN0aW9uYXJ5UmVmLCBXS0V2ZW50TW9k aWZpZXJzLCBXS0V2ZW50TW91c2VCdXR0b24sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCitXS1Bh Z2VSZWYgUGFnZVVJQ2xpZW50RWZsOjpjcmVhdGVOZXdQYWdlKFdLUGFnZVJlZiwgV0tVUkxSZXF1 ZXN0UmVmLCBXS0RpY3Rpb25hcnlSZWYgd2luZG93RmVhdHVyZXMsIFdLRXZlbnRNb2RpZmllcnMs IFdLRXZlbnRNb3VzZUJ1dHRvbiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKLSAgICByZXR1 cm4gdG9QYWdlVUlDbGllbnRFZmwoY2xpZW50SW5mbyktPm1fdmlld0ltcGwtPmNyZWF0ZU5ld1Bh Z2UoKTsKKyAgICByZXR1cm4gdG9QYWdlVUlDbGllbnRFZmwoY2xpZW50SW5mbyktPm1fdmlld0lt cGwtPmNyZWF0ZU5ld1BhZ2Uod2luZG93RmVhdHVyZXMpOwogfQogCiB2b2lkIFBhZ2VVSUNsaWVu dEVmbDo6cnVuSmF2YVNjcmlwdEFsZXJ0KFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgYWxlcnRUZXh0 LCBXS0ZyYW1lUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQpJbmRleDogU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2 aXNpb24gMTM0NDY5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMTEtMTMgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25A aW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0gTmV3IHdpbmRvdyBzaXplIHNob3VsZCBj b25zdWx0IHRoZSB3aW5kb3cgYXR0cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyMTIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUGFzcyB0aGUgc2l6ZSB0aGF0IHdhcyBzcGVjaWZpZWQgaW4g d2luZG93Lm9wZW4gdG8gdGhlIGVtYmVkZGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlld0ltcGwuY3BwOgorICAgICAgICAoRXdrVmlld0ltcGw6OmNyZWF0ZU5ld1BhZ2Up OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmg6CisgICAgICAgIChF d2tWaWV3SW1wbCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OlBhZ2VVSUNsaWVudEVmbDo6Y3JlYXRlTmV3UGFnZSk6CisKIDIwMTItMTEtMTMgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBTdG9yZSBsYXllciBw b3NpdGlvbnMgYW5kIHNpemVzIGluIHRoZSB0cmFuc2FjdGlvbgpJbmRleDogVG9vbHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTM0NDY5KQorKysg VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTEt MTMgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25AaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxd W1dLMl0gTmV3IHdpbmRvdyBzaXplIHNob3VsZCBjb25zdWx0IHRoZSB3aW5kb3cgYXR0cmlidXRl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyMTIy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFrZSBp bnRvIGFjY291bnQgdGhlIHNpemUgdGhhdCB3YXMgc3BlY2lmaWVkIGluIHdpbmRvdy5vcGVuCisg ICAgICAgIHdoZW4gY3JlYXRpbmcgYSBuZXcgd2luZG93LiBUaGlzIGF2b2lkcyB1Z2x5IGZsYXNo aW5nIG9uIHRoZSBzY3JlZW4uCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgor ICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAob25fbmV3X3dpbmRvdyk6CisgICAgICAg ICh3aW5kb3dfY3JlYXRlKToKKyAgICAgICAgKGVsbV9tYWluKToKKwogMjAxMi0xMS0xMyAgRGlt aXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHIxMzQ0NDkuCkluZGV4OiBUb29scy9NaW5pQnJvd3Nlci9lZmwvbWFp bi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMJKHJldmlzaW9u IDEzNDQyNikKKysrIFRvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMJKHdvcmtpbmcgY29weSkK QEAgLTkyLDcgKzkyLDcgQEAKICAgICB9CiB9OwogCi1zdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndp bmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJsKTsKK3N0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2lu ZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCk7CiAKIHN0 YXRpYyBCcm93c2VyX1dpbmRvdyAqYnJvd3Nlcl93aW5kb3dfZmluZChFdmFzX09iamVjdCAqd2lu ZG93KQogewpAQCAtMTg0LDcgKzE4NCw3IEBACiAgICAgICAgICAgICBpbmZvKCJDaGFuZ2UgUGFn aW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQsIGJ1dCBOT1QgY2hhbmdlZCEiKTsKICAgICB9 IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBjdHJsUHJlc3NlZCkgewogICAgICAg ICBpbmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3YXMgcHJlc3NlZC5cbiIpOwotICAg ICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShERUZBVUxUX1VSTCk7 CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKERFRkFVTFRf VVJMLCAwLCAwKTsKICAgICAgICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywg d2luZG93KTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgImkiKSAmJiBjdHJsUHJl c3NlZCkgewogICAgICAgICBpbmZvKCJTaG93IEluc3BlY3RvciAoQ3RybCtpKSB3YXMgcHJlc3Nl ZC5cbiIpOwpAQCAtMjcwLDEzICsyNzAsMTIgQEAKICAgICBlbG1fb2JqZWN0X2Rpc2FibGVkX3Nl dCh3aW5kb3ctPmZvcndhcmRfYnV0dG9uLCAhZXdrX3ZpZXdfZm9yd2FyZF9wb3NzaWJsZSh3ZWJ2 aWV3KSk7CiB9CiAKLXN0YXRpYyB2b2lkCi1vbl9uZXdfd2luZG93KHZvaWQgKnVzZXJfZGF0YSwg RXZhc19PYmplY3QgKndlYnZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCitzdGF0aWMgRXZhc19PYmpl Y3QqCitvbl9uZXdfd2luZG93KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nvb3JkIHdp ZHRoLCBFdmFzX0Nvb3JkIGhlaWdodCkKIHsKLSAgICBFdmFzX09iamVjdCAqKm5ld192aWV3ID0g KEV2YXNfT2JqZWN0ICoqKWV2ZW50X2luZm87Ci0gICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9 IHdpbmRvd19jcmVhdGUoTlVMTCk7Ci0gICAgKm5ld192aWV3ID0gd2luZG93LT53ZWJ2aWV3Owor ICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKE5VTEwsIHdpZHRoLCBo ZWlnaHQpOwogICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3MsIHdpbmRvdyk7 CisgICAgcmV0dXJuIHdpbmRvdy0+d2VidmlldzsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTkzOCw3 ICs5MzcsNyBAQAogICAgIHJldHVybiBidXR0b247CiB9CiAKLXN0YXRpYyBCcm93c2VyX1dpbmRv dyAqd2luZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwpCitzdGF0aWMgQnJvd3Nlcl9XaW5kb3cg KndpbmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiB7 CiAgICAgQnJvd3Nlcl9XaW5kb3cgKmFwcF9kYXRhID0gbWFsbG9jKHNpemVvZihCcm93c2VyX1dp bmRvdykpOwogICAgIGlmICghYXBwX2RhdGEpIHsKQEAgLTEwMzAsNiArMTAyOSw3IEBACiAgICAg ZXdrVmlld0NsYXNzLT53aW5kb3dfZ2VvbWV0cnlfc2V0ID0gb25fd2luZG93X2dlb21ldHJ5X3Nl dDsKICAgICBld2tWaWV3Q2xhc3MtPmZ1bGxzY3JlZW5fZW50ZXIgPSBvbl9mdWxsc2NyZWVuX2Vu dGVyOwogICAgIGV3a1ZpZXdDbGFzcy0+ZnVsbHNjcmVlbl9leGl0ID0gb25fZnVsbHNjcmVlbl9l eGl0OworICAgIGV3a1ZpZXdDbGFzcy0+d2luZG93X2NyZWF0ZV9uZXcgPSBvbl9uZXdfd2luZG93 OwogCiAgICAgRXZhcyAqZXZhcyA9IGV2YXNfb2JqZWN0X2V2YXNfZ2V0KGFwcF9kYXRhLT53aW5k b3cpOwogICAgIEV2YXNfU21hcnQgKnNtYXJ0ID0gZXZhc19zbWFydF9jbGFzc19uZXcoJmV3a1Zp ZXdDbGFzcy0+c2MpOwpAQCAtMTA0Nyw3ICsxMDQ3LDYgQEAKIAogICAgIGV2YXNfb2JqZWN0X3Nt YXJ0X2NhbGxiYWNrX2FkZChhcHBfZGF0YS0+d2VidmlldywgImF1dGhlbnRpY2F0aW9uLHJlcXVl c3QiLCBvbl9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0LCBhcHBfZGF0YSk7CiAgICAgZXZhc19vYmpl Y3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcF9kYXRhLT53ZWJ2aWV3LCAiY2xvc2Usd2luZG93Iiwg b25fY2xvc2Vfd2luZG93LCBhcHBfZGF0YSk7Ci0gICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJh Y2tfYWRkKGFwcF9kYXRhLT53ZWJ2aWV3LCAiY3JlYXRlLHdpbmRvdyIsIG9uX25ld193aW5kb3cs IGFwcF9kYXRhKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwX2RhdGEt PndlYnZpZXcsICJkb3dubG9hZCxmYWlsZWQiLCBvbl9kb3dubG9hZF9mYWlsZWQsIGFwcF9kYXRh KTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwX2RhdGEtPndlYnZpZXcs ICJkb3dubG9hZCxmaW5pc2hlZCIsIG9uX2Rvd25sb2FkX2ZpbmlzaGVkLCBhcHBfZGF0YSk7CiAg ICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcF9kYXRhLT53ZWJ2aWV3LCAiZG93 bmxvYWQscmVxdWVzdCIsIG9uX2Rvd25sb2FkX3JlcXVlc3QsIGFwcF9kYXRhKTsKQEAgLTEwNzIs NyArMTA3MSw3IEBACiAgICAgaWYgKHVybCkKICAgICAgICAgZXdrX3ZpZXdfdXJsX3NldChhcHBf ZGF0YS0+d2VidmlldywgdXJsKTsKIAotICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZShhcHBfZGF0YS0+ d2luZG93LCB3aW5kb3dfd2lkdGgsIHdpbmRvd19oZWlnaHQpOworICAgIGV2YXNfb2JqZWN0X3Jl c2l6ZShhcHBfZGF0YS0+d2luZG93LCB3aWR0aCA/IHdpZHRoIDogd2luZG93X3dpZHRoLCBoZWln aHQgPyBoZWlnaHQgOiB3aW5kb3dfaGVpZ2h0KTsKICAgICBldmFzX29iamVjdF9zaG93KGFwcF9k YXRhLT53aW5kb3cpOwogCiAgICAgdmlld19mb2N1c19zZXQoYXBwX2RhdGEsIEVJTkFfVFJVRSk7 CkBAIC0xMTU4LDEwICsxMTU3LDEwIEBACiAKICAgICBpZiAoYXJncyA8IGFyZ2MpIHsKICAgICAg ICAgY2hhciAqdXJsID0gdXJsX2Zyb21fdXNlcl9pbnB1dChhcmd2W2FyZ3NdKTsKLSAgICAgICAg d2luZG93ID0gd2luZG93X2NyZWF0ZSh1cmwpOworICAgICAgICB3aW5kb3cgPSB3aW5kb3dfY3Jl YXRlKHVybCwgMCwgMCk7CiAgICAgICAgIGZyZWUodXJsKTsKICAgICB9IGVsc2UKLSAgICAgICAg d2luZG93ID0gd2luZG93X2NyZWF0ZShERUZBVUxUX1VSTCk7CisgICAgICAgIHdpbmRvdyA9IHdp bmRvd19jcmVhdGUoREVGQVVMVF9VUkwsIDAsIDApOwogCiAgICAgaWYgKCF3aW5kb3cpCiAgICAg ICAgIHJldHVybiBxdWl0KEVJTkFfRkFMU0UsICJFUlJPUjogY291bGQgbm90IGNyZWF0ZSBicm93 c2VyIHdpbmRvdy5cbiIpOwo= 173996 2012-11-13 14:50:21 -0800 2012-11-13 16:06:30 -0800 Patch 102122.patch text/plain 10039 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwu aAkocmV2aXNpb24gMTM0NDM0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTU2LDcgKzE1Niw3IEBACiAgICAgdm9p ZCBkaXNtaXNzQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCi0gICAgV0tQYWdlUmVmIGNyZWF0ZU5l d1BhZ2UoKTsKKyAgICBXS1BhZ2VSZWYgY3JlYXRlTmV3UGFnZShXS0RpY3Rpb25hcnlSZWYgd2lu ZG93RmVhdHVyZXMpOwogICAgIHZvaWQgY2xvc2VQYWdlKCk7CiAKICAgICB2b2lkIHJlcXVlc3RQ b3B1cE1lbnUoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eUVmbCosIGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmLCBXZWJDb3JlOjpUZXh0RGlyZWN0aW9uLCBkb3VibGUgcGFnZVNjYWxlRmFjdG9yLCBj b25zdCBWZWN0b3I8V2ViS2l0OjpXZWJQb3B1cEl0ZW0+JiBpdGVtcywgaW50MzJfdCBzZWxlY3Rl ZEluZGV4KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaAkocmV2aXNpb24gMTM0NDM0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ3LDYgKzE0NywxMCBAQAogICAgIC8v IHN0b3JhZ2U6CiAgICAgLy8gICAtIFdlYiBkYXRhYmFzZS4KICAgICB1bnNpZ25lZCBsb25nIGxv bmcgKCpleGNlZWRlZF9kYXRhYmFzZV9xdW90YSkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIGNv bnN0IGNoYXIgKmRhdGFiYXNlTmFtZSwgY29uc3QgY2hhciAqZGlzcGxheU5hbWUsIHVuc2lnbmVk IGxvbmcgbG9uZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50T3JpZ2lu VXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2FnZSwgdW5zaWduZWQg bG9uZyBsb25nIGV4cGVjdGVkVXNhZ2UpOworCisgICAgLy8gbmV3IHdpbmRvdzoKKyAgICAvLyAg IC0gQ3JlYXRlIGEgbmV3IHdpbmRvdyB3aXRoIHNwZWNpZmllZCBzaXplCisgICAgRXZhc19PYmpl Y3QqICgqd2luZG93X2NyZWF0ZV9uZXcpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nv b3JkIHdpZHRoLCBFdmFzX0Nvb3JkIGhlaWdodCk7CiB9OwogCiAvKioKQEAgLTE2NSw3ICsxNjks NyBAQAogICogQHNlZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUX1ZFUlNJT04KICAqIEBzZWUg RVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVF9OQU1FX1ZFUlNJT04KICAqLwotI2RlZmluZSBFV0tf VklFV19TTUFSVF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0 LCBFV0tfVklFV19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQorI2RlZmluZSBFV0tfVklFV19TTUFS VF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0LCBFV0tfVklF V19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQogCiAvKioKICAqIEluaXRpYWxpemVyIHRvIHpl cm8gYSB3aG9sZSBFd2tfVmlld19TbWFydF9DbGFzcyBzdHJ1Y3R1cmUuCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCShyZXZpc2lv biAxMzQ0MzQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1w bC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDkgQEAKICNpbmNsdWRlICJQYWdlUG9s aWN5Q2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiUGFnZVVJQ2xpZW50RWZsLmgiCiAjaW5jbHVkZSAi UmVzb3VyY2VMb2FkQ2xpZW50RWZsLmgiCisjaW5jbHVkZSAiV0tEaWN0aW9uYXJ5LmgiCisjaW5j bHVkZSAiV0tHZW9tZXRyeS5oIgorI2luY2x1ZGUgIldLTnVtYmVyLmgiCiAjaW5jbHVkZSAiV0tT dHJpbmcuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViUGFnZUdyb3Vw LmgiCkBAIC04MjYsMTQgKzgyOSwyOCBAQAogICAgIGluZm9ybUljb25DaGFuZ2UoKTsKIH0KIAot V0tQYWdlUmVmIEV3a1ZpZXdJbXBsOjpjcmVhdGVOZXdQYWdlKCkKK1dLUGFnZVJlZiBFd2tWaWV3 SW1wbDo6Y3JlYXRlTmV3UGFnZShXS0RpY3Rpb25hcnlSZWYgd2luZG93RmVhdHVyZXMpCiB7Cisg ICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKKyAgICBBU1NFUlQoc2Qt PmFwaSk7CisKICAgICBFdmFzX09iamVjdCogbmV3RXdrVmlldyA9IDA7Ci0gICAgc21hcnRDYWxs YmFjazxDcmVhdGVXaW5kb3c+KCkuY2FsbCgmbmV3RXdrVmlldyk7CiAKLSAgICBpZiAoIW5ld0V3 a1ZpZXcpCisgICAgLy8gRXh0cmFjdCB0aGUgd2lkdGggYW5kIGhlaWdodCBmcm9tIHRoZSB3aW5k b3cgYXR0cmlidXRlcyBhbmQgcGFzcyB0aGVtIGFsb25nIHRvIHRoZSBlbWJlZGRlci4KKyAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2lkdGhTdHIoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcoIndpZHRoIikpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBo ZWlnaHRTdHIoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoImhlaWdodCIp KTsKKworICAgIFdLVHlwZVJlZiByZWYgPSBXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KHdpbmRv d0ZlYXR1cmVzLCB3aWR0aFN0ci5nZXQoKSk7CisgICAgdW5zaWduZWQgaW50IHdpZHRoID0gcmVm ID8gV0tEb3VibGVHZXRWYWx1ZShzdGF0aWNfY2FzdDxXS0RvdWJsZVJlZj4ocmVmKSkgOiAwOwor ICAgIHJlZiA9IFdLRGljdGlvbmFyeUdldEl0ZW1Gb3JLZXkod2luZG93RmVhdHVyZXMsIGhlaWdo dFN0ci5nZXQoKSk7CisgICAgdW5zaWduZWQgaW50IGhlaWdodCA9IHJlZiA/IFdLRG91YmxlR2V0 VmFsdWUoc3RhdGljX2Nhc3Q8V0tEb3VibGVSZWY+KHJlZikpIDogMDsKKworICAgIGlmICghc2Qt PmFwaS0+d2luZG93X2NyZWF0ZV9uZXcpCiAgICAgICAgIHJldHVybiAwOwogCisgICAgaWYgKCEo bmV3RXdrVmlldyA9IHNkLT5hcGktPndpbmRvd19jcmVhdGVfbmV3KHNkLCB3aWR0aCwgaGVpZ2h0 KSkpCisgICAgICAgIHJldHVybiAwOworCiAgICAgRXdrVmlld0ltcGwqIG5ld1ZpZXdJbXBsID0g RXdrVmlld0ltcGw6OmZyb21FdmFzT2JqZWN0KG5ld0V3a1ZpZXcpOwogICAgIEFTU0VSVChuZXdW aWV3SW1wbCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xp ZW50RWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1Bh Z2VVSUNsaWVudEVmbC5jcHAJKHJldmlzaW9uIDEzNDQzNCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDksOSAr NDksOSBAQAogICAgIHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsLT5j bG9zZVBhZ2UoKTsKIH0KIAotV0tQYWdlUmVmIFBhZ2VVSUNsaWVudEVmbDo6Y3JlYXRlTmV3UGFn ZShXS1BhZ2VSZWYsIFdLVVJMUmVxdWVzdFJlZiwgV0tEaWN0aW9uYXJ5UmVmLCBXS0V2ZW50TW9k aWZpZXJzLCBXS0V2ZW50TW91c2VCdXR0b24sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCitXS1Bh Z2VSZWYgUGFnZVVJQ2xpZW50RWZsOjpjcmVhdGVOZXdQYWdlKFdLUGFnZVJlZiwgV0tVUkxSZXF1 ZXN0UmVmLCBXS0RpY3Rpb25hcnlSZWYgd2luZG93RmVhdHVyZXMsIFdLRXZlbnRNb2RpZmllcnMs IFdLRXZlbnRNb3VzZUJ1dHRvbiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKLSAgICByZXR1 cm4gdG9QYWdlVUlDbGllbnRFZmwoY2xpZW50SW5mbyktPm1fdmlld0ltcGwtPmNyZWF0ZU5ld1Bh Z2UoKTsKKyAgICByZXR1cm4gdG9QYWdlVUlDbGllbnRFZmwoY2xpZW50SW5mbyktPm1fdmlld0lt cGwtPmNyZWF0ZU5ld1BhZ2Uod2luZG93RmVhdHVyZXMpOwogfQogCiB2b2lkIFBhZ2VVSUNsaWVu dEVmbDo6cnVuSmF2YVNjcmlwdEFsZXJ0KFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgYWxlcnRUZXh0 LCBXS0ZyYW1lUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQpJbmRleDogU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2 aXNpb24gMTM0NDM0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMTEtMTMgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25A aW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0gTmV3IHdpbmRvdyBzaXplIHNob3VsZCBj b25zdWx0IHRoZSB3aW5kb3cgYXR0cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyMTIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUGFzcyB0aGUgc2l6ZSB0aGF0IHdhcyBzcGVjaWZpZWQgaW4g d2luZG93Lm9wZW4gdG8gdGhlIGVtYmVkZGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlld0ltcGwuY3BwOgorICAgICAgICAoRXdrVmlld0ltcGw6OmNyZWF0ZU5ld1BhZ2Up OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmg6CisgICAgICAgIChF d2tWaWV3SW1wbCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OlBhZ2VVSUNsaWVudEVmbDo6Y3JlYXRlTmV3UGFnZSk6CisKIDIwMTItMTEtMTMgIE1pa2hh aWwgUG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CiAKICAgICAgICAg W1dLMl0gVGlsZWRCYWNraW5nU3RvcmU6IFdlYkNocm9tZUNsaWVudDo6cGFnZVJlY3QoKSBzaG91 bGQgY29uc2lkZXIgdmlld3BvcnQgc2l6ZQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTM0NDM0KQorKysgVG9vbHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTEtMTMgIFlhZWwgQWhh cm9uICA8eWFlbC5haGFyb25AaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0gTmV3IHdp bmRvdyBzaXplIHNob3VsZCBjb25zdWx0IHRoZSB3aW5kb3cgYXR0cmlidXRlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyMTIyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFrZSBpbnRvIGFjY291bnQg dGhlIHNpemUgdGhhdCB3YXMgc3BlY2lmaWVkIGluIHdpbmRvdy5vcGVuCisgICAgICAgIHdoZW4g Y3JlYXRpbmcgYSBuZXcgd2luZG93LiBUaGlzIGF2b2lkcyB1Z2x5IGZsYXNoaW5nIG9uIHRoZSBz Y3JlZW4uCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAob25f a2V5X2Rvd24pOgorICAgICAgICAob25fbmV3X3dpbmRvdyk6CisgICAgICAgICh3aW5kb3dfY3Jl YXRlKToKKyAgICAgICAgKGVsbV9tYWluKToKKwogMjAxMi0xMS0xMyAgUmFwaGFlbCBLdWJvIGRh IENvc3RhICA8cmFwaGFlbC5rdWJvLmRhLmNvc3RhQGludGVsLmNvbT4KIAogICAgICAgICBbQ01h a2VdIEluY29ycmVjdCBkZXBlbmRlbmN5IGNhbGN1bGF0aW9uIHdoZW4gZ2VuZXJhdGluZyBmb3J3 YXJkaW5nIGhlYWRlcnMKSW5kZXg6IFRvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwkocmV2aXNpb24gMTM0NDM0KQor KysgVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwkod29ya2luZyBjb3B5KQpAQCAtOTIsNyAr OTIsNyBAQAogICAgIH0KIH07CiAKLXN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0 ZShjb25zdCBjaGFyICp1cmwpOworc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRl KGNvbnN0IGNoYXIgKnVybCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KTsKIAogc3RhdGljIEJyb3dz ZXJfV2luZG93ICpicm93c2VyX3dpbmRvd19maW5kKEV2YXNfT2JqZWN0ICp3aW5kb3cpCiB7CkBA IC0xODQsNyArMTg0LDcgQEAKICAgICAgICAgICAgIGluZm8oIkNoYW5nZSBQYWdpbmF0aW9uIE1v ZGUgKEY3KSB3YXMgcHJlc3NlZCwgYnV0IE5PVCBjaGFuZ2VkISIpOwogICAgIH0gZWxzZSBpZiAo IXN0cmNtcChldi0+a2V5LCAibiIpICYmIGN0cmxQcmVzc2VkKSB7CiAgICAgICAgIGluZm8oIkNy ZWF0ZSBuZXcgd2luZG93IChDdHJsK24pIHdhcyBwcmVzc2VkLlxuIik7Ci0gICAgICAgIEJyb3dz ZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKERFRkFVTFRfVVJMKTsKKyAgICAgICAg QnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoREVGQVVMVF9VUkwsIDAsIDAp OwogICAgICAgICB3aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5kb3cpOwog ICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiaSIpICYmIGN0cmxQcmVzc2VkKSB7CiAg ICAgICAgIGluZm8oIlNob3cgSW5zcGVjdG9yIChDdHJsK2kpIHdhcyBwcmVzc2VkLlxuIik7CkBA IC0yNzAsMTMgKzI3MCwxMiBAQAogICAgIGVsbV9vYmplY3RfZGlzYWJsZWRfc2V0KHdpbmRvdy0+ Zm9yd2FyZF9idXR0b24sICFld2tfdmlld19mb3J3YXJkX3Bvc3NpYmxlKHdlYnZpZXcpKTsKIH0K IAotc3RhdGljIHZvaWQKLW9uX25ld193aW5kb3codm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVj dCAqd2Vidmlldywgdm9pZCAqZXZlbnRfaW5mbykKK3N0YXRpYyBFdmFzX09iamVjdCoKK29uX25l d193aW5kb3coRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgd2lkdGgsIEV2YXNf Q29vcmQgaGVpZ2h0KQogewotICAgIEV2YXNfT2JqZWN0ICoqbmV3X3ZpZXcgPSAoRXZhc19PYmpl Y3QgKiopZXZlbnRfaW5mbzsKLSAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2Ny ZWF0ZShOVUxMKTsKLSAgICAqbmV3X3ZpZXcgPSB3aW5kb3ctPndlYnZpZXc7CisgICAgQnJvd3Nl cl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoTlVMTCwgd2lkdGgsIGhlaWdodCk7CiAg ICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKKyAgICByZXR1 cm4gd2luZG93LT53ZWJ2aWV3OwogfQogCiBzdGF0aWMgdm9pZApAQCAtOTM4LDcgKzkzNyw3IEBA CiAgICAgcmV0dXJuIGJ1dHRvbjsKIH0KIAotc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3df Y3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKK3N0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2Ny ZWF0ZShjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCkKIHsKICAgICBCcm93 c2VyX1dpbmRvdyAqYXBwX2RhdGEgPSBtYWxsb2Moc2l6ZW9mKEJyb3dzZXJfV2luZG93KSk7CiAg ICAgaWYgKCFhcHBfZGF0YSkgewpAQCAtMTAzMCw2ICsxMDI5LDcgQEAKICAgICBld2tWaWV3Q2xh c3MtPndpbmRvd19nZW9tZXRyeV9zZXQgPSBvbl93aW5kb3dfZ2VvbWV0cnlfc2V0OwogICAgIGV3 a1ZpZXdDbGFzcy0+ZnVsbHNjcmVlbl9lbnRlciA9IG9uX2Z1bGxzY3JlZW5fZW50ZXI7CiAgICAg ZXdrVmlld0NsYXNzLT5mdWxsc2NyZWVuX2V4aXQgPSBvbl9mdWxsc2NyZWVuX2V4aXQ7CisgICAg ZXdrVmlld0NsYXNzLT53aW5kb3dfY3JlYXRlX25ldyA9IG9uX25ld193aW5kb3c7CiAKICAgICBF dmFzICpldmFzID0gZXZhc19vYmplY3RfZXZhc19nZXQoYXBwX2RhdGEtPndpbmRvdyk7CiAgICAg RXZhc19TbWFydCAqc21hcnQgPSBldmFzX3NtYXJ0X2NsYXNzX25ldygmZXdrVmlld0NsYXNzLT5z Yyk7CkBAIC0xMDQ3LDcgKzEwNDcsNiBAQAogCiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJh Y2tfYWRkKGFwcF9kYXRhLT53ZWJ2aWV3LCAiYXV0aGVudGljYXRpb24scmVxdWVzdCIsIG9uX2F1 dGhlbnRpY2F0aW9uX3JlcXVlc3QsIGFwcF9kYXRhKTsKICAgICBldmFzX29iamVjdF9zbWFydF9j YWxsYmFja19hZGQoYXBwX2RhdGEtPndlYnZpZXcsICJjbG9zZSx3aW5kb3ciLCBvbl9jbG9zZV93 aW5kb3csIGFwcF9kYXRhKTsKLSAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBw X2RhdGEtPndlYnZpZXcsICJjcmVhdGUsd2luZG93Iiwgb25fbmV3X3dpbmRvdywgYXBwX2RhdGEp OwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHBfZGF0YS0+d2Vidmlldywg ImRvd25sb2FkLGZhaWxlZCIsIG9uX2Rvd25sb2FkX2ZhaWxlZCwgYXBwX2RhdGEpOwogICAgIGV2 YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHBfZGF0YS0+d2VidmlldywgImRvd25sb2Fk LGZpbmlzaGVkIiwgb25fZG93bmxvYWRfZmluaXNoZWQsIGFwcF9kYXRhKTsKICAgICBldmFzX29i amVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwX2RhdGEtPndlYnZpZXcsICJkb3dubG9hZCxyZXF1 ZXN0Iiwgb25fZG93bmxvYWRfcmVxdWVzdCwgYXBwX2RhdGEpOwpAQCAtMTA3Miw3ICsxMDcxLDcg QEAKICAgICBpZiAodXJsKQogICAgICAgICBld2tfdmlld191cmxfc2V0KGFwcF9kYXRhLT53ZWJ2 aWV3LCB1cmwpOwogCi0gICAgZXZhc19vYmplY3RfcmVzaXplKGFwcF9kYXRhLT53aW5kb3csIHdp bmRvd193aWR0aCwgd2luZG93X2hlaWdodCk7CisgICAgZXZhc19vYmplY3RfcmVzaXplKGFwcF9k YXRhLT53aW5kb3csIHdpZHRoID8gd2lkdGggOiB3aW5kb3dfd2lkdGgsIGhlaWdodCA/IGhlaWdo dCA6IHdpbmRvd19oZWlnaHQpOwogICAgIGV2YXNfb2JqZWN0X3Nob3coYXBwX2RhdGEtPndpbmRv dyk7CiAKICAgICB2aWV3X2ZvY3VzX3NldChhcHBfZGF0YSwgRUlOQV9UUlVFKTsKQEAgLTExNTgs MTAgKzExNTcsMTAgQEAKIAogICAgIGlmIChhcmdzIDwgYXJnYykgewogICAgICAgICBjaGFyICp1 cmwgPSB1cmxfZnJvbV91c2VyX2lucHV0KGFyZ3ZbYXJnc10pOwotICAgICAgICB3aW5kb3cgPSB3 aW5kb3dfY3JlYXRlKHVybCk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUodXJsLCAw LCAwKTsKICAgICAgICAgZnJlZSh1cmwpOwogICAgIH0gZWxzZQotICAgICAgICB3aW5kb3cgPSB3 aW5kb3dfY3JlYXRlKERFRkFVTFRfVVJMKTsKKyAgICAgICAgd2luZG93ID0gd2luZG93X2NyZWF0 ZShERUZBVUxUX1VSTCwgMCwgMCk7CiAKICAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJu IHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIgd2luZG93 LlxuIik7Cg== 174019 2012-11-13 16:06:30 -0800 2012-11-13 21:06:14 -0800 Patch for landing. 102122.patch text/plain 10102 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwu aAkocmV2aXNpb24gMTM0NDM0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTU2LDcgKzE1Niw3IEBACiAgICAgdm9p ZCBkaXNtaXNzQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCi0gICAgV0tQYWdlUmVmIGNyZWF0ZU5l d1BhZ2UoKTsKKyAgICBXS1BhZ2VSZWYgY3JlYXRlTmV3UGFnZShXS0RpY3Rpb25hcnlSZWYgd2lu ZG93RmVhdHVyZXMpOwogICAgIHZvaWQgY2xvc2VQYWdlKCk7CiAKICAgICB2b2lkIHJlcXVlc3RQ b3B1cE1lbnUoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eUVmbCosIGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmLCBXZWJDb3JlOjpUZXh0RGlyZWN0aW9uLCBkb3VibGUgcGFnZVNjYWxlRmFjdG9yLCBj b25zdCBWZWN0b3I8V2ViS2l0OjpXZWJQb3B1cEl0ZW0+JiBpdGVtcywgaW50MzJfdCBzZWxlY3Rl ZEluZGV4KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaAkocmV2aXNpb24gMTM0NDM0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ3LDYgKzE0NywxMCBAQAogICAgIC8v IHN0b3JhZ2U6CiAgICAgLy8gICAtIFdlYiBkYXRhYmFzZS4KICAgICB1bnNpZ25lZCBsb25nIGxv bmcgKCpleGNlZWRlZF9kYXRhYmFzZV9xdW90YSkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIGNv bnN0IGNoYXIgKmRhdGFiYXNlTmFtZSwgY29uc3QgY2hhciAqZGlzcGxheU5hbWUsIHVuc2lnbmVk IGxvbmcgbG9uZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50T3JpZ2lu VXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2FnZSwgdW5zaWduZWQg bG9uZyBsb25nIGV4cGVjdGVkVXNhZ2UpOworCisgICAgLy8gbmV3IHdpbmRvdzoKKyAgICAvLyAg IC0gQ3JlYXRlIGEgbmV3IHdpbmRvdyB3aXRoIHNwZWNpZmllZCBzaXplCisgICAgRXZhc19PYmpl Y3QqICgqd2luZG93X2NyZWF0ZV9uZXcpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nv b3JkIHdpZHRoLCBFdmFzX0Nvb3JkIGhlaWdodCk7CiB9OwogCiAvKioKQEAgLTE2NSw3ICsxNjks NyBAQAogICogQHNlZSBFV0tfVklFV19TTUFSVF9DTEFTU19JTklUX1ZFUlNJT04KICAqIEBzZWUg RVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVF9OQU1FX1ZFUlNJT04KICAqLwotI2RlZmluZSBFV0tf VklFV19TTUFSVF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0 LCBFV0tfVklFV19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQorI2RlZmluZSBFV0tfVklFV19TTUFS VF9DTEFTU19JTklUKHNtYXJ0X2NsYXNzX2luaXQpIHtzbWFydF9jbGFzc19pbml0LCBFV0tfVklF V19TTUFSVF9DTEFTU19WRVJTSU9OLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAw LCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwLCAwfQogCiAvKioKICAqIEluaXRpYWxpemVyIHRvIHpl cm8gYSB3aG9sZSBFd2tfVmlld19TbWFydF9DbGFzcyBzdHJ1Y3R1cmUuCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCShyZXZpc2lv biAxMzQ0MzQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1w bC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDkgQEAKICNpbmNsdWRlICJQYWdlUG9s aWN5Q2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiUGFnZVVJQ2xpZW50RWZsLmgiCiAjaW5jbHVkZSAi UmVzb3VyY2VMb2FkQ2xpZW50RWZsLmgiCisjaW5jbHVkZSAiV0tEaWN0aW9uYXJ5LmgiCisjaW5j bHVkZSAiV0tHZW9tZXRyeS5oIgorI2luY2x1ZGUgIldLTnVtYmVyLmgiCiAjaW5jbHVkZSAiV0tT dHJpbmcuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViUGFnZUdyb3Vw LmgiCkBAIC04MjYsMTQgKzgyOSwyOCBAQAogICAgIGluZm9ybUljb25DaGFuZ2UoKTsKIH0KIAot V0tQYWdlUmVmIEV3a1ZpZXdJbXBsOjpjcmVhdGVOZXdQYWdlKCkKK1dLUGFnZVJlZiBFd2tWaWV3 SW1wbDo6Y3JlYXRlTmV3UGFnZShXS0RpY3Rpb25hcnlSZWYgd2luZG93RmVhdHVyZXMpCiB7Cisg ICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKKyAgICBBU1NFUlQoc2Qt PmFwaSk7CisKICAgICBFdmFzX09iamVjdCogbmV3RXdrVmlldyA9IDA7Ci0gICAgc21hcnRDYWxs YmFjazxDcmVhdGVXaW5kb3c+KCkuY2FsbCgmbmV3RXdrVmlldyk7CiAKLSAgICBpZiAoIW5ld0V3 a1ZpZXcpCisgICAgLy8gRXh0cmFjdCB0aGUgd2lkdGggYW5kIGhlaWdodCBmcm9tIHRoZSB3aW5k b3cgYXR0cmlidXRlcyBhbmQgcGFzcyB0aGVtIGFsb25nIHRvIHRoZSBlbWJlZGRlci4KKyAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2lkdGhTdHIoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcoIndpZHRoIikpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBo ZWlnaHRTdHIoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoImhlaWdodCIp KTsKKworICAgIFdLVHlwZVJlZiByZWYgPSBXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KHdpbmRv d0ZlYXR1cmVzLCB3aWR0aFN0ci5nZXQoKSk7CisgICAgdW5zaWduZWQgd2lkdGggPSByZWYgPyBX S0RvdWJsZUdldFZhbHVlKHN0YXRpY19jYXN0PFdLRG91YmxlUmVmPihyZWYpKSA6IDA7CisgICAg cmVmID0gV0tEaWN0aW9uYXJ5R2V0SXRlbUZvcktleSh3aW5kb3dGZWF0dXJlcywgaGVpZ2h0U3Ry LmdldCgpKTsKKyAgICB1bnNpZ25lZCBoZWlnaHQgPSByZWYgPyBXS0RvdWJsZUdldFZhbHVlKHN0 YXRpY19jYXN0PFdLRG91YmxlUmVmPihyZWYpKSA6IDA7CisKKyAgICBpZiAoIXNkLT5hcGktPndp bmRvd19jcmVhdGVfbmV3KQogICAgICAgICByZXR1cm4gMDsKIAorICAgIGlmICghKG5ld0V3a1Zp ZXcgPSBzZC0+YXBpLT53aW5kb3dfY3JlYXRlX25ldyhzZCwgd2lkdGgsIGhlaWdodCkpKQorICAg ICAgICByZXR1cm4gMDsKKwogICAgIEV3a1ZpZXdJbXBsKiBuZXdWaWV3SW1wbCA9IEV3a1ZpZXdJ bXBsOjpmcm9tRXZhc09iamVjdChuZXdFd2tWaWV3KTsKICAgICBBU1NFUlQobmV3Vmlld0ltcGwp OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGll bnRFZmwuY3BwCShyZXZpc2lvbiAxMzQ0MzQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDkgKzQ5LDkgQEAK ICAgICB0b1BhZ2VVSUNsaWVudEVmbChjbGllbnRJbmZvKS0+bV92aWV3SW1wbC0+Y2xvc2VQYWdl KCk7CiB9CiAKLVdLUGFnZVJlZiBQYWdlVUlDbGllbnRFZmw6OmNyZWF0ZU5ld1BhZ2UoV0tQYWdl UmVmLCBXS1VSTFJlcXVlc3RSZWYsIFdLRGljdGlvbmFyeVJlZiwgV0tFdmVudE1vZGlmaWVycywg V0tFdmVudE1vdXNlQnV0dG9uLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorV0tQYWdlUmVmIFBh Z2VVSUNsaWVudEVmbDo6Y3JlYXRlTmV3UGFnZShXS1BhZ2VSZWYsIFdLVVJMUmVxdWVzdFJlZiwg V0tEaWN0aW9uYXJ5UmVmIHdpbmRvd0ZlYXR1cmVzLCBXS0V2ZW50TW9kaWZpZXJzLCBXS0V2ZW50 TW91c2VCdXR0b24sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7Ci0gICAgcmV0dXJuIHRvUGFn ZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsLT5jcmVhdGVOZXdQYWdlKCk7Cisg ICAgcmV0dXJuIHRvUGFnZVVJQ2xpZW50RWZsKGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsLT5jcmVh dGVOZXdQYWdlKHdpbmRvd0ZlYXR1cmVzKTsKIH0KIAogdm9pZCBQYWdlVUlDbGllbnRFZmw6OnJ1 bkphdmFTY3JpcHRBbGVydChXS1BhZ2VSZWYsIFdLU3RyaW5nUmVmIGFsZXJ0VGV4dCwgV0tGcmFt ZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEz NDQzNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDEyLTExLTEzICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNv bT4KKworICAgICAgICBbRUZMXVtXSzJdIE5ldyB3aW5kb3cgc2l6ZSBzaG91bGQgY29uc3VsdCB0 aGUgd2luZG93IGF0dHJpYnV0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMjEyMgorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUg Q2hyaXN0aWFuc2VuLgorCisgICAgICAgIFBhc3MgdGhlIHNpemUgdGhhdCB3YXMgc3BlY2lmaWVk IGluIHdpbmRvdy5vcGVuIHRvIHRoZSBlbWJlZGRlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL0V3a1ZpZXdJbXBsLmNwcDoKKyAgICAgICAgKEV3a1ZpZXdJbXBsOjpjcmVhdGVOZXdQ YWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oOgorICAgICAg ICAoRXdrVmlld0ltcGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGllbnRFZmwuY3BwOgorICAgICAgICAo V2ViS2l0OjpQYWdlVUlDbGllbnRFZmw6OmNyZWF0ZU5ld1BhZ2UpOgorCiAyMDEyLTExLTEzICBN aWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgogCiAgICAg ICAgIFtXSzJdIFRpbGVkQmFja2luZ1N0b3JlOiBXZWJDaHJvbWVDbGllbnQ6OnBhZ2VSZWN0KCkg c2hvdWxkIGNvbnNpZGVyIHZpZXdwb3J0IHNpemUKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNDQzNCkKKysrIFRvb2xzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTExLTEzICBZYWVs IEFoYXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIE5l dyB3aW5kb3cgc2l6ZSBzaG91bGQgY29uc3VsdCB0aGUgd2luZG93IGF0dHJpYnV0ZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjEyMgorCisgICAg ICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIFRh a2UgaW50byBhY2NvdW50IHRoZSBzaXplIHRoYXQgd2FzIHNwZWNpZmllZCBpbiB3aW5kb3cub3Bl bgorICAgICAgICB3aGVuIGNyZWF0aW5nIGEgbmV3IHdpbmRvdy4gVGhpcyBhdm9pZHMgdWdseSBm bGFzaGluZyBvbiB0aGUgc2NyZWVuLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4u YzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAgICAgKG9uX25ld193aW5kb3cpOgorICAg ICAgICAod2luZG93X2NyZWF0ZSk6CisgICAgICAgIChlbG1fbWFpbik6CisKIDIwMTItMTEtMTMg IFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPHJhcGhhZWwua3Viby5kYS5jb3N0YUBpbnRlbC5jb20+ CiAKICAgICAgICAgW0NNYWtlXSBJbmNvcnJlY3QgZGVwZW5kZW5jeSBjYWxjdWxhdGlvbiB3aGVu IGdlbmVyYXRpbmcgZm9yd2FyZGluZyBoZWFkZXJzCkluZGV4OiBUb29scy9NaW5pQnJvd3Nlci9l ZmwvbWFpbi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMJKHJl dmlzaW9uIDEzNDQzNCkKKysrIFRvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMJKHdvcmtpbmcg Y29weSkKQEAgLTkyLDcgKzkyLDcgQEAKICAgICB9CiB9OwogCi1zdGF0aWMgQnJvd3Nlcl9XaW5k b3cgKndpbmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJsKTsKK3N0YXRpYyBCcm93c2VyX1dpbmRv dyAqd2luZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCk7 CiAKIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqYnJvd3Nlcl93aW5kb3dfZmluZChFdmFzX09iamVj dCAqd2luZG93KQogewpAQCAtMTg0LDcgKzE4NCw4IEBACiAgICAgICAgICAgICBpbmZvKCJDaGFu Z2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQsIGJ1dCBOT1QgY2hhbmdlZCEiKTsK ICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBjdHJsUHJlc3NlZCkgewog ICAgICAgICBpbmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3YXMgcHJlc3NlZC5cbiIp OwotICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShERUZBVUxU X1VSTCk7CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKERF RkFVTFRfVVJMLCAwLCAwKTsKKyAgICAgICAgLy8gMCBlcXVhbHMgZGVmYXVsdCB3aWR0aCBhbmQg aGVpZ2h0LgogICAgICAgICB3aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5k b3cpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiaSIpICYmIGN0cmxQcmVzc2Vk KSB7CiAgICAgICAgIGluZm8oIlNob3cgSW5zcGVjdG9yIChDdHJsK2kpIHdhcyBwcmVzc2VkLlxu Iik7CkBAIC0yNzAsMTMgKzI3MSwxMiBAQAogICAgIGVsbV9vYmplY3RfZGlzYWJsZWRfc2V0KHdp bmRvdy0+Zm9yd2FyZF9idXR0b24sICFld2tfdmlld19mb3J3YXJkX3Bvc3NpYmxlKHdlYnZpZXcp KTsKIH0KIAotc3RhdGljIHZvaWQKLW9uX25ld193aW5kb3codm9pZCAqdXNlcl9kYXRhLCBFdmFz X09iamVjdCAqd2Vidmlldywgdm9pZCAqZXZlbnRfaW5mbykKK3N0YXRpYyBFdmFzX09iamVjdCoK K29uX25ld193aW5kb3coRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgd2lkdGgs IEV2YXNfQ29vcmQgaGVpZ2h0KQogewotICAgIEV2YXNfT2JqZWN0ICoqbmV3X3ZpZXcgPSAoRXZh c19PYmplY3QgKiopZXZlbnRfaW5mbzsKLSAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2lu ZG93X2NyZWF0ZShOVUxMKTsKLSAgICAqbmV3X3ZpZXcgPSB3aW5kb3ctPndlYnZpZXc7CisgICAg QnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoTlVMTCwgd2lkdGgsIGhlaWdo dCk7CiAgICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKKyAg ICByZXR1cm4gd2luZG93LT53ZWJ2aWV3OwogfQogCiBzdGF0aWMgdm9pZApAQCAtOTM4LDcgKzkz OCw3IEBACiAgICAgcmV0dXJuIGJ1dHRvbjsKIH0KIAotc3RhdGljIEJyb3dzZXJfV2luZG93ICp3 aW5kb3dfY3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKK3N0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2lu ZG93X2NyZWF0ZShjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCkKIHsKICAg ICBCcm93c2VyX1dpbmRvdyAqYXBwX2RhdGEgPSBtYWxsb2Moc2l6ZW9mKEJyb3dzZXJfV2luZG93 KSk7CiAgICAgaWYgKCFhcHBfZGF0YSkgewpAQCAtMTAzMCw2ICsxMDMwLDcgQEAKICAgICBld2tW aWV3Q2xhc3MtPndpbmRvd19nZW9tZXRyeV9zZXQgPSBvbl93aW5kb3dfZ2VvbWV0cnlfc2V0Owog ICAgIGV3a1ZpZXdDbGFzcy0+ZnVsbHNjcmVlbl9lbnRlciA9IG9uX2Z1bGxzY3JlZW5fZW50ZXI7 CiAgICAgZXdrVmlld0NsYXNzLT5mdWxsc2NyZWVuX2V4aXQgPSBvbl9mdWxsc2NyZWVuX2V4aXQ7 CisgICAgZXdrVmlld0NsYXNzLT53aW5kb3dfY3JlYXRlX25ldyA9IG9uX25ld193aW5kb3c7CiAK ICAgICBFdmFzICpldmFzID0gZXZhc19vYmplY3RfZXZhc19nZXQoYXBwX2RhdGEtPndpbmRvdyk7 CiAgICAgRXZhc19TbWFydCAqc21hcnQgPSBldmFzX3NtYXJ0X2NsYXNzX25ldygmZXdrVmlld0Ns YXNzLT5zYyk7CkBAIC0xMDQ3LDcgKzEwNDgsNiBAQAogCiAgICAgZXZhc19vYmplY3Rfc21hcnRf Y2FsbGJhY2tfYWRkKGFwcF9kYXRhLT53ZWJ2aWV3LCAiYXV0aGVudGljYXRpb24scmVxdWVzdCIs IG9uX2F1dGhlbnRpY2F0aW9uX3JlcXVlc3QsIGFwcF9kYXRhKTsKICAgICBldmFzX29iamVjdF9z bWFydF9jYWxsYmFja19hZGQoYXBwX2RhdGEtPndlYnZpZXcsICJjbG9zZSx3aW5kb3ciLCBvbl9j bG9zZV93aW5kb3csIGFwcF9kYXRhKTsKLSAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19h ZGQoYXBwX2RhdGEtPndlYnZpZXcsICJjcmVhdGUsd2luZG93Iiwgb25fbmV3X3dpbmRvdywgYXBw X2RhdGEpOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHBfZGF0YS0+d2Vi dmlldywgImRvd25sb2FkLGZhaWxlZCIsIG9uX2Rvd25sb2FkX2ZhaWxlZCwgYXBwX2RhdGEpOwog ICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHBfZGF0YS0+d2VidmlldywgImRv d25sb2FkLGZpbmlzaGVkIiwgb25fZG93bmxvYWRfZmluaXNoZWQsIGFwcF9kYXRhKTsKICAgICBl dmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwX2RhdGEtPndlYnZpZXcsICJkb3dubG9h ZCxyZXF1ZXN0Iiwgb25fZG93bmxvYWRfcmVxdWVzdCwgYXBwX2RhdGEpOwpAQCAtMTA3Miw3ICsx MDcyLDcgQEAKICAgICBpZiAodXJsKQogICAgICAgICBld2tfdmlld191cmxfc2V0KGFwcF9kYXRh LT53ZWJ2aWV3LCB1cmwpOwogCi0gICAgZXZhc19vYmplY3RfcmVzaXplKGFwcF9kYXRhLT53aW5k b3csIHdpbmRvd193aWR0aCwgd2luZG93X2hlaWdodCk7CisgICAgZXZhc19vYmplY3RfcmVzaXpl KGFwcF9kYXRhLT53aW5kb3csIHdpZHRoID8gd2lkdGggOiB3aW5kb3dfd2lkdGgsIGhlaWdodCA/ IGhlaWdodCA6IHdpbmRvd19oZWlnaHQpOwogICAgIGV2YXNfb2JqZWN0X3Nob3coYXBwX2RhdGEt PndpbmRvdyk7CiAKICAgICB2aWV3X2ZvY3VzX3NldChhcHBfZGF0YSwgRUlOQV9UUlVFKTsKQEAg LTExNTgsMTAgKzExNTgsMTAgQEAKIAogICAgIGlmIChhcmdzIDwgYXJnYykgewogICAgICAgICBj aGFyICp1cmwgPSB1cmxfZnJvbV91c2VyX2lucHV0KGFyZ3ZbYXJnc10pOwotICAgICAgICB3aW5k b3cgPSB3aW5kb3dfY3JlYXRlKHVybCk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUo dXJsLCAwLCAwKTsKICAgICAgICAgZnJlZSh1cmwpOwogICAgIH0gZWxzZQotICAgICAgICB3aW5k b3cgPSB3aW5kb3dfY3JlYXRlKERFRkFVTFRfVVJMKTsKKyAgICAgICAgd2luZG93ID0gd2luZG93 X2NyZWF0ZShERUZBVUxUX1VSTCwgMCwgMCk7CiAKICAgICBpZiAoIXdpbmRvdykKICAgICAgICAg cmV0dXJuIHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIg d2luZG93LlxuIik7Cg==