48408 2010-10-27 03:01:30 -0700 Port ContextMenuWin.cpp to WinCE 2010-11-22 22:26:48 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 paroga paroga aroben commit-queue oldest_to_newest 300091 0 paroga 2010-10-27 03:01:30 -0700 see patch 311596 1 74411 paroga 2010-11-19 11:54:14 -0800 Created attachment 74411 Patch 312434 2 74411 aroben 2010-11-22 11:31:23 -0800 Comment on attachment 74411 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=74411&action=review All the changes of HMENU -> PlatformMenuDescription don't really seem helpful. At the very least they seem unrelated to the rest of the patch. > WebCore/platform/win/ContextMenuWin.cpp:118 > + UINT flags = MF_BYPOSITION; > + UINT newItem = 0; > + LPCWSTR title = 0; > + > + if (item.type() == SeparatorType) > + flags |= MF_SEPARATOR; > + else { > + flags |= MF_STRING; > + flags |= item.checked() ? MF_CHECKED : MF_UNCHECKED; > + flags |= item.enabled() ? MF_ENABLED : MF_GRAYED; > + > + PlatformMenuItemDescription description = item.releasePlatformDescription(); > + title = description->dwTypeData; > + description->dwTypeData = 0; > + > + if (description->hSubMenu) { > + flags |= MF_POPUP; > + newItem = reinterpret_cast<UINT>(description->hSubMenu); > + description->hSubMenu = 0; > + } else > + newItem = description->wID; > + > + free(description); > + } > + > + if (::InsertMenuW(m_platformDescription, position, flags, newItem, title)) > + ++m_itemCount; I think it would be clearer if this code were pulled out into a separate function. > WebCore/platform/win/ContextMenuWin.cpp:152 > +#if OS(WINCE) > + UINT type = info->fType & MFT_STRING; > +#else > UINT type = info->fType & ~(MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTORDER | MFT_RIGHTJUSTIFY); > +#endif I think non-CE Windows can use the CE codepath, too. 312443 3 74580 paroga 2010-11-22 11:51:18 -0800 Created attachment 74580 Patch 312699 4 74580 commit-queue 2010-11-22 22:26:42 -0800 Comment on attachment 74580 Patch Clearing flags on attachment: 74580 Committed r72585: <http://trac.webkit.org/changeset/72585> 312700 5 commit-queue 2010-11-22 22:26:48 -0800 All reviewed patches have been landed. Closing bug. 74411 2010-11-19 11:54:14 -0800 2010-11-22 11:51:18 -0800 Patch bug-48408.patch text/plain 7444 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTMxNDFlYy4uMTk5MGZjYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0xMS0xOSAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQb3J0IENvbnRleHRNZW51V2luLmNwcCB0byBXaW5DRQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg0MDgKKworICAg ICAgICAqIHBsYXRmb3JtL0NvbnRleHRNZW51Lmg6CisgICAgICAgICogcGxhdGZvcm0vd2luL0Nv bnRleHRNZW51V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51OjpDb250ZXh0 TWVudSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudTo6aXRlbUNvdW50KToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRleHRNZW51OjppbnNlcnRJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6 OmNvbnRleHRNZW51SXRlbUJ5SWRPclBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl eHRNZW51OjpzZXRQbGF0Zm9ybURlc2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl eHRNZW51OjpwbGF0Zm9ybURlc2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRN ZW51OjpyZWxlYXNlUGxhdGZvcm1EZXNjcmlwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpjb250 ZXh0TWVudUl0ZW1WZWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6cGxhdGZvcm1NZW51RGVzY3Jp cHRpb24pOgorCiAyMDEwLTExLTE5ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBy aW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuaCBiL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4 dE1lbnUuaAppbmRleCBhMTYyZmU0Li41MzIxZWQ2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL0NvbnRleHRNZW51LmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudS5oCkBA IC04OCw2ICs4OCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgUGxhdGZvcm1NZW51 RGVzY3JpcHRpb24gbV9wbGF0Zm9ybURlc2NyaXB0aW9uOwogI2Vsc2UKICAgICAgICAgUGxhdGZv cm1NZW51RGVzY3JpcHRpb24gbV9wbGF0Zm9ybURlc2NyaXB0aW9uOworI2lmIE9TKFdJTkNFKQor ICAgICAgICB1bnNpZ25lZCBtX2l0ZW1Db3VudDsKKyNlbmRpZgogI2VuZGlmCiAgICAgfTsKIApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVXaW4uY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVXaW4uY3BwCmluZGV4IGFkNTNmN2UuLjQ1YmRj MjEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vd2luL0NvbnRleHRNZW51V2luLmNwcAor KysgYi9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Db250ZXh0TWVudVdpbi5jcHAKQEAgLTMwLDE1ICsz MCwyNSBAQAogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5j bHVkZSAiTm9kZS5oIgotI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx0 Y2hhci5oPgogI2luY2x1ZGUgPHdpbmRvd3MuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CisKKyNpZm5kZWYgTUlJTV9GVFlQRQorI2RlZmluZSBNSUlNX0ZUWVBFIE1JSU1fVFlQRQor I2VuZGlmCisjaWZuZGVmIE1JSU1fU1RSSU5HCisjZGVmaW5lIE1JSU1fU1RSSU5HIE1JSU1fVFlQ RQorI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogQ29udGV4dE1lbnU6OkNvbnRleHRN ZW51KGNvbnN0IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCkKICAgICA6IG1faGl0VGVzdFJlc3VsdChy ZXN1bHQpCiAgICAgLCBtX3BsYXRmb3JtRGVzY3JpcHRpb24oMCkKKyNpZiBPUyhXSU5DRSkKKyAg ICAsIG1faXRlbUNvdW50KDApCisjZW5kaWYKIHsKICAgICBzZXRQbGF0Zm9ybURlc2NyaXB0aW9u KDo6Q3JlYXRlUG9wdXBNZW51KCkpOwogfQpAQCAtNDYsNiArNTYsOSBAQCBDb250ZXh0TWVudTo6 Q29udGV4dE1lbnUoY29uc3QgSGl0VGVzdFJlc3VsdCYgcmVzdWx0KQogQ29udGV4dE1lbnU6OkNv bnRleHRNZW51KGNvbnN0IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgUGxhdGZvcm1NZW51 RGVzY3JpcHRpb24gbWVudSkKICAgICA6IG1faGl0VGVzdFJlc3VsdChyZXN1bHQpCiAgICAgLCBt X3BsYXRmb3JtRGVzY3JpcHRpb24oMCkKKyNpZiBPUyhXSU5DRSkKKyAgICAsIG1faXRlbUNvdW50 KDApCisjZW5kaWYKIHsKICAgICBzZXRQbGF0Zm9ybURlc2NyaXB0aW9uKG1lbnUpOwogfQpAQCAt NTgsMTAgKzcxLDE0IEBAIENvbnRleHRNZW51Ojp+Q29udGV4dE1lbnUoKQogCiB1bnNpZ25lZCBD b250ZXh0TWVudTo6aXRlbUNvdW50KCkgY29uc3QKIHsKKyNpZiBPUyhXSU5DRSkKKyAgICByZXR1 cm4gbV9pdGVtQ291bnQ7CisjZWxzZQogICAgIGlmICghbV9wbGF0Zm9ybURlc2NyaXB0aW9uKQog ICAgICAgICByZXR1cm4gMDsKIAogICAgIHJldHVybiA6OkdldE1lbnVJdGVtQ291bnQobV9wbGF0 Zm9ybURlc2NyaXB0aW9uKTsKKyNlbmRpZgogfQogCiB2b2lkIENvbnRleHRNZW51OjppbnNlcnRJ dGVtKHVuc2lnbmVkIGludCBwb3NpdGlvbiwgQ29udGV4dE1lbnVJdGVtJiBpdGVtKQpAQCAtNzAs NyArODcsMzggQEAgdm9pZCBDb250ZXh0TWVudTo6aW5zZXJ0SXRlbSh1bnNpZ25lZCBpbnQgcG9z aXRpb24sIENvbnRleHRNZW51SXRlbSYgaXRlbSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgY2hl Y2tPckVuYWJsZUlmTmVlZGVkKGl0ZW0pOworCisjaWYgT1MoV0lOQ0UpCisgICAgVUlOVCBmbGFn cyA9IE1GX0JZUE9TSVRJT047CisgICAgVUlOVCBuZXdJdGVtID0gMDsKKyAgICBMUENXU1RSIHRp dGxlID0gMDsKKworICAgIGlmIChpdGVtLnR5cGUoKSA9PSBTZXBhcmF0b3JUeXBlKQorICAgICAg ICBmbGFncyB8PSBNRl9TRVBBUkFUT1I7CisgICAgZWxzZSB7CisgICAgICAgIGZsYWdzIHw9IE1G X1NUUklORzsKKyAgICAgICAgZmxhZ3MgfD0gaXRlbS5jaGVja2VkKCkgPyBNRl9DSEVDS0VEIDog TUZfVU5DSEVDS0VEOworICAgICAgICBmbGFncyB8PSBpdGVtLmVuYWJsZWQoKSA/IE1GX0VOQUJM RUQgOiBNRl9HUkFZRUQ7CisKKyAgICAgICAgUGxhdGZvcm1NZW51SXRlbURlc2NyaXB0aW9uIGRl c2NyaXB0aW9uID0gaXRlbS5yZWxlYXNlUGxhdGZvcm1EZXNjcmlwdGlvbigpOworICAgICAgICB0 aXRsZSA9IGRlc2NyaXB0aW9uLT5kd1R5cGVEYXRhOworICAgICAgICBkZXNjcmlwdGlvbi0+ZHdU eXBlRGF0YSA9IDA7CisKKyAgICAgICAgaWYgKGRlc2NyaXB0aW9uLT5oU3ViTWVudSkgeworICAg ICAgICAgICAgZmxhZ3MgfD0gTUZfUE9QVVA7CisgICAgICAgICAgICBuZXdJdGVtID0gcmVpbnRl cnByZXRfY2FzdDxVSU5UPihkZXNjcmlwdGlvbi0+aFN1Yk1lbnUpOworICAgICAgICAgICAgZGVz Y3JpcHRpb24tPmhTdWJNZW51ID0gMDsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBuZXdJ dGVtID0gZGVzY3JpcHRpb24tPndJRDsKKworICAgICAgICBmcmVlKGRlc2NyaXB0aW9uKTsKKyAg ICB9CisKKyAgICBpZiAoOjpJbnNlcnRNZW51VyhtX3BsYXRmb3JtRGVzY3JpcHRpb24sIHBvc2l0 aW9uLCBmbGFncywgbmV3SXRlbSwgdGl0bGUpKQorICAgICAgICArK21faXRlbUNvdW50OworI2Vs c2UKICAgICA6Okluc2VydE1lbnVJdGVtKG1fcGxhdGZvcm1EZXNjcmlwdGlvbiwgcG9zaXRpb24s IFRSVUUsIGl0ZW0ucmVsZWFzZVBsYXRmb3JtRGVzY3JpcHRpb24oKSk7CisjZW5kaWYKIH0KIAog dm9pZCBDb250ZXh0TWVudTo6YXBwZW5kSXRlbShDb250ZXh0TWVudUl0ZW0mIGl0ZW0pCkBAIC03 OCwxOCArMTI2LDE4IEBAIHZvaWQgQ29udGV4dE1lbnU6OmFwcGVuZEl0ZW0oQ29udGV4dE1lbnVJ dGVtJiBpdGVtKQogICAgIGluc2VydEl0ZW0oaXRlbUNvdW50KCksIGl0ZW0pOwogfQogCi1zdGF0 aWMgQ29udGV4dE1lbnVJdGVtKiBjb250ZXh0TWVudUl0ZW1CeUlkT3JQb3NpdGlvbihITUVOVSBt ZW51LCB1bnNpZ25lZCBpZCwgQk9PTCBieVBvc2l0aW9uKQorc3RhdGljIENvbnRleHRNZW51SXRl bSogY29udGV4dE1lbnVJdGVtQnlJZE9yUG9zaXRpb24oUGxhdGZvcm1NZW51RGVzY3JpcHRpb24g bWVudSwgdW5zaWduZWQgaWQsIEJPT0wgYnlQb3NpdGlvbikKIHsKICAgICBpZiAoIW1lbnUpCiAg ICAgICAgIHJldHVybiAwOwotICAgIExQTUVOVUlURU1JTkZPIGluZm8gPSAoTFBNRU5VSVRFTUlO Rk8pbWFsbG9jKHNpemVvZihNRU5VSVRFTUlORk8pKTsKKyAgICBMUE1FTlVJVEVNSU5GTyBpbmZv ID0gc3RhdGljX2Nhc3Q8TFBNRU5VSVRFTUlORk8+KG1hbGxvYyhzaXplb2YoTUVOVUlURU1JTkZP KSkpOwogICAgIGlmICghaW5mbykKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBtZW1zZXQoaW5m bywgMCwgc2l6ZW9mKE1FTlVJVEVNSU5GTykpOwogCiAgICAgaW5mby0+Y2JTaXplID0gc2l6ZW9m KE1FTlVJVEVNSU5GTyk7Ci0gICAgCisKICAgICAvLyBTZXR0aW5nIE1JSU1fREFUQSB3aGljaCBp cyB1c2VmdWwgZm9yIFdlYktpdCBjbGllbnRzIHdobyBzdG9yZSBkYXRhIGluIHRoaXMgbWVtYmVy IGZvciB0aGVpciBjdXN0b20gbWVudSBpdGVtcy4KICAgICBpbmZvLT5mTWFzayA9IE1JSU1fRlRZ UEUgfCBNSUlNX0lEIHwgTUlJTV9TVFJJTkcgfCBNSUlNX0RBVEE7CiAKQEAgLTk3LDEwICsxNDUs MTMgQEAgc3RhdGljIENvbnRleHRNZW51SXRlbSogY29udGV4dE1lbnVJdGVtQnlJZE9yUG9zaXRp b24oSE1FTlUgbWVudSwgdW5zaWduZWQgaWQsIEIKICAgICAgICAgZnJlZShpbmZvKTsKICAgICAg ICAgcmV0dXJuIDA7CiAgICAgfQotCisjaWYgT1MoV0lOQ0UpCisgICAgVUlOVCB0eXBlID0gaW5m by0+ZlR5cGUgJiBNRlRfU1RSSU5HOworI2Vsc2UKICAgICBVSU5UIHR5cGUgPSBpbmZvLT5mVHlw ZSAmIH4oTUZUX01FTlVCQVJCUkVBSyB8IE1GVF9NRU5VQlJFQUsgfCBNRlRfT1dORVJEUkFXIHwg TUZUX1JBRElPQ0hFQ0sgfCBNRlRfUklHSFRPUkRFUiB8IE1GVF9SSUdIVEpVU1RJRlkpOworI2Vu ZGlmCiAgICAgaWYgKHR5cGUgPT0gTUZUX1NUUklORykgewotICAgICAgICBMUFRTVFIgYnVmZmVy ID0gKExQVFNUUiltYWxsb2MoKytpbmZvLT5jY2ggKiBzaXplb2YoVENIQVIpKTsKKyAgICAgICAg TFBUU1RSIGJ1ZmZlciA9IHN0YXRpY19jYXN0PExQVFNUUj4obWFsbG9jKCsraW5mby0+Y2NoICog c2l6ZW9mKFRDSEFSKSkpOwogICAgICAgICBpZiAoIWJ1ZmZlcikgewogICAgICAgICAgICAgZnJl ZShpbmZvKTsKICAgICAgICAgICAgIHJldHVybiAwOwpAQCAtMTA4LDcgKzE1OSw3IEBAIHN0YXRp YyBDb250ZXh0TWVudUl0ZW0qIGNvbnRleHRNZW51SXRlbUJ5SWRPclBvc2l0aW9uKEhNRU5VIG1l bnUsIHVuc2lnbmVkIGlkLCBCCiAgICAgICAgIGluZm8tPmR3VHlwZURhdGEgPSBidWZmZXI7CiAg ICAgICAgIDo6R2V0TWVudUl0ZW1JbmZvKG1lbnUsIGlkLCBieVBvc2l0aW9uLCBpbmZvKTsKICAg ICB9Ci0gICAgCisKICAgICByZXR1cm4gbmV3IENvbnRleHRNZW51SXRlbShpbmZvKTsKIH0KIApA QCAtMTIyLDExICsxNzMsMTEgQEAgQ29udGV4dE1lbnVJdGVtKiBDb250ZXh0TWVudTo6aXRlbUF0 SW5kZXgodW5zaWduZWQgaW5kZXgsIGNvbnN0IFBsYXRmb3JtTWVudURlc2MKICAgICByZXR1cm4g Y29udGV4dE1lbnVJdGVtQnlJZE9yUG9zaXRpb24ocGxhdGZvcm1EZXNjcmlwdGlvbiwgaW5kZXgs IFRSVUUpOwogfQogCi12b2lkIENvbnRleHRNZW51OjpzZXRQbGF0Zm9ybURlc2NyaXB0aW9uKEhN RU5VIG1lbnUpCit2b2lkIENvbnRleHRNZW51OjpzZXRQbGF0Zm9ybURlc2NyaXB0aW9uKFBsYXRm b3JtTWVudURlc2NyaXB0aW9uIG1lbnUpCiB7CiAgICAgaWYgKG1lbnUgPT0gbV9wbGF0Zm9ybURl c2NyaXB0aW9uKQogICAgICAgICByZXR1cm47Ci0gICAgCisKICAgICBpZiAobV9wbGF0Zm9ybURl c2NyaXB0aW9uKQogICAgICAgICA6OkRlc3Ryb3lNZW51KG1fcGxhdGZvcm1EZXNjcmlwdGlvbik7 CiAKQEAgLTEzNCw2ICsxODUsNyBAQCB2b2lkIENvbnRleHRNZW51OjpzZXRQbGF0Zm9ybURlc2Ny aXB0aW9uKEhNRU5VIG1lbnUpCiAgICAgaWYgKCFtX3BsYXRmb3JtRGVzY3JpcHRpb24pCiAgICAg ICAgIHJldHVybjsKIAorI2lmICFPUyhXSU5DRSkKICAgICBNRU5VSU5GTyBtZW51SW5mbyA9IHsw fTsKICAgICBtZW51SW5mby5jYlNpemUgPSBzaXplb2YoTUVOVUlORk8pOwogICAgIG1lbnVJbmZv LmZNYXNrID0gTUlNX1NUWUxFOwpAQCAtMTQxLDMwICsxOTMsMzEgQEAgdm9pZCBDb250ZXh0TWVu dTo6c2V0UGxhdGZvcm1EZXNjcmlwdGlvbihITUVOVSBtZW51KQogICAgIG1lbnVJbmZvLmZNYXNr ID0gTUlNX1NUWUxFOwogICAgIG1lbnVJbmZvLmR3U3R5bGUgfD0gTU5TX05PVElGWUJZUE9TOwog ICAgIDo6U2V0TWVudUluZm8obV9wbGF0Zm9ybURlc2NyaXB0aW9uLCAmbWVudUluZm8pOworI2Vu ZGlmCiB9CiAKLUhNRU5VIENvbnRleHRNZW51OjpwbGF0Zm9ybURlc2NyaXB0aW9uKCkgY29uc3QK K1BsYXRmb3JtTWVudURlc2NyaXB0aW9uIENvbnRleHRNZW51OjpwbGF0Zm9ybURlc2NyaXB0aW9u KCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9wbGF0Zm9ybURlc2NyaXB0aW9uOwogfQogCi1ITUVO VSBDb250ZXh0TWVudTo6cmVsZWFzZVBsYXRmb3JtRGVzY3JpcHRpb24oKQorUGxhdGZvcm1NZW51 RGVzY3JpcHRpb24gQ29udGV4dE1lbnU6OnJlbGVhc2VQbGF0Zm9ybURlc2NyaXB0aW9uKCkKIHsK LSAgICBITUVOVSBkZXNjcmlwdGlvbiA9IG1fcGxhdGZvcm1EZXNjcmlwdGlvbjsKKyAgICBQbGF0 Zm9ybU1lbnVEZXNjcmlwdGlvbiBkZXNjcmlwdGlvbiA9IG1fcGxhdGZvcm1EZXNjcmlwdGlvbjsK ICAgICBtX3BsYXRmb3JtRGVzY3JpcHRpb24gPSAwOwogICAgIHJldHVybiBkZXNjcmlwdGlvbjsK IH0KIAogVmVjdG9yPENvbnRleHRNZW51SXRlbT4gY29udGV4dE1lbnVJdGVtVmVjdG9yKFBsYXRm b3JtTWVudURlc2NyaXB0aW9uKQogewotICAgIC8vIEZJWE1FIC0gSW1wbGVtZW50ICAgIAorICAg IC8vIEZJWE1FIC0gSW1wbGVtZW50CiAgICAgcmV0dXJuIFZlY3RvcjxDb250ZXh0TWVudUl0ZW0+ KCk7CiB9CiAKIFBsYXRmb3JtTWVudURlc2NyaXB0aW9uIHBsYXRmb3JtTWVudURlc2NyaXB0aW9u KFZlY3RvcjxDb250ZXh0TWVudUl0ZW0+JiBtZW51SXRlbVZlY3RvcikKIHsKLSAgICAvLyBGSVhN RSAtIEltcGxlbWVudCAgICAKKyAgICAvLyBGSVhNRSAtIEltcGxlbWVudAogICAgIHJldHVybiAw OwogfQogCi19Cit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 74580 2010-11-22 11:51:18 -0800 2010-11-22 22:26:42 -0800 Patch bug-48408b.patch text/plain 6480 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODcyMTQ0My4uOTY3NzJhMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMS0yMiAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQb3J0IENvbnRleHRNZW51V2luLmNwcCB0byBXaW5DRQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg0MDgKKworICAg ICAgICAqIHBsYXRmb3JtL0NvbnRleHRNZW51Lmg6CisgICAgICAgICogcGxhdGZvcm0vd2luL0Nv bnRleHRNZW51V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51OjpDb250ZXh0 TWVudSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudTo6aXRlbUNvdW50KToKKyAgICAg ICAgKFdlYkNvcmU6Omluc2VydE1lbnVJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRN ZW51OjppbnNlcnRJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnRleHRNZW51SXRlbUJ5SWRP clBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51OjpzZXRQbGF0Zm9ybURl c2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnRleHRNZW51SXRlbVZlY3Rvcik6Cisg ICAgICAgIChXZWJDb3JlOjpwbGF0Zm9ybU1lbnVEZXNjcmlwdGlvbik6CisKIDIwMTAtMTEtMjEg IFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9D b250ZXh0TWVudS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudS5oCmluZGV4IGExNjJm ZTQuLjUzMjFlZDYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuaAor KysgYi9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51LmgKQEAgLTg4LDYgKzg4LDkgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBQbGF0Zm9ybU1lbnVEZXNjcmlwdGlvbiBtX3BsYXRm b3JtRGVzY3JpcHRpb247CiAjZWxzZQogICAgICAgICBQbGF0Zm9ybU1lbnVEZXNjcmlwdGlvbiBt X3BsYXRmb3JtRGVzY3JpcHRpb247CisjaWYgT1MoV0lOQ0UpCisgICAgICAgIHVuc2lnbmVkIG1f aXRlbUNvdW50OworI2VuZGlmCiAjZW5kaWYKICAgICB9OwogCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL3dpbi9Db250ZXh0TWVudVdpbi5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3dpbi9D b250ZXh0TWVudVdpbi5jcHAKaW5kZXggYWQ1M2Y3ZS4uMTA0NDNhYSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS93aW4vQ29udGV4dE1lbnVXaW4uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vd2luL0NvbnRleHRNZW51V2luLmNwcApAQCAtMzAsMTUgKzMwLDI1IEBACiAjaW5jbHVkZSAi RnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJOb2RlLmgiCi0jaW5j bHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogI2luY2x1ZGUgPHRjaGFyLmg+CiAjaW5jbHVkZSA8 d2luZG93cy5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KKworI2lmbmRlZiBNSUlN X0ZUWVBFCisjZGVmaW5lIE1JSU1fRlRZUEUgTUlJTV9UWVBFCisjZW5kaWYKKyNpZm5kZWYgTUlJ TV9TVFJJTkcKKyNkZWZpbmUgTUlJTV9TVFJJTkcgTUlJTV9UWVBFCisjZW5kaWYKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCiBDb250ZXh0TWVudTo6Q29udGV4dE1lbnUoY29uc3QgSGl0VGVzdFJl c3VsdCYgcmVzdWx0KQogICAgIDogbV9oaXRUZXN0UmVzdWx0KHJlc3VsdCkKICAgICAsIG1fcGxh dGZvcm1EZXNjcmlwdGlvbigwKQorI2lmIE9TKFdJTkNFKQorICAgICwgbV9pdGVtQ291bnQoMCkK KyNlbmRpZgogewogICAgIHNldFBsYXRmb3JtRGVzY3JpcHRpb24oOjpDcmVhdGVQb3B1cE1lbnUo KSk7CiB9CkBAIC00Niw2ICs1Niw5IEBAIENvbnRleHRNZW51OjpDb250ZXh0TWVudShjb25zdCBI aXRUZXN0UmVzdWx0JiByZXN1bHQpCiBDb250ZXh0TWVudTo6Q29udGV4dE1lbnUoY29uc3QgSGl0 VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBQbGF0Zm9ybU1lbnVEZXNjcmlwdGlvbiBtZW51KQog ICAgIDogbV9oaXRUZXN0UmVzdWx0KHJlc3VsdCkKICAgICAsIG1fcGxhdGZvcm1EZXNjcmlwdGlv bigwKQorI2lmIE9TKFdJTkNFKQorICAgICwgbV9pdGVtQ291bnQoMCkKKyNlbmRpZgogewogICAg IHNldFBsYXRmb3JtRGVzY3JpcHRpb24obWVudSk7CiB9CkBAIC01OCwxMSArNzEsNDcgQEAgQ29u dGV4dE1lbnU6On5Db250ZXh0TWVudSgpCiAKIHVuc2lnbmVkIENvbnRleHRNZW51OjppdGVtQ291 bnQoKSBjb25zdAogeworI2lmIE9TKFdJTkNFKQorICAgIHJldHVybiBtX2l0ZW1Db3VudDsKKyNl bHNlCiAgICAgaWYgKCFtX3BsYXRmb3JtRGVzY3JpcHRpb24pCiAgICAgICAgIHJldHVybiAwOwog CiAgICAgcmV0dXJuIDo6R2V0TWVudUl0ZW1Db3VudChtX3BsYXRmb3JtRGVzY3JpcHRpb24pOwor I2VuZGlmCit9CisKKyNpZiBPUyhXSU5DRSkKK3N0YXRpYyBib29sIGluc2VydE1lbnVJdGVtKFBs YXRmb3JtTWVudURlc2NyaXB0aW9uIG1lbnUsIHVuc2lnbmVkIGludCBwb3NpdGlvbiwgQ29udGV4 dE1lbnVJdGVtJiBpdGVtKQoreworICAgIFVJTlQgZmxhZ3MgPSBNRl9CWVBPU0lUSU9OOworICAg IFVJTlQgbmV3SXRlbSA9IDA7CisgICAgTFBDV1NUUiB0aXRsZSA9IDA7CisKKyAgICBpZiAoaXRl bS50eXBlKCkgPT0gU2VwYXJhdG9yVHlwZSkKKyAgICAgICAgZmxhZ3MgfD0gTUZfU0VQQVJBVE9S OworICAgIGVsc2UgeworICAgICAgICBmbGFncyB8PSBNRl9TVFJJTkc7CisgICAgICAgIGZsYWdz IHw9IGl0ZW0uY2hlY2tlZCgpID8gTUZfQ0hFQ0tFRCA6IE1GX1VOQ0hFQ0tFRDsKKyAgICAgICAg ZmxhZ3MgfD0gaXRlbS5lbmFibGVkKCkgPyBNRl9FTkFCTEVEIDogTUZfR1JBWUVEOworCisgICAg ICAgIFBsYXRmb3JtTWVudUl0ZW1EZXNjcmlwdGlvbiBkZXNjcmlwdGlvbiA9IGl0ZW0ucmVsZWFz ZVBsYXRmb3JtRGVzY3JpcHRpb24oKTsKKyAgICAgICAgdGl0bGUgPSBkZXNjcmlwdGlvbi0+ZHdU eXBlRGF0YTsKKyAgICAgICAgZGVzY3JpcHRpb24tPmR3VHlwZURhdGEgPSAwOworCisgICAgICAg IGlmIChkZXNjcmlwdGlvbi0+aFN1Yk1lbnUpIHsKKyAgICAgICAgICAgIGZsYWdzIHw9IE1GX1BP UFVQOworICAgICAgICAgICAgbmV3SXRlbSA9IHJlaW50ZXJwcmV0X2Nhc3Q8VUlOVD4oZGVzY3Jp cHRpb24tPmhTdWJNZW51KTsKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uLT5oU3ViTWVudSA9IDA7 CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbmV3SXRlbSA9IGRlc2NyaXB0aW9uLT53SUQ7 CisKKyAgICAgICAgZnJlZShkZXNjcmlwdGlvbik7CisgICAgfQorCisgICAgcmV0dXJuIDo6SW5z ZXJ0TWVudVcobWVudSwgcG9zaXRpb24sIGZsYWdzLCBuZXdJdGVtLCB0aXRsZSk7CiB9CisjZW5k aWYKIAogdm9pZCBDb250ZXh0TWVudTo6aW5zZXJ0SXRlbSh1bnNpZ25lZCBpbnQgcG9zaXRpb24s IENvbnRleHRNZW51SXRlbSYgaXRlbSkKIHsKQEAgLTcwLDcgKzExOSwxMyBAQCB2b2lkIENvbnRl eHRNZW51OjppbnNlcnRJdGVtKHVuc2lnbmVkIGludCBwb3NpdGlvbiwgQ29udGV4dE1lbnVJdGVt JiBpdGVtKQogICAgICAgICByZXR1cm47CiAKICAgICBjaGVja09yRW5hYmxlSWZOZWVkZWQoaXRl bSk7CisKKyNpZiBPUyhXSU5DRSkKKyAgICBpZiAoaW5zZXJ0TWVudUl0ZW0obV9wbGF0Zm9ybURl c2NyaXB0aW9uLCBwb3NpdGlvbiwgaXRlbSkpCisgICAgICAgICsrbV9pdGVtQ291bnQ7CisjZWxz ZQogICAgIDo6SW5zZXJ0TWVudUl0ZW0obV9wbGF0Zm9ybURlc2NyaXB0aW9uLCBwb3NpdGlvbiwg VFJVRSwgaXRlbS5yZWxlYXNlUGxhdGZvcm1EZXNjcmlwdGlvbigpKTsKKyNlbmRpZgogfQogCiB2 b2lkIENvbnRleHRNZW51OjphcHBlbmRJdGVtKENvbnRleHRNZW51SXRlbSYgaXRlbSkKQEAgLTgy LDE0ICsxMzcsMTQgQEAgc3RhdGljIENvbnRleHRNZW51SXRlbSogY29udGV4dE1lbnVJdGVtQnlJ ZE9yUG9zaXRpb24oSE1FTlUgbWVudSwgdW5zaWduZWQgaWQsIEIKIHsKICAgICBpZiAoIW1lbnUp CiAgICAgICAgIHJldHVybiAwOwotICAgIExQTUVOVUlURU1JTkZPIGluZm8gPSAoTFBNRU5VSVRF TUlORk8pbWFsbG9jKHNpemVvZihNRU5VSVRFTUlORk8pKTsKKyAgICBMUE1FTlVJVEVNSU5GTyBp bmZvID0gc3RhdGljX2Nhc3Q8TFBNRU5VSVRFTUlORk8+KG1hbGxvYyhzaXplb2YoTUVOVUlURU1J TkZPKSkpOwogICAgIGlmICghaW5mbykKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBtZW1zZXQo aW5mbywgMCwgc2l6ZW9mKE1FTlVJVEVNSU5GTykpOwogCiAgICAgaW5mby0+Y2JTaXplID0gc2l6 ZW9mKE1FTlVJVEVNSU5GTyk7Ci0gICAgCisKICAgICAvLyBTZXR0aW5nIE1JSU1fREFUQSB3aGlj aCBpcyB1c2VmdWwgZm9yIFdlYktpdCBjbGllbnRzIHdobyBzdG9yZSBkYXRhIGluIHRoaXMgbWVt YmVyIGZvciB0aGVpciBjdXN0b20gbWVudSBpdGVtcy4KICAgICBpbmZvLT5mTWFzayA9IE1JSU1f RlRZUEUgfCBNSUlNX0lEIHwgTUlJTV9TVFJJTkcgfCBNSUlNX0RBVEE7CiAKQEAgLTk4LDkgKzE1 Myw4IEBAIHN0YXRpYyBDb250ZXh0TWVudUl0ZW0qIGNvbnRleHRNZW51SXRlbUJ5SWRPclBvc2l0 aW9uKEhNRU5VIG1lbnUsIHVuc2lnbmVkIGlkLCBCCiAgICAgICAgIHJldHVybiAwOwogICAgIH0K IAotICAgIFVJTlQgdHlwZSA9IGluZm8tPmZUeXBlICYgfihNRlRfTUVOVUJBUkJSRUFLIHwgTUZU X01FTlVCUkVBSyB8IE1GVF9PV05FUkRSQVcgfCBNRlRfUkFESU9DSEVDSyB8IE1GVF9SSUdIVE9S REVSIHwgTUZUX1JJR0hUSlVTVElGWSk7Ci0gICAgaWYgKHR5cGUgPT0gTUZUX1NUUklORykgewot ICAgICAgICBMUFRTVFIgYnVmZmVyID0gKExQVFNUUiltYWxsb2MoKytpbmZvLT5jY2ggKiBzaXpl b2YoVENIQVIpKTsKKyAgICBpZiAoaW5mby0+ZlR5cGUgJiBNRlRfU1RSSU5HKSB7CisgICAgICAg IExQVFNUUiBidWZmZXIgPSBzdGF0aWNfY2FzdDxMUFRTVFI+KG1hbGxvYygrK2luZm8tPmNjaCAq IHNpemVvZihUQ0hBUikpKTsKICAgICAgICAgaWYgKCFidWZmZXIpIHsKICAgICAgICAgICAgIGZy ZWUoaW5mbyk7CiAgICAgICAgICAgICByZXR1cm4gMDsKQEAgLTEwOCw3ICsxNjIsNyBAQCBzdGF0 aWMgQ29udGV4dE1lbnVJdGVtKiBjb250ZXh0TWVudUl0ZW1CeUlkT3JQb3NpdGlvbihITUVOVSBt ZW51LCB1bnNpZ25lZCBpZCwgQgogICAgICAgICBpbmZvLT5kd1R5cGVEYXRhID0gYnVmZmVyOwog ICAgICAgICA6OkdldE1lbnVJdGVtSW5mbyhtZW51LCBpZCwgYnlQb3NpdGlvbiwgaW5mbyk7CiAg ICAgfQotICAgIAorCiAgICAgcmV0dXJuIG5ldyBDb250ZXh0TWVudUl0ZW0oaW5mbyk7CiB9CiAK QEAgLTEzNCw2ICsxODgsNyBAQCB2b2lkIENvbnRleHRNZW51OjpzZXRQbGF0Zm9ybURlc2NyaXB0 aW9uKEhNRU5VIG1lbnUpCiAgICAgaWYgKCFtX3BsYXRmb3JtRGVzY3JpcHRpb24pCiAgICAgICAg IHJldHVybjsKIAorI2lmICFPUyhXSU5DRSkKICAgICBNRU5VSU5GTyBtZW51SW5mbyA9IHswfTsK ICAgICBtZW51SW5mby5jYlNpemUgPSBzaXplb2YoTUVOVUlORk8pOwogICAgIG1lbnVJbmZvLmZN YXNrID0gTUlNX1NUWUxFOwpAQCAtMTQxLDYgKzE5Niw3IEBAIHZvaWQgQ29udGV4dE1lbnU6OnNl dFBsYXRmb3JtRGVzY3JpcHRpb24oSE1FTlUgbWVudSkKICAgICBtZW51SW5mby5mTWFzayA9IE1J TV9TVFlMRTsKICAgICBtZW51SW5mby5kd1N0eWxlIHw9IE1OU19OT1RJRllCWVBPUzsKICAgICA6 OlNldE1lbnVJbmZvKG1fcGxhdGZvcm1EZXNjcmlwdGlvbiwgJm1lbnVJbmZvKTsKKyNlbmRpZgog fQogCiBITUVOVSBDb250ZXh0TWVudTo6cGxhdGZvcm1EZXNjcmlwdGlvbigpIGNvbnN0CkBAIC0x NTcsMTQgKzIxMywxNCBAQCBITUVOVSBDb250ZXh0TWVudTo6cmVsZWFzZVBsYXRmb3JtRGVzY3Jp cHRpb24oKQogCiBWZWN0b3I8Q29udGV4dE1lbnVJdGVtPiBjb250ZXh0TWVudUl0ZW1WZWN0b3Io UGxhdGZvcm1NZW51RGVzY3JpcHRpb24pCiB7Ci0gICAgLy8gRklYTUUgLSBJbXBsZW1lbnQgICAg CisgICAgLy8gRklYTUUgLSBJbXBsZW1lbnQKICAgICByZXR1cm4gVmVjdG9yPENvbnRleHRNZW51 SXRlbT4oKTsKIH0KIAogUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gcGxhdGZvcm1NZW51RGVzY3Jp cHRpb24oVmVjdG9yPENvbnRleHRNZW51SXRlbT4mIG1lbnVJdGVtVmVjdG9yKQogewotICAgIC8v IEZJWE1FIC0gSW1wbGVtZW50ICAgIAorICAgIC8vIEZJWE1FIC0gSW1wbGVtZW50CiAgICAgcmV0 dXJuIDA7CiB9CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUK