14866 2007-08-02 16:59:28 -0700 [S60] Widget Cascade menu not in FIFO order 2008-04-09 11:39:39 -0700 1 1 1 Unclassified WebKit Layout and Rendering 417.x S60 Emulator S60 3rd edition CLOSED FIXED P2 Critical --- 1 sriram.yadavalli webkit-unassigned oldest_to_newest 3117 0 sriram.yadavalli 2007-08-02 16:59:28 -0700 SYAI-73AS6K 3119 1 15811 sriram.yadavalli 2007-08-02 17:12:35 -0700 Created attachment 15811 Patch for 3.1 3102 2 15812 sriram.yadavalli 2007-08-02 17:34:36 -0700 Created attachment 15812 Patch for 3.2 3061 3 sornalatha.rathnasamy 2007-08-03 07:18:45 -0700 TInt index = aIsRootMenuPane ? aMenuPane.NumberOfItemsInPane() - 1 : aMenuPane.NumberOfItemsInPane(); ------------------ this piece of code assumes that if aIsRootMenuPane is true, NumberOfItemsInPane will always be greater than 0. But we should still handle the case : if inadvertently the value is 0, it would crash since aMenuPane.NumberOfItemsInPane() - 1 will evaluate to -1. 3064 4 sriram.yadavalli 2007-08-03 07:25:05 -0700 Agreed. aMenuPane.NumberOfItemsInPane() - 1 should be Max(aMenuPane.NumberOfItemsInPane() - 1,0) Any other comments? 3078 5 15811 zalan 2007-08-03 10:07:22 -0700 Comment on attachment 15811 Patch for 3.1 r=me 3079 6 15812 zalan 2007-08-03 10:07:43 -0700 Comment on attachment 15812 Patch for 3.2 r=me 3080 7 zalan 2007-08-03 10:24:08 -0700 3.1->24845 ccb->24846 76946 8 bradley.morrison 2008-04-09 11:39:39 -0700 Bulk closing of all s60 platform bugs. Sorry for the noise! 15811 2007-08-02 17:12:35 -0700 2007-08-03 10:07:22 -0700 Patch for 3.1 CascadeMenu31.patch text/plain 18558 sriram.yadavalli SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDI0ODMzKQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMiw3ICsyLDcgQEANCiANCiAgICAgICAgIFJldmlld2VkIGJ5IFphbGFuIEJ1anRhcyAo emJ1anRhc0BnbWFpbC5jb20pLg0KICAgICAgICAgREVTQzogRml4ZXMgZm9yIE1lbnUgQVBJDQot ICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0NCisgICAgICAg IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzYzDQogDQogICAgICAg ICBXQVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5HRUQNCiANCkluZGV4OiBXZWJL aXQvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24g MjQ4MzIpDQorKysgV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQ0KQEAgLTEsMyArMSwy NSBAQA0KKzIwMDctMDgtMDIgIHlhZGF2YWxsICA8c3JpcmFtLnlhZGF2YWxsaUBub2tpYS5jb20+ DQorDQorICAgICAgICBSZXZpZXdlZCBieSBaYWxhbiBCdWp0YXMgKHpidWp0YXNAZ21haWwuY29t KS4NCisgICAgICAgIERFU0M6IFdpZGdldCBDYXNjYWRlIG1lbnUgbm90IGluIEZJRk8gb3JkZXIN CisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODY2DQor DQorICAgICAgICAqIEJyb3dzZXJWaWV3L2luYy9XaWRnZXRFeHRlbnNpb24uaDoNCisgICAgICAg IChDTWVudUl0ZW06OlRleHQpOg0KKyAgICAgICAgKENNZW51SXRlbTo6U2V0VGV4dCk6DQorICAg ICAgICAqIEJyb3dzZXJWaWV3L3NyYy9XaWRnZXRFeHRlbnNpb24uY3BwOg0KKyAgICAgICAgKENX aWRnZXRFeHRlbnNpb246OkFkZE9wdGlvbk1lbnVJdGVtc0wpOg0KKyAgICAgICAgKENXaWRnZXRF eHRlbnNpb246OkFkZE1lbnVJdGVtKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpNZW51 SXRlbVNlbGVjdGVkKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpBZGRPcHRpb25zTWVu dUl0ZW0pOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246OkFwcGVuZCk6DQorICAgICAgICAo Q1dpZGdldEV4dGVuc2lvbjo6RGVsZXRlTWVudUl0ZW0pOg0KKyAgICAgICAgKENXaWRnZXRFeHRl bnNpb246OlJlcGxhY2VNZW51SXRlbSk6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6R2V0 RnJvbU1lbnVJdGVtQ29sbGVjdGlvbik6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6U2V0 RGltbWVkKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRNZW51SXRlbU9ic2VydmVy KToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpNZW51SXRlbU9ic2VydmVyKToNCisNCiAy MDA3LTA3LTMxICB5YWRhdmFsbCAgPHNyaXJhbS55YWRhdmFsbGlAbm9raWEuY29tPg0KIA0KICAg ICAgICAgUmV2aWV3ZWQgYnkgWmFsYW4gQnVqdGFzICh6YnVqdGFzQGdtYWlsLmNvbSkuDQpJbmRl eDogV2ViS2l0L0Jyb3dzZXJWaWV3L2luYy9XaWRnZXRFeHRlbnNpb24uaA0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K LS0tIFdlYktpdC9Ccm93c2VyVmlldy9pbmMvV2lkZ2V0RXh0ZW5zaW9uLmgJKHJldmlzaW9uIDI0 ODI4KQ0KKysrIFdlYktpdC9Ccm93c2VyVmlldy9pbmMvV2lkZ2V0RXh0ZW5zaW9uLmgJKHdvcmtp bmcgY29weSkNCkBAIC0xOTYsNyArMTk2LDcgQEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVi bGljIENCYXNlLCBwdQ0KICAgICAgICAgLyoqDQogICAgICAgICAqIE1ldGhvZCBTZXRSaWdodFNv ZnRLZXlMYWJlbA0KICAgICAgICAgKiBAc2luY2UgMy4yDQotICAgICAgICAqIEBwYXJhbSB0ZXh0 IGJ1ZmZlciB0byBiZSBzZXQgYXMgcmlnaHQgc29mdCBrZXkgbGFiZWwgDQorICAgICAgICAqIEBw YXJhbSB0ZXh0IGJ1ZmZlciB0byBiZSBzZXQgYXMgcmlnaHQgc29mdCBrZXkgbGFiZWwNCiAgICAg ICAgICogQHJldHVybiBub25lDQogICAgICAgICAqLw0KICAgICAgICAgdm9pZCBTZXRSaWdodFNv ZnRLZXlMYWJlbCggY29uc3QgVERlc0MmIGFUZXh0ICk7DQpAQCAtMjA4LDcgKzIwOCw3IEBAIGNs YXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHJldHVy biBub25lDQogICAgICAgICAqLw0KICAgICAgICAgdm9pZCBEZWxldGVNZW51SXRlbSggVEludCBh Q21kSWQgKTsNCi0gICAgICAgIA0KKw0KICAgICAgICAgLyoqDQogICAgICAgICAqIE1ldGhvZCBD bGVhck1lbnVJdGVtcw0KICAgICAgICAgKiBAc2luY2UgMy4yDQpAQCAtMjI2LDcgKzIyNiw3IEBA IGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHBh cmFtIGRpbW1lZCBzdGF0dXMNCiAgICAgICAgICogQHJldHVybiBFcnJvciBjb2RlDQogICAgICAg ICAqLw0KLSAgICAgICAgVEludCBSZXBsYWNlTWVudUl0ZW0oIFRJbnQgb2xkQ21kSWQsIGNvbnN0 IFREZXNDJiBuZXdUZXh0LCANCisgICAgICAgIFRJbnQgUmVwbGFjZU1lbnVJdGVtKCBUSW50IG9s ZENtZElkLCBjb25zdCBURGVzQyYgbmV3VGV4dCwNCiAgICAgICAgICAgICBUSW50IG5ld0NtZElk LCBUSW50IG5ld0RpbW1lZCApOw0KIA0KICAgICAgICAgLyoqDQpAQCAtMjU1LDcgKzI1NSw3IEBA IGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHBh cmFtIGNhbGxiYWNrIGZ1bmN0aW9uDQogICAgICAgICAqIEByZXR1cm4gbm9uZQ0KICAgICAgICAg Ki8NCi0gICAgICAgIHZvaWQgU2V0TWVudUl0ZW1PYnNlcnZlciggDQorICAgICAgICB2b2lkIFNl dE1lbnVJdGVtT2JzZXJ2ZXIoDQogICAgICAgICAgICAgVEludCBhQ21kSWQsIFdpZGdldEV2ZW50 SGFuZGxlciogYU9uU2VsZWN0Q2FsbGJhY2sgKTsNCiANCiAgICAgICAgIC8qKg0KQEAgLTI3Nyw3 ICsyNzcsNyBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogICAg ICAgICAvKioNCiAgICAgICAgICogTWV0aG9kIEdldE1lbnVPYnNlcnZlcg0KICAgICAgICAgKiBA c2luY2UgMy4yDQotICAgICAgICAqIEBwYXJhbSANCisgICAgICAgICogQHBhcmFtDQogICAgICAg ICAqIEByZXR1cm4gY2FsbGJhY2sgZnVuY3Rpb24NCiAgICAgICAgICovDQogICAgICAgICBXaWRn ZXRFdmVudEhhbmRsZXIqIE1lbnVPYnNlcnZlcigpOw0KQEAgLTI4OSwxMSArMjg5LDExIEBAIGNs YXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHJldHVy biBub25lDQogICAgICAgICAqLw0KICAgICAgICAgdm9pZCBTZXRSaWdodEtleU9ic2VydmVyKCBX aWRnZXRFdmVudEhhbmRsZXIqIGFNZW51Q2FsbGJhY2sgKTsNCi0gICAgICAgIA0KKw0KICAgICAg ICAgLyoqDQogICAgICAgICAqIE1ldGhvZCBHZXRNZW51T2JzZXJ2ZXINCiAgICAgICAgICogQHNp bmNlIDMuMg0KLSAgICAgICAgKiBAcGFyYW0gDQorICAgICAgICAqIEBwYXJhbQ0KICAgICAgICAg KiBAcmV0dXJuIGNhbGxiYWNrIGZ1bmN0aW9uDQogICAgICAgICAqLw0KICAgICAgICAgV2lkZ2V0 RXZlbnRIYW5kbGVyKiBSaWdodEtleU9ic2VydmVyKCk7DQpAQCAtMzQ1LDcgKzM0NSw3IEBAIGNs YXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHJldHVy biB2b2lkDQogICAgICAgICAqLw0KICAgICAgICAgdm9pZCBTZXRPblNob3dMaXN0ZW5lciggV2lk Z2V0RXZlbnRIYW5kbGVyKiBhQ2FsbGJhY2sgKTsNCi0gICAgICAgIA0KKw0KICAgICAgICAgLyoq DQogICAgICAgICAqIE1ldGhvZCBHZXRGcm9tTWVudUl0ZW1Db2xsZWN0aW9uDQogICAgICAgICAq IEBzaW5jZSAzLjINCkBAIC0zNTMsNyArMzUzLDcgQEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lvbjog cHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcmV0dXJuIHZvaWQqDQogICAgICAgICAqLw0K ICAgICAgICAgdm9pZCogR2V0RnJvbU1lbnVJdGVtQ29sbGVjdGlvbiggY29uc3QgVERlc0MmIHRl eHRWYWwgKTsNCi0gICAgICAgIA0KKw0KICAgICAgICAgLyoqDQogICAgICAgICAqIE1ldGhvZCBH ZXRGcm9tTWVudUl0ZW1Db2xsZWN0aW9uDQogICAgICAgICAqIEBzaW5jZSAzLjINCkBAIC00MDQs NyArNDA0LDcgQEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAg ICAgICAgKiBAc2luY2UgMy4yDQogICAgICAgICAqIEByZXR1cm4gd2lkZ2V0IGVuZ2luZSBicmlk Z2UNCiAgICAgICAgICovDQotICAgICAgICBNV2lkZ2V0RW5naW5lQnJpZGdlJiBXaWRnZXRFbmdp bmVCcmlkZ2UoKSBjb25zdCB7IA0KKyAgICAgICAgTVdpZGdldEVuZ2luZUJyaWRnZSYgV2lkZ2V0 RW5naW5lQnJpZGdlKCkgY29uc3Qgew0KICAgICAgICAgICAgIHJldHVybiAqaVdpZGdldEVuZ2lu ZUJyaWRnZTsgfQ0KIA0KICAgICAgICAgLyoqDQpAQCAtNDQ0LDcgKzQ0NCw3IEBAIGNsYXNzIENX aWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHBhcmFtIFRoZSB2 YWx1ZSBmb3IgdGhlIHBhcmFtYXRlcg0KICAgICAgICAgKiBAcmV0dXJuIHZvaWQNCiAgICAgICAg ICovDQotICAgICAgICB2b2lkIFNldFBhcmFtTCggDQorICAgICAgICB2b2lkIFNldFBhcmFtTCgN CiAgICAgICAgICAgICBUQnJDdGxEZWZzOjpUQnJDdGxXaWRnZXRQYXJhbXMgYVBhcmFtLCBjb25z dCBURGVzQyYgYVZhbHVlICk7DQogDQogICAgICAgICAvKioNCkBAIC00OTUsNyArNDk1LDcgQEAg Y2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcmV0 dXJuIHZvaWQNCiAgICAgICAgICovDQogICAgICAgICB2b2lkIExvYWRXaWRnZXRFbmdpbmVEbGxM KCk7DQotICAgICAgICANCisNCiAgICAgICAgIC8qDQogICAgICAgICAqIE1ldGhvZCBMYXVuY2hB cHBsaWNhdGlvbkwNCiAgICAgICAgICogQHNpbmNlIDMuMg0KQEAgLTUyNiw3ICs1MjYsNyBAQCBj bGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogICAgIHByaXZhdGU6DQog ICAgICAgICBDV2ViS2l0VmlldyogICAgICAgICAgICBpV2ViS2l0VmlldzsvL25vdCBvd25lZA0K ICAgICAgICAgQ1dpZGdldFByZWZlcmVuY2VzKiAgICAgaVByZWZlcmVuY2VzOw0KLSAgICAgICAg VFdpZGdldFJlbmRlcmVyKiAgICAgICAgaVdpZGdldFJlbmRlcmVyOyAgICAgICANCisgICAgICAg IFRXaWRnZXRSZW5kZXJlciogICAgICAgIGlXaWRnZXRSZW5kZXJlcjsNCiAgICAgICAgIFRJbnQg ICAgICAgICAgICAgICAgICAgIGlXaWRnZXRJZDsNCiAgICAgICAgIFRCb29sICAgICAgICAgICAg ICAgICAgIGlOYXZpZ2F0aW9uRW5hYmxlZDsNCiAgICAgICAgIFRCb29sICAgICAgICAgICAgICAg ICAgIGlQYWdlU2NhbGVyV2FzRW5hYmxlZDsNCkBAIC01NTYsNyArNTU2LDcgQEAgY2xhc3MgQ1dp ZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcGFyYW0gbWVudSBp dGVtIHRvIGJlIGFkZGVkDQogICAgICAgICAqIEByZXR1cm4gdm9pZA0KICAgICAgICAgKi8NCi0g ICAgICAgIHZvaWQgQWRkTWVudUl0ZW0oIENFaWtNZW51UGFuZSYgYU1lbnVQYW5lLCBDTWVudUl0 ZW0qIGFOb2RlICk7DQorICAgICAgICB2b2lkIEFkZE1lbnVJdGVtKCBDRWlrTWVudVBhbmUmIGFN ZW51UGFuZSwgQ01lbnVJdGVtKiBhTm9kZSAsIFRJbnQgYUlzUm9vdE1lbnVQYW5lID0gRUZhbHNl KTsNCiANCiAgICAgICAgIC8qDQogICAgICAgICAqIE1ldGhvZCBBcHBlbmQNCkBAIC01ODAsNyAr NTgwLDcgQEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAg ICAgKiBNZXRob2QgRmluZE5vZGVCeUlkDQogICAgICAgICAqIEBzaW5jZSAzLjINCiAgICAgICAg ICogQHBhcmFtIHJvb3Qgb2YgdGhlIHRyZWUNCi0gICAgICAgICogQHBhcmFtIGNvbW1hbmQgaWQg b2YgdGhlIG1lbnUgaXRlbSANCisgICAgICAgICogQHBhcmFtIGNvbW1hbmQgaWQgb2YgdGhlIG1l bnUgaXRlbQ0KICAgICAgICAgKiBAcmV0dXJuIENNZW51SXRlbSoNCiAgICAgICAgICovDQogICAg ICAgICBDTWVudUl0ZW0qIEZpbmROb2RlQnlJZCggQ01lbnVJdGVtKiBub2RlLCBUSW50IGFDbWRJ ZCApOw0KQEAgLTU4OSw3ICs1ODksNyBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJsaWMg Q0Jhc2UsIHB1DQogICAgICAgICAqIE1ldGhvZCBGaW5kTm9kZUJ5VGV4dA0KICAgICAgICAgKiBA c2luY2UgMy4yDQogICAgICAgICAqIEBwYXJhbSByb290IG9mIHRoZSB0cmVlDQotICAgICAgICAq IEBwYXJhbSB0ZXh0IG9mIHRoZSBtZW51IGl0ZW0gDQorICAgICAgICAqIEBwYXJhbSB0ZXh0IG9m IHRoZSBtZW51IGl0ZW0NCiAgICAgICAgICogQHJldHVybiBDTWVudUl0ZW0qDQogICAgICAgICAq Lw0KICAgICAgICAgQ01lbnVJdGVtKiBGaW5kTm9kZUJ5VGV4dCggQ01lbnVJdGVtKiBub2RlLCBj b25zdCBURGVzQyYgYVRleHQgKTsNCkBAIC01OTgsMTAgKzU5OCwxMCBAQCBjbGFzcyBDV2lkZ2V0 RXh0ZW5zaW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogDQogDQogY2xhc3MgQ01lbnVJdGVtIDogcHVi bGljIENCYXNlDQotICAgIHsgICAgDQorICAgIHsNCiAgICAgcHVibGljOg0KICAgICAgICAgLyoq DQotICAgICAgICAqIENvbnN0cnVjdG9yICAgICAgIA0KKyAgICAgICAgKiBDb25zdHJ1Y3Rvcg0K ICAgICAgICAgKi8NCiAgICAgICAgIHN0YXRpYyBDTWVudUl0ZW0qIE5ld0woIGNvbnN0IFREZXND MTYmIGFUZXh0LCBUSW50IGFDbWRJZCwgVEJvb2wgYURpbW1lZCA9IEVGYWxzZSwNCiAgICAgICAg ICAgICBDTWVudUl0ZW0qIGFQYXJlbnQgPSBOVUxMLCB2b2lkKiBhT2JqID0gTlVMTCApOw0KQEAg LTYyMSw3ICs2MjEsNyBAQCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAgICAg ICogQysrIGNvbnN0cnVjdG9yLg0KICAgICAgICAgKi8NCiAgICAgICAgIENNZW51SXRlbSggY29u c3QgVERlc0MxNiYgYVRleHQsIFRJbnQgYUNtZElkLCBUQm9vbCBhRGltbWVkLCBDTWVudUl0ZW0q IGFQYXJlbnQgPSBOVUxMLA0KLSAgICAgICAgICAgIHZvaWQqIGFPYmogPSBOVUxMICk7ICAgICAg IA0KKyAgICAgICAgICAgIHZvaWQqIGFPYmogPSBOVUxMICk7DQogDQogICAgIHB1YmxpYzoNCiAN CkBAIC02MzEsOCArNjMxLDggQEAgY2xhc3MgQ01lbnVJdGVtIDogcHVibGljIENCYXNlDQogICAg ICAgICAqIEBwYXJhbSBub25lDQogICAgICAgICAqIEByZXR1cm4gdGV4dCBvZiBtZW51IGl0ZW0N CiAgICAgICAgICovDQotICAgICAgICBjb25zdCBURGVzQyYgVGV4dCgpIA0KLSAgICAgICAgICAg IHsgDQorICAgICAgICBjb25zdCBURGVzQyYgVGV4dCgpDQorICAgICAgICAgICAgew0KICAgICAg ICAgICAgIGlmICggaVRleHQgKSByZXR1cm4gKmlUZXh0Ow0KICAgICAgICAgICAgIGVsc2UgcmV0 dXJuIEtOdWxsRGVzQygpOw0KICAgICAgICAgICAgIH0NCkBAIC02NjAsNyArNjYwLDcgQEAgY2xh c3MgQ01lbnVJdGVtIDogcHVibGljIENCYXNlDQogICAgICAgICAqIEByZXR1cm4gbmV4dCBzaWJs aW5nIG9mIG1lbnUgaXRlbQ0KICAgICAgICAgKi8NCiAgICAgICAgIENNZW51SXRlbSogTmV4dFNp YmxpbmcoKSB7IHJldHVybiBpTmV4dFNpYmxpbmc7IH0NCi0gICAgICAgIA0KKw0KICAgICAgICAg LyoNCiAgICAgICAgICogTWV0aG9kIERpbW1lZCgpDQogICAgICAgICAqIEBzaW5jZSAzLjINCkBA IC02OTksMTIgKzY5OSwxMiBAQCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAg ICAgICogQHBhcmFtIHRleHQgb2YgbWVudSBpdGVtDQogICAgICAgICAqIEByZXR1cm4gbm9uZQ0K ICAgICAgICAgKi8NCi0gICAgICAgIHZvaWQgU2V0VGV4dCggY29uc3QgVERlc0MmIGFUZXh0ICkg DQotICAgICAgICAgICAgeyANCisgICAgICAgIHZvaWQgU2V0VGV4dCggY29uc3QgVERlc0MmIGFU ZXh0ICkNCisgICAgICAgICAgICB7DQogICAgICAgICAgICAgSEJ1ZkMqIHRtcFRleHQgPSBIQnVm Qzo6TmV3TCggYVRleHQuTGVuZ3RoKCkgKTsNCiAgICAgICAgICAgICB0bXBUZXh0LT5EZXMoKS5B cHBlbmQoIGFUZXh0ICk7DQogICAgICAgICAgICAgZGVsZXRlIGlUZXh0Ow0KLSAgICAgICAgICAg IGlUZXh0ID0gdG1wVGV4dDsgICAgDQorICAgICAgICAgICAgaVRleHQgPSB0bXBUZXh0Ow0KICAg ICAgICAgICAgIH0NCiANCiAgICAgICAgIC8qDQpAQCAtNzIyLDcgKzcyMiw3IEBAIGNsYXNzIENN ZW51SXRlbSA6IHB1YmxpYyBDQmFzZQ0KICAgICAgICAgKiBAcmV0dXJuIG5vbmUNCiAgICAgICAg ICovDQogICAgICAgICB2b2lkIFNldEZpcnN0Q2hpbGQoIENNZW51SXRlbSogYUZpcnN0Q2hpbGQg KSB7IGlGaXJzdENoaWxkID0gYUZpcnN0Q2hpbGQ7IH0NCi0gICAgICAgIA0KKw0KICAgICAgICAg LyoNCiAgICAgICAgICogTWV0aG9kIFNldE5leHRTaWJsaW5nKCkNCiAgICAgICAgICogQHNpbmNl IDMuMg0KQEAgLTczMCw3ICs3MzAsNyBAQCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UN CiAgICAgICAgICogQHJldHVybiBub25lDQogICAgICAgICAqLw0KICAgICAgICAgdm9pZCBTZXRO ZXh0U2libGluZyggQ01lbnVJdGVtKiBhTmV4dFNpYmxpbmcgKSB7IGlOZXh0U2libGluZyA9IGFO ZXh0U2libGluZzsgfQ0KLSAgICAgICAgDQorDQogICAgICAgICAvKg0KICAgICAgICAgKiBNZXRo b2QgU2V0RGltbWVkKCkNCiAgICAgICAgICogQHNpbmNlIDMuMg0KQEAgLTc2MSw3ICs3NjEsNyBA QCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAgICAgIENNZW51SXRlbSogICAg ICAgICAgICAgIGlQYXJlbnQ7Ly9kYXRhDQogICAgICAgICBDTWVudUl0ZW0qICAgICAgICAgICAg ICBpRmlyc3RDaGlsZDsvL2xlZnQgbm9kZQ0KICAgICAgICAgQ01lbnVJdGVtKiAgICAgICAgICAg ICAgaU5leHRTaWJsaW5nOy8vcmlnaHQgbm9kZQ0KLSAgICAgICAgVEJvb2wgICAgICAgICAgICAg ICAgICAgaURpbW1lZDsvL0VUcnVlIHRvIGRpbSB0aGlzIG1lbnUgaXRlbS4gRUZhbHNlIHRvIHVu LWRpbSB0aGlzIG1lbnUgaXRlbS4gDQorICAgICAgICBUQm9vbCAgICAgICAgICAgICAgICAgICBp RGltbWVkOy8vRVRydWUgdG8gZGltIHRoaXMgbWVudSBpdGVtLiBFRmFsc2UgdG8gdW4tZGltIHRo aXMgbWVudSBpdGVtLg0KICAgICAgICAgV2lkZ2V0RXZlbnRIYW5kbGVyKiAgICAgaUNhbGxiYWNr Ow0KICAgICAgICAgdm9pZCogICAgICAgICAgICAgICAgICAgaU9iajsNCiAgICAgfTsNCkluZGV4 OiBXZWJLaXQvQnJvd3NlclZpZXcvc3JjL1dpZGdldEV4dGVuc2lvbi5jcHANCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBXZWJLaXQvQnJvd3NlclZpZXcvc3JjL1dpZGdldEV4dGVuc2lvbi5jcHAJKHJldmlzaW9u IDI0ODI4KQ0KKysrIFdlYktpdC9Ccm93c2VyVmlldy9zcmMvV2lkZ2V0RXh0ZW5zaW9uLmNwcAko d29ya2luZyBjb3B5KQ0KQEAgLTQzNCwxMyArNDM0LDEzIEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lv bjo6QWRkT3B0aW9uTWVudUl0ZW0NCiAgICAgaWYgKCBub2RlICkNCiAgICAgICAgIHsNCiAgICAg ICAgIC8vYWRkIGZpcnN0IGNoaWxkDQotICAgICAgICBBZGRNZW51SXRlbSggYU1lbnVQYW5lLCBu b2RlICk7DQorICAgICAgICBBZGRNZW51SXRlbSggYU1lbnVQYW5lLCBub2RlLCBwYXJlbnRDbWRJ ZCA9PSAtMSApOw0KIA0KICAgICAgICAgLy9hZGQgYWxsIG90aGVyIGNoaWxkcmVuIChzaWJsaW5n cyBvZiBmaXJzdCBjaGlsZCkNCiAgICAgICAgIENNZW51SXRlbSogc2libGluZyA9IG5vZGUtPk5l eHRTaWJsaW5nKCk7DQogICAgICAgICB3aGlsZSggc2libGluZyApDQogICAgICAgICAgICAgew0K LSAgICAgICAgICAgIEFkZE1lbnVJdGVtKCBhTWVudVBhbmUsIHNpYmxpbmcgKTsNCisgICAgICAg ICAgICBBZGRNZW51SXRlbSggYU1lbnVQYW5lLCBzaWJsaW5nLCBwYXJlbnRDbWRJZCA9PSAtMSAp Ow0KICAgICAgICAgICAgIHNpYmxpbmcgPSBzaWJsaW5nLT5OZXh0U2libGluZygpOw0KICAgICAg ICAgICAgIH0NCiAgICAgICAgIH0NCkBAIC00NTQsNyArNDU0LDcgQEAgdm9pZCBDV2lkZ2V0RXh0 ZW5zaW9uOjpBZGRPcHRpb25NZW51SXRlbQ0KIC8vDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0K IC8vDQotdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpBZGRNZW51SXRlbSggQ0Vpa01lbnVQYW5lJiBh TWVudVBhbmUsIENNZW51SXRlbSogYU5vZGUgKQ0KK3ZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6QWRk TWVudUl0ZW0oIENFaWtNZW51UGFuZSYgYU1lbnVQYW5lLCBDTWVudUl0ZW0qIGFOb2RlICwgVEJv b2wgYUlzUm9vdE1lbnVQYW5lKQ0KICAgICB7DQogICAgIENFaWtNZW51UGFuZUl0ZW06OlNEYXRh IG1lbnVEYXRhOw0KICAgICBtZW51RGF0YS5pQ29tbWFuZElkID0gYU5vZGUtPkNtZElkKCkgKyBL TWVudUl0ZW1Db21tYW5kSWRCYXNlOw0KQEAgLTQ2MywxNyArNDYzLDE3IEBAIHZvaWQgQ1dpZGdl dEV4dGVuc2lvbjo6QWRkTWVudUl0ZW0oIENFaWsNCiAgICAgICAgIHsNCiAgICAgICAgIGlmICgg aVJlc291cmNlSWQgPiBSX0NBU0NBREVfTUVOVV8xICsgS01heE9wdGlvbnNNZW51ICkNCiAgICAg ICAgICAgICB7DQotICAgICAgICAgICAgbWVudURhdGEuaUNhc2NhZGVJZCA9IDA7DQorICAgICAg ICAgICAgcmV0dXJuOyAvL0RvbnQgYWRkIGFueSBtZW51IGl0ZW0gYW55IG1vcmUNCiAgICAgICAg ICAgICB9DQogICAgICAgICBlbHNlDQogICAgICAgICAgICAgew0KICAgICAgICAgICAgIG1lbnVE YXRhLmlDYXNjYWRlSWQgPSBpUmVzb3VyY2VJZDsNCi0gICAgICAgICAgICB9ICAgICAgICAgICAg DQorICAgICAgICAgICAgfQ0KICAgICAgICAgfQ0KICAgICBlbHNlDQogICAgICAgICB7DQogICAg ICAgICBtZW51RGF0YS5pQ2FzY2FkZUlkID0gMDsNCi0gICAgICAgIH0gICAgICAgIA0KKyAgICAg ICAgfQ0KIA0KICAgICBtZW51RGF0YS5pRmxhZ3MgPSAwOw0KICAgICBtZW51RGF0YS5pVGV4dCA9 IGFOb2RlLT5UZXh0KCk7DQpAQCAtNDgzLDcgKzQ4MywxMCBAQCB2b2lkIENXaWRnZXRFeHRlbnNp b246OkFkZE1lbnVJdGVtKCBDRWlrDQogICAgIGVudHJ5LnBhcmVudENtZElkID0gYU5vZGUtPkNt ZElkKCk7DQogICAgIGlDYXNjYWRlQXJyLkFwcGVuZCggZW50cnkgKTsNCiANCi0gICAgYU1lbnVQ YW5lLkluc2VydE1lbnVJdGVtTCggbWVudURhdGEsIE1heChhTWVudVBhbmUuTnVtYmVyT2ZJdGVt c0luUGFuZSgpLTEsMCkgKTsNCisgICAgLy9TaW5jZSByb290IG1lbnUgcGFuZSBoYXMgIkV4aXQi IGF0IHRoZSBib3R0b24sIG1lbnUgaXRlbXMgbXVzdCBiZSBhZGRlZCBhdCBsYXN0IC0gMQ0KKyAg ICAvL2Vsc2UgaXRlbXMgd2lsbCBnZXQgYXBwZW5kZWQgYmVsb3cgIkV4aXQiDQorICAgIFRJbnQg aW5kZXggPSBhSXNSb290TWVudVBhbmUgPyBhTWVudVBhbmUuTnVtYmVyT2ZJdGVtc0luUGFuZSgp IC0gMSA6IGFNZW51UGFuZS5OdW1iZXJPZkl0ZW1zSW5QYW5lKCk7DQorICAgIGFNZW51UGFuZS5J bnNlcnRNZW51SXRlbUwoIG1lbnVEYXRhLCBpbmRleCApOw0KICAgICBhTWVudVBhbmUuU2V0SXRl bURpbW1lZCggYU5vZGUtPkNtZElkKCkrS01lbnVJdGVtQ29tbWFuZElkQmFzZSwgYU5vZGUtPkRp bW1lZCgpICk7DQogICAgIH0NCiANCkBAIC00OTksOCArNTAyLDYgQEAgdm9pZCBDV2lkZ2V0RXh0 ZW5zaW9uOjpNZW51SXRlbVNlbGVjdGVkKA0KICAgICAgICAgew0KICAgICAgICAgaVdpZGdldEVu Z2luZUJyaWRnZS0+TWVudUl0ZW1TZWxlY3RlZCggYUNtZElkIC0gS01lbnVJdGVtQ29tbWFuZElk QmFzZSApOw0KICAgICAgICAgfQ0KLQ0KLSAgICBPblNob3dTZWxlY3RlZCgpOw0KICAgICB9DQog DQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KQEAgLTY2MiwxNCArNjYzLDE0IEBAIHZvaWQgQ1dp ZGdldEV4dGVuc2lvbjo6U2V0UGFyYW1MKA0KIC8vDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0N CiAvLw0KLVRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6QWRkT3B0aW9uc01lbnVJdGVtKCANCitUSW50 IENXaWRnZXRFeHRlbnNpb246OkFkZE9wdGlvbnNNZW51SXRlbSgNCiAgICAgY29uc3QgVERlc0Mm IGFUZXh0LCBUSW50IGFDbWRJZCwgVEJvb2wgYURpbW1lZCwgVEludCBhUGFyZW50SWQsIHZvaWQq IGFPYmogKQ0KLSAgICB7ICAgDQotICAgIGlmICggIWlNZW51Um9vdCApIA0KLSAgICAgICAgeyAN CisgICAgew0KKyAgICBpZiAoICFpTWVudVJvb3QgKQ0KKyAgICAgICAgew0KICAgICAgICAgaU1l bnVSb290ID0gQ01lbnVJdGVtOjpOZXdMKCBfTCgiIiksIC0xICk7DQotICAgICAgICB9ICAgIA0K LSAgICAgICAgDQorICAgICAgICB9DQorDQogICAgIGlmICggYVRleHQuTGVuZ3RoKCkgPiAwICkN CiAgICAgICAgIHsNCiAgICAgICAgIENNZW51SXRlbSogcGFyZW50ID0gRmluZE5vZGVCeUlkKCBp TWVudVJvb3QsIGFQYXJlbnRJZCApOw0KQEAgLTY3NywyNSArNjc4LDI1IEBAIFRJbnQgQ1dpZGdl dEV4dGVuc2lvbjo6QWRkT3B0aW9uc01lbnVJdGUNCiAgICAgICAgICAgICB7DQogICAgICAgICAg ICAgcmV0dXJuIEtFcnJHZW5lcmFsOw0KICAgICAgICAgICAgIH0NCi0gICAgICAgIA0KKw0KICAg ICAgICAgQ01lbnVJdGVtKiBpdGVtID0gTlVMTDsNCi0gICAgICAgIGl0ZW0gPSBGaW5kTm9kZUJ5 SWQoIGlNZW51Um9vdCwgYUNtZElkICk7ICAgICAgICANCisgICAgICAgIGl0ZW0gPSBGaW5kTm9k ZUJ5SWQoIGlNZW51Um9vdCwgYUNtZElkICk7DQogICAgICAgICBpZiAoIGl0ZW0gKQ0KICAgICAg ICAgICAgIHsNCiAgICAgICAgICAgICByZXR1cm4gS0VyckFscmVhZHlFeGlzdHM7DQogICAgICAg ICAgICAgfQ0KLSAgICAgICAgICAgICAgICAgICAgDQorDQogICAgICAgICBpdGVtID0gRmluZE5v ZGVCeVRleHQoIGlNZW51Um9vdCwgYVRleHQgKTsNCiAgICAgICAgIGlmICggaXRlbSApDQogICAg ICAgICAgICAgew0KICAgICAgICAgICAgIHJldHVybiBLRXJyQWxyZWFkeUV4aXN0czsNCiAgICAg ICAgICAgICB9DQotICAgICAgICAgICAgICAgICAgICANCisNCiAgICAgICAgIGl0ZW0gPSBDTWVu dUl0ZW06Ok5ld0woIGFUZXh0LCBhQ21kSWQsIGFEaW1tZWQsIHBhcmVudCwgYU9iaiApOw0KLSAg ICAgICAgcmV0dXJuIEFwcGVuZCggcGFyZW50LCBpdGVtICk7ICAgIA0KKyAgICAgICAgcmV0dXJu IEFwcGVuZCggcGFyZW50LCBpdGVtICk7DQogICAgICAgICB9DQotICAgICAgICANCi0gICAgcmV0 dXJuIEtFcnJHZW5lcmFsOyAgICAgICAgICAgICAgICANCisNCisgICAgcmV0dXJuIEtFcnJHZW5l cmFsOw0KICAgICB9DQogDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCkBAIC03MjEsOSArNzIy LDkgQEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRSaWdodFNvZnRLZXlMYQ0KIC8vDQogLy8g LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAvLw0KLVRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6QXBwZW5k KCANCitUSW50IENXaWRnZXRFeHRlbnNpb246OkFwcGVuZCgNCiAgICAgQ01lbnVJdGVtKiBhUGFy ZW50LCBDTWVudUl0ZW0qIGFJdGVtICkNCi0gICAgeyAgDQorICAgIHsNCiAgICAgaWYgKCAhYVBh cmVudCApDQogICAgICAgICB7DQogICAgICAgICByZXR1cm4gS0VyckdlbmVyYWw7DQpAQCAtNzM3 LDggKzczOCw4IEBAIFRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6QXBwZW5kKCANCiAgICAgICAgIHsN CiAgICAgICAgIEFwcGVuZFNpYmxpbmcoIGFQYXJlbnQtPkZpcnN0Q2hpbGQoKSwgYUl0ZW0gKTsN CiAgICAgICAgIH0NCi0gICAgcmV0dXJuIEtFcnJOb25lOyAgICAgICAgICAgIA0KLSAgICB9IA0K KyAgICByZXR1cm4gS0Vyck5vbmU7DQorICAgIH0NCiANCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQ0KIC8vIENXaWRnZXRFeHRlbnNpb246OkFwcGVuZFNpYmxpbmcNCkBAIC03OTgsNyArNzk5LDcg QEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpEZWxldGVNZW51SXRlbSggVA0KICAgICAgICAgICAg ICAgICB7DQogICAgICAgICAgICAgICAgIGl0ZW0gPSBwcmV2LT5OZXh0U2libGluZygpOw0KICAg ICAgICAgICAgICAgICB9DQotICAgICAgICAgICAgICAgIA0KKw0KICAgICAgICAgICAgIHdoaWxl KCBpdGVtICkNCiAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICBpZiAoIGl0ZW0t PkNtZElkKCkgPT0gYUNtZElkICkNCkBAIC04MzQsNDEgKzgzNSw0MSBAQCB2b2lkIENXaWRnZXRF eHRlbnNpb246OkNsZWFyTWVudUl0ZW1zKCkNCiAvLw0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0N CiAvLw0KLVRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6UmVwbGFjZU1lbnVJdGVtKCANCi0gICAgVElu dCBvbGRJdGVtQ21kSWQsIA0KLSAgICBjb25zdCBURGVzQyYgbmV3SXRlbVRleHQsIA0KLSAgICBU SW50IG5ld0l0ZW1DbWRJZCwgDQorVEludCBDV2lkZ2V0RXh0ZW5zaW9uOjpSZXBsYWNlTWVudUl0 ZW0oDQorICAgIFRJbnQgb2xkSXRlbUNtZElkLA0KKyAgICBjb25zdCBURGVzQyYgbmV3SXRlbVRl eHQsDQorICAgIFRJbnQgbmV3SXRlbUNtZElkLA0KICAgICBUSW50IG5ld0l0ZW1EaW1tZWQgKQ0K ICAgICB7DQogICAgIENNZW51SXRlbSogbmV3SXRlbSA9IE5VTEw7DQogICAgIENNZW51SXRlbSog b2xkSXRlbSA9IE5VTEw7DQotICAgIA0KLSAgICAvLyBjaGVjayBpZiB0aGVyZSBpcyBhbm90aGVy IG5vZGUgaW4gdGhlIHRyZWUgd2l0aCB0aGUgc2FtZSBJZCBhcyB0aGF0IG9mIA0KKw0KKyAgICAv LyBjaGVjayBpZiB0aGVyZSBpcyBhbm90aGVyIG5vZGUgaW4gdGhlIHRyZWUgd2l0aCB0aGUgc2Ft ZSBJZCBhcyB0aGF0IG9mDQogICAgIC8vIG5ld0l0ZW0gYnV0IGFsbG93IGEgcmVwbGFjZSBvZiBv bGRJdGVtIHdpdGggdGhlIHNhbWUgSWQgYXMgdGhlIG5ld0l0ZW0NCi0gICAgbmV3SXRlbSA9IEZp bmROb2RlQnlJZCggaU1lbnVSb290LCBuZXdJdGVtQ21kSWQgKTsgICAgDQorICAgIG5ld0l0ZW0g PSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9vdCwgbmV3SXRlbUNtZElkICk7DQogICAgIGlmICggbmV3 SXRlbSAmJiBuZXdJdGVtLT5DbWRJZCgpICE9IG9sZEl0ZW1DbWRJZCApDQogICAgICAgICB7DQog ICAgICAgICByZXR1cm4gS0VyckFscmVhZHlFeGlzdHM7DQogICAgICAgICB9DQotICAgIA0KLSAg ICAvLyBjaGVjayBpZiB0aGVyZSBpcyBhbm90aGVyIG5vZGUgaW4gdGhlIHRyZWUgd2l0aCB0aGUg c2FtZSB0ZXh0IGFzIHRoYXQgb2YgDQorDQorICAgIC8vIGNoZWNrIGlmIHRoZXJlIGlzIGFub3Ro ZXIgbm9kZSBpbiB0aGUgdHJlZSB3aXRoIHRoZSBzYW1lIHRleHQgYXMgdGhhdCBvZg0KICAgICAv LyBuZXdJdGVtIGJ1dCBhbGxvdyBhIHJlcGxhY2Ugb2Ygb2xkSXRlbSB3aXRoIHRoZSBzYW1lIHRl eHQgYXMgdGhlIG5ld0l0ZW0NCiAgICAgbmV3SXRlbSA9IEZpbmROb2RlQnlUZXh0KCBpTWVudVJv b3QsIG5ld0l0ZW1UZXh0ICk7DQotICAgIG9sZEl0ZW0gPSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9v dCwgb2xkSXRlbUNtZElkICk7ICANCisgICAgb2xkSXRlbSA9IEZpbmROb2RlQnlJZCggaU1lbnVS b290LCBvbGRJdGVtQ21kSWQgKTsNCiAgICAgaWYgKCBuZXdJdGVtICYmIG9sZEl0ZW0gJiYgbmV3 SXRlbS0+VGV4dCgpLkNvbXBhcmUob2xkSXRlbS0+VGV4dCgpKSAhPSAwICkNCiAgICAgICAgIHsN CiAgICAgICAgIHJldHVybiBLRXJyQWxyZWFkeUV4aXN0czsNCiAgICAgICAgIH0NCi0gICAgICAN CisNCiAgICAgaWYgKCBvbGRJdGVtICkNCiAgICAgICAgIHsNCi0gICAgICAgIG9sZEl0ZW0tPlNl dFRleHQoIG5ld0l0ZW1UZXh0ICk7ICAgIA0KLSAgICAgICAgb2xkSXRlbS0+U2V0Q21kSWQoIG5l d0l0ZW1DbWRJZCApOyAgIA0KKyAgICAgICAgb2xkSXRlbS0+U2V0VGV4dCggbmV3SXRlbVRleHQg KTsNCisgICAgICAgIG9sZEl0ZW0tPlNldENtZElkKCBuZXdJdGVtQ21kSWQgKTsNCiAgICAgICAg IG9sZEl0ZW0tPlNldERpbW1lZCggbmV3SXRlbURpbW1lZCApOw0KICAgICAgICAgcmV0dXJuIEtF cnJOb25lOw0KICAgICAgICAgfQ0KLSAgICAgICAgDQotICAgIHJldHVybiBLRXJyR2VuZXJhbDsg ICAgICAgIA0KKw0KKyAgICByZXR1cm4gS0VyckdlbmVyYWw7DQogICAgIH0NCiANCiAvLyAtLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tDQpAQCAtOTE4LDcgKzkxOSw3IEBAIHZvaWQqIENXaWRnZXRFeHRlbnNp b246OkdldEZyb21NZW51SXRlbUMNCiAgICAgZWxzZQ0KICAgICAgICAgew0KICAgICAgICAgcmV0 dXJuIE5VTEw7DQotICAgICAgICB9ICAgICAgICANCisgICAgICAgIH0NCiAgICAgfQ0KIA0KIC8v IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0NCkBAIC05MzMsNyArOTM0LDcgQEAgdm9pZCogQ1dpZGdldEV4 dGVuc2lvbjo6R2V0RnJvbU1lbnVJdGVtQw0KICAgICBDTWVudUl0ZW0qIG5vZGUgPSBOVUxMOw0K IA0KICAgICBub2RlID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGNtZElkICk7DQotICAgIA0K Kw0KICAgICBpZiAoIG5vZGUgKQ0KICAgICAgICAgew0KICAgICAgICAgcmV0dXJuIG5vZGUtPk9i aigpOw0KQEAgLTk0MSw3ICs5NDIsNyBAQCB2b2lkKiBDV2lkZ2V0RXh0ZW5zaW9uOjpHZXRGcm9t TWVudUl0ZW1DDQogICAgIGVsc2UNCiAgICAgICAgIHsNCiAgICAgICAgIHJldHVybiBOVUxMOw0K LSAgICAgICAgfSAgICAgICAgDQorICAgICAgICB9DQogICAgIH0NCiANCiAvLyAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tDQpAQCAtOTU1LDcgKzk1Niw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0 RGltbWVkKCBUSW50IGENCiAgICAgew0KICAgICBDTWVudUl0ZW0qIG5vZGUgPSBOVUxMOw0KICAg ICBub2RlID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGFDbWRJZCApOw0KLSAgICANCisNCiAg ICAgaWYgKCBub2RlICkNCiAgICAgICAgIHsNCiAgICAgICAgIG5vZGUtPlNldERpbW1lZCggYVZh bHVlICk7DQpAQCAtOTc0LDcgKzk3NSw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0TWVu dUl0ZW1PYnNlcnYNCiAgICAgew0KICAgICBDTWVudUl0ZW0qIG5vZGUgPSBOVUxMOw0KICAgICBu b2RlID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGFDbWRJZCApOw0KLSAgICANCisNCiAgICAg aWYgKCBub2RlICkNCiAgICAgICAgIHsNCiAgICAgICAgIG5vZGUtPlNldENhbGxiYWNrKCBhT25T ZWxlY3RDYWxsYmFjayApOw0KQEAgLTk5Miw3ICs5OTMsNyBAQCBXaWRnZXRFdmVudEhhbmRsZXIq IENXaWRnZXRFeHRlbnNpb246Ok1lDQogICAgIHsNCiAgICAgQ01lbnVJdGVtKiBub2RlID0gTlVM TDsNCiAgICAgbm9kZSA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290LCBhQ21kSWQgKTsNCi0gICAg DQorDQogICAgIGlmICggbm9kZSApDQogICAgICAgICB7DQogICAgICAgICByZXR1cm4gbm9kZS0+ Q2FsbGJhY2soKTsNCkBAIC0xMDAwLDcgKzEwMDEsNyBAQCBXaWRnZXRFdmVudEhhbmRsZXIqIENX aWRnZXRFeHRlbnNpb246Ok1lDQogICAgIGVsc2UNCiAgICAgICAgIHsNCiAgICAgICAgIHJldHVy biBOVUxMOw0KLSAgICAgICAgfSAgICAgICAgDQorICAgICAgICB9DQogICAgIH0NCiANCiANCkBA IC0xMTUyLDcgKzExNTMsNyBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OkhpZGVTb2Z0a2V5cygg KQ0KICAgICB7DQogICAgIGlXaWRnZXRDYWxsYmFjay0+U2V0U29mdGtleXNWaXNpYmxlKEVGYWxz ZSk7DQogICAgIH0NCi0gICAgDQorDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAvLyBDV2lk Z2V0RXh0ZW5zaW9uOjpTaG93U29mdGtleXMNCiAvLw0K 15812 2007-08-02 17:34:36 -0700 2007-08-03 10:07:43 -0700 Patch for 3.2 CasecadeMenu32.patch text/plain 3790 sriram.yadavalli SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDgzNCkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDEzIEBADQoreWFkYXZhbGwsIHJldmlld2VkIGJ5IDxaYWxhbj4NCisgREVTQzog Q2FzY2FkZSBtZW51IGlzIG5vdCBpbiBGSUZPIG9yZGVyDQorIGh0dHA6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0ODY2DQorDQorICAgICAgICAqIEJyb3dzZXJWaWV3L2luYy9X aWRnZXRFeHRlbnNpb24uaDoNCisgICAgICAgICogQnJvd3NlclZpZXcvc3JjL1dpZGdldEV4dGVu c2lvbi5jcHA6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6QWRkT3B0aW9uTWVudUl0ZW1z TCk6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6QWRkTWVudUl0ZW0pOg0KKyAgICAgICAg KENXaWRnZXRFeHRlbnNpb246Ok1lbnVJdGVtU2VsZWN0ZWQpOg0KKw0KIHZicmFkbGV5LCByZXZp ZXdlZCBieSBTYWNoaW4NCiAgREVTQzogQVlOTi03NEFGODQgOiBVc2VybmFtZSBmaWVsZCBub3Qg ZmlsbGVkIGF1dG9tYXRpY2FsbHkNCiAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ2MTINCkluZGV4OiBXZWJLaXQvQnJvd3NlclZpZXcvaW5jL1dpZGdldEV4dGVuc2lv bi5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L0Jyb3dzZXJWaWV3L2luYy9XaWRnZXRFeHRlbnNp b24uaAkocmV2aXNpb24gMjQ4MzMpDQorKysgV2ViS2l0L0Jyb3dzZXJWaWV3L2luYy9XaWRnZXRF eHRlbnNpb24uaAkod29ya2luZyBjb3B5KQ0KQEAgLTU1NSw3ICs1NTUsNyBAQCBjbGFzcyBDV2lk Z2V0RXh0ZW5zaW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogICAgICAgICAqIEBwYXJhbSBtZW51IGl0 ZW0gdG8gYmUgYWRkZWQNCiAgICAgICAgICogQHJldHVybiB2b2lkDQogICAgICAgICAqLw0KLSAg ICAgICAgdm9pZCBBZGRNZW51SXRlbSggQ0Vpa01lbnVQYW5lJiBhTWVudVBhbmUsIENNZW51SXRl bSogYU5vZGUgKTsNCisgICAgICAgIHZvaWQgQWRkTWVudUl0ZW0oIENFaWtNZW51UGFuZSYgYU1l bnVQYW5lLCBDTWVudUl0ZW0qIGFOb2RlICwgVEludCBhSXNSb290TWVudVBhbmUgPSBFRmFsc2Up Ow0KIA0KICAgICAgICAgLyoNCiAgICAgICAgICogTWV0aG9kIEFwcGVuZA0KSW5kZXg6IFdlYktp dC9Ccm93c2VyVmlldy9zcmMvV2lkZ2V0RXh0ZW5zaW9uLmNwcA0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdl YktpdC9Ccm93c2VyVmlldy9zcmMvV2lkZ2V0RXh0ZW5zaW9uLmNwcAkocmV2aXNpb24gMjQ4MzMp DQorKysgV2ViS2l0L0Jyb3dzZXJWaWV3L3NyYy9XaWRnZXRFeHRlbnNpb24uY3BwCSh3b3JraW5n IGNvcHkpDQpAQCAtNDI2LDEzICs0MjYsMTMgQEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpBZGRP cHRpb25NZW51SXRlbQ0KICAgICBpZiAoIG5vZGUgKQ0KICAgICAgICAgew0KICAgICAgICAgLy9h ZGQgZmlyc3QgY2hpbGQNCi0gICAgICAgIEFkZE1lbnVJdGVtKCBhTWVudVBhbmUsIG5vZGUgKTsN CisgICAgICAgIEFkZE1lbnVJdGVtKCBhTWVudVBhbmUsIG5vZGUsIHBhcmVudENtZElkID09IC0x ICk7DQogDQogICAgICAgICAvL2FkZCBhbGwgb3RoZXIgY2hpbGRyZW4gKHNpYmxpbmdzIG9mIGZp cnN0IGNoaWxkKQ0KICAgICAgICAgQ01lbnVJdGVtKiBzaWJsaW5nID0gbm9kZS0+TmV4dFNpYmxp bmcoKTsNCiAgICAgICAgIHdoaWxlKCBzaWJsaW5nICkNCiAgICAgICAgICAgICB7DQotICAgICAg ICAgICAgQWRkTWVudUl0ZW0oIGFNZW51UGFuZSwgc2libGluZyApOw0KKyAgICAgICAgICAgIEFk ZE1lbnVJdGVtKCBhTWVudVBhbmUsIHNpYmxpbmcsIHBhcmVudENtZElkID09IC0xICk7DQogICAg ICAgICAgICAgc2libGluZyA9IHNpYmxpbmctPk5leHRTaWJsaW5nKCk7DQogICAgICAgICAgICAg fQ0KICAgICAgICAgfQ0KQEAgLTQ0Niw3ICs0NDYsNyBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246 OkFkZE9wdGlvbk1lbnVJdGVtDQogLy8NCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8NCi12 b2lkIENXaWRnZXRFeHRlbnNpb246OkFkZE1lbnVJdGVtKCBDRWlrTWVudVBhbmUmIGFNZW51UGFu ZSwgQ01lbnVJdGVtKiBhTm9kZSApDQordm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpBZGRNZW51SXRl bSggQ0Vpa01lbnVQYW5lJiBhTWVudVBhbmUsIENNZW51SXRlbSogYU5vZGUgLCBUQm9vbCBhSXNS b290TWVudVBhbmUpDQogICAgIHsNCiAgICAgQ0Vpa01lbnVQYW5lSXRlbTo6U0RhdGEgbWVudURh dGE7DQogICAgIG1lbnVEYXRhLmlDb21tYW5kSWQgPSBhTm9kZS0+Q21kSWQoKSArIEtNZW51SXRl bUNvbW1hbmRJZEJhc2U7DQpAQCAtNDU1LDcgKzQ1NSw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lv bjo6QWRkTWVudUl0ZW0oIENFaWsNCiAgICAgICAgIHsNCiAgICAgICAgIGlmICggaVJlc291cmNl SWQgPiBSX0NBU0NBREVfTUVOVV8xICsgS01heE9wdGlvbnNNZW51ICkNCiAgICAgICAgICAgICB7 DQotICAgICAgICAgICAgbWVudURhdGEuaUNhc2NhZGVJZCA9IDA7DQorICAgICAgICAgICAgcmV0 dXJuOyAvL0RvbnQgYWRkIGFueSBtZW51IGl0ZW0gYW55IG1vcmUNCiAgICAgICAgICAgICB9DQog ICAgICAgICBlbHNlDQogICAgICAgICAgICAgew0KQEAgLTQ3NSw3ICs0NzUsMTAgQEAgdm9pZCBD V2lkZ2V0RXh0ZW5zaW9uOjpBZGRNZW51SXRlbSggQ0Vpaw0KICAgICBlbnRyeS5wYXJlbnRDbWRJ ZCA9IGFOb2RlLT5DbWRJZCgpOw0KICAgICBpQ2FzY2FkZUFyci5BcHBlbmQoIGVudHJ5ICk7DQog DQotICAgIGFNZW51UGFuZS5JbnNlcnRNZW51SXRlbUwoIG1lbnVEYXRhLCBNYXgoYU1lbnVQYW5l Lk51bWJlck9mSXRlbXNJblBhbmUoKS0xLDApICk7DQorICAgIC8vU2luY2Ugcm9vdCBtZW51IHBh bmUgaGFzICJFeGl0IiBhdCB0aGUgYm90dG9uLCBtZW51IGl0ZW1zIG11c3QgYmUgYWRkZWQgYXQg bGFzdCAtIDENCisgICAgLy9lbHNlIGl0ZW1zIHdpbGwgZ2V0IGFwcGVuZGVkIGJlbG93ICJFeGl0 Ig0KKyAgICBUSW50IGluZGV4ID0gYUlzUm9vdE1lbnVQYW5lID8gYU1lbnVQYW5lLk51bWJlck9m SXRlbXNJblBhbmUoKSAtIDEgOiBhTWVudVBhbmUuTnVtYmVyT2ZJdGVtc0luUGFuZSgpOw0KKyAg ICBhTWVudVBhbmUuSW5zZXJ0TWVudUl0ZW1MKCBtZW51RGF0YSwgaW5kZXggKTsNCiAgICAgYU1l bnVQYW5lLlNldEl0ZW1EaW1tZWQoIGFOb2RlLT5DbWRJZCgpK0tNZW51SXRlbUNvbW1hbmRJZEJh c2UsIGFOb2RlLT5EaW1tZWQoKSApOw0KICAgICB9DQogDQpAQCAtNDkyLDcgKzQ5NSw2IEBAIHZv aWQgQ1dpZGdldEV4dGVuc2lvbjo6TWVudUl0ZW1TZWxlY3RlZCgNCiAgICAgICAgIGlXaWRnZXRF bmdpbmVCcmlkZ2UtPk1lbnVJdGVtU2VsZWN0ZWQoIGFDbWRJZCAtIEtNZW51SXRlbUNvbW1hbmRJ ZEJhc2UgKTsNCiAgICAgICAgIH0NCiANCi0gICAgT25TaG93U2VsZWN0ZWQoKTsNCiAgICAgfQ0K IA0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCg==