62899 2011-06-17 12:13:19 -0700 [UNIX] Don't use WebCore::PluginPackage to get plugin information 2011-06-20 10:49:29 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk, Qt P2 Normal --- 1 cgarcia webkit-unassigned oldest_to_newest 422820 0 cgarcia 2011-06-17 12:13:19 -0700 The problem is that both PluginPackage in WebCore and NetscapePluginModule in webkit2 install their own netscape browser functions and that can cause conflicts in some situations. 422822 1 97633 cgarcia 2011-06-17 12:17:42 -0700 Created attachment 97633 Patch 423625 2 97790 cgarcia 2011-06-20 06:05:38 -0700 Created attachment 97790 Patach rebased to current git master It seems previous patch didn't apply, this one has been rebased to current git master so it should apply. 423719 3 97790 mrobinson 2011-06-20 09:57:35 -0700 Comment on attachment 97790 Patach rebased to current git master View in context: https://bugs.webkit.org/attachment.cgi?id=97790&action=review Looks good, but please take a look at the following suggestions before landing. > Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:104 > + Vector<String> mime; Maybe call this something like mimeTypeParts. > Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:116 > + Vector<String> extensions; > + if (mime.size() > 1) { > + mime[1].split(UChar(','), false, extensions); > + mimeInfo.extensions = extensions; Can you just pass mimeInfo.extensions to the split call here? 423758 4 cgarcia 2011-06-20 10:49:29 -0700 Committed r89256: <http://trac.webkit.org/changeset/89256> 97633 2011-06-17 12:17:42 -0700 2011-06-20 06:05:38 -0700 Patch wk2-get-plugin-info.diff text/plain 7414 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4OTQyNjFlLi4yNmU3Yjg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzAg QEAKIDIwMTEtMDYtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtVTklY XSBEb24ndCB1c2UgV2ViQ29yZTo6UGx1Z2luUGFja2FnZSB0byBnZXQgcGx1Z2luIGluZm9ybWF0 aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mjg5 OQorCisgICAgICAgIFRoZSBwcm9ibGVtIGlzIHRoYXQgYm90aCBQbHVnaW5QYWNrYWdlIGluIFdl YkNvcmUgYW5kCisgICAgICAgIE5ldHNjYXBlUGx1Z2luTW9kdWxlIGluIHdlYmtpdDIgaW5zdGFs bCB0aGVpciBvd24gbmV0c2NhcGUgYnJvd3NlcgorICAgICAgICBmdW5jdGlvbnMgYW5kIHRoYXQg Y2FuIGNhdXNlIGNvbmZsaWN0cyBpbiBzb21lIHNpdHVhdGlvbnMuCisKKyAgICAgICAgKiBTaGFy ZWQvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbk1vZHVsZS5oOiBBZGQgaGVscGVyCisg ICAgICAgIGZ1bmN0aW9uIHRvIHNldCBwbHVnaW4gbWltZSB0eXBlIGRlc2NyaXB0aW9ucy4KKyAg ICAgICAgKiBTaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVY MTEuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbk1vZHVsZTo6c2V0TUlNRURl c2NyaXB0aW9uKTogSGVscGVyCisgICAgICAgIGZ1bmN0aW9uIHRvIHNldCBwbHVnaW4gbWltZSB0 eXBlIGRlc2NyaXB0aW9ucy4KKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5Nb2R1bGU6 OmdldFBsdWdpbkluZm8pOiBVc2UKKyAgICAgICAgTmV0c2NhcGVQbHVnaW5Nb2R1bGUgaW5zdGVh ZCBvZiBQbHVnaW5QYWNrYWdlLgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1 Z2luSW5mb1N0b3JlVW5peC5jcHA6IFJlbW92ZSB1bm5lZWRlZAorICAgICAgICBoZWFkZXIuCisg ICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TlBOX0dldFZhbHVlKTogRG8gbm90IHRyeSB0byBnZXQg dGhlIFhEaXNwbGF5IGlmIHRoZQorICAgICAgICBwbHVnaW4gZG9lc24ndCBoYXZlIGEgdmlldy4g SXQgZml4ZXMgYSBjcmFzaCB3aXRoIGZsYXNoIHBsdWdpbiBhbmQKKyAgICAgICAgbWF0Y2hlcyBX ZWJDb3JlLgorCisyMDExLTA2LTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh bGlhLmNvbT4KKwogICAgICAgICBVbnJldmlld2VkLiBGaXggV2ViS2l0MiBHVEsgYnVpbGQgYWZ0 ZXIgcjg5MDYwLgogCiAgICAgICAgICogU2hhcmVkL2d0ay9XZWJDb3JlQXJndW1lbnRDb2RlcnNH dGsuY3BwOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2Nh cGUvTmV0c2NhcGVQbHVnaW5Nb2R1bGUuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luTW9kdWxlLmgKaW5kZXggNjYyNjk5Ny4uZWQ2ZjE4MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2Nh cGVQbHVnaW5Nb2R1bGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRz Y2FwZS9OZXRzY2FwZVBsdWdpbk1vZHVsZS5oCkBAIC02OCw2ICs2OCw3IEBAIHByaXZhdGU6CiAK ICNpZiBQTFVHSU5fQVJDSElURUNUVVJFKFgxMSkKICAgICB2b2lkIGFwcGx5WDExUXVpcmtzQmVm b3JlTG9hZCgpOworICAgIHN0YXRpYyB2b2lkIHNldE1JTUVEZXNjcmlwdGlvbihjb25zdCBTdHJp bmcmIG1pbWVEZXNjcmlwdGlvbiwgUGx1Z2luTW9kdWxlSW5mbyYpOwogI2VuZGlmCiAKICAgICBi b29sIHRyeUdldFNpdGVzV2l0aERhdGEoVmVjdG9yPFN0cmluZz4mKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpbk1v ZHVsZVgxMS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS94MTEv TmV0c2NhcGVQbHVnaW5Nb2R1bGVYMTEuY3BwCmluZGV4IDNlZmYxZjguLjRlYjk3NWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2Fw ZVBsdWdpbk1vZHVsZVgxMS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMv TmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luTW9kdWxlWDExLmNwcApAQCAtMjgsOCArMjgsOCBA QAogCiAjaW5jbHVkZSAiTmV0c2NhcGVQbHVnaW5Nb2R1bGUuaCIKIAotI2luY2x1ZGUgIlBsdWdp bkRhdGFiYXNlLmgiCi0jaW5jbHVkZSAiUGx1Z2luUGFja2FnZS5oIgorI2luY2x1ZGUgIk5ldHNj YXBlQnJvd3NlckZ1bmNzLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lzdGVtLmg+CiAKICNp ZiBQTEFURk9STShRVCkKICNpbmNsdWRlIDxRTGlicmFyeT4KQEAgLTYzLDM1ICs2Myw2NCBAQCB2 b2lkIE5ldHNjYXBlUGx1Z2luTW9kdWxlOjphcHBseVgxMVF1aXJrc0JlZm9yZUxvYWQoKQogI2Vu ZGlmCiB9CiAKK3ZvaWQgTmV0c2NhcGVQbHVnaW5Nb2R1bGU6OnNldE1JTUVEZXNjcmlwdGlvbihj b25zdCBTdHJpbmcmIG1pbWVEZXNjcmlwdGlvbiwgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luKQor eworICAgIFZlY3RvcjxTdHJpbmc+IHR5cGVzOworICAgIG1pbWVEZXNjcmlwdGlvbi5sb3dlcigp LnNwbGl0KFVDaGFyKCc7JyksIGZhbHNlLCB0eXBlcyk7CisgICAgcGx1Z2luLmluZm8ubWltZXMu cmVzZXJ2ZUNhcGFjaXR5KHR5cGVzLnNpemUoKSk7CisKKyAgICBzaXplX3QgbWltZUluZm9Db3Vu dCA9IDA7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0eXBlcy5zaXplKCk7ICsraSkgewor ICAgICAgICBWZWN0b3I8U3RyaW5nPiBtaW1lOworICAgICAgICB0eXBlc1tpXS5zcGxpdChVQ2hh cignOicpLCB0cnVlLCBtaW1lKTsKKyAgICAgICAgaWYgKG1pbWUuc2l6ZSgpIDw9IDApCisgICAg ICAgICAgICBjb250aW51ZTsKKworICAgICAgICBwbHVnaW4uaW5mby5taW1lcy51bmNoZWNrZWRB cHBlbmQoTWltZUNsYXNzSW5mbygpKTsKKyAgICAgICAgTWltZUNsYXNzSW5mbyYgbWltZUluZm8g PSBwbHVnaW4uaW5mby5taW1lc1ttaW1lSW5mb0NvdW50KytdOworICAgICAgICBtaW1lSW5mby50 eXBlID0gbWltZVswXTsKKworICAgICAgICBWZWN0b3I8U3RyaW5nPiBleHRlbnNpb25zOworICAg ICAgICBpZiAobWltZS5zaXplKCkgPiAxKSB7CisgICAgICAgICAgICBtaW1lWzFdLnNwbGl0KFVD aGFyKCcsJyksIGZhbHNlLCBleHRlbnNpb25zKTsKKyAgICAgICAgICAgIG1pbWVJbmZvLmV4dGVu c2lvbnMgPSBleHRlbnNpb25zOworICAgICAgICB9CisgICAgICAgIGlmIChtaW1lLnNpemUoKSA+ IDIpCisgICAgICAgICAgICBtaW1lSW5mby5kZXNjID0gbWltZVsyXTsKKyAgICB9Cit9CisKIGJv b2wgTmV0c2NhcGVQbHVnaW5Nb2R1bGU6OmdldFBsdWdpbkluZm8oY29uc3QgU3RyaW5nJiBwbHVn aW5QYXRoLCBQbHVnaW5Nb2R1bGVJbmZvJiBwbHVnaW4pCiB7CiAgICAgLy8gV2UgYXJlIGxvYWRp bmcgdGhlIHBsdWdpbiBoZXJlIHNpbmNlIGl0IGRvZXMgbm90IHNlZW0gdG8gYmUgYSBzdGFuZGFy ZGl6ZWQgd2F5IHRvCiAgICAgLy8gZ2V0IHRoZSBuZWVkZWQgaW5mb3JtYXRpb25zIGZyb20gYSBV TklYIHBsdWdpbiB3aXRob3V0IGxvYWRpbmcgaXQuCi0KLSAgICBSZWZQdHI8UGx1Z2luUGFja2Fn ZT4gcGFja2FnZSA9IFBsdWdpblBhY2thZ2U6OmNyZWF0ZVBhY2thZ2UocGx1Z2luUGF0aCwgMCAv Kmxhc3RNb2RpZmllZCovKTsKLSAgICBpZiAoIXBhY2thZ2UpCisgICAgUmVmUHRyPE5ldHNjYXBl UGx1Z2luTW9kdWxlPiBwbHVnaW5Nb2R1bGUgPSBOZXRzY2FwZVBsdWdpbk1vZHVsZTo6Z2V0T3JD cmVhdGUocGx1Z2luUGF0aCk7CisgICAgaWYgKCFwbHVnaW5Nb2R1bGUpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAogICAgIHBsdWdpbi5wYXRoID0gcGx1Z2luUGF0aDsKLSAgICBwbHVnaW4uaW5m by5kZXNjID0gcGFja2FnZS0+ZGVzY3JpcHRpb24oKTsKLSAgICBwbHVnaW4uaW5mby5maWxlID0g cGFja2FnZS0+ZmlsZU5hbWUoKTsKLQotICAgIGNvbnN0IE1JTUVUb0Rlc2NyaXB0aW9uc01hcCYg ZGVzY3JpcHRpb25zID0gcGFja2FnZS0+bWltZVRvRGVzY3JpcHRpb25zKCk7Ci0gICAgY29uc3Qg TUlNRVRvRXh0ZW5zaW9uc01hcCYgZXh0ZW5zaW9ucyA9IHBhY2thZ2UtPm1pbWVUb0V4dGVuc2lv bnMoKTsKLSAgICBNSU1FVG9EZXNjcmlwdGlvbnNNYXA6OmNvbnN0X2l0ZXJhdG9yIGRlc2NFbmQg PSBkZXNjcmlwdGlvbnMuZW5kKCk7Ci0gICAgcGx1Z2luLmluZm8ubWltZXMucmVzZXJ2ZUNhcGFj aXR5KGRlc2NyaXB0aW9ucy5zaXplKCkpOwotICAgIHVuc2lnbmVkIGkgPSAwOwotICAgIGZvciAo TUlNRVRvRGVzY3JpcHRpb25zTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IGRlc2NyaXB0aW9ucy5i ZWdpbigpOyBpdCAhPSBkZXNjRW5kOyArK2l0KSB7Ci0gICAgICAgIHBsdWdpbi5pbmZvLm1pbWVz LnVuY2hlY2tlZEFwcGVuZChNaW1lQ2xhc3NJbmZvKCkpOwotICAgICAgICBNaW1lQ2xhc3NJbmZv JiBtaW1lID0gcGx1Z2luLmluZm8ubWltZXNbaSsrXTsKLSAgICAgICAgbWltZS50eXBlID0gaXQt PmZpcnN0OwotICAgICAgICBtaW1lLmRlc2MgPSBpdC0+c2Vjb25kOwotICAgICAgICBNSU1FVG9F eHRlbnNpb25zTWFwOjpjb25zdF9pdGVyYXRvciBleHRlbnNpb25JdCA9IGV4dGVuc2lvbnMuZmlu ZChpdC0+Zmlyc3QpOwotICAgICAgICBBU1NFUlQoZXh0ZW5zaW9uSXQgIT0gZXh0ZW5zaW9ucy5l bmQoKSk7Ci0gICAgICAgIG1pbWUuZXh0ZW5zaW9ucyA9IGV4dGVuc2lvbkl0LT5zZWNvbmQ7Ci0g ICAgfQorICAgIHBsdWdpbi5pbmZvLmZpbGUgPSBwYXRoR2V0RmlsZU5hbWUocGx1Z2luUGF0aCk7 CisKKyAgICBNb2R1bGUqIG1vZHVsZSA9IHBsdWdpbk1vZHVsZS0+bW9kdWxlKCk7CisgICAgTlBQ X0dldFZhbHVlUHJvY1B0ciBOUFBfR2V0VmFsdWUgPSBtb2R1bGUtPmZ1bmN0aW9uUG9pbnRlcjxO UFBfR2V0VmFsdWVQcm9jUHRyPigiTlBfR2V0VmFsdWUiKTsKKyAgICBpZiAoIU5QUF9HZXRWYWx1 ZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgTlBfR2V0TUlNRURlc2NyaXB0aW9uRnVu Y1B0ciBOUF9HZXRNSU1FRGVzY3JpcHRpb24gPSBtb2R1bGUtPmZ1bmN0aW9uUG9pbnRlcjxOUF9H ZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyPigiTlBfR2V0TUlNRURlc2NyaXB0aW9uIik7CisgICAg aWYgKCFOUF9HZXRNSU1FRGVzY3JpcHRpb24pCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg IGNoYXIqIGJ1ZmZlciA9IDA7CisgICAgTlBFcnJvciBlcnIgPSBOUFBfR2V0VmFsdWUoMCwgTlBQ VnBsdWdpbkRlc2NyaXB0aW9uU3RyaW5nLCAmYnVmZmVyKTsKKyAgICBpZiAoZXJyID09IE5QRVJS X05PX0VSUk9SKQorICAgICAgICBwbHVnaW4uaW5mby5kZXNjID0gYnVmZmVyOworCisgICAgY29u c3QgY2hhciogbWltZURlc2NyaXB0aW9uID0gTlBfR2V0TUlNRURlc2NyaXB0aW9uKCk7CisgICAg aWYgKCFtaW1lRGVzY3JpcHRpb24pCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHNldE1J TUVEZXNjcmlwdGlvbihtaW1lRGVzY3JpcHRpb24sIHBsdWdpbik7CiAKLSAgICBwYWNrYWdlLT51 bmxvYWQoKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1BsdWdpbnMvdW5peC9QbHVnaW5JbmZvU3RvcmVVbml4LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luSW5mb1N0b3JlVW5peC5jcHAK aW5kZXggM2M1NGU1My4uODVkYzhkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BsdWdpbnMvdW5peC9QbHVnaW5JbmZvU3RvcmVVbml4LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy91bml4L1BsdWdpbkluZm9TdG9yZVVuaXguY3BwCkBAIC0z MCw3ICszMCw2IEBACiAKICNpbmNsdWRlICJOZXRzY2FwZVBsdWdpbk1vZHVsZS5oIgogI2luY2x1 ZGUgIlBsdWdpbkRhdGFiYXNlLmgiCi0jaW5jbHVkZSAiUGx1Z2luUGFja2FnZS5oIgogCiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5j cHAKaW5kZXggYzdlMGMyZi4uMWU4MWZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2Vy RnVuY3MuY3BwCkBAIC01MDMsNyArNTAzLDEwIEBAIHN0YXRpYyBOUEVycm9yIE5QTl9HZXRWYWx1 ZShOUFAgbnBwLCBOUE5WYXJpYWJsZSB2YXJpYWJsZSwgdm9pZCAqdmFsdWUpCiAgICAgICAgICAg ICooTlBCb29sKil2YWx1ZSA9IHRydWU7CiAgICAgICAgICAgIGJyZWFrOwogI2VsaWYgUExVR0lO X0FSQ0hJVEVDVFVSRShYMTEpCi0gICAgICAgY2FzZSBOUE5WeERpc3BsYXk6CisgICAgICAgY2Fz ZSBOUE5WeERpc3BsYXk6IHsKKyAgICAgICAgICAgUmVmUHRyPE5ldHNjYXBlUGx1Z2luPiBwbHVn aW4gPSBOZXRzY2FwZVBsdWdpbjo6ZnJvbU5QUChucHApOworICAgICAgICAgICBpZiAoIXBsdWdp bikKKyAgICAgICAgICAgICAgIHJldHVybiBOUEVSUl9HRU5FUklDX0VSUk9SOwogI2lmIFBMQVRG T1JNKFFUKQogICAgICAgICAgICAqcmVpbnRlcnByZXRfY2FzdDxEaXNwbGF5Kio+KHZhbHVlKSA9 IFFYMTFJbmZvOjpkaXNwbGF5KCk7CiAgICAgICAgICAgIGJyZWFrOwpAQCAtNTEzLDYgKzUxNiw3 IEBAIHN0YXRpYyBOUEVycm9yIE5QTl9HZXRWYWx1ZShOUFAgbnBwLCBOUE5WYXJpYWJsZSB2YXJp YWJsZSwgdm9pZCAqdmFsdWUpCiAjZWxzZQogICAgICAgICAgICBnb3RvIGRlZmF1bHQ7CiAjZW5k aWYKKyAgICAgICB9CiAgICAgICAgY2FzZSBOUE5WU3VwcG9ydHNYRW1iZWRCb29sOgogICAgICAg ICAgICAqc3RhdGljX2Nhc3Q8TlBCb29sKj4odmFsdWUpID0gdHJ1ZTsKICAgICAgICAgICAgYnJl YWs7Cg== 97790 2011-06-20 06:05:38 -0700 2011-06-20 09:57:35 -0700 Patach rebased to current git master wk2-plugin-info2.diff text/plain 7554 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhNjM3MWVmLi45ZDEwOWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTEtMDYtMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtVTklY XSBEb24ndCB1c2UgV2ViQ29yZTo6UGx1Z2luUGFja2FnZSB0byBnZXQgcGx1Z2luIGluZm9ybWF0 aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mjg5 OQorCisgICAgICAgIFRoZSBwcm9ibGVtIGlzIHRoYXQgYm90aCBQbHVnaW5QYWNrYWdlIGluIFdl YkNvcmUgYW5kCisgICAgICAgIE5ldHNjYXBlUGx1Z2luTW9kdWxlIGluIHdlYmtpdDIgaW5zdGFs bCB0aGVpciBvd24gbmV0c2NhcGUgYnJvd3NlcgorICAgICAgICBmdW5jdGlvbnMgYW5kIHRoYXQg Y2FuIGNhdXNlIGNvbmZsaWN0cyBpbiBzb21lIHNpdHVhdGlvbnMuCisKKyAgICAgICAgKiBTaGFy ZWQvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbk1vZHVsZS5oOiBBZGQgaGVscGVyCisg ICAgICAgIGZ1bmN0aW9uIHRvIHNldCBwbHVnaW4gbWltZSB0eXBlIGRlc2NyaXB0aW9ucy4KKyAg ICAgICAgKiBTaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVY MTEuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbk1vZHVsZTo6c2V0TUlNRURl c2NyaXB0aW9uKTogSGVscGVyCisgICAgICAgIGZ1bmN0aW9uIHRvIHNldCBwbHVnaW4gbWltZSB0 eXBlIGRlc2NyaXB0aW9ucy4KKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5Nb2R1bGU6 OmdldFBsdWdpbkluZm8pOiBVc2UKKyAgICAgICAgTmV0c2NhcGVQbHVnaW5Nb2R1bGUgaW5zdGVh ZCBvZiBQbHVnaW5QYWNrYWdlLgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1 Z2luSW5mb1N0b3JlVW5peC5jcHA6IFJlbW92ZSB1bm5lZWRlZAorICAgICAgICBoZWFkZXIgaW5j bHVkZS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93 c2VyRnVuY3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUE5fR2V0VmFsdWUpOiBEbyBub3QgdHJ5 IHRvIGdldCB0aGUgWERpc3BsYXkgaWYgdGhlCisgICAgICAgIHBsdWdpbiBkb2Vzbid0IGhhdmUg YSB2aWV3LiBJdCBmaXhlcyBhIGNyYXNoIHdpdGggZmxhc2ggcGx1Z2luIGFuZAorICAgICAgICBt YXRjaGVzIFdlYkNvcmUuCisKIDIwMTEtMDYtMTkgIE1PUklUQSBIYWppbWUgPG1vcnJpdGFAZ29v Z2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIHdpbmNhaXJvIGJ1aWxkIGZpeC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1 Z2luTW9kdWxlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbk1vZHVsZS5oCmluZGV4IDY2MjY5OTcuLmVkNmYxODIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luTW9kdWxl LmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQ bHVnaW5Nb2R1bGUuaApAQCAtNjgsNiArNjgsNyBAQCBwcml2YXRlOgogCiAjaWYgUExVR0lOX0FS Q0hJVEVDVFVSRShYMTEpCiAgICAgdm9pZCBhcHBseVgxMVF1aXJrc0JlZm9yZUxvYWQoKTsKKyAg ICBzdGF0aWMgdm9pZCBzZXRNSU1FRGVzY3JpcHRpb24oY29uc3QgU3RyaW5nJiBtaW1lRGVzY3Jp cHRpb24sIFBsdWdpbk1vZHVsZUluZm8mKTsKICNlbmRpZgogCiAgICAgYm9vbCB0cnlHZXRTaXRl c1dpdGhEYXRhKFZlY3RvcjxTdHJpbmc+Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVYMTEuY3BwIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2lu TW9kdWxlWDExLmNwcAppbmRleCA0NThlMTdiLi45NDFhYWRlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVY MTEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL3gxMS9O ZXRzY2FwZVBsdWdpbk1vZHVsZVgxMS5jcHAKQEAgLTI4LDggKzI4LDggQEAKIAogI2luY2x1ZGUg Ik5ldHNjYXBlUGx1Z2luTW9kdWxlLmgiCiAKLSNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZS5oIgot I2luY2x1ZGUgIlBsdWdpblBhY2thZ2UuaCIKKyNpbmNsdWRlICJOZXRzY2FwZUJyb3dzZXJGdW5j cy5oIgorI2luY2x1ZGUgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgogCiAjaWYgUExBVEZPUk0oUVQp CiAjaW5jbHVkZSA8UUxpYnJhcnk+CkBAIC05Myw2ICs5MywzMyBAQCB2b2lkIE5ldHNjYXBlUGx1 Z2luTW9kdWxlOjphcHBseVgxMVF1aXJrc0JlZm9yZUxvYWQoKQogI2VuZGlmCiB9CiAKK3ZvaWQg TmV0c2NhcGVQbHVnaW5Nb2R1bGU6OnNldE1JTUVEZXNjcmlwdGlvbihjb25zdCBTdHJpbmcmIG1p bWVEZXNjcmlwdGlvbiwgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luKQoreworICAgIFZlY3RvcjxT dHJpbmc+IHR5cGVzOworICAgIG1pbWVEZXNjcmlwdGlvbi5sb3dlcigpLnNwbGl0KFVDaGFyKCc7 JyksIGZhbHNlLCB0eXBlcyk7CisgICAgcGx1Z2luLmluZm8ubWltZXMucmVzZXJ2ZUNhcGFjaXR5 KHR5cGVzLnNpemUoKSk7CisKKyAgICBzaXplX3QgbWltZUluZm9Db3VudCA9IDA7CisgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCB0eXBlcy5zaXplKCk7ICsraSkgeworICAgICAgICBWZWN0b3I8 U3RyaW5nPiBtaW1lOworICAgICAgICB0eXBlc1tpXS5zcGxpdChVQ2hhcignOicpLCB0cnVlLCBt aW1lKTsKKyAgICAgICAgaWYgKG1pbWUuc2l6ZSgpIDw9IDApCisgICAgICAgICAgICBjb250aW51 ZTsKKworICAgICAgICBwbHVnaW4uaW5mby5taW1lcy51bmNoZWNrZWRBcHBlbmQoTWltZUNsYXNz SW5mbygpKTsKKyAgICAgICAgTWltZUNsYXNzSW5mbyYgbWltZUluZm8gPSBwbHVnaW4uaW5mby5t aW1lc1ttaW1lSW5mb0NvdW50KytdOworICAgICAgICBtaW1lSW5mby50eXBlID0gbWltZVswXTsK KworICAgICAgICBWZWN0b3I8U3RyaW5nPiBleHRlbnNpb25zOworICAgICAgICBpZiAobWltZS5z aXplKCkgPiAxKSB7CisgICAgICAgICAgICBtaW1lWzFdLnNwbGl0KFVDaGFyKCcsJyksIGZhbHNl LCBleHRlbnNpb25zKTsKKyAgICAgICAgICAgIG1pbWVJbmZvLmV4dGVuc2lvbnMgPSBleHRlbnNp b25zOworICAgICAgICB9CisgICAgICAgIGlmIChtaW1lLnNpemUoKSA+IDIpCisgICAgICAgICAg ICBtaW1lSW5mby5kZXNjID0gbWltZVsyXTsKKyAgICB9Cit9CisKIGJvb2wgTmV0c2NhcGVQbHVn aW5Nb2R1bGU6OmdldFBsdWdpbkluZm8oY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoLCBQbHVnaW5N b2R1bGVJbmZvJiBwbHVnaW4pCiB7CiAgICAgLy8gVGVtcGFyYXJpbHkgc3VwcHJlc3Mgc3Rkb3V0 IGluIHRoaXMgZnVuY3Rpb24gYXMgcGx1Z2lucyB3aWxsIGJlIGxvYWRlZCBhbmQgc2h1dGRvd24g YW5kIGRlYnVnIGluZm8KQEAgLTEwMSwzMSArMTI4LDMzIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5N b2R1bGU6OmdldFBsdWdpbkluZm8oY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoLCBQbHVnaW5Nb2R1 bGVJCiAKICAgICAvLyBXZSBhcmUgbG9hZGluZyB0aGUgcGx1Z2luIGhlcmUgc2luY2UgaXQgZG9l cyBub3Qgc2VlbSB0byBiZSBhIHN0YW5kYXJkaXplZCB3YXkgdG8KICAgICAvLyBnZXQgdGhlIG5l ZWRlZCBpbmZvcm1hdGlvbnMgZnJvbSBhIFVOSVggcGx1Z2luIHdpdGhvdXQgbG9hZGluZyBpdC4K LQotICAgIFJlZlB0cjxQbHVnaW5QYWNrYWdlPiBwYWNrYWdlID0gUGx1Z2luUGFja2FnZTo6Y3Jl YXRlUGFja2FnZShwbHVnaW5QYXRoLCAwIC8qbGFzdE1vZGlmaWVkKi8pOwotICAgIGlmICghcGFj a2FnZSkKKyAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW5Nb2R1bGU+IHBsdWdpbk1vZHVsZSA9IE5l dHNjYXBlUGx1Z2luTW9kdWxlOjpnZXRPckNyZWF0ZShwbHVnaW5QYXRoKTsKKyAgICBpZiAoIXBs dWdpbk1vZHVsZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcGx1Z2luLnBhdGggPSBw bHVnaW5QYXRoOwotICAgIHBsdWdpbi5pbmZvLmRlc2MgPSBwYWNrYWdlLT5kZXNjcmlwdGlvbigp OwotICAgIHBsdWdpbi5pbmZvLmZpbGUgPSBwYWNrYWdlLT5maWxlTmFtZSgpOwotCi0gICAgY29u c3QgTUlNRVRvRGVzY3JpcHRpb25zTWFwJiBkZXNjcmlwdGlvbnMgPSBwYWNrYWdlLT5taW1lVG9E ZXNjcmlwdGlvbnMoKTsKLSAgICBjb25zdCBNSU1FVG9FeHRlbnNpb25zTWFwJiBleHRlbnNpb25z ID0gcGFja2FnZS0+bWltZVRvRXh0ZW5zaW9ucygpOwotICAgIE1JTUVUb0Rlc2NyaXB0aW9uc01h cDo6Y29uc3RfaXRlcmF0b3IgZGVzY0VuZCA9IGRlc2NyaXB0aW9ucy5lbmQoKTsKLSAgICBwbHVn aW4uaW5mby5taW1lcy5yZXNlcnZlQ2FwYWNpdHkoZGVzY3JpcHRpb25zLnNpemUoKSk7Ci0gICAg dW5zaWduZWQgaSA9IDA7Ci0gICAgZm9yIChNSU1FVG9EZXNjcmlwdGlvbnNNYXA6OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gZGVzY3JpcHRpb25zLmJlZ2luKCk7IGl0ICE9IGRlc2NFbmQ7ICsraXQpIHsK LSAgICAgICAgcGx1Z2luLmluZm8ubWltZXMudW5jaGVja2VkQXBwZW5kKE1pbWVDbGFzc0luZm8o KSk7Ci0gICAgICAgIE1pbWVDbGFzc0luZm8mIG1pbWUgPSBwbHVnaW4uaW5mby5taW1lc1tpKytd OwotICAgICAgICBtaW1lLnR5cGUgPSBpdC0+Zmlyc3Q7Ci0gICAgICAgIG1pbWUuZGVzYyA9IGl0 LT5zZWNvbmQ7Ci0gICAgICAgIE1JTUVUb0V4dGVuc2lvbnNNYXA6OmNvbnN0X2l0ZXJhdG9yIGV4 dGVuc2lvbkl0ID0gZXh0ZW5zaW9ucy5maW5kKGl0LT5maXJzdCk7Ci0gICAgICAgIEFTU0VSVChl eHRlbnNpb25JdCAhPSBleHRlbnNpb25zLmVuZCgpKTsKLSAgICAgICAgbWltZS5leHRlbnNpb25z ID0gZXh0ZW5zaW9uSXQtPnNlY29uZDsKLSAgICB9CisgICAgcGx1Z2luLmluZm8uZmlsZSA9IHBh dGhHZXRGaWxlTmFtZShwbHVnaW5QYXRoKTsKKworICAgIE1vZHVsZSogbW9kdWxlID0gcGx1Z2lu TW9kdWxlLT5tb2R1bGUoKTsKKyAgICBOUFBfR2V0VmFsdWVQcm9jUHRyIE5QUF9HZXRWYWx1ZSA9 IG1vZHVsZS0+ZnVuY3Rpb25Qb2ludGVyPE5QUF9HZXRWYWx1ZVByb2NQdHI+KCJOUF9HZXRWYWx1 ZSIpOworICAgIGlmICghTlBQX0dldFZhbHVlKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICBOUF9HZXRNSU1FRGVzY3JpcHRpb25GdW5jUHRyIE5QX0dldE1JTUVEZXNjcmlwdGlvbiA9IG1v ZHVsZS0+ZnVuY3Rpb25Qb2ludGVyPE5QX0dldE1JTUVEZXNjcmlwdGlvbkZ1bmNQdHI+KCJOUF9H ZXRNSU1FRGVzY3JpcHRpb24iKTsKKyAgICBpZiAoIU5QX0dldE1JTUVEZXNjcmlwdGlvbikKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgY2hhciogYnVmZmVyID0gMDsKKyAgICBOUEVycm9y IGVyciA9IE5QUF9HZXRWYWx1ZSgwLCBOUFBWcGx1Z2luRGVzY3JpcHRpb25TdHJpbmcsICZidWZm ZXIpOworICAgIGlmIChlcnIgPT0gTlBFUlJfTk9fRVJST1IpCisgICAgICAgIHBsdWdpbi5pbmZv LmRlc2MgPSBidWZmZXI7CisKKyAgICBjb25zdCBjaGFyKiBtaW1lRGVzY3JpcHRpb24gPSBOUF9H ZXRNSU1FRGVzY3JpcHRpb24oKTsKKyAgICBpZiAoIW1pbWVEZXNjcmlwdGlvbikKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgc2V0TUlNRURlc2NyaXB0aW9uKG1pbWVEZXNjcmlwdGlvbiwg cGx1Z2luKTsKIAotICAgIHBhY2thZ2UtPnVubG9hZCgpOwogICAgIHJldHVybiB0cnVlOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy91bml4L1BsdWdp bkluZm9TdG9yZVVuaXguY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvdW5p eC9QbHVnaW5JbmZvU3RvcmVVbml4LmNwcAppbmRleCAzYzU0ZTUzLi44NWRjOGQ4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy91bml4L1BsdWdpbkluZm9TdG9y ZVVuaXguY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1 Z2luSW5mb1N0b3JlVW5peC5jcHAKQEAgLTMwLDcgKzMwLDYgQEAKIAogI2luY2x1ZGUgIk5ldHNj YXBlUGx1Z2luTW9kdWxlLmgiCiAjaW5jbHVkZSAiUGx1Z2luRGF0YWJhc2UuaCIKLSNpbmNsdWRl ICJQbHVnaW5QYWNrYWdlLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVC cm93c2VyRnVuY3MuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcAppbmRleCBjN2UwYzJmLi4xZTgxZmUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2Nh cGVCcm93c2VyRnVuY3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAKQEAgLTUwMyw3ICs1MDMsMTAgQEAg c3RhdGljIE5QRXJyb3IgTlBOX0dldFZhbHVlKE5QUCBucHAsIE5QTlZhcmlhYmxlIHZhcmlhYmxl LCB2b2lkICp2YWx1ZSkKICAgICAgICAgICAgKihOUEJvb2wqKXZhbHVlID0gdHJ1ZTsKICAgICAg ICAgICAgYnJlYWs7CiAjZWxpZiBQTFVHSU5fQVJDSElURUNUVVJFKFgxMSkKLSAgICAgICBjYXNl IE5QTlZ4RGlzcGxheToKKyAgICAgICBjYXNlIE5QTlZ4RGlzcGxheTogeworICAgICAgICAgICBS ZWZQdHI8TmV0c2NhcGVQbHVnaW4+IHBsdWdpbiA9IE5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQKG5w cCk7CisgICAgICAgICAgIGlmICghcGx1Z2luKQorICAgICAgICAgICAgICAgcmV0dXJuIE5QRVJS X0dFTkVSSUNfRVJST1I7CiAjaWYgUExBVEZPUk0oUVQpCiAgICAgICAgICAgICpyZWludGVycHJl dF9jYXN0PERpc3BsYXkqKj4odmFsdWUpID0gUVgxMUluZm86OmRpc3BsYXkoKTsKICAgICAgICAg ICAgYnJlYWs7CkBAIC01MTMsNiArNTE2LDcgQEAgc3RhdGljIE5QRXJyb3IgTlBOX0dldFZhbHVl KE5QUCBucHAsIE5QTlZhcmlhYmxlIHZhcmlhYmxlLCB2b2lkICp2YWx1ZSkKICNlbHNlCiAgICAg ICAgICAgIGdvdG8gZGVmYXVsdDsKICNlbmRpZgorICAgICAgIH0KICAgICAgICBjYXNlIE5QTlZT dXBwb3J0c1hFbWJlZEJvb2w6CiAgICAgICAgICAgICpzdGF0aWNfY2FzdDxOUEJvb2wqPih2YWx1 ZSkgPSB0cnVlOwogICAgICAgICAgICBicmVhazsK