12533 2007-02-01 12:05:52 -0800 [s60] Enhanced Input feature not working in 3.1 2008-04-09 11:39:49 -0700 1 1 1 Unclassified WebKit WebKit Misc. 420+ S60 Emulator S60 3rd edition CLOSED FIXED P2 Normal --- 1 rasvan.alexandrescu webkit-unassigned oldest_to_newest 29112 0 rasvan.alexandrescu 2007-02-01 12:05:52 -0800 [s60] character is not placed at the location of the pointer when the field was activated. 29117 1 12859 rasvan.alexandrescu 2007-02-01 12:33:37 -0800 Created attachment 12859 fixed pointer position 29186 2 12859 yongjun.zhang 2007-02-02 07:39:03 -0800 Comment on attachment 12859 fixed pointer position 3.1 already has the fix in FControlInputWidget.cpp. Is this fix for 3.2? 29228 3 12884 rasvan.alexandrescu 2007-02-02 12:18:17 -0800 Created attachment 12884 fix for 3.1 branch 29239 4 12884 yongjun.zhang 2007-02-02 14:44:29 -0800 Comment on attachment 12884 fix for 3.1 branch r=me 27438 5 bradley.morrison 2007-02-05 09:09:47 -0800 (In reply to comment #4) > (From update of attachment 12884 [edit]) > r=me > ok. landed on 3.1m (r19404), resolved. 24694 6 krishnamurty.podipireddy 2007-02-09 13:33:39 -0800 Closed. 22384 7 bradley.morrison 2007-02-21 11:07:28 -0800 This patch was reverted in r19774. 22243 8 12884 bradley.morrison 2007-02-22 13:25:54 -0800 Comment on attachment 12884 fix for 3.1 branch clearing review flag 15035 9 14008 rasvan.alexandrescu 2007-04-11 08:47:32 -0700 Created attachment 14008 new attachement for the chinese environment 14497 10 14008 yongjun.zhang 2007-04-17 08:05:26 -0700 Comment on attachment 14008 new attachement for the chinese environment r=me 14498 11 yongjun.zhang 2007-04-17 08:06:56 -0700 landed on r20917 for 31m. 77040 12 bradley.morrison 2008-04-09 11:39:49 -0700 Bulk closing of all s60 platform bugs. Sorry for the noise! 12859 2007-02-01 12:33:37 -0800 2007-02-02 12:18:17 -0800 fixed pointer position input.patch text/plain 1375 rasvan.alexandrescu SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAxOTMzOSkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDEyIEBADQorMjAwNy0wMi0wMSAgcmFhbGV4YW4gIDxyYXN2YW4uYWxleGFuZHJl c2N1QG5va2lhLmNvbT4NCisNCisgICAgICAgIFJldmlld2VkIFlvbmdqdW4gWmhhbmcuDQorICAg ICAgICBERVNDOiBFbmhhbmNlZCBJbnB1dCBmZWF0dXJlIG5vdCB3b3JraW5nIGluIDMuMSBbVFNX IFRNQ04tNlhZU0xZXQ0KKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI1MzMNCisNCisgICAgICAgICogQnJvd3NlckNvcmUvRm9ybWNvbnRyb2xzL3NyYy9G Q29udHJvbElucHV0V2lkZ2V0LmNwcDoNCisgICAgICAgIChDQ29udHJvbElucHV0V2lkZ2V0OjpT ZXRDdXJzb3JQb3NpdGlvbkwpOg0KKw0KIHNhcmVlbiwgUmV2aWV3ZWQgYnkgemFsYW4uDQogICAg ICAgICBERVNDOiBjYWNoZSBjb250cm9sIHByZXNlbnQgaW4gdGhlIEhUVFAgaGVhZGVyIGlzIG5v dCBwcm9wZXJseSBzdXBwb3J0ZWQgRUFNTy02WFRKVlgNCiAgICAgICAgIGh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDc4DQpJbmRleDogV2ViS2l0L0Jyb3dzZXJDb3Jl L0Zvcm1jb250cm9scy9zcmMvRkNvbnRyb2xJbnB1dFdpZGdldC5jcHANCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0t LSBXZWJLaXQvQnJvd3NlckNvcmUvRm9ybWNvbnRyb2xzL3NyYy9GQ29udHJvbElucHV0V2lkZ2V0 LmNwcAkocmV2aXNpb24gMTkzMzkpDQorKysgV2ViS2l0L0Jyb3dzZXJDb3JlL0Zvcm1jb250cm9s cy9zcmMvRkNvbnRyb2xJbnB1dFdpZGdldC5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC0xMjc2LDgg KzEyNzYsNyBAQCB2b2lkIENDb250cm9sSW5wdXRXaWRnZXQ6OlNldEN1cnNvclBvc2l0DQogICAg ICAgfQ0KICAgZWxzZQ0KICAgICAgIHsNCi0gICAgICBUUmVjdCByZWN0ID0gaUVkaXRvci0+UmVj dCgpOw0KLSAgICAgIFRJbnQgbkNoYXJBdFBvcyA9IGlGb250LlRleHRDb3VudChhVGV4dCwgcG9z LmlYIC0gcmVjdC5pVGwuaVgpOw0KKyAgICAgIFRJbnQgbkNoYXJBdFBvcyA9IGlGb250LlRleHRD b3VudChhVGV4dCwgcG9zLmlYKTsNCiAgICAgICBpRWRpdG9yLT5TZXRDdXJzb3JQb3NMKG5DaGFy QXRQb3MsIEVGYWxzZSk7DQogICAgICAgaUxhc3RDdXJQb3MgPSBuQ2hhckF0UG9zOyAgIA0KICAg ICAgIH0NCg== 12884 2007-02-02 12:18:17 -0800 2007-04-11 08:47:32 -0700 fix for 3.1 branch input.patch text/plain 6353 rasvan.alexandrescu SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAxOTM3MSkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDE2IEBADQorMjAwNy0wMi0wMiAgcmFhbGV4YW4gIDxyYXN2YW4uYWxleGFuZHJl c2N1QG5va2lhLmNvbT4NCisNCisgICAgICAgIFJldmlld2VkIGJ5IFlvbmdqdW4gWmhhbmcuDQor ICAgICAgICBERVNDOiBFbmhhbmNlZCBJbnB1dCBmZWF0dXJlIG5vdCB3b3JraW5nIGluIDMuMSBb VFNXIFRNQ04tNlhZU0xZXQ0KKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI1MzMNCisNCisgICAgICAgICogQnJvd3NlckNvcmUvRm9ybWNvbnRyb2xzL2lu Yy9GQ29udHJvbElucHV0V2lkZ2V0Lmg6DQorICAgICAgICAqIEJyb3dzZXJDb3JlL0Zvcm1jb250 cm9scy9zcmMvRkNvbnRyb2xJbnB1dFdpZGdldC5jcHA6DQorICAgICAgICAoQ0NvbnRyb2xJbnB1 dFdpZGdldDo6Q29uc3RydWN0VGV4dEVkaXRvckwpOg0KKyAgICAgICAgKENDb250cm9sSW5wdXRX aWRnZXQ6Ok9mZmVyS2V5RXZlbnRMKToNCisgICAgICAgIChDQ29udHJvbElucHV0V2lkZ2V0OjpT ZXRDdXJzb3JQb3NpdGlvbkwpOg0KKyAgICAgICAgKENDb250cm9sSW5wdXRXaWRnZXQ6OlNldFdl YktpdEN1cnNvclBvc2l0aW9uKToNCisNCiBzYXJlZW4sIFJldmlld2VkIGJ5IHphbGFuLg0KICAg ICAgICAgREVTQzogY2FjaGUgY29udHJvbCBwcmVzZW50IGluIHRoZSBIVFRQIGhlYWRlciBpcyBu b3QgcHJvcGVybHkgc3VwcG9ydGVkIEVBTU8tNlhUSlZYDQogICAgICAgICBodHRwOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ3OCANCkluZGV4OiBXZWJLaXQvQnJvd3NlckNv cmUvRm9ybWNvbnRyb2xzL2luYy9GQ29udHJvbElucHV0V2lkZ2V0LmgNCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0t LSBXZWJLaXQvQnJvd3NlckNvcmUvRm9ybWNvbnRyb2xzL2luYy9GQ29udHJvbElucHV0V2lkZ2V0 LmgJKHJldmlzaW9uIDE5MzY2KQ0KKysrIFdlYktpdC9Ccm93c2VyQ29yZS9Gb3JtY29udHJvbHMv aW5jL0ZDb250cm9sSW5wdXRXaWRnZXQuaAkod29ya2luZyBjb3B5KQ0KQEAgLTM1OCw3ICszNTgs NiBAQCBjbGFzcyBDQ29udHJvbElucHV0V2lkZ2V0IDogcHVibGljIENFaWtCDQogICAgICAgICAq Lw0KICAgICAgICAgc3RhdGljIFRJbnQgUHJlZGljdGl2ZVRleHRPbk9mZkdTTm90aWZpYWN0aW9u KCBUQW55KiBhT2JqICk7DQogICAgICAgICANCi0jaWZkZWYgUkRfMzJfQlJPV1NFUg0KICAgICAg ICAgLyoqDQogICAgICAgICAqIFNldHMgdGhlIEN1cnNvciBQb3NpdGlvbg0KICAgICAgICAgKiAN CkBAIC0zNzAsNyArMzY5LDYgQEAgY2xhc3MgQ0NvbnRyb2xJbnB1dFdpZGdldCA6IHB1YmxpYyBD RWlrQg0KICAgICAgICAgKiANCiAgICAgICAgICovDQogICAgICAgICB2b2lkIFNldFdlYktpdEN1 cnNvclBvc2l0aW9uKGNvbnN0IFRLZXlFdmVudCYgYUtleUV2ZW50KTsNCi0jZW5kaWYNCiANCiAN CiAgICAgcHJpdmF0ZTogICAgICAgIC8vIERhdGENCkluZGV4OiBXZWJLaXQvQnJvd3NlckNvcmUv Rm9ybWNvbnRyb2xzL3NyYy9GQ29udHJvbElucHV0V2lkZ2V0LmNwcA0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0t IFdlYktpdC9Ccm93c2VyQ29yZS9Gb3JtY29udHJvbHMvc3JjL0ZDb250cm9sSW5wdXRXaWRnZXQu Y3BwCShyZXZpc2lvbiAxOTM2NikNCisrKyBXZWJLaXQvQnJvd3NlckNvcmUvRm9ybWNvbnRyb2xz L3NyYy9GQ29udHJvbElucHV0V2lkZ2V0LmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTU2LDkgKzU2 LDggQEANCiAjZWxzZQ0KICNpbmNsdWRlIDxXZWJLaXQucnNnPg0KICNlbmRpZg0KLSNpZmRlZiBS RF8zMl9CUk9XU0VSDQorDQogI2luY2x1ZGUgIldlYktpdEN1cnNvci5oIg0KLSNlbmRpZg0KIA0K ICNpbmNsdWRlIDxjZW50cmFscmVwb3NpdG9yeS5oPg0KICNpbmNsdWRlIDxBa25GZXBJbnRlcm5h bENSS2V5cy5oPg0KQEAgLTgzLDkgKzgyLDggQEAgc3RhdGljIGNvbnN0IFRJbnQgS1RleHRMaW1p dCA9IEtNYXhUSW50Ow0KIHN0YXRpYyBjb25zdCBUSW50IEtBU0NJSTAgPSAweDMwOw0KIHN0YXRp YyBjb25zdCBUSW50IEtBU0NJSTkgPSAweDM5Ow0KIA0KLSNpZmRlZiBSRF8zMl9CUk9XU0VSDQog c3RhdGljIGNvbnN0IFRJbnQgS0NoYXJhY3RlcldpZHRoID0gNjsNCi0jZW5kaWYNCisNCiANCiAN CiAvLyA9PT09PT09PT09PT09PT09PSBTVEFUSUMgRlVOQ1RJT05TID09PT09PT09PT09PT09PT09 PT09PT09DQpAQCAtMjU2LDEwICsyNTQsOCBAQCB2b2lkIENDb250cm9sSW5wdXRXaWRnZXQ6OkNv bnN0cnVjdFRleHRFDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBUV2ViQ29yZVBhbGV0dGUmIGFXZWJDb3JlUGFsZXR0ZSkNCiAgIHsNCiAgIFRCb29sIHQ5QWxs b3dlZDsNCi0gIA0KLSNpZmRlZiBSRF8zMl9CUk9XU0VSDQogICBpUmVjdCA9IGFJbml0aWFsUmVj dGFuZ2xlOw0KLSNlbmRpZg0KKw0KICAgICAvL0NyZWF0ZSBhIG5ldyByZXBvc2l0b3J5DQogICAg IENSZXBvc2l0b3J5KiByZXBvc2l0b3J5ID0gQ1JlcG9zaXRvcnk6Ok5ld0woIEtDUlVpZEFrbkZl cCApOw0KIA0KQEAgLTM3MSwxMSArMzY3LDcgQEAgdm9pZCBDQ29udHJvbElucHV0V2lkZ2V0OjpD b25zdHJ1Y3RUZXh0RQ0KICAgICBpRWRpdG9yLT5TZXRBbGxvd1VuZG8oIEVGYWxzZSApOw0KICAg ICANCiAgICAgLy8gbW92ZSBjdXJzb3INCi0jaWZkZWYgUkRfMzJfQlJPV1NFUg0KICAgICBTZXRD dXJzb3JQb3NpdGlvbkwoYUluaXRpYWxUZXh0LCBhSW5pdGlhbFJlY3RhbmdsZSk7DQotI2Vsc2UN Ci0gICAgaUVkaXRvci0+U2V0Q3Vyc29yUG9zTChpRWRpdG9yLT5UZXh0TGVuZ3RoKCksIEVGYWxz ZSk7DQotI2VuZGlmDQogICAgIA0KICAgICBpRWRpdG9yLT5TZXRpQ3Vyc29yUG9zKCk7Ly8gdHVy bnMgb24gY29ycmVjdCB0OSBiYW5uZXIgYmFzZWQgb24gZm9ybWF0DQogICAgIC8vIHN0YXJ0IGVk aXRpbmcNCkBAIC01MzQsNyArNTI2LDYgQEAgVEtleVJlc3BvbnNlIENDb250cm9sSW5wdXRXaWRn ZXQ6Ok9mZmVySw0KICAgICAgICAgfQ0KICAgICBlbHNlDQogICAgICAgICB7DQotI2lmZGVmIFJE XzMyX0JST1dTRVINCiAgICAgICBpZiAoaVR5cGUgPT0gRU5vcm1hbCAmJiAoKGFLZXlFdmVudC5p U2NhbkNvZGUgPT0gRVN0ZEtleVJpZ2h0QXJyb3cgJiYgQ3VyUG9zKCkgPT0gMCAgJiYgDQogICAg ICAgICBpTGFzdEN1clBvcyA9PSBpRWRpdG9yLT5SZWFkYWJsZVRleHRMKCktPkxlbmd0aCgpKSB8 fCANCiAgICAgICAgICAoYUtleUV2ZW50LmlTY2FuQ29kZSA9PSBFU3RkS2V5TGVmdEFycm93ICYm IEN1clBvcygpID09IGlFZGl0b3ItPlJlYWRhYmxlVGV4dEwoKS0+TGVuZ3RoKCkgJiYNCkBAIC01 NDYsMTAgKzUzNyw3IEBAIFRLZXlSZXNwb25zZSBDQ29udHJvbElucHV0V2lkZ2V0OjpPZmZlcksN CiAgICAgICAgIGVsc2UNCiAgICAgICAgICAgew0KICAgICAgICAgICByZXNwb25zZSA9IGlFZGl0 b3ItPk9mZmVyS2V5RXZlbnRMKCBhS2V5RXZlbnQsIGFUeXBlICk7IA0KLSAgICAgICAgICB9DQot I2Vsc2UNCi0gICAgICAgIHJlc3BvbnNlID0gaUVkaXRvci0+T2ZmZXJLZXlFdmVudEwoIGFLZXlF dmVudCwgYVR5cGUgKTsgDQotI2VuZGlmICANCisgICAgICAgICAgfSAgDQogICAgICAgICANCiAg ICAgICAgIH0NCiAgICAgaWYocmVzcG9uc2UgPT0gRUtleVdhc0NvbnN1bWVkKQ0KQEAgLTU2Mywx MSArNTUxLDggQEAgVEtleVJlc3BvbnNlIENDb250cm9sSW5wdXRXaWRnZXQ6Ok9mZmVySw0KICAg ICAgICAgU2ltdWxhdGVEb25lS2V5TCgoVFN0ZFNjYW5Db2RlIClFU3RkS2V5RW50ZXIgKTsNCiAg ICAgICAgIH0NCiAgICAgZWxzZSBpZiAoYVR5cGUgPT0gRUV2ZW50S2V5ICAmJiAoYUtleUV2ZW50 LmlTY2FuQ29kZSA9PSBFU3RkS2V5VXBBcnJvdyB8fA0KLSAgICAgICAgICAgICBhS2V5RXZlbnQu aVNjYW5Db2RlID09IEVTdGRLZXlEb3duQXJyb3cgDQotI2lmZGVmIFJEXzMyX0JST1dTRVINCi0g ICAgICAgICAgICAgfHwgYUtleUV2ZW50LmlTY2FuQ29kZSA9PSBFU3RkS2V5UmlnaHRBcnJvdw0K LSNlbmRpZg0KLSAgICAgICAgICAgICApKQ0KKyAgICAgICAgICAgICBhS2V5RXZlbnQuaVNjYW5D b2RlID09IEVTdGRLZXlEb3duQXJyb3cgfHwNCisgICAgICAgICAgICAgYUtleUV2ZW50LmlTY2Fu Q29kZSA9PSBFU3RkS2V5UmlnaHRBcnJvdykpDQogICAgICAgICB7DQogICAgICAgICBTaW11bGF0 ZURvbmVLZXlMKChUU3RkU2NhbkNvZGUgKWFLZXlFdmVudC5pU2NhbkNvZGUgKTsNCiAgICAgICAg IC8vIFNpbXVsYXRlRG9uZUtleUwgc2V0cyBpRXhpdENvbnRyb2wgdG8gZmFsc2UgaWYgZm9ybWF0 dGVkIGRhdGEgaXMgaW52YWxpZA0KQEAgLTU4Nyw5ICs1NzIsOCBAQCBUS2V5UmVzcG9uc2UgQ0Nv bnRyb2xJbnB1dFdpZGdldDo6T2ZmZXJLDQogICAgICAgICAgICAgaUxpc3RlbmVyLT5Pa1RvRXhp dCgpOw0KICAgICAgICAgcmVzcG9uc2UgPSBFS2V5V2FzQ29uc3VtZWQ7DQogICAgICAgICB9DQot I2lmZGVmIFJEXzMyX0JST1dTRVINCisNCiAgIGlMYXN0Q3VyUG9zID0gQ3VyUG9zKCk7DQotI2Vu ZGlmDQogICAgIHJldHVybiByZXNwb25zZTsNCiAgICAgfQ0KIA0KQEAgLTEyNDEsNyArMTIyNSw2 IEBAIHZvaWQgQ0NvbnRyb2xJbnB1dFdpZGdldDo6RHJhdygpIGNvbnN0DQogICAgIH0NCiAgIH0N CiANCi0jaWZkZWYgUkRfMzJfQlJPV1NFUg0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vIENDb250cm9sSW5wdXRXaWRnZXQ6 OlNldEN1cnNvclBvc2l0aW9uDQogLy8gU2V0cyBDdXJzb3IgUG9zaXRpb24NCkBAIC0xMjUwLDkg KzEyMzMsMTkgQEAgdm9pZCBDQ29udHJvbElucHV0V2lkZ2V0OjpEcmF3KCkgY29uc3QNCiB2b2lk IENDb250cm9sSW5wdXRXaWRnZXQ6OlNldEN1cnNvclBvc2l0aW9uTChjb25zdCBURGVzQyYgYVRl eHQsIGNvbnN0IFRSZWN0JiBhSW5pdGlhbFJlY3RhbmdsZSkNCiAgIHsNCiAgIENXZWJLaXRWaWV3 KiB3ZWJraXRWaWV3ID0gc3RhdGljX2Nhc3Q8Q1dlYktpdFZpZXcqPihpUGFyZW50KTsNCi0gIFRQ b2ludCBwb3MgPSB3ZWJraXRWaWV3LT5DdXJzb3IoKS0+UG9zaXRpb24oKTsNCi0gICAgICANCi0g ICAgVEludCBjb25zdCBsaW5lTnVtYmVyID0gKHBvcy5pWSAtIGFJbml0aWFsUmVjdGFuZ2xlLmlU bC5pWSkgLyBpRm9udC5Gb250TGluZUdhcCgpOyAvL2lGb250LkhlaWdodEluUGl4ZWxzKCk7DQor ICBDV2ViS2l0Q3Vyc29yKiBjdXIgPSB3ZWJraXRWaWV3LT5DdXJzb3IoKTsNCisgIGlmICggIWN1 ciApIA0KKyAgICAgIHsNCisgICAgICByZXR1cm47DQorICAgICAgfQ0KKyAgVFBvaW50IHBvcyA9 IGN1ci0+UG9zaXRpb24oKTsgIA0KKyAgVEludCBmb250R2FwID0gaUZvbnQuRm9udExpbmVHYXAo KTsNCisgIFRJbnQgbGluZU51bWJlciA9IDA7DQorDQorICBpZihmb250R2FwKQ0KKyAgICB7DQor ICAgIGxpbmVOdW1iZXIgPSAocG9zLmlZIC0gYUluaXRpYWxSZWN0YW5nbGUuaVRsLmlZKSAvIGZv bnRHYXA7IC8vaUZvbnQuSGVpZ2h0SW5QaXhlbHMoKTsNCisgICAgfQ0KICAgICANCiAgICAgaWYo bGluZU51bWJlcikNCiAgICAgICB7DQpAQCAtMTI3MSw3ICsxMjY0LDggQEAgdm9pZCBDQ29udHJv bElucHV0V2lkZ2V0OjpTZXRDdXJzb3JQb3NpdA0KICAgICAgIH0NCiAgICAgZWxzZQ0KICAgICAg IHsNCi0gICAgICBUSW50IG5DaGFyQXRQb3MgPSBpRm9udC5UZXh0Q291bnQoYVRleHQsIHBvcy5p WCk7DQorICAgICAgVFJlY3QgcmVjdCA9IGlFZGl0b3ItPlJlY3QoKTsNCisgICAgICBUSW50IG5D aGFyQXRQb3MgPSBpRm9udC5UZXh0Q291bnQoYVRleHQsIHBvcy5pWCAtIHJlY3QuaVRsLmlYKTsN CiAgICAgICBpRWRpdG9yLT5TZXRDdXJzb3JQb3NMKG5DaGFyQXRQb3MsIEVGYWxzZSk7DQogICAg ICAgaUxhc3RDdXJQb3MgPSBuQ2hhckF0UG9zOyAgIA0KICAgICAgIH0NCkBAIC0xMzIyLDUgKzEz MTYsNCBAQCB2b2lkIENDb250cm9sSW5wdXRXaWRnZXQ6OlNldFdlYktpdEN1cnNvDQogICAgIHdl YmtpdFZpZXctPkN1cnNvcigpLT5TZXRQb3NpdGlvbihwb3MpOyANCiAgICAgICB9DQogICB9DQot I2VuZGlmDQogLy8gIEVuZCBvZiBGaWxlDQo= 14008 2007-04-11 08:47:32 -0700 2007-04-17 08:05:26 -0700 new attachement for the chinese environment 31enhancedinput.patch text/plain 10420 rasvan.alexandrescu SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMDg0NSkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDIwIEBADQorMjAwNy0wNC0xMSAgcmFhbGV4YW4gIDxyYXN2YW4uYWxleGFuZHJl c2N1QG5va2lhLmNvbT4NCisNCisgICAgICAgIFJldmlld2VkIGJ5IFlvbmdqdW4gWmhhbmcuDQor ICAgICAgICBERVNDOiBFbmhhbmNlZCBJbnB1dCBmZWF0dXJlIG5vdCB3b3JraW5nIGluIDMuMSBb VFNXIFRNQ04tNlhZU0xZXSBmaXggZm9yIGNoaW5lc2UgdmFyaWFudA0KKyAgICAgICAgaHR0cDov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MzMNCisNCisgICAgICAgICogQnJv d3NlckNvcmUvRm9ybWNvbnRyb2xzL2luYy9GQ29udHJvbElucHV0U2tpbi5oOg0KKyAgICAgICAg KiBCcm93c2VyQ29yZS9Gb3JtY29udHJvbHMvaW5jL0ZDb250cm9sSW5wdXRXaWRnZXQuaDoNCisg ICAgICAgICogQnJvd3NlckNvcmUvRm9ybWNvbnRyb2xzL3NyYy9GQ29udHJvbElucHV0U2tpbi5j cHA6DQorICAgICAgICAoQ0Zvcm1JbnB1dFNraW46OlNlbGVjdGVkTGFuZ3VhZ2UpOg0KKyAgICAg ICAgKENGb3JtSW5wdXRTa2luOjpBY3RpdmF0ZUwpOg0KKyAgICAgICAgKiBCcm93c2VyQ29yZS9G b3JtY29udHJvbHMvc3JjL0ZDb250cm9sSW5wdXRXaWRnZXQuY3BwOg0KKyAgICAgICAgKENDb250 cm9sSW5wdXRXaWRnZXQ6OkNvbnN0cnVjdFRleHRFZGl0b3JMKToNCisgICAgICAgIChDQ29udHJv bElucHV0V2lkZ2V0OjpPZmZlcktleUV2ZW50TCk6DQorICAgICAgICAoQ0NvbnRyb2xJbnB1dFdp ZGdldDo6U2V0Q3Vyc29yUG9zaXRpb25MKToNCisgICAgICAgIChDQ29udHJvbElucHV0V2lkZ2V0 OjpTZXRXZWJLaXRDdXJzb3JQb3NpdGlvbik6DQorDQogMjAwNy0wNC0xMCAgc3BhZG1hDQogDQog ICAgICAgICBSZXZpZXdlZCBieSBaYWxhbi4NCkluZGV4OiBXZWJLaXQvQnJvd3NlckNvcmUvRm9y bWNvbnRyb2xzL2luYy9GQ29udHJvbElucHV0U2tpbi5oDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0 L0Jyb3dzZXJDb3JlL0Zvcm1jb250cm9scy9pbmMvRkNvbnRyb2xJbnB1dFNraW4uaAkocmV2aXNp b24gMjA4NDUpDQorKysgV2ViS2l0L0Jyb3dzZXJDb3JlL0Zvcm1jb250cm9scy9pbmMvRkNvbnRy b2xJbnB1dFNraW4uaAkod29ya2luZyBjb3B5KQ0KQEAgLTEwNCw3ICsxMDQsMTAgQEAgY2xhc3Mg TUlucHV0V2lkZ2V0TGlzdGVuZXINCiAgICAgKi8NCiAgICAgdmlydHVhbCBUS2V5UmVzcG9uc2Ug TGlzdEJveEtleUV2ZW50TCggY29uc3QgVEtleUV2ZW50JiBhS2V5RXZlbnQsIA0KICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBURXZlbnRDb2RlIGFUeXBlICkgPSAwOw0KLQ0K KyAgICAvKioNCisgICAgKiBUaGlzIGZ1bmN0aW9uIGlzIGNhbGxlZCB3aGVuIHRoZSB1c2VyIG5h dmlnYXRlIGxlZnQvcmlnaHQgb3V0IHRoZSB3aWRnZXQgKHNvbWUgbGFuZ3VhZ2VzIHBvcHMgdXAg YSBsaXN0KQ0KKyAgICAqLw0KKyAgICB2aXJ0dWFsIFRCb29sIFNlbGVjdGVkTGFuZ3VhZ2UoKSA9 IDA7DQogICB9Ow0KIA0KIA0KQEAgLTQ2Niw2ICs0NjksMTIgQEAgY2xhc3MgQ0Zvcm1JbnB1dFNr aW46IHB1YmxpYyBDQmFzZSwgDQogICAgICovDQogICAgIHZvaWQgU2V0RGlzYWJsZWQoVEJvb2wg YURpc2FibGVkKSB7IGlEaXNhYmxlZCA9IGFEaXNhYmxlZDsgfQ0KICAgICANCisgICAgLyoqDQor ICAgICogUmV0dXJucyB0aGUgc2VsZWN0ZWQgbGFuZ3VhZ2UNCisgICAgKiBAc2luY2UgMy4xDQor ICAgICogQHJldHVybiBUQm9vbA0KKyAgICAqLw0KKyAgICBUQm9vbCBTZWxlY3RlZExhbmd1YWdl KCk7DQogICBwdWJsaWM6DQogDQogICAgIHZvaWQgUmVmKCkgeyBpUmVmQ291bnQrKzsgfQ0KSW5k ZXg6IFdlYktpdC9Ccm93c2VyQ29yZS9Gb3JtY29udHJvbHMvaW5jL0ZDb250cm9sSW5wdXRXaWRn ZXQuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9Ccm93c2VyQ29yZS9Gb3JtY29udHJvbHMvaW5j L0ZDb250cm9sSW5wdXRXaWRnZXQuaAkocmV2aXNpb24gMjA4NDUpDQorKysgV2ViS2l0L0Jyb3dz ZXJDb3JlL0Zvcm1jb250cm9scy9pbmMvRkNvbnRyb2xJbnB1dFdpZGdldC5oCSh3b3JraW5nIGNv cHkpDQpAQCAtMzU4LDcgKzM1OCw2IEBAIGNsYXNzIENDb250cm9sSW5wdXRXaWRnZXQgOiBwdWJs aWMgQ0Vpa0INCiAgICAgICAgICovDQogICAgICAgICBzdGF0aWMgVEludCBQcmVkaWN0aXZlVGV4 dE9uT2ZmR1NOb3RpZmlhY3Rpb24oIFRBbnkqIGFPYmogKTsNCiAgICAgICAgIA0KLSNpZmRlZiBS RF8zMl9CUk9XU0VSDQogICAgICAgICAvKioNCiAgICAgICAgICogU2V0cyB0aGUgQ3Vyc29yIFBv c2l0aW9uDQogICAgICAgICAqIA0KQEAgLTM3MCw3ICszNjksNiBAQCBjbGFzcyBDQ29udHJvbElu cHV0V2lkZ2V0IDogcHVibGljIENFaWtCDQogICAgICAgICAqIA0KICAgICAgICAgKi8NCiAgICAg ICAgIHZvaWQgU2V0V2ViS2l0Q3Vyc29yUG9zaXRpb24oY29uc3QgVEtleUV2ZW50JiBhS2V5RXZl bnQpOw0KLSNlbmRpZg0KIA0KIA0KICAgICBwcml2YXRlOiAgICAgICAgLy8gRGF0YQ0KSW5kZXg6 IFdlYktpdC9Ccm93c2VyQ29yZS9Gb3JtY29udHJvbHMvc3JjL0ZDb250cm9sSW5wdXRTa2luLmNw cA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9Ccm93c2VyQ29yZS9Gb3JtY29udHJvbHMvc3JjL0ZD b250cm9sSW5wdXRTa2luLmNwcAkocmV2aXNpb24gMjA4NDUpDQorKysgV2ViS2l0L0Jyb3dzZXJD b3JlL0Zvcm1jb250cm9scy9zcmMvRkNvbnRyb2xJbnB1dFNraW4uY3BwCSh3b3JraW5nIGNvcHkp DQpAQCAtNzA2LDYgKzcwNiwxOCBAQCBUS2V5UmVzcG9uc2UgQ0Zvcm1JbnB1dFNraW46Okxpc3RC b3hLZXlFDQogICAgIHJldHVybiByZXNwb25jZTsNCiAgICAgfQ0KIA0KKy8vLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0NCisvLyBDRm9ybUlucHV0U2tpbjo6U2VsZWN0ZWRMYW5ndWFnZSgpIC0gY2hlY2sg Zm9yIHNlbGVjdGVkIGlucHV0IGxhbmd1YWdlDQorLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KK1RC b29sIENGb3JtSW5wdXRTa2luOjpTZWxlY3RlZExhbmd1YWdlKCkNCisgICAgew0KKyAgICBUQm9v bCBzZWxlY3RlZCA9IEVUcnVlOw0KKyAgICBDQWtuU2V0dGluZ0NhY2hlJiBjYWNoZSA9IENBa25F bnY6OlN0YXRpYygpLT5TZXR0aW5nQ2FjaGUoKTsNCisgICAgVExhbmd1YWdlIGxhbmcgPSBjYWNo ZS5JbnB1dExhbmd1YWdlKCk7DQorICAgIGlmKGxhbmcgPT0gRUxhbmdQcmNDaGluZXNlKQ0KKyAg ICAgICAgc2VsZWN0ZWQgPSBFRmFsc2U7DQorICAgIHJldHVybiBzZWxlY3RlZDsNCisgICAgfQ0K IA0KIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAvLyBDRm9ybUlucHV0U2tpbjo6QWN0aXZhdGUt IGFjdGl2YXRlcyB0aGUgY29udHJvbA0KQEAgLTgyMCwyMyArODMyLDEzIEBAIHZvaWQgQ0Zvcm1J bnB1dFNraW46OkFjdGl2YXRlTCgpDQogICAgICAgICBUSW50IHdyYXBXaWR0aCA9IGRpc3BsYXlS ZWN0LldpZHRoKCk7DQogDQogICAgICAgICAvLyBjb25zdHVjdCB0aGUgaW5wdXQgd2lkZ2V0DQot I2lmZGVmIFJEXzMyX0JST1dTRVINCisNCiAgICAgICAgIFRSQVAoZXJyLCBpSW5wdXRXaWRnZXQg PSBDQ29udHJvbElucHV0V2lkZ2V0OjpOZXdMKA0KICAgICAgICAgICAgICZ3ZWJraXRGcmFtZS0+ V2ViS2l0VmlldygpLCB0aGlzLCBpVHlwZSwgZGlzcGxheVJlY3QsDQogICAgICAgICAgICAgbWFy Z2lucywgd3JhcFdpZHRoLCAqZGF0YSwgKnRtcEZvcm1hdCwgaXNQYXNzd29yZCwgaUVtcHR5T2ss DQogICAgICAgICAgICAgaU1heExlbmd0aCwgKmlGb250LCAxLCBpV2ViQ29yZVBhbGV0dGUsDQot ICAgICAgICAgICAgd2Via2l0RnJhbWUtPldlYktpdFZpZXcoKS5XZWJLaXRDb250cm9sKCkuQnJD dGwoKS5CckN0bERpYWxvZ3NQcm92aWRlcigpDQotICAgICAgICAgICAgKQ0KLSAgICAgICAgICAg ICk7DQotI2Vsc2UNCi0gICAgICAgIFRSQVAoZXJyLCBpSW5wdXRXaWRnZXQgPSBDQ29udHJvbElu cHV0V2lkZ2V0OjpOZXdMKA0KLSAgICAgICAgICAgICZ3ZWJraXRGcmFtZS0+V2ViS2l0Vmlldygp LCB0aGlzLCBpVHlwZSwgZGlzcGxheVJlY3QsDQotICAgICAgICAgICAgbWFyZ2lucywgaVJlY3Qu V2lkdGgoKSwgKmRhdGEsICp0bXBGb3JtYXQsIGlzUGFzc3dvcmQsIGlFbXB0eU9rLA0KLSAgICAg ICAgICAgIGlNYXhMZW5ndGgsICppRm9udCwgMSwgaVdlYkNvcmVQYWxldHRlLA0KLSAgICAgICAg ICAgIHdlYmtpdEZyYW1lLT5XZWJLaXRWaWV3KCkuV2ViS2l0Q29udHJvbCgpLkJyQ3RsKCkuQnJD dGxEaWFsb2dzUHJvdmlkZXIoKQ0KLSAgICAgICAgICAgICkNCisgICAgICAgICAgICB3ZWJraXRG cmFtZS0+V2ViS2l0VmlldygpLldlYktpdENvbnRyb2woKS5CckN0bCgpLkJyQ3RsRGlhbG9nc1By b3ZpZGVyKCkpDQogICAgICAgICAgICAgKTsNCi0jZW5kaWYNCiANCiAgICAgICAgIC8vIGlmIHRo ZSBpbnB1dHdpZGdldCBjb25zdHJ1Y3Rpb24gZmFpbHMgcmVzZXQgdGhlIGZsYWdzDQogICAgICAg ICBpZiAoZXJyICE9IEtFcnJOb25lKQ0KSW5kZXg6IFdlYktpdC9Ccm93c2VyQ29yZS9Gb3JtY29u dHJvbHMvc3JjL0ZDb250cm9sSW5wdXRXaWRnZXQuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0 L0Jyb3dzZXJDb3JlL0Zvcm1jb250cm9scy9zcmMvRkNvbnRyb2xJbnB1dFdpZGdldC5jcHAJKHJl dmlzaW9uIDIwODQ1KQ0KKysrIFdlYktpdC9Ccm93c2VyQ29yZS9Gb3JtY29udHJvbHMvc3JjL0ZD b250cm9sSW5wdXRXaWRnZXQuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtNTYsOSArNTYsNyBAQA0K ICNlbHNlDQogI2luY2x1ZGUgPFdlYktpdC5yc2c+DQogI2VuZGlmDQotI2lmZGVmIFJEXzMyX0JS T1dTRVINCiAjaW5jbHVkZSAiV2ViS2l0Q3Vyc29yLmgiDQotI2VuZGlmDQogDQogI2luY2x1ZGUg PGNlbnRyYWxyZXBvc2l0b3J5Lmg+DQogI2luY2x1ZGUgPEFrbkZlcEludGVybmFsQ1JLZXlzLmg+ DQpAQCAtODMsOSArODEsNyBAQCBzdGF0aWMgY29uc3QgVEludCBLVGV4dExpbWl0ID0gS01heFRJ bnQ7DQogc3RhdGljIGNvbnN0IFRJbnQgS0FTQ0lJMCA9IDB4MzA7DQogc3RhdGljIGNvbnN0IFRJ bnQgS0FTQ0lJOSA9IDB4Mzk7DQogDQotI2lmZGVmIFJEXzMyX0JST1dTRVINCiBzdGF0aWMgY29u c3QgVEludCBLQ2hhcmFjdGVyV2lkdGggPSA2Ow0KLSNlbmRpZg0KIA0KIA0KIC8vID09PT09PT09 PT09PT09PT09IFNUQVRJQyBGVU5DVElPTlMgPT09PT09PT09PT09PT09PT09PT09PT0NCkBAIC0y NTcsOSArMjUzLDggQEAgdm9pZCBDQ29udHJvbElucHV0V2lkZ2V0OjpDb25zdHJ1Y3RUZXh0RQ0K ICAgew0KICAgVEJvb2wgdDlBbGxvd2VkOw0KICAgDQotI2lmZGVmIFJEXzMyX0JST1dTRVINCiAg IGlSZWN0ID0gYUluaXRpYWxSZWN0YW5nbGU7DQotI2VuZGlmDQorDQogICAgIC8vQ3JlYXRlIGEg bmV3IHJlcG9zaXRvcnkNCiAgICAgQ1JlcG9zaXRvcnkqIHJlcG9zaXRvcnkgPSBDUmVwb3NpdG9y eTo6TmV3TCggS0NSVWlkQWtuRmVwICk7DQogDQpAQCAtMzIwLDggKzMxNSw2IEBAIHZvaWQgQ0Nv bnRyb2xJbnB1dFdpZGdldDo6Q29uc3RydWN0VGV4dEUNCiAgICAgLy8gYWRkIG91cnNlbHZlcyB0 byB0aGUgY29udHJvbHMgc3RhY2ssIHNvIHRoYXQgd2UnbGwgcmVjaWV2ZSBrZXkgZXZlbnRzDQog ICAgIGlFaWtvbkVudi0+RWlrQXBwVWkoKS0+QWRkVG9TdGFja0woIHRoaXMgKTsNCiANCi0NCi0g ICAgLy9jb25zdCBOV19PYmplY3RfdCogb2JqZWN0ID0gTldfRkJveF9JbnB1dFNraW5fR2V0SW5w dXRCb3ggKChOV19GQm94X0Vwb2MzMklucHV0U2tpbl90ICopaU9vY0lucHV0U2tpbik7DQogICAg IGlmIChpVHlwZSA9PSBFTm9ybWFsIHx8IGlUeXBlID09IEVQYXNzd29yZCkNCiAgICAgICAgIHsg ICAvLyBpZiBOT1QgdGV4dGFyZWEgYm94Li4uDQogICAgICAgICBTZXRSZWN0KCBhSW5pdGlhbFJl Y3RhbmdsZSApOw0KQEAgLTM3MSwxMSArMzY0LDcgQEAgdm9pZCBDQ29udHJvbElucHV0V2lkZ2V0 OjpDb25zdHJ1Y3RUZXh0RQ0KICAgICBpRWRpdG9yLT5TZXRBbGxvd1VuZG8oIEVGYWxzZSApOw0K ICAgICANCiAgICAgLy8gbW92ZSBjdXJzb3INCi0jaWZkZWYgUkRfMzJfQlJPV1NFUg0KICAgICBT ZXRDdXJzb3JQb3NpdGlvbkwoYUluaXRpYWxUZXh0LCBhSW5pdGlhbFJlY3RhbmdsZSk7DQotI2Vs c2UNCi0gICAgaUVkaXRvci0+U2V0Q3Vyc29yUG9zTChpRWRpdG9yLT5UZXh0TGVuZ3RoKCksIEVG YWxzZSk7DQotI2VuZGlmDQogICAgIA0KICAgICBpRWRpdG9yLT5TZXRpQ3Vyc29yUG9zKCk7Ly8g dHVybnMgb24gY29ycmVjdCB0OSBiYW5uZXIgYmFzZWQgb24gZm9ybWF0DQogICAgIC8vIHN0YXJ0 IGVkaXRpbmcNCkBAIC01NTAsMTEgKzUzOSwxMCBAQCBUS2V5UmVzcG9uc2UgQ0NvbnRyb2xJbnB1 dFdpZGdldDo6T2ZmZXJLDQogICAgICAgICB9DQogICAgIGVsc2UNCiAgICAgICAgIHsNCi0jaWZk ZWYgUkRfMzJfQlJPV1NFUg0KICAgICAgIGlmIChpVHlwZSA9PSBFTm9ybWFsICYmICgoYUtleUV2 ZW50LmlTY2FuQ29kZSA9PSBFU3RkS2V5UmlnaHRBcnJvdyAmJiBDdXJQb3MoKSA9PSAwICAmJiAN Ci0gICAgICAgIGlMYXN0Q3VyUG9zID09IGlFZGl0b3ItPlJlYWRhYmxlVGV4dEwoKS0+TGVuZ3Ro KCkpIHx8IA0KKyAgICAgICAgIGlMYXN0Q3VyUG9zID09IGlFZGl0b3ItPlJlYWRhYmxlVGV4dEwo KS0+TGVuZ3RoKCkpIHx8IA0KICAgICAgICAgIChhS2V5RXZlbnQuaVNjYW5Db2RlID09IEVTdGRL ZXlMZWZ0QXJyb3cgJiYgQ3VyUG9zKCkgPT0gaUVkaXRvci0+UmVhZGFibGVUZXh0TCgpLT5MZW5n dGgoKSAmJg0KLSAgICAgICAgIGlMYXN0Q3VyUG9zID09IDApKSkNCisgICAgICAgICBpTGFzdEN1 clBvcyA9PSAwKSkgJiYgaUxpc3RlbmVyLT5TZWxlY3RlZExhbmd1YWdlKCkgKQ0KICAgICAgICAg ew0KICAgICAgICAgU2V0V2ViS2l0Q3Vyc29yUG9zaXRpb24oYUtleUV2ZW50KTsNCiAgICAgICAg IFNpbXVsYXRlRG9uZUtleUwoKFRTdGRTY2FuQ29kZSApYUtleUV2ZW50LmlTY2FuQ29kZSApOw0K QEAgLTU2Myw5ICs1NTEsNiBAQCBUS2V5UmVzcG9uc2UgQ0NvbnRyb2xJbnB1dFdpZGdldDo6T2Zm ZXJLDQogICAgICAgICAgIHsNCiAgICAgICAgICAgcmVzcG9uc2UgPSBpRWRpdG9yLT5PZmZlcktl eUV2ZW50TCggYUtleUV2ZW50LCBhVHlwZSApOyANCiAgICAgICAgICAgfQ0KLSNlbHNlDQotICAg ICAgICByZXNwb25zZSA9IGlFZGl0b3ItPk9mZmVyS2V5RXZlbnRMKCBhS2V5RXZlbnQsIGFUeXBl ICk7IA0KLSNlbmRpZiAgDQogICAgICAgICANCiAgICAgICAgIH0NCiAgICAgaWYocmVzcG9uc2Ug PT0gRUtleVdhc0NvbnN1bWVkKQ0KQEAgLTU4MCw5ICs1NjUsNyBAQCBUS2V5UmVzcG9uc2UgQ0Nv bnRyb2xJbnB1dFdpZGdldDo6T2ZmZXJLDQogICAgICAgICB9DQogICAgIGVsc2UgaWYgKGFUeXBl ID09IEVFdmVudEtleSAgJiYgKGFLZXlFdmVudC5pU2NhbkNvZGUgPT0gRVN0ZEtleVVwQXJyb3cg fHwNCiAgICAgICAgICAgICAgYUtleUV2ZW50LmlTY2FuQ29kZSA9PSBFU3RkS2V5RG93bkFycm93 IA0KLSNpZmRlZiBSRF8zMl9CUk9XU0VSDQogICAgICAgICAgICAgIHx8IGFLZXlFdmVudC5pU2Nh bkNvZGUgPT0gRVN0ZEtleVJpZ2h0QXJyb3cNCi0jZW5kaWYNCiAgICAgICAgICAgICAgKSkNCiAg ICAgICAgIHsNCiAgICAgICAgIFNpbXVsYXRlRG9uZUtleUwoKFRTdGRTY2FuQ29kZSApYUtleUV2 ZW50LmlTY2FuQ29kZSApOw0KQEAgLTU5NCw4ICs1NzcsNiBAQCBUS2V5UmVzcG9uc2UgQ0NvbnRy b2xJbnB1dFdpZGdldDo6T2ZmZXJLDQogICAgICAgICAgIH0NCiAgICAgICAgIHJlc3BvbnNlID0g RUtleVdhc0NvbnN1bWVkOw0KICAgICAgICAgfQ0KLSAgICAgDQotICAgIA0KICAgICBpZiAoaUV4 aXRDb250cm9sKQ0KICAgICAgICAgew0KICAgICAgICAgLy8gc2ltdWxhdGUgYSBkb25lIGtleSBl dmVudA0KQEAgLTYwMyw5ICs1ODQsNyBAQCBUS2V5UmVzcG9uc2UgQ0NvbnRyb2xJbnB1dFdpZGdl dDo6T2ZmZXJLDQogICAgICAgICAgICAgaUxpc3RlbmVyLT5Pa1RvRXhpdCgpOw0KICAgICAgICAg cmVzcG9uc2UgPSBFS2V5V2FzQ29uc3VtZWQ7DQogICAgICAgICB9DQotI2lmZGVmIFJEXzMyX0JS T1dTRVINCi0gIGlMYXN0Q3VyUG9zID0gQ3VyUG9zKCk7DQotI2VuZGlmDQorICAgIGlMYXN0Q3Vy UG9zID0gQ3VyUG9zKCk7DQogICAgIHJldHVybiByZXNwb25zZTsNCiAgICAgfQ0KIA0KQEAgLTEy NTcsNyArMTIzNiw2IEBAIHZvaWQgQ0NvbnRyb2xJbnB1dFdpZGdldDo6RHJhdygpIGNvbnN0DQog ICAgIH0NCiAgIH0NCiANCi0jaWZkZWYgUkRfMzJfQlJPV1NFUg0KIC8vIC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vIENDb250cm9s SW5wdXRXaWRnZXQ6OlNldEN1cnNvclBvc2l0aW9uDQogLy8gU2V0cyBDdXJzb3IgUG9zaXRpb24N CkBAIC0xMjY2LDExICsxMjQ0LDIxIEBAIHZvaWQgQ0NvbnRyb2xJbnB1dFdpZGdldDo6RHJhdygp IGNvbnN0DQogdm9pZCBDQ29udHJvbElucHV0V2lkZ2V0OjpTZXRDdXJzb3JQb3NpdGlvbkwoY29u c3QgVERlc0MmIGFUZXh0LCBjb25zdCBUUmVjdCYgYUluaXRpYWxSZWN0YW5nbGUpDQogICB7DQog ICBDV2ViS2l0Vmlldyogd2Via2l0VmlldyA9IHN0YXRpY19jYXN0PENXZWJLaXRWaWV3Kj4oaVBh cmVudCk7DQotICBUUG9pbnQgcG9zID0gd2Via2l0Vmlldy0+Q3Vyc29yKCktPlBvc2l0aW9uKCk7 DQotICAgICAgDQotICAgIFRJbnQgY29uc3QgbGluZU51bWJlciA9IChwb3MuaVkgLSBhSW5pdGlh bFJlY3RhbmdsZS5pVGwuaVkpIC8gaUZvbnQuRm9udExpbmVHYXAoKTsgLy9pRm9udC5IZWlnaHRJ blBpeGVscygpOw0KKyAgQ1dlYktpdEN1cnNvciogY3VyID0gd2Via2l0Vmlldy0+Q3Vyc29yKCk7 DQorICBpZiAoICFjdXIgKSANCisgICAgICB7DQorICAgICAgcmV0dXJuOw0KKyAgICAgIH0NCisg IFRQb2ludCBwb3MgPSBjdXItPlBvc2l0aW9uKCk7ICANCisgIFRJbnQgZm9udEdhcCA9IGlGb250 LkZvbnRMaW5lR2FwKCk7DQorICBUSW50IGxpbmVOdW1iZXIgPSAwOw0KKw0KKyAgaWYoZm9udEdh cCkNCisgICAgew0KKyAgICBsaW5lTnVtYmVyID0gKHBvcy5pWSAtIGFJbml0aWFsUmVjdGFuZ2xl LmlUbC5pWSkgLyBmb250R2FwOyAvL2lGb250LkhlaWdodEluUGl4ZWxzKCk7DQorICAgIH0NCiAg ICAgDQotICAgIGlmKGxpbmVOdW1iZXIpDQorICBpZihsaW5lTnVtYmVyKQ0KICAgICAgIHsNCiAg ICAgICBUUG9pbnRlckV2ZW50IHBFdmVudERvd247DQogICAgICAgVFBvaW50ZXJFdmVudCBwRXZl bnRVcDsNCkBAIC0xMjg1LDkgKzEyNzMsMTAgQEAgdm9pZCBDQ29udHJvbElucHV0V2lkZ2V0OjpT ZXRDdXJzb3JQb3NpdA0KICAgICAgIHBFdmVudFVwLmlQb3NpdGlvbiA9IHBvczsNCiAgICAgICBp RWRpdG9yLT5IYW5kbGVQb2ludGVyRXZlbnRMKHBFdmVudFVwKTsgDQogICAgICAgfQ0KLSAgICBl bHNlDQorICBlbHNlDQogICAgICAgew0KLSAgICAgIFRJbnQgbkNoYXJBdFBvcyA9IGlGb250LlRl eHRDb3VudChhVGV4dCwgcG9zLmlYKTsNCisgICAgICBUUmVjdCByZWN0ID0gaUVkaXRvci0+UmVj dCgpOw0KKyAgICAgIFRJbnQgbkNoYXJBdFBvcyA9IGlGb250LlRleHRDb3VudChhVGV4dCwgcG9z LmlYIC0gcmVjdC5pVGwuaVgpOw0KICAgICAgIGlFZGl0b3ItPlNldEN1cnNvclBvc0wobkNoYXJB dFBvcywgRUZhbHNlKTsNCiAgICAgICBpTGFzdEN1clBvcyA9IG5DaGFyQXRQb3M7ICAgDQogICAg ICAgfQ0KQEAgLTEzMzgsNSArMTMyNyw0IEBAIHZvaWQgQ0NvbnRyb2xJbnB1dFdpZGdldDo6U2V0 V2ViS2l0Q3Vyc28NCiAgICAgd2Via2l0Vmlldy0+Q3Vyc29yKCktPlNldFBvc2l0aW9uKHBvcyk7 IA0KICAgICAgIH0NCiAgIH0NCi0jZW5kaWYNCiAvLyAgRW5kIG9mIEZpbGUNCg==