64260 2011-07-11 04:28:17 -0700 [EFL] ewk_frame_hit_test_new enhancement 2011-07-22 10:31:22 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P4 Enhancement --- 0 mpakulavelrutka webkit-unassigned gyuyoung.kim gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 434750 0 mpakulavelrutka 2011-07-11 04:28:17 -0700 This patch enhances Ewk_Hit_Test structure by replacing structure flags with enum Ewk_Hit_Test_Result_Context and adding two fields containing image and media uri. Respective changes are also made in EWebLauncher. 434751 1 100263 mpakulavelrutka 2011-07-11 04:29:48 -0700 Created attachment 100263 proposed patch 434809 2 100284 mpakulavelrutka 2011-07-11 06:04:08 -0700 Created attachment 100284 fixed patch 434812 3 100285 mpakulavelrutka 2011-07-11 06:13:10 -0700 Created attachment 100285 fixed patch 434830 4 rakuco 2011-07-11 06:32:14 -0700 When you update the patch, please describe briefly what has changed in the new version, otherwise one needs to use "Diff" -> "Differences between" to find out. > Source/WebKit/efl/ewk/ewk_frame.cpp:1068 > + hit_test->context = (Ewk_Hit_Test_Result_Context)context; Do you really need this cast? If so, please use a C++ cast. > Tools/EWebLauncher/main.c:558 > + "%s" Perhaps indent the lines here instead of below? This way you'd have " %s\n" /* code */ ht->context & EWK_HIT_TEST_RESULT_FOO ? "FOO" : "", > Tools/EWebLauncher/main.c:573 > + ht->context & EWK_HIT_TEST_RESULT_CONTEXT_LINK ? " LINK\n": "", Pleas add a space before the ":" 434845 5 mpakulavelrutka 2011-07-11 06:56:57 -0700 (In reply to comment #4) > When you update the patch, please describe briefly what has changed in the new version, otherwise one needs to use "Diff" -> "Differences between" to find out. > OK > > Source/WebKit/efl/ewk/ewk_frame.cpp:1068 > > + hit_test->context = (Ewk_Hit_Test_Result_Context)context; > > Do you really need this cast? If so, please use a C++ cast. > Yes, I think is needed here, anyway I will change it to static_cast. > > Tools/EWebLauncher/main.c:558 > > + "%s" > > Perhaps indent the lines here instead of below? This way you'd have > > " %s\n" > /* code */ > ht->context & EWK_HIT_TEST_RESULT_FOO ? "FOO" : "", > But then when ht->context & EWK_HIT_TEST_RESULT_FOO will be false we will get two spaces and there will be problem with aligning contexts. > > Tools/EWebLauncher/main.c:573 > > + ht->context & EWK_HIT_TEST_RESULT_CONTEXT_LINK ? " LINK\n": "", > > Pleas add a space before the ":" OK 434848 6 rakuco 2011-07-11 07:01:37 -0700 (In reply to comment #5) > > > Tools/EWebLauncher/main.c:558 > > > + "%s" > > > > Perhaps indent the lines here instead of below? This way you'd have > > > > " %s\n" > > /* code */ > > ht->context & EWK_HIT_TEST_RESULT_FOO ? "FOO" : "", > > > > But then when ht->context & EWK_HIT_TEST_RESULT_FOO will be false we will get two spaces and there will be problem with aligning contexts. Oh, you're right. Sorry. 434856 7 100296 mpakulavelrutka 2011-07-11 07:14:35 -0700 Created attachment 100296 changed C-cast to static_cast + code style according to Raphael's suggestions 434899 8 rakuco 2011-07-11 08:41:09 -0700 LGTM. 435343 9 gyuyoung.kim 2011-07-11 17:48:18 -0700 LGTM too. 440988 10 100296 webkit.review.bot 2011-07-22 10:31:17 -0700 Comment on attachment 100296 changed C-cast to static_cast + code style according to Raphael's suggestions Clearing flags on attachment: 100296 Committed r91572: <http://trac.webkit.org/changeset/91572> 440989 11 webkit.review.bot 2011-07-22 10:31:22 -0700 All reviewed patches have been landed. Closing bug. 100263 2011-07-11 04:29:48 -0700 2011-07-11 06:04:08 -0700 proposed patch patch_hit_test.diff text/plain 6441 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5OTNkZjczLi5hOTJlNjg2IDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTEtMDctMDUgIE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5w YWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gZXdrX2ZyYW1lX2hpdF90ZXN0X25l dyBlbmhhbmNlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyNjAKKworICAgICAgICBSZXBsYWNlcyBzdHJ1Y3R1cmUgJ2ZsYWdzJyB3aXRoIGVu dW0gJ2NvbnRleHQnIGNvbnRhaW5pbmcgbW9yZSBoaXQgdGVzdAorICAgICAgICByZXN1bHQgdHlw ZXMgYW5kIGFkZHMgbmV3IGNoYXIqIGZpZWxkcyB0byBFd2tfSGl0X1Rlc3Qgc3RydWN0dXJlOgor ICAgICAgICBpbWFnZV91cmkgYW5kIG1lZGlhX3VyaS4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGV3ay9ld2tfZnJhbWUuY3BwOgorICAgICAgICAo ZXdrX2ZyYW1lX2hpdF90ZXN0X2ZyZWUpOgorICAgICAgICAoZXdrX2ZyYW1lX2hpdF90ZXN0X25l dyk6CisgICAgICAgICogZXdrL2V3a19mcmFtZS5oOgorCiAyMDExLTA2LTI5ICBLYW5naWwgSGFu ICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRo IFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKaW5kZXgg ODU4MzRjZC4uZDhkZDlmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19m cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKQEAgLTk4 Miw2ICs5ODIsOCBAQCB2b2lkIGV3a19mcmFtZV9oaXRfdGVzdF9mcmVlKEV3a19IaXRfVGVzdCog aGl0X3Rlc3QpCiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwoaGl0X3Rlc3QtPmxpbmsudGV4dCk7 CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwoaGl0X3Rlc3QtPmxpbmsudXJsKTsKICAgICBlaW5h X3N0cmluZ3NoYXJlX2RlbChoaXRfdGVzdC0+bGluay50aXRsZSk7CisgICAgZWluYV9zdHJpbmdz aGFyZV9kZWwoaGl0X3Rlc3QtPmltYWdlX3VyaSk7CisgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwo aGl0X3Rlc3QtPm1lZGlhX3VyaSk7CiAgICAgZnJlZShoaXRfdGVzdCk7CiB9CiAKQEAgLTEwNDYs OSArMTA0OCwyMyBAQCBFd2tfSGl0X1Rlc3QqIGV3a19mcmFtZV9oaXRfdGVzdF9uZXcoY29uc3Qg RXZhc19PYmplY3QqIG8sIGludCB4LCBpbnQgeSkKICAgICBoaXRfdGVzdC0+bGluay51cmwgPSBl aW5hX3N0cmluZ3NoYXJlX2FkZChyZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCkuc3RyaW5nKCkudXRm OCgpLmRhdGEoKSk7CiAgICAgaGl0X3Rlc3QtPmxpbmsudGl0bGUgPSBlaW5hX3N0cmluZ3NoYXJl X2FkZChyZXN1bHQudGl0bGVEaXNwbGF5U3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgaGl0 X3Rlc3QtPmxpbmsudGFyZ2V0X2ZyYW1lID0ga2l0KHJlc3VsdC50YXJnZXRGcmFtZSgpKTsKLQot ICAgIGhpdF90ZXN0LT5mbGFncy5lZGl0YWJsZSA9IHJlc3VsdC5pc0NvbnRlbnRFZGl0YWJsZSgp OwotICAgIGhpdF90ZXN0LT5mbGFncy5zZWxlY3RlZCA9IHJlc3VsdC5pc1NlbGVjdGVkKCk7Cisg ICAgaGl0X3Rlc3QtPmltYWdlX3VyaSA9IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHJlc3VsdC5hYnNv bHV0ZUltYWdlVVJMKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgaGl0X3Rlc3QtPm1l ZGlhX3VyaSA9IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHJlc3VsdC5hYnNvbHV0ZU1lZGlhVVJMKCku c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisKKyAgICBpbnQgY29udGV4dCA9IEVXS19ISVRfVEVT VF9SRVNVTFRfQ09OVEVYVF9ET0NVTUVOVDsKKworICAgIGlmICghcmVzdWx0LmFic29sdXRlTGlu a1VSTCgpLmlzRW1wdHkoKSkKKyAgICAgICAgY29udGV4dCB8PSBFV0tfSElUX1RFU1RfUkVTVUxU X0NPTlRFWFRfTElOSzsKKyAgICBpZiAoIXJlc3VsdC5hYnNvbHV0ZUltYWdlVVJMKCkuaXNFbXB0 eSgpKQorICAgICAgICBjb250ZXh0IHw9IEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9JTUFH RTsKKyAgICBpZiAoIXJlc3VsdC5hYnNvbHV0ZU1lZGlhVVJMKCkuaXNFbXB0eSgpKQorICAgICAg ICBjb250ZXh0IHw9IEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9NRURJQTsKKyAgICBpZiAo cmVzdWx0LmlzU2VsZWN0ZWQoKSkKKyAgICAgICAgY29udGV4dCB8PSBFV0tfSElUX1RFU1RfUkVT VUxUX0NPTlRFWFRfU0VMRUNUSU9OOworICAgIGlmIChyZXN1bHQuaXNDb250ZW50RWRpdGFibGUo KSkKKyAgICAgICAgY29udGV4dCB8PSBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRfRURJVEFC TEU7CisKKyAgICBoaXRfdGVzdC0+Y29udGV4dCA9IChFd2tfSGl0X1Rlc3RfUmVzdWx0X0NvbnRl eHQpIGNvbnRleHQ7CiAKICAgICByZXR1cm4gaGl0X3Rlc3Q7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X2ZyYW1lLmgKaW5kZXggZDY3NDQzYy4uMTU4ZWM2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a19mcmFtZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJh bWUuaApAQCAtMTA0LDYgKzEwNCwxNiBAQCBzdHJ1Y3QgX0V3a19GcmFtZV9SZXNvdXJjZV9SZXF1 ZXN0IHsKICAgICBjb25zdCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXI7IC8qKjwgaWRlbnRpZmll ciBvZiByZXNvdXJjZSwgY2FuIG5vdCBiZSBjaGFuZ2VkICovCiB9OwogCisvLy8gRW51bSBjb250 YWluaW5nIGhpdCB0ZXN0IGRhdGEgdHlwZXMKK3R5cGVkZWYgZW51bSB7CisgICAgRVdLX0hJVF9U RVNUX1JFU1VMVF9DT05URVhUX0RPQ1VNRU5UID0gMSA8PCAxLAorICAgIEVXS19ISVRfVEVTVF9S RVNVTFRfQ09OVEVYVF9MSU5LID0gMSA8PCAyLAorICAgIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09O VEVYVF9JTUFHRSA9IDEgPDwgMywKKyAgICBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRfTUVE SUEgPSAxIDw8IDQsCisgICAgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX1NFTEVDVElPTiA9 IDEgPDwgNSwKKyAgICBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRfRURJVEFCTEUgPSAxIDw8 IDYKK30gRXdrX0hpdF9UZXN0X1Jlc3VsdF9Db250ZXh0OworCiAvLy8gQ3JlYXRlcyBhIHR5cGUg bmFtZSBmb3IgX0V3a19IaXRfVGVzdC4KIHR5cGVkZWYgc3RydWN0IF9Fd2tfSGl0X1Rlc3QgRXdr X0hpdF9UZXN0OwogLy8vIFN0cnVjdHVyZSB1c2VkIHRvIHJlcG9ydCBoaXQgdGVzdCByZXN1bHQu CkBAIC0xMjIsMTAgKzEzMiwxMCBAQCBzdHJ1Y3QgX0V3a19IaXRfVGVzdCB7CiAgICAgICAgIGNv bnN0IGNoYXIgKnRpdGxlOyAvKio8IHRoZSB0aXRsZSBvZiBsaW5rICovCiAgICAgICAgIEV2YXNf T2JqZWN0ICp0YXJnZXRfZnJhbWU7CiAgICAgfSBsaW5rOwotICAgIHN0cnVjdCB7Ci0gICAgICAg IEVpbmFfQm9vbCBlZGl0YWJsZToxOyAvKio8IEBjIEVJTkFfVFJVRSBpZiBlbGVtZW50IGlzIGVk aXRhYmxlLCBAYyBFSU5BX0ZBTFNFIGlmIG5vdCAqLwotICAgICAgICBFaW5hX0Jvb2wgc2VsZWN0 ZWQ6MTsgLyoqPCBAYyBFSU5BX1RSVUUgaWYgZWxlbWVudCBpcyBzZWxlY3RlZCwgQGMgRUlOQV9G QUxTRSBpZiBub3QgKi8KLSAgICB9IGZsYWdzOworICAgIGNvbnN0IGNoYXIgKmltYWdlX3VyaTsK KyAgICBjb25zdCBjaGFyICptZWRpYV91cmk7CisKKyAgICBFd2tfSGl0X1Rlc3RfUmVzdWx0X0Nv bnRleHQgY29udGV4dDsKIH07CiAKIC8vLyBSZXByZXNlbnRzIGFjdGlvbnMgb2YgdG91Y2ggZXZl bnRzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGViYzhmYzguLjEyMWFjMTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wNy0wNSAgTWljaGFsIFBha3VsYSB2 ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBld2tfZnJh bWVfaGl0X3Rlc3RfbmV3IGVuY2hhbmNlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQyNjAKKworICAgICAgICBBcHBseSBjaGFuZ2VzIGRvbmUg aW4gZXdrX2ZyYW1lX2hpdF90ZXN0X25ldyBpbiBFV2ViTGF1bmNoZXI6CisgICAgICAgIFJlcGxh Y2luZyBFd2tfSGl0X1Rlc3RfUmVzdWx0X0NvbnRleHQgc3RydWN0dXJlICdmbGFncycKKyAgICAg ICAgaW4gaGl0IHRlc3Qgb3V0cHV0IHRvIGJ5IGVudW0gJ2NvbnRleHQnLgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRVdlYkxhdW5jaGVyL21haW4u YzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKwogMjAxMS0wNy0wNCAgR2F2aW4gQmFycmFjbG91 Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdl aW5pZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMgYi9Ub29scy9FV2Vi TGF1bmNoZXIvbWFpbi5jCmluZGV4IGQzYmI1YTEuLjViODFiZDEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0VXZWJMYXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwpAQCAt NTUzLDExICs1NTMsMTIgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19P YmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgICAgICAgICAgICAiICAgIHVy bD0nJXMnXG4iCiAgICAgICAgICAgICAgICAgICAgIiAgICB0aXRsZT0nJXMnXG4iCiAgICAgICAg ICAgICAgICAgICAgIiAgICB0YXJnZXQgZnJhbWU9JXAgKCVzKVxuIgotICAgICAgICAgICAgICAg ICAgICIgIH1cbiIKLSAgICAgICAgICAgICAgICAgICAiICBmbGFncyB7XG4iCi0gICAgICAgICAg ICAgICAgICAgIiAgICBlZGl0YWJsZT0laGh1XG4iCi0gICAgICAgICAgICAgICAgICAgIiAgICBz ZWxlY3RlZD0laGh1XG4iCi0gICAgICAgICAgICAgICAgICAgIiAgfVxuIiwKKyAgICAgICAgICAg ICAgICAgICAiY29udGV4dDpcbiIKKyAgICAgICAgICAgICAgICAgICAiJXMiCisgICAgICAgICAg ICAgICAgICAgIiVzIgorICAgICAgICAgICAgICAgICAgICIlcyIKKyAgICAgICAgICAgICAgICAg ICAiJXMiCisgICAgICAgICAgICAgICAgICAgIiVzXG4iLAogICAgICAgICAgICAgICAgICAgIHgs IHksCiAgICAgICAgICAgICAgICAgICAgaHQtPngsIGh0LT55LAogICAgICAgICAgICAgICAgICAg IGh0LT5ib3VuZGluZ19ib3gueCwgaHQtPmJvdW5kaW5nX2JveC55LCBodC0+Ym91bmRpbmdfYm94 LncsIGh0LT5ib3VuZGluZ19ib3guaCwKQEAgLTU2OCw4ICs1NjksMTEgQEAgb25fa2V5X2Rvd24o dm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykK ICAgICAgICAgICAgICAgICAgICBodC0+bGluay51cmwsCiAgICAgICAgICAgICAgICAgICAgaHQt PmxpbmsudGl0bGUsCiAgICAgICAgICAgICAgICAgICAgaHQtPmxpbmsudGFyZ2V0X2ZyYW1lLCBl dmFzX29iamVjdF9uYW1lX2dldChodC0+bGluay50YXJnZXRfZnJhbWUpLAotICAgICAgICAgICAg ICAgICAgIGh0LT5mbGFncy5lZGl0YWJsZSwKLSAgICAgICAgICAgICAgICAgICBodC0+ZmxhZ3Mu c2VsZWN0ZWQpOworICAgICAgICAgICAgICAgICAgIGh0LT5jb250ZXh0ICYgRVdLX0hJVF9URVNU X1JFU1VMVF9DT05URVhUX0xJTksgPyAiICBMSU5LXG4iOiAiIiwKKyAgICAgICAgICAgICAgICAg ICBodC0+Y29udGV4dCAmIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9JTUFHRSA/ICIgIElN QUdFXG4iOiAiIiwKKyAgICAgICAgICAgICAgICAgICBodC0+Y29udGV4dCAmIEVXS19ISVRfVEVT VF9SRVNVTFRfQ09OVEVYVF9NRURJQSA/ICIgICBNRURJQVxuIjogIiIsCisgICAgICAgICAgICAg ICAgICAgaHQtPmNvbnRleHQgJiBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRfU0VMRUNUSU9O ID8gIiAgU0VMRUNUSU9OXG4iOiAiIiwKKyAgICAgICAgICAgICAgICAgICBodC0+Y29udGV4dCAm IEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9FRElUQUJMRSA/ICIgIEVESVRBQkxFIjogIiIp OwogICAgICAgICAgICAgZXdrX2ZyYW1lX2hpdF90ZXN0X2ZyZWUoaHQpOwogICAgICAgICB9CiAK 100284 2011-07-11 06:04:08 -0700 2011-07-11 06:13:10 -0700 fixed patch patch.diff text/plain 6342 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5OTNkZjczLi5hNTIxZGRmIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMTEgIE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5w YWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gZXdrX2ZyYW1lX2hpdF90ZXN0X25l dyBlbmhhbmNlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyNjAKKworICAgICAgICBSZXBsYWNlcyBzdHJ1Y3R1cmUgJ2ZsYWdzJyB3aXRoIGVu dW0gJ2NvbnRleHQnIGNvbnRhaW5pbmcgbW9yZSBoaXQgdGVzdAorICAgICAgICByZXN1bHQgdHlw ZXMgYW5kIGFkZHMgbmV3IGNoYXIqIGZpZWxkcyB0byBFd2tfSGl0X1Rlc3Qgc3RydWN0dXJlOgor ICAgICAgICBpbWFnZV91cmkgYW5kIG1lZGlhX3VyaS4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGV3ay9ld2tfZnJhbWUuY3BwOgorICAgICAgICAo ZXdrX2ZyYW1lX2hpdF90ZXN0X2ZyZWUpOgorICAgICAgICAoZXdrX2ZyYW1lX2hpdF90ZXN0X25l dyk6CisgICAgICAgICogZXdrL2V3a19mcmFtZS5oOgorCiAyMDExLTA2LTI5ICBLYW5naWwgSGFu ICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRo IFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKaW5kZXgg ODU4MzRjZC4uNmM4ODIyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19m cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKQEAgLTk4 Miw2ICs5ODIsOCBAQCB2b2lkIGV3a19mcmFtZV9oaXRfdGVzdF9mcmVlKEV3a19IaXRfVGVzdCog aGl0X3Rlc3QpCiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwoaGl0X3Rlc3QtPmxpbmsudGV4dCk7 CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwoaGl0X3Rlc3QtPmxpbmsudXJsKTsKICAgICBlaW5h X3N0cmluZ3NoYXJlX2RlbChoaXRfdGVzdC0+bGluay50aXRsZSk7CisgICAgZWluYV9zdHJpbmdz aGFyZV9kZWwoaGl0X3Rlc3QtPmltYWdlX3VyaSk7CisgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwo aGl0X3Rlc3QtPm1lZGlhX3VyaSk7CiAgICAgZnJlZShoaXRfdGVzdCk7CiB9CiAKQEAgLTEwNDcs OCArMTA0OSwyMyBAQCBFd2tfSGl0X1Rlc3QqIGV3a19mcmFtZV9oaXRfdGVzdF9uZXcoY29uc3Qg RXZhc19PYmplY3QqIG8sIGludCB4LCBpbnQgeSkKICAgICBoaXRfdGVzdC0+bGluay50aXRsZSA9 IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHJlc3VsdC50aXRsZURpc3BsYXlTdHJpbmcoKS51dGY4KCku ZGF0YSgpKTsKICAgICBoaXRfdGVzdC0+bGluay50YXJnZXRfZnJhbWUgPSBraXQocmVzdWx0LnRh cmdldEZyYW1lKCkpOwogCi0gICAgaGl0X3Rlc3QtPmZsYWdzLmVkaXRhYmxlID0gcmVzdWx0Lmlz Q29udGVudEVkaXRhYmxlKCk7Ci0gICAgaGl0X3Rlc3QtPmZsYWdzLnNlbGVjdGVkID0gcmVzdWx0 LmlzU2VsZWN0ZWQoKTsKKyAgICBoaXRfdGVzdC0+aW1hZ2VfdXJpID0gZWluYV9zdHJpbmdzaGFy ZV9hZGQocmVzdWx0LmFic29sdXRlSW1hZ2VVUkwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsK KyAgICBoaXRfdGVzdC0+bWVkaWFfdXJpID0gZWluYV9zdHJpbmdzaGFyZV9hZGQocmVzdWx0LmFi c29sdXRlTWVkaWFVUkwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKworICAgIGludCBjb250 ZXh0ID0gRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0RPQ1VNRU5UOworCisgICAgaWYgKCFy ZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCkuaXNFbXB0eSgpKQorICAgICAgICBjb250ZXh0IHw9IEVX S19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9MSU5LOworICAgIGlmICghcmVzdWx0LmFic29sdXRl SW1hZ2VVUkwoKS5pc0VtcHR5KCkpCisgICAgICAgIGNvbnRleHQgfD0gRVdLX0hJVF9URVNUX1JF U1VMVF9DT05URVhUX0lNQUdFOworICAgIGlmICghcmVzdWx0LmFic29sdXRlTWVkaWFVUkwoKS5p c0VtcHR5KCkpCisgICAgICAgIGNvbnRleHQgfD0gRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhU X01FRElBOworICAgIGlmIChyZXN1bHQuaXNTZWxlY3RlZCgpKQorICAgICAgICBjb250ZXh0IHw9 IEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9TRUxFQ1RJT047CisgICAgaWYgKHJlc3VsdC5p c0NvbnRlbnRFZGl0YWJsZSgpKQorICAgICAgICBjb250ZXh0IHw9IEVXS19ISVRfVEVTVF9SRVNV TFRfQ09OVEVYVF9FRElUQUJMRTsKKworICAgIGhpdF90ZXN0LT5jb250ZXh0ID0gKEV3a19IaXRf VGVzdF9SZXN1bHRfQ29udGV4dCkgY29udGV4dDsKIAogICAgIHJldHVybiBoaXRfdGVzdDsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaCBiL1NvdXJjZS9X ZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaAppbmRleCBkNjc0NDNjLi4xNThlYzZkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKKysrIGIvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a19mcmFtZS5oCkBAIC0xMDQsNiArMTA0LDE2IEBAIHN0cnVjdCBfRXdrX0Zy YW1lX1Jlc291cmNlX1JlcXVlc3QgewogICAgIGNvbnN0IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmll cjsgLyoqPCBpZGVudGlmaWVyIG9mIHJlc291cmNlLCBjYW4gbm90IGJlIGNoYW5nZWQgKi8KIH07 CiAKKy8vLyBFbnVtIGNvbnRhaW5pbmcgaGl0IHRlc3QgZGF0YSB0eXBlcwordHlwZWRlZiBlbnVt IHsKKyAgICBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRfRE9DVU1FTlQgPSAxIDw8IDEsCisg ICAgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0xJTksgPSAxIDw8IDIsCisgICAgRVdLX0hJ VF9URVNUX1JFU1VMVF9DT05URVhUX0lNQUdFID0gMSA8PCAzLAorICAgIEVXS19ISVRfVEVTVF9S RVNVTFRfQ09OVEVYVF9NRURJQSA9IDEgPDwgNCwKKyAgICBFV0tfSElUX1RFU1RfUkVTVUxUX0NP TlRFWFRfU0VMRUNUSU9OID0gMSA8PCA1LAorICAgIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVY VF9FRElUQUJMRSA9IDEgPDwgNgorfSBFd2tfSGl0X1Rlc3RfUmVzdWx0X0NvbnRleHQ7CisKIC8v LyBDcmVhdGVzIGEgdHlwZSBuYW1lIGZvciBfRXdrX0hpdF9UZXN0LgogdHlwZWRlZiBzdHJ1Y3Qg X0V3a19IaXRfVGVzdCBFd2tfSGl0X1Rlc3Q7CiAvLy8gU3RydWN0dXJlIHVzZWQgdG8gcmVwb3J0 IGhpdCB0ZXN0IHJlc3VsdC4KQEAgLTEyMiwxMCArMTMyLDEwIEBAIHN0cnVjdCBfRXdrX0hpdF9U ZXN0IHsKICAgICAgICAgY29uc3QgY2hhciAqdGl0bGU7IC8qKjwgdGhlIHRpdGxlIG9mIGxpbmsg Ki8KICAgICAgICAgRXZhc19PYmplY3QgKnRhcmdldF9mcmFtZTsKICAgICB9IGxpbms7Ci0gICAg c3RydWN0IHsKLSAgICAgICAgRWluYV9Cb29sIGVkaXRhYmxlOjE7IC8qKjwgQGMgRUlOQV9UUlVF IGlmIGVsZW1lbnQgaXMgZWRpdGFibGUsIEBjIEVJTkFfRkFMU0UgaWYgbm90ICovCi0gICAgICAg IEVpbmFfQm9vbCBzZWxlY3RlZDoxOyAvKio8IEBjIEVJTkFfVFJVRSBpZiBlbGVtZW50IGlzIHNl bGVjdGVkLCBAYyBFSU5BX0ZBTFNFIGlmIG5vdCAqLwotICAgIH0gZmxhZ3M7CisgICAgY29uc3Qg Y2hhciAqaW1hZ2VfdXJpOworICAgIGNvbnN0IGNoYXIgKm1lZGlhX3VyaTsKKworICAgIEV3a19I aXRfVGVzdF9SZXN1bHRfQ29udGV4dCBjb250ZXh0OwogfTsKIAogLy8vIFJlcHJlc2VudHMgYWN0 aW9ucyBvZiB0b3VjaCBldmVudHMuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggYTI0ODI1ZC4uNTY0MDFkYSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTA3LTEx ICBNaWNoYWwgUGFrdWxhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgorCisgICAg ICAgIFtFRkxdIGV3a19mcmFtZV9oaXRfdGVzdF9uZXcgZW5jaGFuY2VtZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDI2MAorCisgICAgICAgIEFw cGx5IGNoYW5nZXMgZG9uZSBpbiBld2tfZnJhbWVfaGl0X3Rlc3RfbmV3IGluIEVXZWJMYXVuY2hl cjoKKyAgICAgICAgUmVwbGFjaW5nIEV3a19IaXRfVGVzdF9SZXN1bHRfQ29udGV4dCBzdHJ1Y3R1 cmUgJ2ZsYWdzJworICAgICAgICBpbiBoaXQgdGVzdCBvdXRwdXQgdG8gYnkgZW51bSAnY29udGV4 dCcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBF V2ViTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgorCiAyMDExLTA3LTEx ICBLZW5pY2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQg VGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL0Zvcm1WYWx1ZS5jcHAgdG8gRFJUIGJ1aWxkIGZpbGVz CmRpZmYgLS1naXQgYS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jIGIvVG9vbHMvRVdlYkxhdW5j aGVyL21haW4uYwppbmRleCBkM2JiNWExLi5kNGE4MGRjIDEwMDY0NAotLS0gYS9Ub29scy9FV2Vi TGF1bmNoZXIvbWFpbi5jCisrKyBiL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKQEAgLTU1NCwx MCArNTU0LDEyIEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0 ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgICAgICAgICAgICAgIiAgICB0aXRsZT0n JXMnXG4iCiAgICAgICAgICAgICAgICAgICAgIiAgICB0YXJnZXQgZnJhbWU9JXAgKCVzKVxuIgog ICAgICAgICAgICAgICAgICAgICIgIH1cbiIKLSAgICAgICAgICAgICAgICAgICAiICBmbGFncyB7 XG4iCi0gICAgICAgICAgICAgICAgICAgIiAgICBlZGl0YWJsZT0laGh1XG4iCi0gICAgICAgICAg ICAgICAgICAgIiAgICBzZWxlY3RlZD0laGh1XG4iCi0gICAgICAgICAgICAgICAgICAgIiAgfVxu IiwKKyAgICAgICAgICAgICAgICAgICAiY29udGV4dDpcbiIKKyAgICAgICAgICAgICAgICAgICAi JXMiCisgICAgICAgICAgICAgICAgICAgIiVzIgorICAgICAgICAgICAgICAgICAgICIlcyIKKyAg ICAgICAgICAgICAgICAgICAiJXMiCisgICAgICAgICAgICAgICAgICAgIiVzXG4iLAogICAgICAg ICAgICAgICAgICAgIHgsIHksCiAgICAgICAgICAgICAgICAgICAgaHQtPngsIGh0LT55LAogICAg ICAgICAgICAgICAgICAgIGh0LT5ib3VuZGluZ19ib3gueCwgaHQtPmJvdW5kaW5nX2JveC55LCBo dC0+Ym91bmRpbmdfYm94LncsIGh0LT5ib3VuZGluZ19ib3guaCwKQEAgLTU2OCw4ICs1NzAsMTEg QEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKm9iaiwgdm9p ZCAqZXZlbnRfaW5mbykKICAgICAgICAgICAgICAgICAgICBodC0+bGluay51cmwsCiAgICAgICAg ICAgICAgICAgICAgaHQtPmxpbmsudGl0bGUsCiAgICAgICAgICAgICAgICAgICAgaHQtPmxpbmsu dGFyZ2V0X2ZyYW1lLCBldmFzX29iamVjdF9uYW1lX2dldChodC0+bGluay50YXJnZXRfZnJhbWUp LAotICAgICAgICAgICAgICAgICAgIGh0LT5mbGFncy5lZGl0YWJsZSwKLSAgICAgICAgICAgICAg ICAgICBodC0+ZmxhZ3Muc2VsZWN0ZWQpOworICAgICAgICAgICAgICAgICAgIGh0LT5jb250ZXh0 ICYgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0xJTksgPyAiICBMSU5LXG4iOiAiIiwKKyAg ICAgICAgICAgICAgICAgICBodC0+Y29udGV4dCAmIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVY VF9JTUFHRSA/ICIgIElNQUdFXG4iOiAiIiwKKyAgICAgICAgICAgICAgICAgICBodC0+Y29udGV4 dCAmIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9NRURJQSA/ICIgICBNRURJQVxuIjogIiIs CisgICAgICAgICAgICAgICAgICAgaHQtPmNvbnRleHQgJiBFV0tfSElUX1RFU1RfUkVTVUxUX0NP TlRFWFRfU0VMRUNUSU9OID8gIiAgU0VMRUNUSU9OXG4iOiAiIiwKKyAgICAgICAgICAgICAgICAg ICBodC0+Y29udGV4dCAmIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9FRElUQUJMRSA/ICIg IEVESVRBQkxFIjogIiIpOwogICAgICAgICAgICAgZXdrX2ZyYW1lX2hpdF90ZXN0X2ZyZWUoaHQp OwogICAgICAgICB9CiAK 100285 2011-07-11 06:13:10 -0700 2011-07-11 07:14:35 -0700 fixed patch patch2.diff text/plain 6341 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5OTNkZjczLi5hNTIxZGRmIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMTEgIE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5w YWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gZXdrX2ZyYW1lX2hpdF90ZXN0X25l dyBlbmhhbmNlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyNjAKKworICAgICAgICBSZXBsYWNlcyBzdHJ1Y3R1cmUgJ2ZsYWdzJyB3aXRoIGVu dW0gJ2NvbnRleHQnIGNvbnRhaW5pbmcgbW9yZSBoaXQgdGVzdAorICAgICAgICByZXN1bHQgdHlw ZXMgYW5kIGFkZHMgbmV3IGNoYXIqIGZpZWxkcyB0byBFd2tfSGl0X1Rlc3Qgc3RydWN0dXJlOgor ICAgICAgICBpbWFnZV91cmkgYW5kIG1lZGlhX3VyaS4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGV3ay9ld2tfZnJhbWUuY3BwOgorICAgICAgICAo ZXdrX2ZyYW1lX2hpdF90ZXN0X2ZyZWUpOgorICAgICAgICAoZXdrX2ZyYW1lX2hpdF90ZXN0X25l dyk6CisgICAgICAgICogZXdrL2V3a19mcmFtZS5oOgorCiAyMDExLTA2LTI5ICBLYW5naWwgSGFu ICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRo IFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKaW5kZXgg ODU4MzRjZC4uMWYxY2U0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19m cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKQEAgLTk4 Miw2ICs5ODIsOCBAQCB2b2lkIGV3a19mcmFtZV9oaXRfdGVzdF9mcmVlKEV3a19IaXRfVGVzdCog aGl0X3Rlc3QpCiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwoaGl0X3Rlc3QtPmxpbmsudGV4dCk7 CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwoaGl0X3Rlc3QtPmxpbmsudXJsKTsKICAgICBlaW5h X3N0cmluZ3NoYXJlX2RlbChoaXRfdGVzdC0+bGluay50aXRsZSk7CisgICAgZWluYV9zdHJpbmdz aGFyZV9kZWwoaGl0X3Rlc3QtPmltYWdlX3VyaSk7CisgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwo aGl0X3Rlc3QtPm1lZGlhX3VyaSk7CiAgICAgZnJlZShoaXRfdGVzdCk7CiB9CiAKQEAgLTEwNDcs OCArMTA0OSwyMyBAQCBFd2tfSGl0X1Rlc3QqIGV3a19mcmFtZV9oaXRfdGVzdF9uZXcoY29uc3Qg RXZhc19PYmplY3QqIG8sIGludCB4LCBpbnQgeSkKICAgICBoaXRfdGVzdC0+bGluay50aXRsZSA9 IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHJlc3VsdC50aXRsZURpc3BsYXlTdHJpbmcoKS51dGY4KCku ZGF0YSgpKTsKICAgICBoaXRfdGVzdC0+bGluay50YXJnZXRfZnJhbWUgPSBraXQocmVzdWx0LnRh cmdldEZyYW1lKCkpOwogCi0gICAgaGl0X3Rlc3QtPmZsYWdzLmVkaXRhYmxlID0gcmVzdWx0Lmlz Q29udGVudEVkaXRhYmxlKCk7Ci0gICAgaGl0X3Rlc3QtPmZsYWdzLnNlbGVjdGVkID0gcmVzdWx0 LmlzU2VsZWN0ZWQoKTsKKyAgICBoaXRfdGVzdC0+aW1hZ2VfdXJpID0gZWluYV9zdHJpbmdzaGFy ZV9hZGQocmVzdWx0LmFic29sdXRlSW1hZ2VVUkwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsK KyAgICBoaXRfdGVzdC0+bWVkaWFfdXJpID0gZWluYV9zdHJpbmdzaGFyZV9hZGQocmVzdWx0LmFi c29sdXRlTWVkaWFVUkwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKworICAgIGludCBjb250 ZXh0ID0gRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0RPQ1VNRU5UOworCisgICAgaWYgKCFy ZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCkuaXNFbXB0eSgpKQorICAgICAgICBjb250ZXh0IHw9IEVX S19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9MSU5LOworICAgIGlmICghcmVzdWx0LmFic29sdXRl SW1hZ2VVUkwoKS5pc0VtcHR5KCkpCisgICAgICAgIGNvbnRleHQgfD0gRVdLX0hJVF9URVNUX1JF U1VMVF9DT05URVhUX0lNQUdFOworICAgIGlmICghcmVzdWx0LmFic29sdXRlTWVkaWFVUkwoKS5p c0VtcHR5KCkpCisgICAgICAgIGNvbnRleHQgfD0gRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhU X01FRElBOworICAgIGlmIChyZXN1bHQuaXNTZWxlY3RlZCgpKQorICAgICAgICBjb250ZXh0IHw9 IEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9TRUxFQ1RJT047CisgICAgaWYgKHJlc3VsdC5p c0NvbnRlbnRFZGl0YWJsZSgpKQorICAgICAgICBjb250ZXh0IHw9IEVXS19ISVRfVEVTVF9SRVNV TFRfQ09OVEVYVF9FRElUQUJMRTsKKworICAgIGhpdF90ZXN0LT5jb250ZXh0ID0gKEV3a19IaXRf VGVzdF9SZXN1bHRfQ29udGV4dCljb250ZXh0OwogCiAgICAgcmV0dXJuIGhpdF90ZXN0OwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oIGIvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCmluZGV4IGQ2NzQ0M2MuLjE1OGVjNmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX2ZyYW1lLmgKQEAgLTEwNCw2ICsxMDQsMTYgQEAgc3RydWN0IF9Fd2tfRnJh bWVfUmVzb3VyY2VfUmVxdWVzdCB7CiAgICAgY29uc3QgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy OyAvKio8IGlkZW50aWZpZXIgb2YgcmVzb3VyY2UsIGNhbiBub3QgYmUgY2hhbmdlZCAqLwogfTsK IAorLy8vIEVudW0gY29udGFpbmluZyBoaXQgdGVzdCBkYXRhIHR5cGVzCit0eXBlZGVmIGVudW0g eworICAgIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9ET0NVTUVOVCA9IDEgPDwgMSwKKyAg ICBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRfTElOSyA9IDEgPDwgMiwKKyAgICBFV0tfSElU X1RFU1RfUkVTVUxUX0NPTlRFWFRfSU1BR0UgPSAxIDw8IDMsCisgICAgRVdLX0hJVF9URVNUX1JF U1VMVF9DT05URVhUX01FRElBID0gMSA8PCA0LAorICAgIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09O VEVYVF9TRUxFQ1RJT04gPSAxIDw8IDUsCisgICAgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhU X0VESVRBQkxFID0gMSA8PCA2Cit9IEV3a19IaXRfVGVzdF9SZXN1bHRfQ29udGV4dDsKKwogLy8v IENyZWF0ZXMgYSB0eXBlIG5hbWUgZm9yIF9Fd2tfSGl0X1Rlc3QuCiB0eXBlZGVmIHN0cnVjdCBf RXdrX0hpdF9UZXN0IEV3a19IaXRfVGVzdDsKIC8vLyBTdHJ1Y3R1cmUgdXNlZCB0byByZXBvcnQg aGl0IHRlc3QgcmVzdWx0LgpAQCAtMTIyLDEwICsxMzIsMTAgQEAgc3RydWN0IF9Fd2tfSGl0X1Rl c3QgewogICAgICAgICBjb25zdCBjaGFyICp0aXRsZTsgLyoqPCB0aGUgdGl0bGUgb2YgbGluayAq LwogICAgICAgICBFdmFzX09iamVjdCAqdGFyZ2V0X2ZyYW1lOwogICAgIH0gbGluazsKLSAgICBz dHJ1Y3QgewotICAgICAgICBFaW5hX0Jvb2wgZWRpdGFibGU6MTsgLyoqPCBAYyBFSU5BX1RSVUUg aWYgZWxlbWVudCBpcyBlZGl0YWJsZSwgQGMgRUlOQV9GQUxTRSBpZiBub3QgKi8KLSAgICAgICAg RWluYV9Cb29sIHNlbGVjdGVkOjE7IC8qKjwgQGMgRUlOQV9UUlVFIGlmIGVsZW1lbnQgaXMgc2Vs ZWN0ZWQsIEBjIEVJTkFfRkFMU0UgaWYgbm90ICovCi0gICAgfSBmbGFnczsKKyAgICBjb25zdCBj aGFyICppbWFnZV91cmk7CisgICAgY29uc3QgY2hhciAqbWVkaWFfdXJpOworCisgICAgRXdrX0hp dF9UZXN0X1Jlc3VsdF9Db250ZXh0IGNvbnRleHQ7CiB9OwogCiAvLy8gUmVwcmVzZW50cyBhY3Rp b25zIG9mIHRvdWNoIGV2ZW50cy4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCBhMjQ4MjVkLi41NjQwMWRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMTEg IE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5wYWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAg ICAgW0VGTF0gZXdrX2ZyYW1lX2hpdF90ZXN0X25ldyBlbmNoYW5jZW1lbnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MjYwCisKKyAgICAgICAgQXBw bHkgY2hhbmdlcyBkb25lIGluIGV3a19mcmFtZV9oaXRfdGVzdF9uZXcgaW4gRVdlYkxhdW5jaGVy OgorICAgICAgICBSZXBsYWNpbmcgRXdrX0hpdF9UZXN0X1Jlc3VsdF9Db250ZXh0IHN0cnVjdHVy ZSAnZmxhZ3MnCisgICAgICAgIGluIGhpdCB0ZXN0IG91dHB1dCB0byBieSBlbnVtICdjb250ZXh0 Jy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEVX ZWJMYXVuY2hlci9tYWluLmM6CisgICAgICAgIChvbl9rZXlfZG93bik6CisKIDIwMTEtMDctMTEg IEtlbmljaGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFkZCBU ZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvRm9ybVZhbHVlLmNwcCB0byBEUlQgYnVpbGQgZmlsZXMK ZGlmZiAtLWdpdCBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMgYi9Ub29scy9FV2ViTGF1bmNo ZXIvbWFpbi5jCmluZGV4IGQzYmI1YTEuLmQ0YTgwZGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0VXZWJM YXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwpAQCAtNTU0LDEw ICs1NTQsMTIgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3Qg Km9iaiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgICAgICAgICAgICAiICAgIHRpdGxlPScl cydcbiIKICAgICAgICAgICAgICAgICAgICAiICAgIHRhcmdldCBmcmFtZT0lcCAoJXMpXG4iCiAg ICAgICAgICAgICAgICAgICAgIiAgfVxuIgotICAgICAgICAgICAgICAgICAgICIgIGZsYWdzIHtc biIKLSAgICAgICAgICAgICAgICAgICAiICAgIGVkaXRhYmxlPSVoaHVcbiIKLSAgICAgICAgICAg ICAgICAgICAiICAgIHNlbGVjdGVkPSVoaHVcbiIKLSAgICAgICAgICAgICAgICAgICAiICB9XG4i LAorICAgICAgICAgICAgICAgICAgICJjb250ZXh0OlxuIgorICAgICAgICAgICAgICAgICAgICIl cyIKKyAgICAgICAgICAgICAgICAgICAiJXMiCisgICAgICAgICAgICAgICAgICAgIiVzIgorICAg ICAgICAgICAgICAgICAgICIlcyIKKyAgICAgICAgICAgICAgICAgICAiJXNcbiIsCiAgICAgICAg ICAgICAgICAgICAgeCwgeSwKICAgICAgICAgICAgICAgICAgICBodC0+eCwgaHQtPnksCiAgICAg ICAgICAgICAgICAgICAgaHQtPmJvdW5kaW5nX2JveC54LCBodC0+Ym91bmRpbmdfYm94LnksIGh0 LT5ib3VuZGluZ19ib3gudywgaHQtPmJvdW5kaW5nX2JveC5oLApAQCAtNTY4LDggKzU3MCwxMSBA QCBvbl9rZXlfZG93bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lk ICpldmVudF9pbmZvKQogICAgICAgICAgICAgICAgICAgIGh0LT5saW5rLnVybCwKICAgICAgICAg ICAgICAgICAgICBodC0+bGluay50aXRsZSwKICAgICAgICAgICAgICAgICAgICBodC0+bGluay50 YXJnZXRfZnJhbWUsIGV2YXNfb2JqZWN0X25hbWVfZ2V0KGh0LT5saW5rLnRhcmdldF9mcmFtZSks Ci0gICAgICAgICAgICAgICAgICAgaHQtPmZsYWdzLmVkaXRhYmxlLAotICAgICAgICAgICAgICAg ICAgIGh0LT5mbGFncy5zZWxlY3RlZCk7CisgICAgICAgICAgICAgICAgICAgaHQtPmNvbnRleHQg JiBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRfTElOSyA/ICIgIExJTktcbiI6ICIiLAorICAg ICAgICAgICAgICAgICAgIGh0LT5jb250ZXh0ICYgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhU X0lNQUdFID8gIiAgSU1BR0VcbiI6ICIiLAorICAgICAgICAgICAgICAgICAgIGh0LT5jb250ZXh0 ICYgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX01FRElBID8gIiAgIE1FRElBXG4iOiAiIiwK KyAgICAgICAgICAgICAgICAgICBodC0+Y29udGV4dCAmIEVXS19ISVRfVEVTVF9SRVNVTFRfQ09O VEVYVF9TRUxFQ1RJT04gPyAiICBTRUxFQ1RJT05cbiI6ICIiLAorICAgICAgICAgICAgICAgICAg IGh0LT5jb250ZXh0ICYgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0VESVRBQkxFID8gIiAg RURJVEFCTEUiOiAiIik7CiAgICAgICAgICAgICBld2tfZnJhbWVfaGl0X3Rlc3RfZnJlZShodCk7 CiAgICAgICAgIH0KIAo= 100296 2011-07-11 07:14:35 -0700 2011-07-22 10:31:17 -0700 changed C-cast to static_cast + code style according to Raphael's suggestions hit_test3.diff text/plain 6359 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5OTNkZjczLi5hNTIxZGRmIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMTEgIE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5w YWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gZXdrX2ZyYW1lX2hpdF90ZXN0X25l dyBlbmhhbmNlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyNjAKKworICAgICAgICBSZXBsYWNlcyBzdHJ1Y3R1cmUgJ2ZsYWdzJyB3aXRoIGVu dW0gJ2NvbnRleHQnIGNvbnRhaW5pbmcgbW9yZSBoaXQgdGVzdAorICAgICAgICByZXN1bHQgdHlw ZXMgYW5kIGFkZHMgbmV3IGNoYXIqIGZpZWxkcyB0byBFd2tfSGl0X1Rlc3Qgc3RydWN0dXJlOgor ICAgICAgICBpbWFnZV91cmkgYW5kIG1lZGlhX3VyaS4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGV3ay9ld2tfZnJhbWUuY3BwOgorICAgICAgICAo ZXdrX2ZyYW1lX2hpdF90ZXN0X2ZyZWUpOgorICAgICAgICAoZXdrX2ZyYW1lX2hpdF90ZXN0X25l dyk6CisgICAgICAgICogZXdrL2V3a19mcmFtZS5oOgorCiAyMDExLTA2LTI5ICBLYW5naWwgSGFu ICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRo IFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKaW5kZXgg ODU4MzRjZC4uMDU3MDk0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19m cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKQEAgLTk4 Miw2ICs5ODIsOCBAQCB2b2lkIGV3a19mcmFtZV9oaXRfdGVzdF9mcmVlKEV3a19IaXRfVGVzdCog aGl0X3Rlc3QpCiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwoaGl0X3Rlc3QtPmxpbmsudGV4dCk7 CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwoaGl0X3Rlc3QtPmxpbmsudXJsKTsKICAgICBlaW5h X3N0cmluZ3NoYXJlX2RlbChoaXRfdGVzdC0+bGluay50aXRsZSk7CisgICAgZWluYV9zdHJpbmdz aGFyZV9kZWwoaGl0X3Rlc3QtPmltYWdlX3VyaSk7CisgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwo aGl0X3Rlc3QtPm1lZGlhX3VyaSk7CiAgICAgZnJlZShoaXRfdGVzdCk7CiB9CiAKQEAgLTEwNDcs OCArMTA0OSwyMyBAQCBFd2tfSGl0X1Rlc3QqIGV3a19mcmFtZV9oaXRfdGVzdF9uZXcoY29uc3Qg RXZhc19PYmplY3QqIG8sIGludCB4LCBpbnQgeSkKICAgICBoaXRfdGVzdC0+bGluay50aXRsZSA9 IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHJlc3VsdC50aXRsZURpc3BsYXlTdHJpbmcoKS51dGY4KCku ZGF0YSgpKTsKICAgICBoaXRfdGVzdC0+bGluay50YXJnZXRfZnJhbWUgPSBraXQocmVzdWx0LnRh cmdldEZyYW1lKCkpOwogCi0gICAgaGl0X3Rlc3QtPmZsYWdzLmVkaXRhYmxlID0gcmVzdWx0Lmlz Q29udGVudEVkaXRhYmxlKCk7Ci0gICAgaGl0X3Rlc3QtPmZsYWdzLnNlbGVjdGVkID0gcmVzdWx0 LmlzU2VsZWN0ZWQoKTsKKyAgICBoaXRfdGVzdC0+aW1hZ2VfdXJpID0gZWluYV9zdHJpbmdzaGFy ZV9hZGQocmVzdWx0LmFic29sdXRlSW1hZ2VVUkwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsK KyAgICBoaXRfdGVzdC0+bWVkaWFfdXJpID0gZWluYV9zdHJpbmdzaGFyZV9hZGQocmVzdWx0LmFi c29sdXRlTWVkaWFVUkwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKworICAgIGludCBjb250 ZXh0ID0gRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0RPQ1VNRU5UOworCisgICAgaWYgKCFy ZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCkuaXNFbXB0eSgpKQorICAgICAgICBjb250ZXh0IHw9IEVX S19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9MSU5LOworICAgIGlmICghcmVzdWx0LmFic29sdXRl SW1hZ2VVUkwoKS5pc0VtcHR5KCkpCisgICAgICAgIGNvbnRleHQgfD0gRVdLX0hJVF9URVNUX1JF U1VMVF9DT05URVhUX0lNQUdFOworICAgIGlmICghcmVzdWx0LmFic29sdXRlTWVkaWFVUkwoKS5p c0VtcHR5KCkpCisgICAgICAgIGNvbnRleHQgfD0gRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhU X01FRElBOworICAgIGlmIChyZXN1bHQuaXNTZWxlY3RlZCgpKQorICAgICAgICBjb250ZXh0IHw9 IEVXS19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9TRUxFQ1RJT047CisgICAgaWYgKHJlc3VsdC5p c0NvbnRlbnRFZGl0YWJsZSgpKQorICAgICAgICBjb250ZXh0IHw9IEVXS19ISVRfVEVTVF9SRVNV TFRfQ09OVEVYVF9FRElUQUJMRTsKKworICAgIGhpdF90ZXN0LT5jb250ZXh0ID0gc3RhdGljX2Nh c3Q8RXdrX0hpdF9UZXN0X1Jlc3VsdF9Db250ZXh0Pihjb250ZXh0KTsKIAogICAgIHJldHVybiBo aXRfdGVzdDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUu aCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaAppbmRleCBkNjc0NDNjLi4xNThl YzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKKysrIGIv U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCkBAIC0xMDQsNiArMTA0LDE2IEBAIHN0 cnVjdCBfRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVlc3QgewogICAgIGNvbnN0IHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllcjsgLyoqPCBpZGVudGlmaWVyIG9mIHJlc291cmNlLCBjYW4gbm90IGJlIGNo YW5nZWQgKi8KIH07CiAKKy8vLyBFbnVtIGNvbnRhaW5pbmcgaGl0IHRlc3QgZGF0YSB0eXBlcwor dHlwZWRlZiBlbnVtIHsKKyAgICBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRfRE9DVU1FTlQg PSAxIDw8IDEsCisgICAgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0xJTksgPSAxIDw8IDIs CisgICAgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0lNQUdFID0gMSA8PCAzLAorICAgIEVX S19ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9NRURJQSA9IDEgPDwgNCwKKyAgICBFV0tfSElUX1RF U1RfUkVTVUxUX0NPTlRFWFRfU0VMRUNUSU9OID0gMSA8PCA1LAorICAgIEVXS19ISVRfVEVTVF9S RVNVTFRfQ09OVEVYVF9FRElUQUJMRSA9IDEgPDwgNgorfSBFd2tfSGl0X1Rlc3RfUmVzdWx0X0Nv bnRleHQ7CisKIC8vLyBDcmVhdGVzIGEgdHlwZSBuYW1lIGZvciBfRXdrX0hpdF9UZXN0LgogdHlw ZWRlZiBzdHJ1Y3QgX0V3a19IaXRfVGVzdCBFd2tfSGl0X1Rlc3Q7CiAvLy8gU3RydWN0dXJlIHVz ZWQgdG8gcmVwb3J0IGhpdCB0ZXN0IHJlc3VsdC4KQEAgLTEyMiwxMCArMTMyLDEwIEBAIHN0cnVj dCBfRXdrX0hpdF9UZXN0IHsKICAgICAgICAgY29uc3QgY2hhciAqdGl0bGU7IC8qKjwgdGhlIHRp dGxlIG9mIGxpbmsgKi8KICAgICAgICAgRXZhc19PYmplY3QgKnRhcmdldF9mcmFtZTsKICAgICB9 IGxpbms7Ci0gICAgc3RydWN0IHsKLSAgICAgICAgRWluYV9Cb29sIGVkaXRhYmxlOjE7IC8qKjwg QGMgRUlOQV9UUlVFIGlmIGVsZW1lbnQgaXMgZWRpdGFibGUsIEBjIEVJTkFfRkFMU0UgaWYgbm90 ICovCi0gICAgICAgIEVpbmFfQm9vbCBzZWxlY3RlZDoxOyAvKio8IEBjIEVJTkFfVFJVRSBpZiBl bGVtZW50IGlzIHNlbGVjdGVkLCBAYyBFSU5BX0ZBTFNFIGlmIG5vdCAqLwotICAgIH0gZmxhZ3M7 CisgICAgY29uc3QgY2hhciAqaW1hZ2VfdXJpOworICAgIGNvbnN0IGNoYXIgKm1lZGlhX3VyaTsK KworICAgIEV3a19IaXRfVGVzdF9SZXN1bHRfQ29udGV4dCBjb250ZXh0OwogfTsKIAogLy8vIFJl cHJlc2VudHMgYWN0aW9ucyBvZiB0b3VjaCBldmVudHMuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTI0ODI1ZC4uNTY0MDFkYSAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDExLTA3LTExICBNaWNoYWwgUGFrdWxhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcu Y29tPgorCisgICAgICAgIFtFRkxdIGV3a19mcmFtZV9oaXRfdGVzdF9uZXcgZW5jaGFuY2VtZW50 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDI2MAor CisgICAgICAgIEFwcGx5IGNoYW5nZXMgZG9uZSBpbiBld2tfZnJhbWVfaGl0X3Rlc3RfbmV3IGlu IEVXZWJMYXVuY2hlcjoKKyAgICAgICAgUmVwbGFjaW5nIEV3a19IaXRfVGVzdF9SZXN1bHRfQ29u dGV4dCBzdHJ1Y3R1cmUgJ2ZsYWdzJworICAgICAgICBpbiBoaXQgdGVzdCBvdXRwdXQgdG8gYnkg ZW51bSAnY29udGV4dCcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBFV2ViTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgor CiAyMDExLTA3LTExICBLZW5pY2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBBZGQgVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL0Zvcm1WYWx1ZS5jcHAgdG8gRFJU IGJ1aWxkIGZpbGVzCmRpZmYgLS1naXQgYS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jIGIvVG9v bHMvRVdlYkxhdW5jaGVyL21haW4uYwppbmRleCBkM2JiNWExLi44Y2UwMmM2IDEwMDY0NAotLS0g YS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCisrKyBiL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWlu LmMKQEAgLTU1NCwxMCArNTU0LDEyIEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUs IEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgICAgICAgICAgICAg IiAgICB0aXRsZT0nJXMnXG4iCiAgICAgICAgICAgICAgICAgICAgIiAgICB0YXJnZXQgZnJhbWU9 JXAgKCVzKVxuIgogICAgICAgICAgICAgICAgICAgICIgIH1cbiIKLSAgICAgICAgICAgICAgICAg ICAiICBmbGFncyB7XG4iCi0gICAgICAgICAgICAgICAgICAgIiAgICBlZGl0YWJsZT0laGh1XG4i Ci0gICAgICAgICAgICAgICAgICAgIiAgICBzZWxlY3RlZD0laGh1XG4iCi0gICAgICAgICAgICAg ICAgICAgIiAgfVxuIiwKKyAgICAgICAgICAgICAgICAgICAiY29udGV4dDpcbiIKKyAgICAgICAg ICAgICAgICAgICAiJXMiCisgICAgICAgICAgICAgICAgICAgIiVzIgorICAgICAgICAgICAgICAg ICAgICIlcyIKKyAgICAgICAgICAgICAgICAgICAiJXMiCisgICAgICAgICAgICAgICAgICAgIiVz XG4iLAogICAgICAgICAgICAgICAgICAgIHgsIHksCiAgICAgICAgICAgICAgICAgICAgaHQtPngs IGh0LT55LAogICAgICAgICAgICAgICAgICAgIGh0LT5ib3VuZGluZ19ib3gueCwgaHQtPmJvdW5k aW5nX2JveC55LCBodC0+Ym91bmRpbmdfYm94LncsIGh0LT5ib3VuZGluZ19ib3guaCwKQEAgLTU2 OCw4ICs1NzAsMTEgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmpl Y3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgICAgICAgICAgICBodC0+bGluay51 cmwsCiAgICAgICAgICAgICAgICAgICAgaHQtPmxpbmsudGl0bGUsCiAgICAgICAgICAgICAgICAg ICAgaHQtPmxpbmsudGFyZ2V0X2ZyYW1lLCBldmFzX29iamVjdF9uYW1lX2dldChodC0+bGluay50 YXJnZXRfZnJhbWUpLAotICAgICAgICAgICAgICAgICAgIGh0LT5mbGFncy5lZGl0YWJsZSwKLSAg ICAgICAgICAgICAgICAgICBodC0+ZmxhZ3Muc2VsZWN0ZWQpOworICAgICAgICAgICAgICAgICAg IGh0LT5jb250ZXh0ICYgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX0xJTksgPyAiICBMSU5L XG4iIDogIiIsCisgICAgICAgICAgICAgICAgICAgaHQtPmNvbnRleHQgJiBFV0tfSElUX1RFU1Rf UkVTVUxUX0NPTlRFWFRfSU1BR0UgPyAiICBJTUFHRVxuIiA6ICIiLAorICAgICAgICAgICAgICAg ICAgIGh0LT5jb250ZXh0ICYgRVdLX0hJVF9URVNUX1JFU1VMVF9DT05URVhUX01FRElBID8gIiAg IE1FRElBXG4iIDogIiIsCisgICAgICAgICAgICAgICAgICAgaHQtPmNvbnRleHQgJiBFV0tfSElU X1RFU1RfUkVTVUxUX0NPTlRFWFRfU0VMRUNUSU9OID8gIiAgU0VMRUNUSU9OXG4iIDogIiIsCisg ICAgICAgICAgICAgICAgICAgaHQtPmNvbnRleHQgJiBFV0tfSElUX1RFU1RfUkVTVUxUX0NPTlRF WFRfRURJVEFCTEUgPyAiICBFRElUQUJMRSIgOiAiIik7CiAgICAgICAgICAgICBld2tfZnJhbWVf aGl0X3Rlc3RfZnJlZShodCk7CiAgICAgICAgIH0KIAo=