95670 2012-09-03 00:13:47 -0700 [EFL] Fix resizing issues related to URL bar in Minibrowser / EWebLauncher 2012-09-03 01:50:16 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63966 1 cdumez cdumez gyuyoung.kim kenneth lucas.de.marchi rakuco ryuan.choi tonikitoo webkit.review.bot oldest_to_newest 710444 0 cdumez 2012-09-03 00:13:47 -0700 The layout is incorrect upon resizing the window in Minibrowser / EWebLauncher: 1. The URL bar is not resized accordingly 2. The page is moved behind the URL bar and we miss the top of the page. 710445 1 161867 cdumez 2012-09-03 00:15:55 -0700 Created attachment 161867 Patch 710450 2 161867 ryuan.choi 2012-09-03 00:33:14 -0700 Comment on attachment 161867 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161867&action=review Thank you for the fixing. > Tools/EWebLauncher/url_bar.c:85 > +void > +url_bar_update_size(Url_Bar *urlBar, int width) > +{ How do you think about url_bar_resize for Efl friendly naming. > Tools/MiniBrowser/efl/main.c:291 > - MiniBrowser *browser = browserCreate(url, engine); > + browser = browserCreate(url, engine); IMO, this is not necessary. 710454 3 ryuan.choi 2012-09-03 00:42:54 -0700 (In reply to comment #2) > (From update of attachment 161867 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=161867&action=review > > > Tools/MiniBrowser/efl/main.c:291 > > - MiniBrowser *browser = browserCreate(url, engine); > > + browser = browserCreate(url, engine); > > IMO, this is not necessary. Never mind. In order to simplify issue, this approach is reasonable to me. 710456 4 161871 cdumez 2012-09-03 00:44:20 -0700 Created attachment 161871 Patch Take ryuan's feedback into consideration (thanks!). 710457 5 161871 kenneth 2012-09-03 00:46:29 -0700 Comment on attachment 161871 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161871&action=review > Tools/EWebLauncher/main.c:159 > +find_app_with_ee(Ecore_Evas *ee) from_ee? 710458 6 161872 cdumez 2012-09-03 00:50:51 -0700 Created attachment 161872 Patch for landing Take Kenneth's feedback into consideration. 710489 7 161872 webkit.review.bot 2012-09-03 01:50:11 -0700 Comment on attachment 161872 Patch for landing Clearing flags on attachment: 161872 Committed r127411: <http://trac.webkit.org/changeset/127411> 710490 8 webkit.review.bot 2012-09-03 01:50:16 -0700 All reviewed patches have been landed. Closing bug. 161867 2012-09-03 00:15:55 -0700 2012-09-03 00:44:20 -0700 Patch 95670_url_bar_fix.patch text/plain 5737 cdumez ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5OTZi NGNjLi5mOTRlY2MwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTItMDktMDMgIENocmlzdG9waGUgRHVtZXogIDxj aHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBGaXggcmVzaXppbmcg aXNzdWVzIHJlbGF0ZWQgdG8gVVJMIGJhciBpbiBNaW5pYnJvd3NlciAvIEVXZWJMYXVuY2hlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU2NzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggbGF5b3V0 IGlzc3VlcyByZWxhdGVkIHRvIHRoZSBVUkwgYmFyIGluIE1pbmlicm93c2VyCisgICAgICAgIGFu ZCBFV2ViTGF1bmNoZXIgd2hlbiB0aGUgd2luZG93IGlzIHJlc2l6ZWQuCisKKyAgICAgICAgVGhl IFVSTCBiYXIgd2FzIG5vdCByZXNpemVkIGFjY29yZGluZ2x5IGFuZCB0aGUgV2ViCisgICAgICAg IHBhZ2Ugd2FzIG1vdmVkIGJlaGluZyB0aGUgVVJMIGJhciwgaGlkaW5nIHBhcnQgb2YgaXQuCisK KyAgICAgICAgKiBFV2ViTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAob25fZWNvcmVfZXZhc19y ZXNpemUpOgorICAgICAgICAoY2xvc2VXaW5kb3cpOgorICAgICAgICAqIEVXZWJMYXVuY2hlci91 cmxfYmFyLmM6CisgICAgICAgICh1cmxfYmFyX3VwZGF0ZV9zaXplKToKKyAgICAgICAgKiBFV2Vi TGF1bmNoZXIvdXJsX2Jhci5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6Cisg ICAgICAgIChvbl9lY29yZV9ldmFzX3Jlc2l6ZSk6CisgICAgICAgIChtYWluKToKKwogMjAxMi0w OS0wMSAgWGlhbnpodSBXYW5nICA8d2FuZ3hpYW56aHVAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFtDaHJvbWl1bS1BbmRyb2lkXSBSZW1vdmUgaGFyZC1jb2RlZCBza2lwcGVkIGRpcmVjdG9yaWVz IGluIGNocm9taXVtX2FuZHJvaWQucHkKZGlmZiAtLWdpdCBhL1Rvb2xzL0VXZWJMYXVuY2hlci9t YWluLmMgYi9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCmluZGV4IDA2NzAzY2YuLmExMzE4OGYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMvRVdlYkxh dW5jaGVyL21haW4uYwpAQCAtMTU1LDYgKzE1NSwyMSBAQCBzdGF0aWMgdm9pZCBicm93c2VyRGVz dHJveShFY29yZV9FdmFzICplZSk7CiBzdGF0aWMgdm9pZCBjbG9zZVdpbmRvdyhFY29yZV9FdmFz ICplZSk7CiBzdGF0aWMgaW50IGJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsLCBjb25zdCBj aGFyICp0aGVtZSwgY29uc3QgY2hhciAqdXNlckFnZW50LCBFaW5hX1JlY3RhbmdsZSBnZW9tZXRy eSwgY29uc3QgY2hhciAqZW5naW5lLCBjb25zdCBjaGFyICpiYWNraW5nU3RvcmUsIHVuc2lnbmVk IGNoYXIgaXNGbGF0dGVuaW5nLCB1bnNpZ25lZCBjaGFyIGlzRnVsbHNjcmVlbiwgY29uc3QgY2hh ciAqZGF0YWJhc2VQYXRoKTsKIAorc3RhdGljIEVMYXVuY2hlciAqCitmaW5kX2FwcF93aXRoX2Vl KEVjb3JlX0V2YXMgKmVlKQoreworICAgIEVpbmFfTGlzdCAqbDsKKyAgICB2b2lkICpkYXRhOwor CisgICAgRUlOQV9MSVNUX0ZPUkVBQ0god2luZG93cywgbCwgZGF0YSkKKyAgICB7CisgICAgICAg IEVMYXVuY2hlciAqYXBwID0gKEVMYXVuY2hlciAqKSBkYXRhOworICAgICAgICBpZiAoYXBwLT5l ZSA9PSBlZSkKKyAgICAgICAgICAgIHJldHVybiBhcHA7CisgICAgfQorICAgIHJldHVybiBOVUxM OworfQorCiBzdGF0aWMgdm9pZAogcHJpbnRfaGlzdG9yeShFaW5hX0xpc3QgKmxpc3QpCiB7CkBA IC0yMTUsMTkgKzIzMCwyNCBAQCB6b29tX2xldmVsX3NldChFdmFzX09iamVjdCAqd2Vidmlldywg aW50IGxldmVsKQogc3RhdGljIHZvaWQKIG9uX2Vjb3JlX2V2YXNfcmVzaXplKEVjb3JlX0V2YXMg KmVlKQogeworICAgIEVMYXVuY2hlciAqYXBwOwogICAgIEV2YXNfT2JqZWN0ICp3ZWJ2aWV3Owog ICAgIEV2YXNfT2JqZWN0ICpiZzsKICAgICBpbnQgdywgaDsKIAogICAgIGVjb3JlX2V2YXNfZ2Vv bWV0cnlfZ2V0KGVlLCBOVUxMLCBOVUxMLCAmdywgJmgpOwogCisgICAgLyogUmVzaXplIFVSTCBi YXIgKi8KKyAgICBhcHAgPSBmaW5kX2FwcF93aXRoX2VlKGVlKTsKKyAgICB1cmxfYmFyX3VwZGF0 ZV9zaXplKGFwcC0+dXJsX2Jhciwgdyk7CisKICAgICBiZyA9IGV2YXNfb2JqZWN0X25hbWVfZmlu ZChlY29yZV9ldmFzX2dldChlZSksICJiZyIpOwogICAgIGV2YXNfb2JqZWN0X21vdmUoYmcsIDAs IDApOwogICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZShiZywgdywgaCk7CiAKICAgICB3ZWJ2aWV3ID0g ZXZhc19vYmplY3RfbmFtZV9maW5kKGVjb3JlX2V2YXNfZ2V0KGVlKSwgImJyb3dzZXIiKTsKLSAg ICBldmFzX29iamVjdF9tb3ZlKHdlYnZpZXcsIDEwLCAxMCk7Ci0gICAgZXZhc19vYmplY3RfcmVz aXplKHdlYnZpZXcsIHcgLSAyMCwgaCAtIDIwKTsKKyAgICBldmFzX29iamVjdF9tb3ZlKHdlYnZp ZXcsIDAsIFVSTF9CQVJfSEVJR0hUKTsKKyAgICBldmFzX29iamVjdF9yZXNpemUod2Vidmlldywg dywgaCAtIFVSTF9CQVJfSEVJR0hUKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTc0MywxNSArNzYz LDExIEBAIGJyb3dzZXJEZXN0cm95KEVjb3JlX0V2YXMgKmVlKQogc3RhdGljIHZvaWQKIGNsb3Nl V2luZG93KEVjb3JlX0V2YXMgKmVlKQogewotICAgIEVpbmFfTGlzdCAqbDsKLSAgICB2b2lkICph cHA7Ci0gICAgRUlOQV9MSVNUX0ZPUkVBQ0god2luZG93cywgbCwgYXBwKQotICAgIHsKLSAgICAg ICAgaWYgKCgoRUxhdW5jaGVyKikgYXBwKS0+ZWUgPT0gZWUpCi0gICAgICAgICAgICBicmVhazsK LSAgICB9CisgICAgRUxhdW5jaGVyICphcHA7CisKKyAgICBhcHAgPSBmaW5kX2FwcF93aXRoX2Vl KGVlKTsKICAgICB3aW5kb3dzID0gZWluYV9saXN0X3JlbW92ZSh3aW5kb3dzLCBhcHApOwotICAg IHVybF9iYXJfZGVsKCgoRUxhdW5jaGVyICopYXBwKS0+dXJsX2Jhcik7CisgICAgdXJsX2Jhcl9k ZWwoYXBwLT51cmxfYmFyKTsKICAgICBicm93c2VyRGVzdHJveShlZSk7CiAgICAgZnJlZShhcHAp OwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvRVdlYkxhdW5jaGVyL3VybF9iYXIuYyBiL1Rvb2xzL0VX ZWJMYXVuY2hlci91cmxfYmFyLmMKaW5kZXggNGVjNmIxYi4uNzM5NDIyZiAxMDA2NDQKLS0tIGEv VG9vbHMvRVdlYkxhdW5jaGVyL3VybF9iYXIuYworKysgYi9Ub29scy9FV2ViTGF1bmNoZXIvdXJs X2Jhci5jCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAidXJsX2Jhci5oIgogCiAjaW5jbHVk ZSA8RWRqZS5oPgorI2luY2x1ZGUgPEVjb3JlX0V2YXMuaD4KICNpbmNsdWRlIDxFY29yZV9GaWxl Lmg+CiAKICNkZWZpbmUgUEFERElOR19TSVpFIDUKQEAgLTc5LDYgKzgwLDE2IEBAIG9uX3VybGJh cl9mb2N1c19vdXQodm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAq ZXZlbnRfaW5mbykKICAgICBlZGplX29iamVjdF9zaWduYWxfZW1pdCh1cmxCYXItPmVudHJ5LCAi ZW50cnksYWN0aW9uLHVuZm9jdXMiLCAiZW50cnkiKTsKIH0KIAordm9pZAordXJsX2Jhcl91cGRh dGVfc2l6ZShVcmxfQmFyICp1cmxCYXIsIGludCB3aWR0aCkKK3sKKyAgICBldmFzX29iamVjdF9t b3ZlKHVybEJhci0+YXJlYSwgMCwgMCk7CisgICAgZXZhc19vYmplY3RfcmVzaXplKHVybEJhci0+ YXJlYSwgd2lkdGgsIFVSTF9CQVJfSEVJR0hUKTsKKworICAgIGV2YXNfb2JqZWN0X21vdmUodXJs QmFyLT5lbnRyeSwgUEFERElOR19TSVpFLCBQQURESU5HX1NJWkUpOworICAgIGV2YXNfb2JqZWN0 X3Jlc2l6ZSh1cmxCYXItPmVudHJ5LCB3aWR0aCAtIFBBRERJTkdfU0laRSAqIDIsIFVSTF9CQVJf SEVJR0hUIC0gUEFERElOR19TSVpFICogMik7Cit9CisKIFVybF9CYXIgKgogdXJsX2Jhcl9hZGQo RXZhc19PYmplY3QgKndlYlZpZXcsIGludCB3aWR0aCkKIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0VX ZWJMYXVuY2hlci91cmxfYmFyLmggYi9Ub29scy9FV2ViTGF1bmNoZXIvdXJsX2Jhci5oCmluZGV4 IDQ3MjU3NmYuLjY2NjVhMTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0VXZWJMYXVuY2hlci91cmxfYmFy LmgKKysrIGIvVG9vbHMvRVdlYkxhdW5jaGVyL3VybF9iYXIuaApAQCAtNDMsNiArNDMsNyBAQCB0 eXBlZGVmIHN0cnVjdCBfVXJsX0JhciB7CiBVcmxfQmFyICp1cmxfYmFyX2FkZChFdmFzX09iamVj dCogd2VidmlldywgaW50IHdpZHRoKTsKIHZvaWQgdXJsX2Jhcl9kZWwoVXJsX0JhciAqdXJsQmFy KTsKIHZvaWQgdXJsX2Jhcl91cmxfc2V0KFVybF9CYXIgKnVybEJhciwgY29uc3QgY2hhciAqdXJs KTsKK3ZvaWQgdXJsX2Jhcl91cGRhdGVfc2l6ZShVcmxfQmFyICp1cmxCYXIsIGludCB3aWR0aCk7 CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv ZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggYjA2ZGQ5OC4u ZTZhNzkzZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9U b29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC00NSw2ICs0NSw4IEBAIHR5cGVkZWYgc3Ry dWN0IF9NaW5pQnJvd3NlciB7CiAgICAgVXJsX0JhciAqdXJsX2JhcjsKIH0gTWluaUJyb3dzZXI7 CiAKK01pbmlCcm93c2VyICpicm93c2VyOworCiBzdGF0aWMgY29uc3QgRWNvcmVfR2V0b3B0IG9w dGlvbnMgPSB7CiAgICAgIk1pbmlCcm93c2VyIiwKICAgICAiJXByb2cgW29wdGlvbnNdIFt1cmxd IiwKQEAgLTg3LDEzICs4OSwxNiBAQCBzdGF0aWMgdm9pZCBvbl9lY29yZV9ldmFzX3Jlc2l6ZShF Y29yZV9FdmFzICplZSkKIAogICAgIGVjb3JlX2V2YXNfZ2VvbWV0cnlfZ2V0KGVlLCBOVUxMLCBO VUxMLCAmdywgJmgpOwogCisgICAgLyogUmVzaXplIFVSTCBiYXIgKi8KKyAgICB1cmxfYmFyX3Vw ZGF0ZV9zaXplKGJyb3dzZXItPnVybF9iYXIsIHcpOworCiAgICAgYmcgPSBldmFzX29iamVjdF9u YW1lX2ZpbmQoZWNvcmVfZXZhc19nZXQoZWUpLCAiYmciKTsKICAgICBldmFzX29iamVjdF9tb3Zl KGJnLCAwLCAwKTsKICAgICBldmFzX29iamVjdF9yZXNpemUoYmcsIHcsIGgpOwogCiAgICAgd2Vi dmlldyA9IGV2YXNfb2JqZWN0X25hbWVfZmluZChlY29yZV9ldmFzX2dldChlZSksICJicm93c2Vy Iik7Ci0gICAgZXZhc19vYmplY3RfbW92ZSh3ZWJ2aWV3LCAwLCAwKTsKLSAgICBldmFzX29iamVj dF9yZXNpemUod2VidmlldywgdywgaCk7CisgICAgZXZhc19vYmplY3RfbW92ZSh3ZWJ2aWV3LCAw LCBVUkxfQkFSX0hFSUdIVCk7CisgICAgZXZhc19vYmplY3RfcmVzaXplKHdlYnZpZXcsIHcsIGgg LSBVUkxfQkFSX0hFSUdIVCk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC0yODMsNyArMjg4LDcgQEAg aW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBlbHNlCiAgICAgICAgIHVybCA9 IERFRkFVTFRfVVJMOwogCi0gICAgTWluaUJyb3dzZXIgKmJyb3dzZXIgPSBicm93c2VyQ3JlYXRl KHVybCwgZW5naW5lKTsKKyAgICBicm93c2VyID0gYnJvd3NlckNyZWF0ZSh1cmwsIGVuZ2luZSk7 CiAgICAgaWYgKCFicm93c2VyKQogICAgICAgICByZXR1cm4gcXVpdChFSU5BX0ZBTFNFLCAiRVJS T1I6IGNvdWxkIG5vdCBjcmVhdGUgYnJvd3Nlci5cbiIpOwogCg== 161871 2012-09-03 00:44:20 -0700 2012-09-03 00:50:51 -0700 Patch 95670_url_bar_fix.patch text/plain 7092 cdumez ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5OTZi NGNjLi4wMTBmZjRlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTItMDktMDMgIENocmlzdG9waGUgRHVtZXogIDxj aHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBGaXggcmVzaXppbmcg aXNzdWVzIHJlbGF0ZWQgdG8gVVJMIGJhciBpbiBNaW5pYnJvd3NlciAvIEVXZWJMYXVuY2hlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU2NzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggbGF5b3V0 IGlzc3VlcyByZWxhdGVkIHRvIHRoZSBVUkwgYmFyIGluIE1pbmlicm93c2VyCisgICAgICAgIGFu ZCBFV2ViTGF1bmNoZXIgd2hlbiB0aGUgd2luZG93IGlzIHJlc2l6ZWQuCisKKyAgICAgICAgVGhl IFVSTCBiYXIgd2FzIG5vdCByZXNpemVkIGFjY29yZGluZ2x5IGFuZCB0aGUgV2ViCisgICAgICAg IHBhZ2Ugd2FzIG1vdmVkIGJlaGluZyB0aGUgVVJMIGJhciwgaGlkaW5nIHBhcnQgb2YgaXQuCisK KyAgICAgICAgKiBFV2ViTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAob25fZWNvcmVfZXZhc19y ZXNpemUpOgorICAgICAgICAoY2xvc2VXaW5kb3cpOgorICAgICAgICAqIEVXZWJMYXVuY2hlci91 cmxfYmFyLmM6CisgICAgICAgICh1cmxfYmFyX3dpZHRoX3NldCk6CisgICAgICAgICh1cmxfYmFy X2FkZCk6CisgICAgICAgICogRVdlYkxhdW5jaGVyL3VybF9iYXIuaDoKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAob25fZWNvcmVfZXZhc19yZXNpemUpOgorICAg ICAgICAobWFpbik6CisKIDIwMTItMDktMDEgIFhpYW56aHUgV2FuZyAgPHdhbmd4aWFuemh1QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW0tQW5kcm9pZF0gUmVtb3ZlIGhhcmQtY29k ZWQgc2tpcHBlZCBkaXJlY3RvcmllcyBpbiBjaHJvbWl1bV9hbmRyb2lkLnB5CmRpZmYgLS1naXQg YS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwpp bmRleCAwNjcwM2NmLi5mYjk2N2VmIDEwMDY0NAotLS0gYS9Ub29scy9FV2ViTGF1bmNoZXIvbWFp bi5jCisrKyBiL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKQEAgLTE1NSw2ICsxNTUsMjEgQEAg c3RhdGljIHZvaWQgYnJvd3NlckRlc3Ryb3koRWNvcmVfRXZhcyAqZWUpOwogc3RhdGljIHZvaWQg Y2xvc2VXaW5kb3coRWNvcmVfRXZhcyAqZWUpOwogc3RhdGljIGludCBicm93c2VyQ3JlYXRlKGNv bnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwg RWluYV9SZWN0YW5nbGUgZ2VvbWV0cnksIGNvbnN0IGNoYXIgKmVuZ2luZSwgY29uc3QgY2hhciAq YmFja2luZ1N0b3JlLCB1bnNpZ25lZCBjaGFyIGlzRmxhdHRlbmluZywgdW5zaWduZWQgY2hhciBp c0Z1bGxzY3JlZW4sIGNvbnN0IGNoYXIgKmRhdGFiYXNlUGF0aCk7CiAKK3N0YXRpYyBFTGF1bmNo ZXIgKgorZmluZF9hcHBfd2l0aF9lZShFY29yZV9FdmFzICplZSkKK3sKKyAgICBFaW5hX0xpc3Qg Kmw7CisgICAgdm9pZCAqZGF0YTsKKworICAgIEVJTkFfTElTVF9GT1JFQUNIKHdpbmRvd3MsIGws IGRhdGEpCisgICAgeworICAgICAgICBFTGF1bmNoZXIgKmFwcCA9IChFTGF1bmNoZXIgKikgZGF0 YTsKKyAgICAgICAgaWYgKGFwcC0+ZWUgPT0gZWUpCisgICAgICAgICAgICByZXR1cm4gYXBwOwor ICAgIH0KKyAgICByZXR1cm4gTlVMTDsKK30KKwogc3RhdGljIHZvaWQKIHByaW50X2hpc3Rvcnko RWluYV9MaXN0ICpsaXN0KQogewpAQCAtMjE1LDE5ICsyMzAsMjQgQEAgem9vbV9sZXZlbF9zZXQo RXZhc19PYmplY3QgKndlYnZpZXcsIGludCBsZXZlbCkKIHN0YXRpYyB2b2lkCiBvbl9lY29yZV9l dmFzX3Jlc2l6ZShFY29yZV9FdmFzICplZSkKIHsKKyAgICBFTGF1bmNoZXIgKmFwcDsKICAgICBF dmFzX09iamVjdCAqd2VidmlldzsKICAgICBFdmFzX09iamVjdCAqYmc7CiAgICAgaW50IHcsIGg7 CiAKICAgICBlY29yZV9ldmFzX2dlb21ldHJ5X2dldChlZSwgTlVMTCwgTlVMTCwgJncsICZoKTsK IAorICAgIC8qIFJlc2l6ZSBVUkwgYmFyICovCisgICAgYXBwID0gZmluZF9hcHBfd2l0aF9lZShl ZSk7CisgICAgdXJsX2Jhcl93aWR0aF9zZXQoYXBwLT51cmxfYmFyLCB3KTsKKwogICAgIGJnID0g ZXZhc19vYmplY3RfbmFtZV9maW5kKGVjb3JlX2V2YXNfZ2V0KGVlKSwgImJnIik7CiAgICAgZXZh c19vYmplY3RfbW92ZShiZywgMCwgMCk7CiAgICAgZXZhc19vYmplY3RfcmVzaXplKGJnLCB3LCBo KTsKIAogICAgIHdlYnZpZXcgPSBldmFzX29iamVjdF9uYW1lX2ZpbmQoZWNvcmVfZXZhc19nZXQo ZWUpLCAiYnJvd3NlciIpOwotICAgIGV2YXNfb2JqZWN0X21vdmUod2VidmlldywgMTAsIDEwKTsK LSAgICBldmFzX29iamVjdF9yZXNpemUod2VidmlldywgdyAtIDIwLCBoIC0gMjApOworICAgIGV2 YXNfb2JqZWN0X21vdmUod2VidmlldywgMCwgVVJMX0JBUl9IRUlHSFQpOworICAgIGV2YXNfb2Jq ZWN0X3Jlc2l6ZSh3ZWJ2aWV3LCB3LCBoIC0gVVJMX0JBUl9IRUlHSFQpOwogfQogCiBzdGF0aWMg dm9pZApAQCAtNzQzLDE1ICs3NjMsMTEgQEAgYnJvd3NlckRlc3Ryb3koRWNvcmVfRXZhcyAqZWUp CiBzdGF0aWMgdm9pZAogY2xvc2VXaW5kb3coRWNvcmVfRXZhcyAqZWUpCiB7Ci0gICAgRWluYV9M aXN0ICpsOwotICAgIHZvaWQgKmFwcDsKLSAgICBFSU5BX0xJU1RfRk9SRUFDSCh3aW5kb3dzLCBs LCBhcHApCi0gICAgewotICAgICAgICBpZiAoKChFTGF1bmNoZXIqKSBhcHApLT5lZSA9PSBlZSkK LSAgICAgICAgICAgIGJyZWFrOwotICAgIH0KKyAgICBFTGF1bmNoZXIgKmFwcDsKKworICAgIGFw cCA9IGZpbmRfYXBwX3dpdGhfZWUoZWUpOwogICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfcmVtb3Zl KHdpbmRvd3MsIGFwcCk7Ci0gICAgdXJsX2Jhcl9kZWwoKChFTGF1bmNoZXIgKilhcHApLT51cmxf YmFyKTsKKyAgICB1cmxfYmFyX2RlbChhcHAtPnVybF9iYXIpOwogICAgIGJyb3dzZXJEZXN0cm95 KGVlKTsKICAgICBmcmVlKGFwcCk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9FV2ViTGF1bmNoZXIv dXJsX2Jhci5jIGIvVG9vbHMvRVdlYkxhdW5jaGVyL3VybF9iYXIuYwppbmRleCA0ZWM2YjFiLi5l MWVjZTg4IDEwMDY0NAotLS0gYS9Ub29scy9FV2ViTGF1bmNoZXIvdXJsX2Jhci5jCisrKyBiL1Rv b2xzL0VXZWJMYXVuY2hlci91cmxfYmFyLmMKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJ1 cmxfYmFyLmgiCiAKICNpbmNsdWRlIDxFZGplLmg+CisjaW5jbHVkZSA8RWNvcmVfRXZhcy5oPgog I2luY2x1ZGUgPEVjb3JlX0ZpbGUuaD4KIAogI2RlZmluZSBQQURESU5HX1NJWkUgNQpAQCAtNzks NiArODAsMTYgQEAgb25fdXJsYmFyX2ZvY3VzX291dCh2b2lkICpkYXRhLCBFdmFzICplLCBFdmFz X09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgIGVkamVfb2JqZWN0X3NpZ25hbF9l bWl0KHVybEJhci0+ZW50cnksICJlbnRyeSxhY3Rpb24sdW5mb2N1cyIsICJlbnRyeSIpOwogfQog Cit2b2lkCit1cmxfYmFyX3dpZHRoX3NldChVcmxfQmFyICp1cmxCYXIsIGludCB3aWR0aCkKK3sK KyAgICBldmFzX29iamVjdF9tb3ZlKHVybEJhci0+YXJlYSwgMCwgMCk7CisgICAgZXZhc19vYmpl Y3RfcmVzaXplKHVybEJhci0+YXJlYSwgd2lkdGgsIFVSTF9CQVJfSEVJR0hUKTsKKworICAgIGV2 YXNfb2JqZWN0X21vdmUodXJsQmFyLT5lbnRyeSwgUEFERElOR19TSVpFLCBQQURESU5HX1NJWkUp OworICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZSh1cmxCYXItPmVudHJ5LCB3aWR0aCAtIFBBRERJTkdf U0laRSAqIDIsIFVSTF9CQVJfSEVJR0hUIC0gUEFERElOR19TSVpFICogMik7Cit9CisKIFVybF9C YXIgKgogdXJsX2Jhcl9hZGQoRXZhc19PYmplY3QgKndlYlZpZXcsIGludCB3aWR0aCkKIHsKQEAg LTk0LDkgKzEwNSw2IEBAIHVybF9iYXJfYWRkKEV2YXNfT2JqZWN0ICp3ZWJWaWV3LCBpbnQgd2lk dGgpCiAgICAgdXJsX2Jhci0+YXJlYSA9IGV2YXNfb2JqZWN0X3JlY3RhbmdsZV9hZGQoZXZhcyk7 CiAgICAgZXZhc19vYmplY3RfbmFtZV9zZXQodXJsX2Jhci0+YXJlYSwgInVybF9iYXJBcmVhIik7 CiAgICAgZXZhc19vYmplY3RfY29sb3Jfc2V0KHVybF9iYXItPmFyZWEsIDI1NSwgMjU1LCAyNTUs IDI1NSk7Ci0gICAgZXZhc19vYmplY3RfbW92ZSh1cmxfYmFyLT5hcmVhLCAwLCAwKTsKLSAgICBl dmFzX29iamVjdF9yZXNpemUodXJsX2Jhci0+YXJlYSwgd2lkdGgsIFVSTF9CQVJfSEVJR0hUKTsK LSAgICBldmFzX29iamVjdF9zaG93KHVybF9iYXItPmFyZWEpOwogCiAgICAgdXJsX2Jhci0+ZW50 cnkgPSBlZGplX29iamVjdF9hZGQoZXZhcyk7CiAgICAgRWluYV9Cb29sIHJldCA9IGVkamVfb2Jq ZWN0X2ZpbGVfc2V0KHVybF9iYXItPmVudHJ5LCBUSEVNRV9ESVIiL2VudHJ5LmVkaiIsICJjb250 cm9sL2VudHJ5L2Jhc2UvZGVmYXVsdCIpOwpAQCAtMTA4LDkgKzExNiwxMiBAQCB1cmxfYmFyX2Fk ZChFdmFzX09iamVjdCAqd2ViVmlldywgaW50IHdpZHRoKQogICAgIH0KIAogICAgIGVkamVfb2Jq ZWN0X3BhcnRfdGV4dF9zZXQodXJsX2Jhci0+ZW50cnksICJ1cmwudGV4dCIsICIiKTsKLSAgICBl dmFzX29iamVjdF9tb3ZlKHVybF9iYXItPmVudHJ5LCBQQURESU5HX1NJWkUsIFBBRERJTkdfU0la RSk7Ci0gICAgZXZhc19vYmplY3RfcmVzaXplKHVybF9iYXItPmVudHJ5LCB3aWR0aCAtIFBBRERJ TkdfU0laRSAqIDIsIFVSTF9CQVJfSEVJR0hUIC0gUEFERElOR19TSVpFICogMik7CisKKyAgICAv KiBTZXQgVVJMIGJhciBkaW1lbnNpb25zIGFuZCBzaG93IGl0ICovCisgICAgdXJsX2Jhcl93aWR0 aF9zZXQodXJsX2Jhciwgd2lkdGgpOworICAgIGV2YXNfb2JqZWN0X3Nob3codXJsX2Jhci0+YXJl YSk7CiAgICAgZXZhc19vYmplY3Rfc2hvdyh1cmxfYmFyLT5lbnRyeSk7CisKICAgICBldmFzX29i amVjdF9ldmVudF9jYWxsYmFja19hZGQodXJsX2Jhci0+ZW50cnksIEVWQVNfQ0FMTEJBQ0tfTU9V U0VfRE9XTiwgb25fdXJsYmFyX21vdXNlX2Rvd24sIHVybF9iYXIpOwogICAgIGV2YXNfb2JqZWN0 X2V2ZW50X2NhbGxiYWNrX2FkZCh1cmxfYmFyLT5lbnRyeSwgRVZBU19DQUxMQkFDS19LRVlfRE9X Tiwgb25fdXJsYmFyX2tleV9kb3duLCB1cmxfYmFyKTsKICAgICBldmFzX29iamVjdF9ldmVudF9j YWxsYmFja19hZGQodXJsX2Jhci0+ZW50cnksIEVWQVNfQ0FMTEJBQ0tfRk9DVVNfT1VULCBvbl91 cmxiYXJfZm9jdXNfb3V0LCB1cmxfYmFyKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0VXZWJMYXVuY2hl ci91cmxfYmFyLmggYi9Ub29scy9FV2ViTGF1bmNoZXIvdXJsX2Jhci5oCmluZGV4IDQ3MjU3NmYu LjMyZDc3OTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0VXZWJMYXVuY2hlci91cmxfYmFyLmgKKysrIGIv VG9vbHMvRVdlYkxhdW5jaGVyL3VybF9iYXIuaApAQCAtNDMsNiArNDMsNyBAQCB0eXBlZGVmIHN0 cnVjdCBfVXJsX0JhciB7CiBVcmxfQmFyICp1cmxfYmFyX2FkZChFdmFzX09iamVjdCogd2Vidmll dywgaW50IHdpZHRoKTsKIHZvaWQgdXJsX2Jhcl9kZWwoVXJsX0JhciAqdXJsQmFyKTsKIHZvaWQg dXJsX2Jhcl91cmxfc2V0KFVybF9CYXIgKnVybEJhciwgY29uc3QgY2hhciAqdXJsKTsKK3ZvaWQg dXJsX2Jhcl93aWR0aF9zZXQoVXJsX0JhciAqdXJsQmFyLCBpbnQgd2lkdGgpOwogCiAjaWZkZWYg X19jcGx1c3BsdXMKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMg Yi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IGIwNmRkOTguLmMzY2FmYTcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJy b3dzZXIvZWZsL21haW4uYwpAQCAtNDUsNiArNDUsOCBAQCB0eXBlZGVmIHN0cnVjdCBfTWluaUJy b3dzZXIgewogICAgIFVybF9CYXIgKnVybF9iYXI7CiB9IE1pbmlCcm93c2VyOwogCitNaW5pQnJv d3NlciAqYnJvd3NlcjsKKwogc3RhdGljIGNvbnN0IEVjb3JlX0dldG9wdCBvcHRpb25zID0gewog ICAgICJNaW5pQnJvd3NlciIsCiAgICAgIiVwcm9nIFtvcHRpb25zXSBbdXJsXSIsCkBAIC04Nywx MyArODksMTYgQEAgc3RhdGljIHZvaWQgb25fZWNvcmVfZXZhc19yZXNpemUoRWNvcmVfRXZhcyAq ZWUpCiAKICAgICBlY29yZV9ldmFzX2dlb21ldHJ5X2dldChlZSwgTlVMTCwgTlVMTCwgJncsICZo KTsKIAorICAgIC8qIFJlc2l6ZSBVUkwgYmFyICovCisgICAgdXJsX2Jhcl93aWR0aF9zZXQoYnJv d3Nlci0+dXJsX2Jhciwgdyk7CisKICAgICBiZyA9IGV2YXNfb2JqZWN0X25hbWVfZmluZChlY29y ZV9ldmFzX2dldChlZSksICJiZyIpOwogICAgIGV2YXNfb2JqZWN0X21vdmUoYmcsIDAsIDApOwog ICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZShiZywgdywgaCk7CiAKICAgICB3ZWJ2aWV3ID0gZXZhc19v YmplY3RfbmFtZV9maW5kKGVjb3JlX2V2YXNfZ2V0KGVlKSwgImJyb3dzZXIiKTsKLSAgICBldmFz X29iamVjdF9tb3ZlKHdlYnZpZXcsIDAsIDApOwotICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZSh3ZWJ2 aWV3LCB3LCBoKTsKKyAgICBldmFzX29iamVjdF9tb3ZlKHdlYnZpZXcsIDAsIFVSTF9CQVJfSEVJ R0hUKTsKKyAgICBldmFzX29iamVjdF9yZXNpemUod2VidmlldywgdywgaCAtIFVSTF9CQVJfSEVJ R0hUKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTI4Myw3ICsyODgsNyBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhciAqYXJndltdKQogICAgIGVsc2UKICAgICAgICAgdXJsID0gREVGQVVMVF9VUkw7 CiAKLSAgICBNaW5pQnJvd3NlciAqYnJvd3NlciA9IGJyb3dzZXJDcmVhdGUodXJsLCBlbmdpbmUp OworICAgIGJyb3dzZXIgPSBicm93c2VyQ3JlYXRlKHVybCwgZW5naW5lKTsKICAgICBpZiAoIWJy b3dzZXIpCiAgICAgICAgIHJldHVybiBxdWl0KEVJTkFfRkFMU0UsICJFUlJPUjogY291bGQgbm90 IGNyZWF0ZSBicm93c2VyLlxuIik7CiAK 161872 2012-09-03 00:50:51 -0700 2012-09-03 01:50:11 -0700 Patch for landing 95670_url_bar_fix.patch text/plain 7104 cdumez ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5OTZi NGNjLi5jODJhM2E1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTItMDktMDMgIENocmlzdG9waGUgRHVtZXogIDxj aHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBGaXggcmVzaXppbmcg aXNzdWVzIHJlbGF0ZWQgdG8gVVJMIGJhciBpbiBNaW5pYnJvd3NlciAvIEVXZWJMYXVuY2hlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU2NzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAg ICBGaXggbGF5b3V0IGlzc3VlcyByZWxhdGVkIHRvIHRoZSBVUkwgYmFyIGluIE1pbmlicm93c2Vy CisgICAgICAgIGFuZCBFV2ViTGF1bmNoZXIgd2hlbiB0aGUgd2luZG93IGlzIHJlc2l6ZWQuCisK KyAgICAgICAgVGhlIFVSTCBiYXIgd2FzIG5vdCByZXNpemVkIGFjY29yZGluZ2x5IGFuZCB0aGUg V2ViCisgICAgICAgIHBhZ2Ugd2FzIG1vdmVkIGJlaGluZyB0aGUgVVJMIGJhciwgaGlkaW5nIHBh cnQgb2YgaXQuCisKKyAgICAgICAgKiBFV2ViTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAob25f ZWNvcmVfZXZhc19yZXNpemUpOgorICAgICAgICAoY2xvc2VXaW5kb3cpOgorICAgICAgICAqIEVX ZWJMYXVuY2hlci91cmxfYmFyLmM6CisgICAgICAgICh1cmxfYmFyX3dpZHRoX3NldCk6CisgICAg ICAgICh1cmxfYmFyX2FkZCk6CisgICAgICAgICogRVdlYkxhdW5jaGVyL3VybF9iYXIuaDoKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAob25fZWNvcmVfZXZhc19y ZXNpemUpOgorICAgICAgICAobWFpbik6CisKIDIwMTItMDktMDEgIFhpYW56aHUgV2FuZyAgPHdh bmd4aWFuemh1QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW0tQW5kcm9pZF0gUmVt b3ZlIGhhcmQtY29kZWQgc2tpcHBlZCBkaXJlY3RvcmllcyBpbiBjaHJvbWl1bV9hbmRyb2lkLnB5 CmRpZmYgLS1naXQgYS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jIGIvVG9vbHMvRVdlYkxhdW5j aGVyL21haW4uYwppbmRleCAwNjcwM2NmLi40YzMzOWQxIDEwMDY0NAotLS0gYS9Ub29scy9FV2Vi TGF1bmNoZXIvbWFpbi5jCisrKyBiL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKQEAgLTE1NSw2 ICsxNTUsMjEgQEAgc3RhdGljIHZvaWQgYnJvd3NlckRlc3Ryb3koRWNvcmVfRXZhcyAqZWUpOwog c3RhdGljIHZvaWQgY2xvc2VXaW5kb3coRWNvcmVfRXZhcyAqZWUpOwogc3RhdGljIGludCBicm93 c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUsIGNvbnN0IGNoYXIg KnVzZXJBZ2VudCwgRWluYV9SZWN0YW5nbGUgZ2VvbWV0cnksIGNvbnN0IGNoYXIgKmVuZ2luZSwg Y29uc3QgY2hhciAqYmFja2luZ1N0b3JlLCB1bnNpZ25lZCBjaGFyIGlzRmxhdHRlbmluZywgdW5z aWduZWQgY2hhciBpc0Z1bGxzY3JlZW4sIGNvbnN0IGNoYXIgKmRhdGFiYXNlUGF0aCk7CiAKK3N0 YXRpYyBFTGF1bmNoZXIgKgorZmluZF9hcHBfZnJvbV9lZShFY29yZV9FdmFzICplZSkKK3sKKyAg ICBFaW5hX0xpc3QgKmw7CisgICAgdm9pZCAqZGF0YTsKKworICAgIEVJTkFfTElTVF9GT1JFQUNI KHdpbmRvd3MsIGwsIGRhdGEpCisgICAgeworICAgICAgICBFTGF1bmNoZXIgKmFwcCA9IChFTGF1 bmNoZXIgKikgZGF0YTsKKyAgICAgICAgaWYgKGFwcC0+ZWUgPT0gZWUpCisgICAgICAgICAgICBy ZXR1cm4gYXBwOworICAgIH0KKyAgICByZXR1cm4gTlVMTDsKK30KKwogc3RhdGljIHZvaWQKIHBy aW50X2hpc3RvcnkoRWluYV9MaXN0ICpsaXN0KQogewpAQCAtMjE1LDE5ICsyMzAsMjQgQEAgem9v bV9sZXZlbF9zZXQoRXZhc19PYmplY3QgKndlYnZpZXcsIGludCBsZXZlbCkKIHN0YXRpYyB2b2lk CiBvbl9lY29yZV9ldmFzX3Jlc2l6ZShFY29yZV9FdmFzICplZSkKIHsKKyAgICBFTGF1bmNoZXIg KmFwcDsKICAgICBFdmFzX09iamVjdCAqd2VidmlldzsKICAgICBFdmFzX09iamVjdCAqYmc7CiAg ICAgaW50IHcsIGg7CiAKICAgICBlY29yZV9ldmFzX2dlb21ldHJ5X2dldChlZSwgTlVMTCwgTlVM TCwgJncsICZoKTsKIAorICAgIC8qIFJlc2l6ZSBVUkwgYmFyICovCisgICAgYXBwID0gZmluZF9h cHBfZnJvbV9lZShlZSk7CisgICAgdXJsX2Jhcl93aWR0aF9zZXQoYXBwLT51cmxfYmFyLCB3KTsK KwogICAgIGJnID0gZXZhc19vYmplY3RfbmFtZV9maW5kKGVjb3JlX2V2YXNfZ2V0KGVlKSwgImJn Iik7CiAgICAgZXZhc19vYmplY3RfbW92ZShiZywgMCwgMCk7CiAgICAgZXZhc19vYmplY3RfcmVz aXplKGJnLCB3LCBoKTsKIAogICAgIHdlYnZpZXcgPSBldmFzX29iamVjdF9uYW1lX2ZpbmQoZWNv cmVfZXZhc19nZXQoZWUpLCAiYnJvd3NlciIpOwotICAgIGV2YXNfb2JqZWN0X21vdmUod2Vidmll dywgMTAsIDEwKTsKLSAgICBldmFzX29iamVjdF9yZXNpemUod2VidmlldywgdyAtIDIwLCBoIC0g MjApOworICAgIGV2YXNfb2JqZWN0X21vdmUod2VidmlldywgMCwgVVJMX0JBUl9IRUlHSFQpOwor ICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZSh3ZWJ2aWV3LCB3LCBoIC0gVVJMX0JBUl9IRUlHSFQpOwog fQogCiBzdGF0aWMgdm9pZApAQCAtNzQzLDE1ICs3NjMsMTEgQEAgYnJvd3NlckRlc3Ryb3koRWNv cmVfRXZhcyAqZWUpCiBzdGF0aWMgdm9pZAogY2xvc2VXaW5kb3coRWNvcmVfRXZhcyAqZWUpCiB7 Ci0gICAgRWluYV9MaXN0ICpsOwotICAgIHZvaWQgKmFwcDsKLSAgICBFSU5BX0xJU1RfRk9SRUFD SCh3aW5kb3dzLCBsLCBhcHApCi0gICAgewotICAgICAgICBpZiAoKChFTGF1bmNoZXIqKSBhcHAp LT5lZSA9PSBlZSkKLSAgICAgICAgICAgIGJyZWFrOwotICAgIH0KKyAgICBFTGF1bmNoZXIgKmFw cDsKKworICAgIGFwcCA9IGZpbmRfYXBwX2Zyb21fZWUoZWUpOwogICAgIHdpbmRvd3MgPSBlaW5h X2xpc3RfcmVtb3ZlKHdpbmRvd3MsIGFwcCk7Ci0gICAgdXJsX2Jhcl9kZWwoKChFTGF1bmNoZXIg KilhcHApLT51cmxfYmFyKTsKKyAgICB1cmxfYmFyX2RlbChhcHAtPnVybF9iYXIpOwogICAgIGJy b3dzZXJEZXN0cm95KGVlKTsKICAgICBmcmVlKGFwcCk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9F V2ViTGF1bmNoZXIvdXJsX2Jhci5jIGIvVG9vbHMvRVdlYkxhdW5jaGVyL3VybF9iYXIuYwppbmRl eCA0ZWM2YjFiLi5lMWVjZTg4IDEwMDY0NAotLS0gYS9Ub29scy9FV2ViTGF1bmNoZXIvdXJsX2Jh ci5jCisrKyBiL1Rvb2xzL0VXZWJMYXVuY2hlci91cmxfYmFyLmMKQEAgLTI2LDYgKzI2LDcgQEAK ICNpbmNsdWRlICJ1cmxfYmFyLmgiCiAKICNpbmNsdWRlIDxFZGplLmg+CisjaW5jbHVkZSA8RWNv cmVfRXZhcy5oPgogI2luY2x1ZGUgPEVjb3JlX0ZpbGUuaD4KIAogI2RlZmluZSBQQURESU5HX1NJ WkUgNQpAQCAtNzksNiArODAsMTYgQEAgb25fdXJsYmFyX2ZvY3VzX291dCh2b2lkICpkYXRhLCBF dmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgIGVkamVfb2Jq ZWN0X3NpZ25hbF9lbWl0KHVybEJhci0+ZW50cnksICJlbnRyeSxhY3Rpb24sdW5mb2N1cyIsICJl bnRyeSIpOwogfQogCit2b2lkCit1cmxfYmFyX3dpZHRoX3NldChVcmxfQmFyICp1cmxCYXIsIGlu dCB3aWR0aCkKK3sKKyAgICBldmFzX29iamVjdF9tb3ZlKHVybEJhci0+YXJlYSwgMCwgMCk7Cisg ICAgZXZhc19vYmplY3RfcmVzaXplKHVybEJhci0+YXJlYSwgd2lkdGgsIFVSTF9CQVJfSEVJR0hU KTsKKworICAgIGV2YXNfb2JqZWN0X21vdmUodXJsQmFyLT5lbnRyeSwgUEFERElOR19TSVpFLCBQ QURESU5HX1NJWkUpOworICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZSh1cmxCYXItPmVudHJ5LCB3aWR0 aCAtIFBBRERJTkdfU0laRSAqIDIsIFVSTF9CQVJfSEVJR0hUIC0gUEFERElOR19TSVpFICogMik7 Cit9CisKIFVybF9CYXIgKgogdXJsX2Jhcl9hZGQoRXZhc19PYmplY3QgKndlYlZpZXcsIGludCB3 aWR0aCkKIHsKQEAgLTk0LDkgKzEwNSw2IEBAIHVybF9iYXJfYWRkKEV2YXNfT2JqZWN0ICp3ZWJW aWV3LCBpbnQgd2lkdGgpCiAgICAgdXJsX2Jhci0+YXJlYSA9IGV2YXNfb2JqZWN0X3JlY3Rhbmds ZV9hZGQoZXZhcyk7CiAgICAgZXZhc19vYmplY3RfbmFtZV9zZXQodXJsX2Jhci0+YXJlYSwgInVy bF9iYXJBcmVhIik7CiAgICAgZXZhc19vYmplY3RfY29sb3Jfc2V0KHVybF9iYXItPmFyZWEsIDI1 NSwgMjU1LCAyNTUsIDI1NSk7Ci0gICAgZXZhc19vYmplY3RfbW92ZSh1cmxfYmFyLT5hcmVhLCAw LCAwKTsKLSAgICBldmFzX29iamVjdF9yZXNpemUodXJsX2Jhci0+YXJlYSwgd2lkdGgsIFVSTF9C QVJfSEVJR0hUKTsKLSAgICBldmFzX29iamVjdF9zaG93KHVybF9iYXItPmFyZWEpOwogCiAgICAg dXJsX2Jhci0+ZW50cnkgPSBlZGplX29iamVjdF9hZGQoZXZhcyk7CiAgICAgRWluYV9Cb29sIHJl dCA9IGVkamVfb2JqZWN0X2ZpbGVfc2V0KHVybF9iYXItPmVudHJ5LCBUSEVNRV9ESVIiL2VudHJ5 LmVkaiIsICJjb250cm9sL2VudHJ5L2Jhc2UvZGVmYXVsdCIpOwpAQCAtMTA4LDkgKzExNiwxMiBA QCB1cmxfYmFyX2FkZChFdmFzX09iamVjdCAqd2ViVmlldywgaW50IHdpZHRoKQogICAgIH0KIAog ICAgIGVkamVfb2JqZWN0X3BhcnRfdGV4dF9zZXQodXJsX2Jhci0+ZW50cnksICJ1cmwudGV4dCIs ICIiKTsKLSAgICBldmFzX29iamVjdF9tb3ZlKHVybF9iYXItPmVudHJ5LCBQQURESU5HX1NJWkUs IFBBRERJTkdfU0laRSk7Ci0gICAgZXZhc19vYmplY3RfcmVzaXplKHVybF9iYXItPmVudHJ5LCB3 aWR0aCAtIFBBRERJTkdfU0laRSAqIDIsIFVSTF9CQVJfSEVJR0hUIC0gUEFERElOR19TSVpFICog Mik7CisKKyAgICAvKiBTZXQgVVJMIGJhciBkaW1lbnNpb25zIGFuZCBzaG93IGl0ICovCisgICAg dXJsX2Jhcl93aWR0aF9zZXQodXJsX2Jhciwgd2lkdGgpOworICAgIGV2YXNfb2JqZWN0X3Nob3co dXJsX2Jhci0+YXJlYSk7CiAgICAgZXZhc19vYmplY3Rfc2hvdyh1cmxfYmFyLT5lbnRyeSk7CisK ICAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19hZGQodXJsX2Jhci0+ZW50cnksIEVWQVNf Q0FMTEJBQ0tfTU9VU0VfRE9XTiwgb25fdXJsYmFyX21vdXNlX2Rvd24sIHVybF9iYXIpOwogICAg IGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZCh1cmxfYmFyLT5lbnRyeSwgRVZBU19DQUxM QkFDS19LRVlfRE9XTiwgb25fdXJsYmFyX2tleV9kb3duLCB1cmxfYmFyKTsKICAgICBldmFzX29i amVjdF9ldmVudF9jYWxsYmFja19hZGQodXJsX2Jhci0+ZW50cnksIEVWQVNfQ0FMTEJBQ0tfRk9D VVNfT1VULCBvbl91cmxiYXJfZm9jdXNfb3V0LCB1cmxfYmFyKTsKZGlmZiAtLWdpdCBhL1Rvb2xz L0VXZWJMYXVuY2hlci91cmxfYmFyLmggYi9Ub29scy9FV2ViTGF1bmNoZXIvdXJsX2Jhci5oCmlu ZGV4IDQ3MjU3NmYuLjMyZDc3OTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0VXZWJMYXVuY2hlci91cmxf YmFyLmgKKysrIGIvVG9vbHMvRVdlYkxhdW5jaGVyL3VybF9iYXIuaApAQCAtNDMsNiArNDMsNyBA QCB0eXBlZGVmIHN0cnVjdCBfVXJsX0JhciB7CiBVcmxfQmFyICp1cmxfYmFyX2FkZChFdmFzX09i amVjdCogd2VidmlldywgaW50IHdpZHRoKTsKIHZvaWQgdXJsX2Jhcl9kZWwoVXJsX0JhciAqdXJs QmFyKTsKIHZvaWQgdXJsX2Jhcl91cmxfc2V0KFVybF9CYXIgKnVybEJhciwgY29uc3QgY2hhciAq dXJsKTsKK3ZvaWQgdXJsX2Jhcl93aWR0aF9zZXQoVXJsX0JhciAqdXJsQmFyLCBpbnQgd2lkdGgp OwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2Vy L2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IGIwNmRkOTgu LmMzY2FmYTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIv VG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtNDUsNiArNDUsOCBAQCB0eXBlZGVmIHN0 cnVjdCBfTWluaUJyb3dzZXIgewogICAgIFVybF9CYXIgKnVybF9iYXI7CiB9IE1pbmlCcm93c2Vy OwogCitNaW5pQnJvd3NlciAqYnJvd3NlcjsKKwogc3RhdGljIGNvbnN0IEVjb3JlX0dldG9wdCBv cHRpb25zID0gewogICAgICJNaW5pQnJvd3NlciIsCiAgICAgIiVwcm9nIFtvcHRpb25zXSBbdXJs XSIsCkBAIC04NywxMyArODksMTYgQEAgc3RhdGljIHZvaWQgb25fZWNvcmVfZXZhc19yZXNpemUo RWNvcmVfRXZhcyAqZWUpCiAKICAgICBlY29yZV9ldmFzX2dlb21ldHJ5X2dldChlZSwgTlVMTCwg TlVMTCwgJncsICZoKTsKIAorICAgIC8qIFJlc2l6ZSBVUkwgYmFyICovCisgICAgdXJsX2Jhcl93 aWR0aF9zZXQoYnJvd3Nlci0+dXJsX2Jhciwgdyk7CisKICAgICBiZyA9IGV2YXNfb2JqZWN0X25h bWVfZmluZChlY29yZV9ldmFzX2dldChlZSksICJiZyIpOwogICAgIGV2YXNfb2JqZWN0X21vdmUo YmcsIDAsIDApOwogICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZShiZywgdywgaCk7CiAKICAgICB3ZWJ2 aWV3ID0gZXZhc19vYmplY3RfbmFtZV9maW5kKGVjb3JlX2V2YXNfZ2V0KGVlKSwgImJyb3dzZXIi KTsKLSAgICBldmFzX29iamVjdF9tb3ZlKHdlYnZpZXcsIDAsIDApOwotICAgIGV2YXNfb2JqZWN0 X3Jlc2l6ZSh3ZWJ2aWV3LCB3LCBoKTsKKyAgICBldmFzX29iamVjdF9tb3ZlKHdlYnZpZXcsIDAs IFVSTF9CQVJfSEVJR0hUKTsKKyAgICBldmFzX29iamVjdF9yZXNpemUod2VidmlldywgdywgaCAt IFVSTF9CQVJfSEVJR0hUKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTI4Myw3ICsyODgsNyBAQCBp bnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIGVsc2UKICAgICAgICAgdXJsID0g REVGQVVMVF9VUkw7CiAKLSAgICBNaW5pQnJvd3NlciAqYnJvd3NlciA9IGJyb3dzZXJDcmVhdGUo dXJsLCBlbmdpbmUpOworICAgIGJyb3dzZXIgPSBicm93c2VyQ3JlYXRlKHVybCwgZW5naW5lKTsK ICAgICBpZiAoIWJyb3dzZXIpCiAgICAgICAgIHJldHVybiBxdWl0KEVJTkFfRkFMU0UsICJFUlJP UjogY291bGQgbm90IGNyZWF0ZSBicm93c2VyLlxuIik7CiAK