41023 2010-06-22 16:51:02 -0700 Add a SimpleArgumentCoder class template that works on POD types 2010-06-22 17:36:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 241539 0 andersca 2010-06-22 16:51:02 -0700 Add a SimpleArgumentCoder class template that works on POD types 241541 1 59444 andersca 2010-06-22 16:51:41 -0700 Created attachment 59444 Patch 241543 2 59444 sam 2010-06-22 16:53:09 -0700 Comment on attachment 59444 Patch > Index: WebKit2/ChangeLog > =================================================================== > --- WebKit2/ChangeLog (revision 61638) > +++ WebKit2/ChangeLog (working copy) > @@ -1,3 +1,17 @@ > +2010-06-22 Anders Carlsson <andersca@apple.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Add a SimpleArgumentCoder class template that works on POD types > + https://bugs.webkit.org/show_bug.cgi?id=41023 > + > + * Platform/CoreIPC/SimpleArgumentCoder.h: Added. > + (CoreIPC::SimpleArgumentCoder::encode): > + (CoreIPC::SimpleArgumentCoder::decode): > + * Shared/WebCoreTypeArgumentMarshalling.h: > + (CoreIPC::): > + * WebKit2.xcodeproj/project.pbxproj: > + > 2010-06-22 Anders Carlsson <andersca@apple.com> > > Reviewed by Sam Weinig. > Index: WebKit2/Platform/CoreIPC/SimpleArgumentCoder.h > =================================================================== > --- WebKit2/Platform/CoreIPC/SimpleArgumentCoder.h (revision 0) > +++ WebKit2/Platform/CoreIPC/SimpleArgumentCoder.h (revision 0) > @@ -0,0 +1,48 @@ > +/* > + * Copyright (C) 2010 Apple Inc. All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS > + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF > + * THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +#ifndef SimpleArgumentCoder_h > +#define SimpleArgumentCoder_h > + > +#include "ArgumentCoder.h" > + > +namespace CoreIPC { > + > +// An argument coder works on POD types > +template<typename T> struct SimpleArgumentCoder { > + static void encode(ArgumentEncoder* encoder, const T& t) > + { > + encoder->encodeBytes(reinterpret_cast<const uint8_t*>(&t), sizeof(T)); > + } > + static bool decode(ArgumentDecoder* decoder, T& t) > + { > + return decoder->decodeBytes(reinterpret_cast<uint8_t*>(&t), sizeof(T)); > + } > +}; > + > +} This should have a closing comment. > + > + > +#endif // SimpleArgumentCoder_h Two newlines where only one is needed. r=me. 241544 3 andersca 2010-06-22 16:55:40 -0700 Committed r61639: <http://trac.webkit.org/changeset/61639> 241564 4 webkit.review.bot 2010-06-22 17:36:12 -0700 http://trac.webkit.org/changeset/61639 might have broken Qt Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/61640 http://trac.webkit.org/changeset/61638 http://trac.webkit.org/changeset/61639 59444 2010-06-22 16:51:41 -0700 2010-06-22 16:53:13 -0700 Patch bug-41023-20100622165140.patch text/plain 8824 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTYzOCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDYtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSBTaW1wbGVBcmd1bWVudENvZGVyIGNsYXNzIHRlbXBsYXRlIHRoYXQgd29ya3Mgb24g UE9EIHR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MTAyMworCisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9TaW1wbGVBcmd1bWVudENvZGVy Lmg6IEFkZGVkLgorICAgICAgICAoQ29yZUlQQzo6U2ltcGxlQXJndW1lbnRDb2Rlcjo6ZW5jb2Rl KToKKyAgICAgICAgKENvcmVJUEM6OlNpbXBsZUFyZ3VtZW50Q29kZXI6OmRlY29kZSk6CisgICAg ICAgICogU2hhcmVkL1dlYkNvcmVUeXBlQXJndW1lbnRNYXJzaGFsbGluZy5oOgorICAgICAgICAo Q29yZUlQQzo6KToKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6 CisKIDIwMTAtMDYtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViS2l0Mi9QbGF0Zm9ybS9D b3JlSVBDL1NpbXBsZUFyZ3VtZW50Q29kZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1BsYXRm b3JtL0NvcmVJUEMvU2ltcGxlQXJndW1lbnRDb2Rlci5oCShyZXZpc2lvbiAwKQorKysgV2ViS2l0 Mi9QbGF0Zm9ybS9Db3JlSVBDL1NpbXBsZUFyZ3VtZW50Q29kZXIuaAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSw0OCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBt ZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgU2ltcGxlQXJndW1lbnRDb2Rlcl9o CisjZGVmaW5lIFNpbXBsZUFyZ3VtZW50Q29kZXJfaAorCisjaW5jbHVkZSAiQXJndW1lbnRDb2Rl ci5oIgorCituYW1lc3BhY2UgQ29yZUlQQyB7CisKKy8vIEFuIGFyZ3VtZW50IGNvZGVyIHdvcmtz IG9uIFBPRCB0eXBlcwordGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RydWN0IFNpbXBsZUFyZ3VtZW50 Q29kZXIgeworICAgIHN0YXRpYyB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIs IGNvbnN0IFQmIHQpCisgICAgeworICAgICAgICBlbmNvZGVyLT5lbmNvZGVCeXRlcyhyZWludGVy cHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPigmdCksIHNpemVvZihUKSk7CisgICAgfQorICAgIHN0 YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFQmIHQpCisgICAgewor ICAgICAgICByZXR1cm4gZGVjb2Rlci0+ZGVjb2RlQnl0ZXMocmVpbnRlcnByZXRfY2FzdDx1aW50 OF90Kj4oJnQpLCBzaXplb2YoVCkpOworICAgIH0KK307CisgICAgCit9CisKKworI2VuZGlmIC8v IFNpbXBsZUFyZ3VtZW50Q29kZXJfaApJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZVR5cGVB cmd1bWVudE1hcnNoYWxsaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvV2ViQ29y ZVR5cGVBcmd1bWVudE1hcnNoYWxsaW5nLmgJKHJldmlzaW9uIDYxNjM1KQorKysgV2ViS2l0Mi9T aGFyZWQvV2ViQ29yZVR5cGVBcmd1bWVudE1hcnNoYWxsaW5nLmgJKHdvcmtpbmcgY29weSkKQEAg LTI5LDY5ICsyOSwxNiBAQAogI2luY2x1ZGUgIkFyZ3VtZW50RGVjb2Rlci5oIgogI2luY2x1ZGUg IkFyZ3VtZW50RW5jb2Rlci5oIgogI2luY2x1ZGUgIkFyZ3VtZW50cy5oIgorI2luY2x1ZGUgIlNp bXBsZUFyZ3VtZW50Q29kZXIuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1TdHJp bmcuaD4KIAogbmFtZXNwYWNlIENvcmVJUEMgewogCi10ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVu dENvZGVyPFdlYkNvcmU6OkludFBvaW50PiB7Ci0gICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3Vt ZW50RW5jb2RlciogZW5jb2RlciwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHApCi0gICAgewot ICAgICAgICBlbmNvZGVyLT5lbmNvZGUoQ29yZUlQQzo6SW4ocC54KCksIHAueSgpKSk7Ci0gICAg fTsKLQotICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFdl YkNvcmU6OkludFBvaW50JiBwKQotICAgIHsKLSAgICAgICAgaW50IHg7Ci0gICAgICAgIGludCB5 OwotICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZShDb3JlSVBDOjpPdXQoeCwgeSkpKQotICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAKLSAgICAgICAgcC5zZXRYKHgpOwotICAg ICAgICBwLnNldFkoeSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLX07Ci0KLXRlbXBs YXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6SW50U2l6ZT4gewotICAgIHN0YXRp YyB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IFdlYkNvcmU6Oklu dFNpemUmIHMpCi0gICAgewotICAgICAgICBlbmNvZGVyLT5lbmNvZGUoQ29yZUlQQzo6SW4ocy53 aWR0aCgpLCBzLmhlaWdodCgpKSk7Ci0gICAgfTsKLSAgICAKLSAgICBzdGF0aWMgYm9vbCBkZWNv ZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3JlOjpJbnRTaXplJiBzKQotICAgIHsK LSAgICAgICAgaW50IHdpZHRoOwotICAgICAgICBpbnQgaGVpZ2h0OwotICAgICAgICBpZiAoIWRl Y29kZXItPmRlY29kZShDb3JlSVBDOjpPdXQod2lkdGgsIGhlaWdodCkpKQotICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgICAgICAKLSAgICAgICAgcy5zZXRXaWR0aCh3aWR0aCk7Ci0gICAg ICAgIHMuc2V0SGVpZ2h0KGhlaWdodCk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLQot fTsKLQotdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpJbnRSZWN0PiB7 Ci0gICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgcikKLSAgICB7Ci0gICAgICAgIGVuY29kZXItPmVuY29kZShDb3Jl SVBDOjpJbihyLmxvY2F0aW9uKCksIHIuc2l6ZSgpKSk7Ci0gICAgfTsKLSAgICAKLSAgICBzdGF0 aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3JlOjpJbnRSZWN0 JiByKQotICAgIHsKLSAgICAgICAgV2ViQ29yZTo6SW50UG9pbnQgbG9jYXRpb247Ci0gICAgICAg IFdlYkNvcmU6OkludFNpemUgc2l6ZTsKLSAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUoQ29y ZUlQQzo6T3V0KGxvY2F0aW9uLCBzaXplKSkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgICAgIAotICAgICAgICByLnNldExvY2F0aW9uKGxvY2F0aW9uKTsKLSAgICAgICAgci5zZXRT aXplKHNpemUpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci19OwordGVtcGxhdGU8PiBz dHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpJbnRQb2ludD4gOiBTaW1wbGVBcmd1bWVudENv ZGVyPFdlYkNvcmU6OkludFBvaW50PiB7IH07Cit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENv ZGVyPFdlYkNvcmU6OkludFNpemU+IDogU2ltcGxlQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpJbnRT aXplPiB7IH07Cit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkludFJl Y3Q+IDogU2ltcGxlQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpJbnRSZWN0PiB7IH07CiAKIHRlbXBs YXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6U3RyaW5nPiB7CiAgICAgc3RhdGlj IHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgY29uc3QgV2ViQ29yZTo6U3Ry aW5nJiBzdHJpbmcpCkluZGV4OiBXZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagkocmV2aXNpb24gNjE2MzQpCisrKyBXZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQAogCQkxQUVGQ0MxMzEx RDAxRjk2MDA4MjE5RDMgLyogUGx1Z2luSW5mb1N0b3JlLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRUZDQzExMTFEMDFGOTYwMDgyMTlEMyAvKiBQ bHVnaW5JbmZvU3RvcmUuY3BwICovOyB9OwogCQkxQUVGQ0NCRDExRDAyQzVFMDA4MjE5RDMgLyog UGx1Z2luSW5mb1N0b3JlTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMUFFRkNDQkMxMUQwMkM1RTAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZU1h Yy5tbSAqLzsgfTsKIAkJMUFFRkQyNzkxMUQxNkM4MTAwODIxOUQzIC8qIEFyZ3VtZW50Q29kZXIu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRUZEMjc4 MTFEMTZDODEwMDgyMTlEMyAvKiBBcmd1bWVudENvZGVyLmggKi87IH07CisJCTFBRUZEMkY3MTFE MTgwN0IwMDgyMTlEMyAvKiBTaW1wbGVBcmd1bWVudENvZGVyLmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUVGRDJGNjExRDE4MDdCMDA4MjE5RDMgLyog U2ltcGxlQXJndW1lbnRDb2Rlci5oICovOyB9OwogCQkxQUYzMDYwQTExMUI1OTlFMDBGOTY0MzYg LyogV2ViS2l0Mi5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA4REMyRUY1QjA0ODZBNjk0MDA5OEIyMTYgLyogV2ViS2l0Mi5mcmFtZXdv cmsgKi87IH07CiAJCTVEQUQ3MjlDMTE2RkY4NjIwMEVFNTM5NiAvKiBBcHBLaXQuZnJhbWV3b3Jr IGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMDg2N0Q2 QTVGRTg0MDMwN0MwMkFBQzA3IC8qIEFwcEtpdC5mcmFtZXdvcmsgKi87IH07CiAJCThEQzJFRjUz MDQ4NkE2OTQwMDk4QjIxNiAvKiBJbmZvUGxpc3Quc3RyaW5ncyBpbiBSZXNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMDg5QzE2NjZGRTg0MTE1OEMwMkFBQzA3IC8q IEluZm9QbGlzdC5zdHJpbmdzICovOyB9OwpAQCAtMjYxLDYgKzI2Miw3IEBACiAJCTFBRUZDQzEx MTFEMDFGOTYwMDgyMTlEMyAvKiBQbHVnaW5JbmZvU3RvcmUuY3BwICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBwYXRoID0gUGx1Z2luSW5mb1N0b3JlLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJMUFFRkNDQkMxMUQwMkM1RTAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9y ZU1hYy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFBsdWdpbklu Zm9TdG9yZU1hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFFRkQyNzgxMUQx NkM4MTAwODIxOUQzIC8qIEFyZ3VtZW50Q29kZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gQXJndW1lbnRDb2Rlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkx QUVGRDJGNjExRDE4MDdCMDA4MjE5RDMgLyogU2ltcGxlQXJndW1lbnRDb2Rlci5oICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTaW1wbGVBcmd1bWVudENvZGVyLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTMyREJDRjVFMDM3MEFERUUwMEM5MTc4MyAvKiBXZWJLaXQy UHJlZml4LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYktpdDJQcmVmaXgu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNURBRDcyOTQxMTZGRjcwQjAwRUU1Mzk2 IC8qIFdlYlByb2Nlc3MueGNjb25maWcgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0LnhjY29uZmlnOyBwYXRoID0g V2ViUHJvY2Vzcy54Y2NvbmZpZzsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNURBRDcz RjExMTZGRjkwQzAwRUU1Mzk2IC8qIEJhc2VUYXJnZXQueGNjb25maWcgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0 LnhjY29uZmlnOyBwYXRoID0gQmFzZVRhcmdldC54Y2NvbmZpZzsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKQEAgLTU3Niw2ICs1NzgsNyBAQAogCQkJCUJDMDMyREEzMTBGNDM3RDEwMDU4QzE1 QSAvKiBDb25uZWN0aW9uLmggKi8sCiAJCQkJQkMxMzFCQzgxMTcyNkMyODAwQjY5NzI3IC8qIENv cmVJUENNZXNzYWdlS2luZHMuaCAqLywKIAkJCQlCQzAzMkRBNDEwRjQzN0QxMDA1OEMxNUEgLyog TWVzc2FnZUlELmggKi8sCisJCQkJMUFFRkQyRjYxMUQxODA3QjAwODIxOUQzIC8qIFNpbXBsZUFy Z3VtZW50Q29kZXIuaCAqLywKIAkJCSk7CiAJCQlwYXRoID0gQ29yZUlQQzsKIAkJCXNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7CkBAIC0xMDQyLDYgKzEwNDUsNyBAQAogCQkJCUJDREUwNTlCMTFDREE4 QUUwMEU0MUFGMSAvKiBXZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQuaCBpbiBIZWFkZXJz ICovLAogCQkJCUJDQjczNDZFMTFDRUUzRkYwMEVDNTAwMiAvKiBXZWJQcm9jZXNzUHJveHlNZXNz YWdlS2luZHMuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBRUZEMjc5MTFEMTZDODEwMDgyMTlEMyAv KiBBcmd1bWVudENvZGVyLmggaW4gSGVhZGVycyAqLywKKwkJCQkxQUVGRDJGNzExRDE4MDdCMDA4 MjE5RDMgLyogU2ltcGxlQXJndW1lbnRDb2Rlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkpOwogCQkJ cnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07Cg==