25863 2009-05-19 08:39:35 -0700 [Qt] Expose default encoding in qt 2010-02-09 07:36:23 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 antialize webkit-unassigned hausmann zengweihong oldest_to_newest 121908 0 antialize 2009-05-19 08:39:35 -0700 Please apply the following patch, exposing the default encoding property in QT 121909 1 30470 antialize 2009-05-19 08:40:52 -0700 Created attachment 30470 Patch exposing the property 121914 2 30471 antialize 2009-05-19 09:04:17 -0700 Created attachment 30471 Patch exposing the property 122800 3 30471 zecke 2009-05-22 22:29:05 -0700 Comment on attachment 30471 Patch exposing the property > Index: WebKit/qt/ChangeLog > =================================================================== > --- WebKit/qt/ChangeLog (revision 43858) > +++ WebKit/qt/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2009-05-19 Jakob Truelsen <antialize@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Expose the default text encoding property to QT ^^^ no tabs! > /*! > + \since 4.6 > + Specifies the default text encoding system. > + > + The \a encoding, must be a string describing an encoding such as “utf-8”, “iso-8859-1", etc. > + > + \sa defaultTextEncoding() > +*/ > +void QWebSettings::setDefaultTextEncoding(const QString &encoding) > +{ > + d->defaultTextEncoding = encoding; > + d->apply(); > +} For the doc string, maybe you should refer to the Qt TextCodec's for other encodings and that an empty string will use whatever default? 122811 4 30607 antialize 2009-05-23 00:45:26 -0700 Created attachment 30607 A updated patch Updated the patch, with propper whitespace, and a better documentation 122838 5 30607 zecke 2009-05-23 06:02:26 -0700 Comment on attachment 30607 A updated patch looks good, for Qt4.6 the api might change. 122851 6 zecke 2009-05-23 07:06:25 -0700 Thanks. Landed in r44090. Some hints for future patches. Try to not have whitespace in the patch, no tabs in general (the commit will be rejected), put a reference to the bug into the commit log. :) 188998 7 hausmann 2010-02-09 07:31:45 -0800 *** Bug 34751 has been marked as a duplicate of this bug. *** 189004 8 hausmann 2010-02-09 07:36:23 -0800 *** Bug 32849 has been marked as a duplicate of this bug. *** 30470 2009-05-19 08:40:52 -0700 2009-05-19 09:04:17 -0700 Patch exposing the property defaultEncoding.patch text/plain 3045 antialize SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNDM4NTgpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDUtMTkgIEpha29iIFRydWVsc2VuICA8YW50aWFs aXplQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor CUV4cG9zZSB0aGUgZGVmYXVsdCB0ZXh0IGVuY29kaW5nIHByb3BlcnR5IHRvIFFUCisJCisgICAg ICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6CisgICAgICAgIChRV2ViU2V0dGluZ3NQcml2YXRl OjphcHBseSk6CisgICAgICAgIChRV2ViU2V0dGluZ3M6OnNldERlZmF1bHRUZXh0RW5jb2Rpbmcp OgorICAgICAgICAoUVdlYlNldHRpbmdzOjpkZWZhdWx0VGV4dEVuY29kaW5nKToKKyAgICAgICAg KiBBcGkvcXdlYnNldHRpbmdzLmg6CisKIDIwMDktMDUtMTggIFpvbHRhbiBIb3J2YXRoIDxob3J2 YXRoLnpvbHRhbi42QHN0dWQudS1zemVnZWQuaHU+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQXJp eWEgSGlkYXlhdC4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHJldmlzaW9uIDQzODU3KQor KysgV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2 ICs1Miw3IEBAIHB1YmxpYzoKICAgICBRSGFzaDxpbnQsIGludD4gZm9udFNpemVzOwogICAgIFFI YXNoPGludCwgYm9vbD4gYXR0cmlidXRlczsKICAgICBRVXJsIHVzZXJTdHlsZVNoZWV0TG9jYXRp b247CisgICAgUVN0cmluZyBkZWZhdWx0VGV4dEVuY29kaW5nOwogICAgIFFTdHJpbmcgbG9jYWxT dG9yYWdlRGF0YWJhc2VQYXRoOwogICAgIFFTdHJpbmcgb2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGVQYXRoOwogICAgIHFpbnQ2NCBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YTsKQEAgLTE2MSw2 ICsxNjIsOSBAQCB2b2lkIFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KCkKICAgICAgICAgUVVy bCBsb2NhdGlvbiA9ICF1c2VyU3R5bGVTaGVldExvY2F0aW9uLmlzRW1wdHkoKSA/IHVzZXJTdHls ZVNoZWV0TG9jYXRpb24gOiBnbG9iYWwtPnVzZXJTdHlsZVNoZWV0TG9jYXRpb247CiAgICAgICAg IHNldHRpbmdzLT5zZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKFdlYkNvcmU6OktVUkwobG9jYXRp b24pKTsKIAorICAgICAgICBRU3RyaW5nIGVuY29kaW5nID0gIWRlZmF1bHRUZXh0RW5jb2Rpbmcu aXNFbXB0eSgpID8gZGVmYXVsdFRleHRFbmNvZGluZzogZ2xvYmFsLT5kZWZhdWx0VGV4dEVuY29k aW5nOworICAgICAgICBzZXR0aW5ncy0+c2V0RGVmYXVsdFRleHRFbmNvZGluZ05hbWUoZW5jb2Rp bmcpOworCiAgICAgICAgIFFTdHJpbmcgbG9jYWxTdG9yYWdlUGF0aCA9ICFsb2NhbFN0b3JhZ2VE YXRhYmFzZVBhdGguaXNFbXB0eSgpID8gbG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoIDogZ2xvYmFs LT5sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGg7CiAgICAgICAgIHNldHRpbmdzLT5zZXRMb2NhbFN0 b3JhZ2VEYXRhYmFzZVBhdGgobG9jYWxTdG9yYWdlUGF0aCk7CiAKQEAgLTQzMSw2ICs0MzUsMzAg QEAgUVVybCBRV2ViU2V0dGluZ3M6OnVzZXJTdHlsZVNoZWV0VXJsKCkgYwogfQogCiAvKiEKKyAg ICBcc2luY2UgNC42CisgICAgU3BlY2lmaWVzIHRoZSBkZWZhdWx0IHRleHQgZW5jb2Rpbmcgc3lz dGVtLgorCisgICAgVGhlIFxhIGVuY29kaW5nLCBtdXN0IGJlIGEgc3RyaW5nIGRlc2NyaWJpbmcg YW4gZW5jb2Rpbmcgc3VjaCBhcyDigJx1dGYtOOKAnSwg4oCcaXNvLTg4NTktMSIsIGV0Yy4KKwor ICAgIFxzYSBkZWZhdWx0VGV4dEVuY29kaW5nKCkKKyovCit2b2lkIFFXZWJTZXR0aW5nczo6c2V0 RGVmYXVsdFRleHRFbmNvZGluZyhjb25zdCBRU3RyaW5nICZlbmNvZGluZykgCit7CisgICAgZC0+ ZGVmYXVsdFRleHRFbmNvZGluZyA9IGVuY29kaW5nOworICAgIGQtPmFwcGx5KCk7Cit9CisKKy8q IQorICAgIFJldHVybnMgdGhlIGRlZmF1bHQgdGV4dCBlbmNvZGluZy4KKworICAgIFxzYSBzZXRE ZWZhdWx0VGV4dEVuY29kaW5nKCkKKyovCitRU3RyaW5nIFFXZWJTZXR0aW5nczo6ZGVmYXVsdFRl eHRFbmNvZGluZygpIGNvbnN0Cit7CisgICAgcmV0dXJuIGQtPmRlZmF1bHRUZXh0RW5jb2Rpbmc7 Cit9CisKKy8qIQogICAgIFNldHMgdGhlIHBhdGggb2YgdGhlIGljb24gZGF0YWJhc2UgdG8gXGEg cGF0aC4gVGhlIGljb24gZGF0YWJhc2UgaXMgdXNlZAogICAgIHRvIHN0b3JlICJmYXZpY29ucyIg YXNzb2NpYXRlZCB3aXRoIHdlYiBzaXRlcy4KIApJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0 dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCShyZXZp c2lvbiA0Mzg1NykKKysrIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgJKHdvcmtpbmcgY29w eSkKQEAgLTk2LDYgKzk2LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VXNlclN0eWxlU2hlZXRV cmwoY29uc3QgUVVybCAmbG9jYXRpb24pOwogICAgIFFVcmwgdXNlclN0eWxlU2hlZXRVcmwoKSBj b25zdDsKIAorICAgIHZvaWQgc2V0RGVmYXVsdFRleHRFbmNvZGluZyhjb25zdCBRU3RyaW5nICZl bmNvZGluZyk7CisgICAgUVN0cmluZyBkZWZhdWx0VGV4dEVuY29kaW5nKCkgY29uc3Q7CisKICAg ICBzdGF0aWMgdm9pZCBzZXRJY29uRGF0YWJhc2VQYXRoKGNvbnN0IFFTdHJpbmcgJmxvY2F0aW9u KTsKICAgICBzdGF0aWMgUVN0cmluZyBpY29uRGF0YWJhc2VQYXRoKCk7CiAgICAgc3RhdGljIHZv aWQgY2xlYXJJY29uRGF0YWJhc2UoKTsK 30471 2009-05-19 09:04:17 -0700 2009-05-23 00:46:23 -0700 Patch exposing the property defaultEncoding.patch text/plain 3061 antialize SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNDM4NTgpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDUtMTkgIEpha29iIFRydWVsc2VuICA8YW50aWFs aXplQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor CUV4cG9zZSB0aGUgZGVmYXVsdCB0ZXh0IGVuY29kaW5nIHByb3BlcnR5IHRvIFFUCisJCisgICAg ICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6CisgICAgICAgIChRV2ViU2V0dGluZ3NQcml2YXRl OjphcHBseSk6CisgICAgICAgIChRV2ViU2V0dGluZ3M6OnNldERlZmF1bHRUZXh0RW5jb2Rpbmcp OgorICAgICAgICAoUVdlYlNldHRpbmdzOjpkZWZhdWx0VGV4dEVuY29kaW5nKToKKyAgICAgICAg KiBBcGkvcXdlYnNldHRpbmdzLmg6CisKIDIwMDktMDUtMTggIFpvbHRhbiBIb3J2YXRoIDxob3J2 YXRoLnpvbHRhbi42QHN0dWQudS1zemVnZWQuaHU+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQXJp eWEgSGlkYXlhdC4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHJldmlzaW9uIDQzODU3KQor KysgV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2 ICs1Miw3IEBAIHB1YmxpYzoKICAgICBRSGFzaDxpbnQsIGludD4gZm9udFNpemVzOwogICAgIFFI YXNoPGludCwgYm9vbD4gYXR0cmlidXRlczsKICAgICBRVXJsIHVzZXJTdHlsZVNoZWV0TG9jYXRp b247CisgICAgUVN0cmluZyBkZWZhdWx0VGV4dEVuY29kaW5nOwogICAgIFFTdHJpbmcgbG9jYWxT dG9yYWdlRGF0YWJhc2VQYXRoOwogICAgIFFTdHJpbmcgb2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGVQYXRoOwogICAgIHFpbnQ2NCBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YTsKQEAgLTE2MSw2 ICsxNjIsOSBAQCB2b2lkIFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KCkKICAgICAgICAgUVVy bCBsb2NhdGlvbiA9ICF1c2VyU3R5bGVTaGVldExvY2F0aW9uLmlzRW1wdHkoKSA/IHVzZXJTdHls ZVNoZWV0TG9jYXRpb24gOiBnbG9iYWwtPnVzZXJTdHlsZVNoZWV0TG9jYXRpb247CiAgICAgICAg IHNldHRpbmdzLT5zZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKFdlYkNvcmU6OktVUkwobG9jYXRp b24pKTsKIAorICAgICAgICBRU3RyaW5nIGVuY29kaW5nID0gIWRlZmF1bHRUZXh0RW5jb2Rpbmcu aXNFbXB0eSgpID8gZGVmYXVsdFRleHRFbmNvZGluZzogZ2xvYmFsLT5kZWZhdWx0VGV4dEVuY29k aW5nOworICAgICAgICBzZXR0aW5ncy0+c2V0RGVmYXVsdFRleHRFbmNvZGluZ05hbWUoZW5jb2Rp bmcpOworCiAgICAgICAgIFFTdHJpbmcgbG9jYWxTdG9yYWdlUGF0aCA9ICFsb2NhbFN0b3JhZ2VE YXRhYmFzZVBhdGguaXNFbXB0eSgpID8gbG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoIDogZ2xvYmFs LT5sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGg7CiAgICAgICAgIHNldHRpbmdzLT5zZXRMb2NhbFN0 b3JhZ2VEYXRhYmFzZVBhdGgobG9jYWxTdG9yYWdlUGF0aCk7CiAKQEAgLTQzMSw2ICs0MzUsMzEg QEAgUVVybCBRV2ViU2V0dGluZ3M6OnVzZXJTdHlsZVNoZWV0VXJsKCkgYwogfQogCiAvKiEKKyAg ICBcc2luY2UgNC42CisgICAgU3BlY2lmaWVzIHRoZSBkZWZhdWx0IHRleHQgZW5jb2Rpbmcgc3lz dGVtLgorCisgICAgVGhlIFxhIGVuY29kaW5nLCBtdXN0IGJlIGEgc3RyaW5nIGRlc2NyaWJpbmcg YW4gZW5jb2Rpbmcgc3VjaCBhcyDigJx1dGYtOOKAnSwg4oCcaXNvLTg4NTktMSIsIGV0Yy4KKwor ICAgIFxzYSBkZWZhdWx0VGV4dEVuY29kaW5nKCkKKyovCit2b2lkIFFXZWJTZXR0aW5nczo6c2V0 RGVmYXVsdFRleHRFbmNvZGluZyhjb25zdCBRU3RyaW5nICZlbmNvZGluZykgCit7CisgICAgZC0+ ZGVmYXVsdFRleHRFbmNvZGluZyA9IGVuY29kaW5nOworICAgIGQtPmFwcGx5KCk7Cit9CisKKy8q IQorICAgIFxzaW5jZSA0LjYKKyAgICBSZXR1cm5zIHRoZSBkZWZhdWx0IHRleHQgZW5jb2Rpbmcu CisKKyAgICBcc2Egc2V0RGVmYXVsdFRleHRFbmNvZGluZygpCisqLworUVN0cmluZyBRV2ViU2V0 dGluZ3M6OmRlZmF1bHRUZXh0RW5jb2RpbmcoKSBjb25zdAoreworICAgIHJldHVybiBkLT5kZWZh dWx0VGV4dEVuY29kaW5nOworfQorCisvKiEKICAgICBTZXRzIHRoZSBwYXRoIG9mIHRoZSBpY29u IGRhdGFiYXNlIHRvIFxhIHBhdGguIFRoZSBpY29uIGRhdGFiYXNlIGlzIHVzZWQKICAgICB0byBz dG9yZSAiZmF2aWNvbnMiIGFzc29jaWF0ZWQgd2l0aCB3ZWIgc2l0ZXMuCiAKSW5kZXg6IFdlYktp dC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2Vi c2V0dGluZ3MuaAkocmV2aXNpb24gNDM4NTcpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5n cy5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNl dFVzZXJTdHlsZVNoZWV0VXJsKGNvbnN0IFFVcmwgJmxvY2F0aW9uKTsKICAgICBRVXJsIHVzZXJT dHlsZVNoZWV0VXJsKCkgY29uc3Q7CiAKKyAgICB2b2lkIHNldERlZmF1bHRUZXh0RW5jb2Rpbmco Y29uc3QgUVN0cmluZyAmZW5jb2RpbmcpOworICAgIFFTdHJpbmcgZGVmYXVsdFRleHRFbmNvZGlu ZygpIGNvbnN0OworCiAgICAgc3RhdGljIHZvaWQgc2V0SWNvbkRhdGFiYXNlUGF0aChjb25zdCBR U3RyaW5nICZsb2NhdGlvbik7CiAgICAgc3RhdGljIFFTdHJpbmcgaWNvbkRhdGFiYXNlUGF0aCgp OwogICAgIHN0YXRpYyB2b2lkIGNsZWFySWNvbkRhdGFiYXNlKCk7Cg== 30607 2009-05-23 00:45:26 -0700 2009-05-23 06:02:26 -0700 A updated patch defaultEncoding.patch text/plain 3184 antialize SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNDQwODUpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDUtMjMgIEpha29iIFRydWVsc2VuICA8YW50aWFs aXplQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBFeHBvc2UgdGhlIGRlZmF1bHQgdGV4dCBlbmNvZGluZyBwcm9wZXJ0eSB0byBRVC4K KwkKKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAgICAgICAgKFFXZWJTZXR0aW5n c1ByaXZhdGU6OmFwcGx5KToKKyAgICAgICAgKFFXZWJTZXR0aW5nczo6c2V0RGVmYXVsdFRleHRF bmNvZGluZyk6CisgICAgICAgIChRV2ViU2V0dGluZ3M6OmRlZmF1bHRUZXh0RW5jb2RpbmcpOgor ICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3MuaDoKKwogMjAwOS0wNS0yMSAgQW50b25pbyBHb21l cyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg U2ltb24gSGF1c21hbm4uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCShyZXZpc2lvbiA0NDA4 NCkKKysrIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTIsNiArNTIsNyBAQCBwdWJsaWM6CiAgICAgUUhhc2g8aW50LCBpbnQ+IGZvbnRTaXplczsKICAg ICBRSGFzaDxpbnQsIGJvb2w+IGF0dHJpYnV0ZXM7CiAgICAgUVVybCB1c2VyU3R5bGVTaGVldExv Y2F0aW9uOworICAgIFFTdHJpbmcgZGVmYXVsdFRleHRFbmNvZGluZzsKICAgICBRU3RyaW5nIGxv Y2FsU3RvcmFnZURhdGFiYXNlUGF0aDsKICAgICBRU3RyaW5nIG9mZmxpbmVXZWJBcHBsaWNhdGlv bkNhY2hlUGF0aDsKICAgICBxaW50NjQgb2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGE7CkBAIC0x NjEsNiArMTYyLDkgQEAgdm9pZCBRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSgpCiAgICAgICAg IFFVcmwgbG9jYXRpb24gPSAhdXNlclN0eWxlU2hlZXRMb2NhdGlvbi5pc0VtcHR5KCkgPyB1c2Vy U3R5bGVTaGVldExvY2F0aW9uIDogZ2xvYmFsLT51c2VyU3R5bGVTaGVldExvY2F0aW9uOwogICAg ICAgICBzZXR0aW5ncy0+c2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbihXZWJDb3JlOjpLVVJMKGxv Y2F0aW9uKSk7CiAKKyAgICAgICAgUVN0cmluZyBlbmNvZGluZyA9ICFkZWZhdWx0VGV4dEVuY29k aW5nLmlzRW1wdHkoKSA/IGRlZmF1bHRUZXh0RW5jb2Rpbmc6IGdsb2JhbC0+ZGVmYXVsdFRleHRF bmNvZGluZzsKKyAgICAgICAgc2V0dGluZ3MtPnNldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lKGVu Y29kaW5nKTsKKwogICAgICAgICBRU3RyaW5nIGxvY2FsU3RvcmFnZVBhdGggPSAhbG9jYWxTdG9y YWdlRGF0YWJhc2VQYXRoLmlzRW1wdHkoKSA/IGxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCA6IGds b2JhbC0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoOwogICAgICAgICBzZXR0aW5ncy0+c2V0TG9j YWxTdG9yYWdlRGF0YWJhc2VQYXRoKGxvY2FsU3RvcmFnZVBhdGgpOwogCkBAIC00MzEsNiArNDM1 LDMzIEBAIFFVcmwgUVdlYlNldHRpbmdzOjp1c2VyU3R5bGVTaGVldFVybCgpIGMKIH0KIAogLyoh CisgICAgXHNpbmNlIDQuNgorICAgIFNwZWNpZmllcyB0aGUgZGVmYXVsdCB0ZXh0IGVuY29kaW5n IHN5c3RlbS4KKworICAgIFRoZSBcYSBlbmNvZGluZywgbXVzdCBiZSBhIHN0cmluZyBkZXNjcmli aW5nIGFuIGVuY29kaW5nIHN1Y2ggYXMg4oCcdXRmLTjigJ0sIAorICAgIOKAnGlzby04ODU5LTEi LCBldGMuIElmIGxlZnQgZW1wdHkgYSBkZWZhdWx0IHZhbHVlIHdpbGwgYmUgdXNlZC4gRm9yIGEg bW9yZSAKKyAgICBleHRlbnNpdmUgbGlzdCBvZiBlbmNvZGluZyBuYW1lcyBzZWUgXGx7UVRleHRD b2RlY30KKworICAgIFxzYSBkZWZhdWx0VGV4dEVuY29kaW5nKCkKKyovCit2b2lkIFFXZWJTZXR0 aW5nczo6c2V0RGVmYXVsdFRleHRFbmNvZGluZyhjb25zdCBRU3RyaW5nICZlbmNvZGluZykgCit7 CisgICAgZC0+ZGVmYXVsdFRleHRFbmNvZGluZyA9IGVuY29kaW5nOworICAgIGQtPmFwcGx5KCk7 Cit9CisKKy8qIQorICAgIFxzaW5jZSA0LjYKKyAgICBSZXR1cm5zIHRoZSBkZWZhdWx0IHRleHQg ZW5jb2RpbmcuCisKKyAgICBcc2Egc2V0RGVmYXVsdFRleHRFbmNvZGluZygpCisqLworUVN0cmlu ZyBRV2ViU2V0dGluZ3M6OmRlZmF1bHRUZXh0RW5jb2RpbmcoKSBjb25zdAoreworICAgIHJldHVy biBkLT5kZWZhdWx0VGV4dEVuY29kaW5nOworfQorCisvKiEKICAgICBTZXRzIHRoZSBwYXRoIG9m IHRoZSBpY29uIGRhdGFiYXNlIHRvIFxhIHBhdGguIFRoZSBpY29uIGRhdGFiYXNlIGlzIHVzZWQK ICAgICB0byBzdG9yZSAiZmF2aWNvbnMiIGFzc29jaWF0ZWQgd2l0aCB3ZWIgc2l0ZXMuCiAKSW5k ZXg6IFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0 L0FwaS9xd2Vic2V0dGluZ3MuaAkocmV2aXNpb24gNDQwODQpCisrKyBXZWJLaXQvcXQvQXBpL3F3 ZWJzZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw5IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldFVzZXJTdHlsZVNoZWV0VXJsKGNvbnN0IFFVcmwgJmxvY2F0aW9uKTsKICAgICBR VXJsIHVzZXJTdHlsZVNoZWV0VXJsKCkgY29uc3Q7CiAKKyAgICB2b2lkIHNldERlZmF1bHRUZXh0 RW5jb2RpbmcoY29uc3QgUVN0cmluZyAmZW5jb2RpbmcpOworICAgIFFTdHJpbmcgZGVmYXVsdFRl eHRFbmNvZGluZygpIGNvbnN0OworCiAgICAgc3RhdGljIHZvaWQgc2V0SWNvbkRhdGFiYXNlUGF0 aChjb25zdCBRU3RyaW5nICZsb2NhdGlvbik7CiAgICAgc3RhdGljIFFTdHJpbmcgaWNvbkRhdGFi YXNlUGF0aCgpOwogICAgIHN0YXRpYyB2b2lkIGNsZWFySWNvbkRhdGFiYXNlKCk7Cg==