77933 2012-02-06 22:00:55 -0800 [EFL] Use modifier keys to execute pre-rendering. 2012-02-19 11:30:02 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 jungjik.lee webkit-unassigned cshu gyuyoung.kim hyuki.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 550622 0 jungjik.lee 2012-02-06 22:00:55 -0800 I've changed the code to use modifier key to execute pre-rendering instead of using reserved function keys. Because F10 fuction key is already reserved by system or ecore/efl, so eweblauncher can not catch the key event. In addtion, we run out of function keys to map other features. so that I remap the current pre-rendering function to shortcut keys by using modifier keys. 550742 1 125792 jungjik.lee 2012-02-07 02:16:17 -0800 Created attachment 125792 proposal patch 551734 2 hyuki.kim 2012-02-07 20:19:49 -0800 Just a few idea is added. > Tools/EWebLauncher/main.c:436 > + modifierKey = modifierKey | ECORE_EVENT_MODIFIER_CTRL; Why don't you use "modifierKey |= ECORE_EVENT_MODIFIER_CTRL;" ? > Tools/EWebLauncher/main.c:565 > + Evas_Event_Key_Up *ev = (Evas_Event_Key_Up*) event_info; (Evas_Event_Key_Up*) ? 551977 3 jungjik.lee 2012-02-08 03:38:37 -0800 (In reply to comment #2) > Just a few idea is added. > > > Tools/EWebLauncher/main.c:436 > > + modifierKey = modifierKey | ECORE_EVENT_MODIFIER_CTRL; > > Why don't you use "modifierKey |= ECORE_EVENT_MODIFIER_CTRL;" ? > i'll fix it. > > Tools/EWebLauncher/main.c:565 > > + Evas_Event_Key_Up *ev = (Evas_Event_Key_Up*) event_info; > > (Evas_Event_Key_Up*) ? do you point to type casting, *'s position or Evas_Event_Key_Up itself? Eweblauncher is still C file. 552093 4 126077 jungjik.lee 2012-02-08 06:55:26 -0800 Created attachment 126077 patch_1 552635 5 hyuki.kim 2012-02-08 16:51:01 -0800 LGTM. 559064 6 126077 cshu 2012-02-17 02:24:32 -0800 Comment on attachment 126077 patch_1 View in context: https://bugs.webkit.org/attachment.cgi?id=126077&action=review > Tools/EWebLauncher/main.c:436 > + if (!strcmp(ev->key, "Control_L")) > + modifierKey |= ECORE_EVENT_MODIFIER_CTRL; Why isn't this a part of the if-elseif block below? In another question, a key event usually comes in with modifier status. That is to say, when you have ev->key=="g", you check if ev->modifier==CTRL-L(note this is my fake code). Isn't it the case in EFL? Using a static modiferkey variable seems hacky. 559895 7 127733 jungjik.lee 2012-02-19 05:13:03 -0800 Created attachment 127733 patch_2 Thanks your comment and as your comment, I found the simple way to use modifier key. 559910 8 127733 cshu 2012-02-19 10:15:44 -0800 Comment on attachment 127733 patch_2 Good! 559924 9 127733 webkit.review.bot 2012-02-19 11:29:57 -0800 Comment on attachment 127733 patch_2 Clearing flags on attachment: 127733 Committed r108192: <http://trac.webkit.org/changeset/108192> 559925 10 webkit.review.bot 2012-02-19 11:30:02 -0800 All reviewed patches have been landed. Closing bug. 125792 2012-02-07 02:16:17 -0800 2012-02-08 06:55:26 -0800 proposal patch proposal.patch text/plain 4442 jungjik.lee ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzMDM4 MGFhLi45ZTg2ZGZmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDItMDcgIEp1bmdKaWsgTGVlICA8anVuZ2pp ay5sZWVAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gVXNlIG1vZGlmaWVyIGtleXMgdG8g ZXhlY3V0ZSBwcmUtcmVuZGVyaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzc5MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVc2UgbW9kaWZpZXIga2V5IHRvIGV4ZWN1dGUgcHJlLXJlbmRlcmluZyBp bnN0ZWFkIG9mIHVzaW5nIHJlc2VydmVkIGZ1bmN0aW9uIGtleXMuCisKKyAgICAgICAgKiBFV2Vi TGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAob25fa2V5 X3VwKToKKyAgICAgICAgKG9uX2Jyb3dzZXJfZGVsKToKKyAgICAgICAgKGJyb3dzZXJDcmVhdGUp OgorCiAyMDEyLTAyLTA2ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K IAogICAgICAgICBGaXggc29tZSBtaXNjZWxsYW5lb3VzICdtYWtlIGRpc3QnIGVycm9yIGZvciBX ZWJLaXRHVEsrLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYyBiL1Rvb2xz L0VXZWJMYXVuY2hlci9tYWluLmMKaW5kZXggMmQ2NGQ0YS4uY2EzYzQ4NSAxMDA2NDQKLS0tIGEv VG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYworKysgYi9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5j CkBAIC0xMzUsNiArMTM1LDggQEAgc3RhdGljIGNvbnN0IEVjb3JlX0dldG9wdCBvcHRpb25zID0g ewogICAgIH0KIH07CiAKK3N0YXRpYyB1bnNpZ25lZCBpbnQgbW9kaWZpZXJLZXkgPSAwOworCiB0 eXBlZGVmIHN0cnVjdCBfRUxhdW5jaGVyIHsKICAgICBFY29yZV9FdmFzICplZTsKICAgICBFdmFz ICpldmFzOwpAQCAtNDMwLDYgKzQzMiw5IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMg KmUsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgfTsKICAgICBzdGF0 aWMgaW50IGN1cnJlbnRFbmNvZGluZyA9IC0xOwogCisgICAgaWYgKCFzdHJjbXAoZXYtPmtleSwg IkNvbnRyb2xfTCIpKQorICAgICAgICBtb2RpZmllcktleSA9IG1vZGlmaWVyS2V5IHwgRUNPUkVf RVZFTlRfTU9ESUZJRVJfQ1RSTDsKKwogICAgIGlmICghc3RyY21wKGV2LT5rZXksICJFc2NhcGUi KSkgewogICAgICAgICBjbG9zZVdpbmRvdyhhcHAtPmVlKTsKICAgICB9IGVsc2UgaWYgKCFzdHJj bXAoZXYtPmtleSwgIkYxIikpIHsKQEAgLTUyNyw3ICs1MzIsNyBAQCBvbl9rZXlfZG93bih2b2lk ICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogICAg ICAgICBicm93c2VyQ3JlYXRlKCJodHRwOi8vd3d3Lmdvb2dsZS5jb20iLAogICAgICAgICAgICAg ICAgICAgICAgICBhcHAtPnRoZW1lLCBhcHAtPnVzZXJBZ2VudCwgZ2VvbWV0cnksIGFwcC0+IGJh Y2tpbmdTdG9yZSwKICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwgYXBwLT5pc0ZsYXR0ZW5p bmcsIDAsIE5VTEwpOwotICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjEwIikpIHsK KyAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgImciKSAmJiAobW9kaWZpZXJLZXkgJiBF Q09SRV9FVkVOVF9NT0RJRklFUl9DVFJMKSkgewogICAgICAgICBFdmFzX0Nvb3JkIHgsIHksIHcs IGg7CiAgICAgICAgIEV2YXNfT2JqZWN0ICpmcmFtZSA9IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0 KG9iaik7CiAgICAgICAgIGZsb2F0IHpvb20gPSB6b29tTGV2ZWxzW2N1cnJlbnRab29tTGV2ZWxd IC8gMTAwLjA7CkBAIC01MzksMjcgKzU0NCwzNyBAQCBvbl9rZXlfZG93bih2b2lkICpkYXRhLCBF dmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgICAgICBoICo9 IDQ7CiAgICAgICAgIGluZm8oIlByZS1yZW5kZXIgJWQsJWQgKyAlZHglZFxuIiwgeCwgeSwgdywg aCk7CiAgICAgICAgIGV3a192aWV3X3ByZV9yZW5kZXJfcmVnaW9uKG9iaiwgeCwgeSwgdywgaCwg em9vbSk7Ci0gICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGMTEiKSkgeworICAgIH0g ZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiciIpICYmIChtb2RpZmllcktleSAmIEVDT1JFX0VW RU5UX01PRElGSUVSX0NUUkwpKSB7CiAgICAgICAgIGluZm8oIlByZS1yZW5kZXIgMSBleHRyYSBj b2x1bW4vcm93IHdpdGggY3VycmVudCB6b29tIik7CiAgICAgICAgIGV3a192aWV3X3ByZV9yZW5k ZXJfcmVsYXRpdmVfcmFkaXVzKG9iaiwgMSk7CisgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5r ZXksICJwIikgJiYgKG1vZGlmaWVyS2V5ICYgRUNPUkVfRVZFTlRfTU9ESUZJRVJfQ1RSTCkpIHsK KyAgICAgICAgaW5mbygiUHJlLXJlbmRlcmluZyBzdGFydCIpOworICAgICAgICBld2tfdmlld19w cmVfcmVuZGVyX3N0YXJ0KG9iaik7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJk IikpIHsKICAgICAgICAgaW5mbygiUmVuZGVyIHN1c3BlbmRlZCIpOwogICAgICAgICBld2tfdmll d19kaXNhYmxlX3JlbmRlcihvYmopOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAi ZSIpKSB7CiAgICAgICAgIGluZm8oIlJlbmRlciByZXN1bWVkIik7CiAgICAgICAgIGV3a192aWV3 X2VuYWJsZV9yZW5kZXIob2JqKTsKLSAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIklu c2VydCIpKSB7Ci0gICAgICAgIGluZm8oIlByZS1yZW5kZXJpbmcgc3RhcnQiKTsKLSAgICAgICAg ZXdrX3ZpZXdfcHJlX3JlbmRlcl9zdGFydChvYmopOwogICAgIH0KIH0KIAogc3RhdGljIHZvaWQK K29uX2tleV91cCh2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpl dmVudF9pbmZvKQoreworICAgIEV2YXNfRXZlbnRfS2V5X1VwICpldiA9IChFdmFzX0V2ZW50X0tl eV9VcCopIGV2ZW50X2luZm87CisKKyAgICBpZiAoIXN0cmNtcChldi0+a2V5LCAiQ29udHJvbF9M IikpCisgICAgICAgIG1vZGlmaWVyS2V5ICY9ICgweEZGRkYgXiBFQ09SRV9FVkVOVF9NT0RJRklF Ul9DVFJMKTsKK30KKworc3RhdGljIHZvaWQKIG9uX2Jyb3dzZXJfZGVsKHZvaWQgKmRhdGEsIEV2 YXMgKmV2YXMsIEV2YXNfT2JqZWN0ICpicm93c2VyLCB2b2lkICpldmVudCkKIHsKICAgICBFTGF1 bmNoZXIgKmFwcCA9IChFTGF1bmNoZXIqKSBkYXRhOwogCiAgICAgZXZhc19vYmplY3RfZXZlbnRf Y2FsbGJhY2tfZGVsKGFwcC0+YnJvd3NlciwgRVZBU19DQUxMQkFDS19LRVlfRE9XTiwgb25fa2V5 X2Rvd24pOworICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2RlbChhcHAtPmJyb3dzZXIs IEVWQVNfQ0FMTEJBQ0tfS0VZX1VQLCBvbl9rZXlfdXApOwogICAgIGV2YXNfb2JqZWN0X2V2ZW50 X2NhbGxiYWNrX2RlbChhcHAtPmJyb3dzZXIsIEVWQVNfQ0FMTEJBQ0tfTU9VU0VfRE9XTiwgb25f bW91c2VfZG93bik7CiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfZGVsKGFwcC0+YnJv d3NlciwgRVZBU19DQUxMQkFDS19GT0NVU19JTiwgb25fZm9jdXNfaW4pOwogICAgIGV2YXNfb2Jq ZWN0X2V2ZW50X2NhbGxiYWNrX2RlbChhcHAtPmJyb3dzZXIsIEVWQVNfQ0FMTEJBQ0tfRk9DVVNf T1VULCBvbl9mb2N1c19vdXQpOwpAQCAtNjY0LDYgKzY3OSw3IEBAIGJyb3dzZXJDcmVhdGUoY29u c3QgY2hhciAqdXJsLCBjb25zdCBjaGFyICp0aGVtZSwgY29uc3QgY2hhciAqdXNlckFnZW50LCBF aW5hX1JlCiAvKiAgICAgZXdrX2NhbGxiYWNrX3Jlc2l6ZV9yZXF1ZXN0ZWRfYWRkKGFwcC0+YnJv d3Nlciwgb25fcmVzaXplX3JlcXVlc3RlZCwgYXBwLT5lZSk7ICovCiAKICAgICBldmFzX29iamVj dF9ldmVudF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCBFVkFTX0NBTExCQUNLX0tFWV9ET1dO LCBvbl9rZXlfZG93biwgYXBwKTsKKyAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19hZGQo YXBwLT5icm93c2VyLCBFVkFTX0NBTExCQUNLX0tFWV9VUCwgb25fa2V5X3VwLCBhcHApOwogICAg IGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsIEVWQVNfQ0FMTEJB Q0tfTU9VU0VfRE9XTiwgb25fbW91c2VfZG93biwgYXBwKTsKICAgICBldmFzX29iamVjdF9ldmVu dF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCBFVkFTX0NBTExCQUNLX0ZPQ1VTX0lOLCBvbl9m b2N1c19pbiwgYXBwKTsKICAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19hZGQoYXBwLT5i cm93c2VyLCBFVkFTX0NBTExCQUNLX0ZPQ1VTX09VVCwgb25fZm9jdXNfb3V0LCBhcHApOwo= 126077 2012-02-08 06:55:26 -0800 2012-02-19 05:13:03 -0800 patch_1 revise.patch text/plain 4420 jungjik.lee ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlODg0 OTQ2Li4zODU3MTEyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDItMDggIEp1bmdKaWsgTGVlICA8anVuZ2pp ay5sZWVAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gVXNlIG1vZGlmaWVyIGtleXMgdG8g ZXhlY3V0ZSBwcmUtcmVuZGVyaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzc5MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVc2UgbW9kaWZpZXIga2V5IHRvIGV4ZWN1dGUgcHJlLXJlbmRlcmluZyBp bnN0ZWFkIG9mIHVzaW5nIHJlc2VydmVkIGZ1bmN0aW9uIGtleXMuCisKKyAgICAgICAgKiBFV2Vi TGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAob25fa2V5 X3VwKToKKyAgICAgICAgKG9uX2Jyb3dzZXJfZGVsKToKKyAgICAgICAgKGJyb3dzZXJDcmVhdGUp OgorCiAyMDEyLTAyLTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFJldmVydCBhIHBhcnQgb2YgdGhlIGNoYW5nZSBpbiByMTA2Njg3IGFzIGEgYnVpbGQgZml4 LgpkaWZmIC0tZ2l0IGEvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYyBiL1Rvb2xzL0VXZWJMYXVu Y2hlci9tYWluLmMKaW5kZXggMmQ2NGQ0YS4uMzFlOTkxMyAxMDA2NDQKLS0tIGEvVG9vbHMvRVdl YkxhdW5jaGVyL21haW4uYworKysgYi9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCkBAIC0xMzUs NiArMTM1LDggQEAgc3RhdGljIGNvbnN0IEVjb3JlX0dldG9wdCBvcHRpb25zID0gewogICAgIH0K IH07CiAKK3N0YXRpYyB1bnNpZ25lZCBpbnQgbW9kaWZpZXJLZXkgPSAwOworCiB0eXBlZGVmIHN0 cnVjdCBfRUxhdW5jaGVyIHsKICAgICBFY29yZV9FdmFzICplZTsKICAgICBFdmFzICpldmFzOwpA QCAtNDMwLDYgKzQzMiw5IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNf T2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgfTsKICAgICBzdGF0aWMgaW50IGN1 cnJlbnRFbmNvZGluZyA9IC0xOwogCisgICAgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkNvbnRyb2xf TCIpKQorICAgICAgICBtb2RpZmllcktleSB8PSBFQ09SRV9FVkVOVF9NT0RJRklFUl9DVFJMOwor CiAgICAgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkVzY2FwZSIpKSB7CiAgICAgICAgIGNsb3NlV2lu ZG93KGFwcC0+ZWUpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjEiKSkgewpA QCAtNTI3LDcgKzUzMiw3IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNf T2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgIGJyb3dzZXJDcmVhdGUoImh0 dHA6Ly93d3cuZ29vZ2xlLmNvbSIsCiAgICAgICAgICAgICAgICAgICAgICAgIGFwcC0+dGhlbWUs IGFwcC0+dXNlckFnZW50LCBnZW9tZXRyeSwgYXBwLT4gYmFja2luZ1N0b3JlLAogICAgICAgICAg ICAgICAgICAgICAgICBOVUxMLCBhcHAtPmlzRmxhdHRlbmluZywgMCwgTlVMTCk7Ci0gICAgfSBl bHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGMTAiKSkgeworICAgIH0gZWxzZSBpZiAoIXN0cmNt cChldi0+a2V5LCAiZyIpICYmIChtb2RpZmllcktleSAmIEVDT1JFX0VWRU5UX01PRElGSUVSX0NU UkwpKSB7CiAgICAgICAgIEV2YXNfQ29vcmQgeCwgeSwgdywgaDsKICAgICAgICAgRXZhc19PYmpl Y3QgKmZyYW1lID0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQob2JqKTsKICAgICAgICAgZmxvYXQg em9vbSA9IHpvb21MZXZlbHNbY3VycmVudFpvb21MZXZlbF0gLyAxMDAuMDsKQEAgLTUzOSwyNyAr NTQ0LDM3IEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpv YmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgIGggKj0gNDsKICAgICAgICAgaW5mbygiUHJl LXJlbmRlciAlZCwlZCArICVkeCVkXG4iLCB4LCB5LCB3LCBoKTsKICAgICAgICAgZXdrX3ZpZXdf cHJlX3JlbmRlcl9yZWdpb24ob2JqLCB4LCB5LCB3LCBoLCB6b29tKTsKLSAgICB9IGVsc2UgaWYg KCFzdHJjbXAoZXYtPmtleSwgIkYxMSIpKSB7CisgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5r ZXksICJyIikgJiYgKG1vZGlmaWVyS2V5ICYgRUNPUkVfRVZFTlRfTU9ESUZJRVJfQ1RSTCkpIHsK ICAgICAgICAgaW5mbygiUHJlLXJlbmRlciAxIGV4dHJhIGNvbHVtbi9yb3cgd2l0aCBjdXJyZW50 IHpvb20iKTsKICAgICAgICAgZXdrX3ZpZXdfcHJlX3JlbmRlcl9yZWxhdGl2ZV9yYWRpdXMob2Jq LCAxKTsKKyAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgInAiKSAmJiAobW9kaWZpZXJL ZXkgJiBFQ09SRV9FVkVOVF9NT0RJRklFUl9DVFJMKSkgeworICAgICAgICBpbmZvKCJQcmUtcmVu ZGVyaW5nIHN0YXJ0Iik7CisgICAgICAgIGV3a192aWV3X3ByZV9yZW5kZXJfc3RhcnQob2JqKTsK ICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgImQiKSkgewogICAgICAgICBpbmZvKCJS ZW5kZXIgc3VzcGVuZGVkIik7CiAgICAgICAgIGV3a192aWV3X2Rpc2FibGVfcmVuZGVyKG9iaik7 CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJlIikpIHsKICAgICAgICAgaW5mbygi UmVuZGVyIHJlc3VtZWQiKTsKICAgICAgICAgZXdrX3ZpZXdfZW5hYmxlX3JlbmRlcihvYmopOwot ICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiSW5zZXJ0IikpIHsKLSAgICAgICAgaW5m bygiUHJlLXJlbmRlcmluZyBzdGFydCIpOwotICAgICAgICBld2tfdmlld19wcmVfcmVuZGVyX3N0 YXJ0KG9iaik7CiAgICAgfQogfQogCiBzdGF0aWMgdm9pZAorb25fa2V5X3VwKHZvaWQgKmRhdGEs IEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCit7CisgICAgRXZh c19FdmVudF9LZXlfVXAgKmV2ID0gKEV2YXNfRXZlbnRfS2V5X1VwKikgZXZlbnRfaW5mbzsKKwor ICAgIGlmICghc3RyY21wKGV2LT5rZXksICJDb250cm9sX0wiKSkKKyAgICAgICAgbW9kaWZpZXJL ZXkgJj0gKDB4RkZGRiBeIEVDT1JFX0VWRU5UX01PRElGSUVSX0NUUkwpOworfQorCitzdGF0aWMg dm9pZAogb25fYnJvd3Nlcl9kZWwodm9pZCAqZGF0YSwgRXZhcyAqZXZhcywgRXZhc19PYmplY3Qg KmJyb3dzZXIsIHZvaWQgKmV2ZW50KQogewogICAgIEVMYXVuY2hlciAqYXBwID0gKEVMYXVuY2hl ciopIGRhdGE7CiAKICAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19kZWwoYXBwLT5icm93 c2VyLCBFVkFTX0NBTExCQUNLX0tFWV9ET1dOLCBvbl9rZXlfZG93bik7CisgICAgZXZhc19vYmpl Y3RfZXZlbnRfY2FsbGJhY2tfZGVsKGFwcC0+YnJvd3NlciwgRVZBU19DQUxMQkFDS19LRVlfVVAs IG9uX2tleV91cCk7CiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfZGVsKGFwcC0+YnJv d3NlciwgRVZBU19DQUxMQkFDS19NT1VTRV9ET1dOLCBvbl9tb3VzZV9kb3duKTsKICAgICBldmFz X29iamVjdF9ldmVudF9jYWxsYmFja19kZWwoYXBwLT5icm93c2VyLCBFVkFTX0NBTExCQUNLX0ZP Q1VTX0lOLCBvbl9mb2N1c19pbik7CiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfZGVs KGFwcC0+YnJvd3NlciwgRVZBU19DQUxMQkFDS19GT0NVU19PVVQsIG9uX2ZvY3VzX291dCk7CkBA IC02NjQsNiArNjc5LDcgQEAgYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNvbnN0IGNo YXIgKnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmUKIC8qICAgICBld2tfY2Fs bGJhY2tfcmVzaXplX3JlcXVlc3RlZF9hZGQoYXBwLT5icm93c2VyLCBvbl9yZXNpemVfcmVxdWVz dGVkLCBhcHAtPmVlKTsgKi8KIAogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZChh cHAtPmJyb3dzZXIsIEVWQVNfQ0FMTEJBQ0tfS0VZX0RPV04sIG9uX2tleV9kb3duLCBhcHApOwor ICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsIEVWQVNfQ0FM TEJBQ0tfS0VZX1VQLCBvbl9rZXlfdXAsIGFwcCk7CiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2Fs bGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgRVZBU19DQUxMQkFDS19NT1VTRV9ET1dOLCBvbl9tb3Vz ZV9kb3duLCBhcHApOwogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZChhcHAtPmJy b3dzZXIsIEVWQVNfQ0FMTEJBQ0tfRk9DVVNfSU4sIG9uX2ZvY3VzX2luLCBhcHApOwogICAgIGV2 YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsIEVWQVNfQ0FMTEJBQ0tf Rk9DVVNfT1VULCBvbl9mb2N1c19vdXQsIGFwcCk7Cg== 127733 2012-02-19 05:13:03 -0800 2012-02-19 11:29:57 -0800 patch_2 revise.patch text/plain 2697 jungjik.lee ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNjFj N2EyLi43YWZlNDIxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDItMTkgIEp1bmdKaWsgTGVlICA8anVuZ2pp ay5sZWVAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gVXNlIG1vZGlmaWVyIGtleXMgdG8g ZXhlY3V0ZSBwcmUtcmVuZGVyaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzc5MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVc2UgbW9kaWZpZXIga2V5IHRvIGV4ZWN1dGUgcHJlLXJlbmRlcmluZyBp bnN0ZWFkIG9mIHVzaW5nIHJlc2VydmVkIGZ1bmN0aW9uIGtleXMuCisKKyAgICAgICAgKiBFV2Vi TGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgorCiAyMDEyLTAyLTE4ICBE aXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBvbmUgbW9y ZSBkYW5nbGluZyByZWZlcmVuY2UgdG8gd29ya2VyX2Nvbm5lY3Rpb24ubmFtZSwgZGVsZXRlIHVu dXNlZCBjb2RlLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYyBiL1Rvb2xz L0VXZWJMYXVuY2hlci9tYWluLmMKaW5kZXggMmQ2NGQ0YS4uZjU0NTNmNyAxMDA2NDQKLS0tIGEv VG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYworKysgYi9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5j CkBAIC00MjksNiArNDI5LDcgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZh c19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgTlVMTAogICAgIH07CiAg ICAgc3RhdGljIGludCBjdXJyZW50RW5jb2RpbmcgPSAtMTsKKyAgICBFaW5hX0Jvb2wgY3RybFBy ZXNzZWQgPSBldmFzX2tleV9tb2RpZmllcl9pc19zZXQoZXZhc19rZXlfbW9kaWZpZXJfZ2V0KGUp LCAiQ29udHJvbCIpOwogCiAgICAgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkVzY2FwZSIpKSB7CiAg ICAgICAgIGNsb3NlV2luZG93KGFwcC0+ZWUpOwpAQCAtNTI3LDcgKzUyOCw3IEBAIG9uX2tleV9k b3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2lu Zm8pCiAgICAgICAgIGJyb3dzZXJDcmVhdGUoImh0dHA6Ly93d3cuZ29vZ2xlLmNvbSIsCiAgICAg ICAgICAgICAgICAgICAgICAgIGFwcC0+dGhlbWUsIGFwcC0+dXNlckFnZW50LCBnZW9tZXRyeSwg YXBwLT4gYmFja2luZ1N0b3JlLAogICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCBhcHAtPmlz RmxhdHRlbmluZywgMCwgTlVMTCk7Ci0gICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJG MTAiKSkgeworICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiZyIpICYmIGN0cmxQcmVz c2VkICkgewogICAgICAgICBFdmFzX0Nvb3JkIHgsIHksIHcsIGg7CiAgICAgICAgIEV2YXNfT2Jq ZWN0ICpmcmFtZSA9IGV3a192aWV3X2ZyYW1lX21haW5fZ2V0KG9iaik7CiAgICAgICAgIGZsb2F0 IHpvb20gPSB6b29tTGV2ZWxzW2N1cnJlbnRab29tTGV2ZWxdIC8gMTAwLjA7CkBAIC01MzksMTgg KzU0MCwxOCBAQCBvbl9rZXlfZG93bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAq b2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgICAgICBoICo9IDQ7CiAgICAgICAgIGluZm8oIlBy ZS1yZW5kZXIgJWQsJWQgKyAlZHglZFxuIiwgeCwgeSwgdywgaCk7CiAgICAgICAgIGV3a192aWV3 X3ByZV9yZW5kZXJfcmVnaW9uKG9iaiwgeCwgeSwgdywgaCwgem9vbSk7Ci0gICAgfSBlbHNlIGlm ICghc3RyY21wKGV2LT5rZXksICJGMTEiKSkgeworICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+ a2V5LCAiciIpICYmIGN0cmxQcmVzc2VkKSB7CiAgICAgICAgIGluZm8oIlByZS1yZW5kZXIgMSBl eHRyYSBjb2x1bW4vcm93IHdpdGggY3VycmVudCB6b29tIik7CiAgICAgICAgIGV3a192aWV3X3By ZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzKG9iaiwgMSk7Ci0gICAgfSBlbHNlIGlmICghc3RyY21w KGV2LT5rZXksICJkIikpIHsKKyAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgInAiKSAm JiBjdHJsUHJlc3NlZCkgeworICAgICAgICBpbmZvKCJQcmUtcmVuZGVyaW5nIHN0YXJ0Iik7Cisg ICAgICAgIGV3a192aWV3X3ByZV9yZW5kZXJfc3RhcnQob2JqKTsKKyAgICB9IGVsc2UgaWYgKCFz dHJjbXAoZXYtPmtleSwgImQiKSAmJiBjdHJsUHJlc3NlZCkgewogICAgICAgICBpbmZvKCJSZW5k ZXIgc3VzcGVuZGVkIik7CiAgICAgICAgIGV3a192aWV3X2Rpc2FibGVfcmVuZGVyKG9iaik7Ci0g ICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJlIikpIHsKKyAgICB9IGVsc2UgaWYgKCFz dHJjbXAoZXYtPmtleSwgImUiKSAmJiBjdHJsUHJlc3NlZCkgewogICAgICAgICBpbmZvKCJSZW5k ZXIgcmVzdW1lZCIpOwogICAgICAgICBld2tfdmlld19lbmFibGVfcmVuZGVyKG9iaik7Ci0gICAg fSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJJbnNlcnQiKSkgewotICAgICAgICBpbmZvKCJQ cmUtcmVuZGVyaW5nIHN0YXJ0Iik7Ci0gICAgICAgIGV3a192aWV3X3ByZV9yZW5kZXJfc3RhcnQo b2JqKTsKICAgICB9CiB9CiAK