67208 2011-08-30 10:39:08 -0700 Get rid of platform specific undefs for NO_ERROR and VERSION in GraphicsContext3D 2011-09-01 07:37:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 66903 1 cmarrin cmarrin kbr oldest_to_newest 459001 0 cmarrin 2011-08-30 10:39:08 -0700 Get rid of platform specific undefs for NO_ERROR and VERSION in GraphicsContext3D 459002 1 105649 cmarrin 2011-08-30 10:41:01 -0700 Created attachment 105649 Patch 459016 2 105649 webkit-ews 2011-08-30 10:55:36 -0700 Comment on attachment 105649 Patch Attachment 105649 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/9572270 459025 3 105649 darin 2011-08-30 11:11:27 -0700 Comment on attachment 105649 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105649&action=review This fails to compile. See the Qt EWS build failure. It’s because the IDL and C++ names need to match. To change the names we’d probably need a new feature in the bindings generation script. > Source/WebCore/html/canvas/WebGLRenderingContext.idl:145 > - const unsigned int NO_ERROR = 0; > + const unsigned int NO_ERROR = 0; // This is named GC3D_NO_ERROR in GraphicsContext3D to avoid clash with system defines on some platforms I’m not sure this comment is helpful here. Don’t we have something in the IDL-generation process that requires that the C++ constant and the IDL constant have the same name and same value? I had thought we did, and I’m surprised you are not having problems compiling. > Source/WebCore/html/canvas/WebGLRenderingContext.idl:288 > - const unsigned int VERSION = 0x1F02; > + const unsigned int VERSION = 0x1F02; // This is named GC3D_VERSION in GraphicsContext3D to avoid clash with system defines on some platforms Ditto. 105649 2011-08-30 10:41:01 -0700 2011-08-30 11:11:26 -0700 Patch bug-67208-20110830104100.patch text/plain 11052 cmarrin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0MDg4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDgtMzAgIENocmlzIE1h cnJpbiAgPGNtYXJyaW5AYXBwbGUuY29tPgorCisgICAgICAgIEdldCByaWQgb2YgcGxhdGZvcm0g c3BlY2lmaWMgdW5kZWZzIGZvciBOT19FUlJPUiBhbmQgVkVSU0lPTiBpbiBHcmFwaGljc0NvbnRl eHQzRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njcy MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmVm aXhlZCB0aGVzZSBkZWZpbmVzIHRvIGdldCByaWQgb2YgdGhlIHBsYXRmb3JtIGRlcGVuZGVudCBp ZmRlZnMgcHJvdGVjdGluZyB0aGVtLgorICAgICAgICBBbHNvIGFkZGVkIGNvbW1lbnRzIG1lbnRp b25pbmcgdGhhdCBuYXRpdmUgdmVyc2lvbnMgYXJlIHByZWZpeGVkLCBidXQgSlMgdmVyc2lvbnMK KyAgICAgICAgYXJlIG5vdCBjaGFuZ2VkLgorCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xS ZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29u dGV4dDo6Y29weVRleFN1YkltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJp bmdDb250ZXh0OjpnZXRQYXJhbWV0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJp bmdDb250ZXh0OjpyZWFkUGl4ZWxzKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6dmFsaWRhdGVUZXhGdW5jRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJl bmRlcmluZ0NvbnRleHQ6Omxvc2VDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVu ZGVyaW5nQ29udGV4dDo6bWF5YmVSZXN0b3JlQ29udGV4dCk6CisgICAgICAgICogaHRtbC9jYW52 YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmlkbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQzRC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQzRDo6dGV4SW1hZ2UyRFJlc291cmNlU2FmZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQzRDo6Y29tcHV0ZUltYWdlU2l6ZUluQnl0ZXMpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFeHRl bnNpb25zM0RPcGVuR0w6OmdldEdyYXBoaWNzUmVzZXRTdGF0dXNBUkIpOgorCiAyMDExLTA4LTMw ICBEbWl0cnkgVGl0b3YgIDxkaW1pY2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JFU1NJ T04gKHI5MzkxMyk6IEZhaWx1cmVzIGluIGZhc3QvcmVwbGFjZWQvZnJhbWUtcmVtb3ZlZC1kdXJp bmctcmVzaXplLmh0bWwgYW5kIHNjcm9sbGJhcnMvc2Nyb2xsYWJsZS1pZnJhbWUtcmVtb3ZlLWNy YXNoLmh0bWwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5n Q29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xSZW5kZXJpbmdDb250ZXh0LmNwcAkocmV2aXNpb24gOTQwODYpCisrKyBTb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMTQwLDcgKzExNDAsNyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y29weVRleFN1 YkltCiAgICAgICAgICAgICBpZiAod2lkdGggJiYgaGVpZ2h0KSB7CiAgICAgICAgICAgICAgICAg dW5zaWduZWQgaW50IHNpemU7CiAgICAgICAgICAgICAgICAgR0MzRGVudW0gZXJyb3IgPSBtX2Nv bnRleHQtPmNvbXB1dGVJbWFnZVNpemVJbkJ5dGVzKGZvcm1hdCwgdHlwZSwgd2lkdGgsIGhlaWdo dCwgbV91bnBhY2tBbGlnbm1lbnQsICZzaXplLCAwKTsKLSAgICAgICAgICAgICAgICBpZiAoZXJy b3IgIT0gR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VSUk9SKSB7CisgICAgICAgICAgICAgICAgaWYg KGVycm9yICE9IEdyYXBoaWNzQ29udGV4dDNEOjpHQzNEX05PX0VSUk9SKSB7CiAgICAgICAgICAg ICAgICAgICAgIG1fY29udGV4dC0+c3ludGhlc2l6ZUdMRXJyb3IoZXJyb3IpOwogICAgICAgICAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAgfQpAQCAtMjIzNiw4ICsyMjM2LDgg QEAgV2ViR0xHZXRJbmZvIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0UAogICAgICAgICByZXR1 cm4gV2ViR0xHZXRJbmZvKG1fdW5wYWNrQ29sb3JzcGFjZUNvbnZlcnNpb24pOwogICAgIGNhc2Ug R3JhcGhpY3NDb250ZXh0M0Q6OlZFTkRPUjoKICAgICAgICAgcmV0dXJuIFdlYkdMR2V0SW5mbygi V2Via2l0ICgiICsgbV9jb250ZXh0LT5nZXRTdHJpbmcoR3JhcGhpY3NDb250ZXh0M0Q6OlZFTkRP UikgKyAiKSIpOwotICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlZFUlNJT046Ci0gICAgICAg IHJldHVybiBXZWJHTEdldEluZm8oIldlYkdMIDEuMCAoIiArIG1fY29udGV4dC0+Z2V0U3RyaW5n KEdyYXBoaWNzQ29udGV4dDNEOjpWRVJTSU9OKSArICIpIik7CisgICAgY2FzZSBHcmFwaGljc0Nv bnRleHQzRDo6R0MzRF9WRVJTSU9OOgorICAgICAgICByZXR1cm4gV2ViR0xHZXRJbmZvKCJXZWJH TCAxLjAgKCIgKyBtX2NvbnRleHQtPmdldFN0cmluZyhHcmFwaGljc0NvbnRleHQzRDo6R0MzRF9W RVJTSU9OKSArICIpIik7CiAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6VklFV1BPUlQ6CiAg ICAgICAgIHJldHVybiBnZXRXZWJHTEludEFycmF5UGFyYW1ldGVyKHBuYW1lKTsKICAgICBjYXNl IEV4dGVuc2lvbnMzRDo6RlJBR01FTlRfU0hBREVSX0RFUklWQVRJVkVfSElOVF9PRVM6IC8vIE9F U19zdGFuZGFyZF9kZXJpdmF0aXZlcwpAQCAtMjg2Niw3ICsyODY2LDcgQEAgdm9pZCBXZWJHTFJl bmRlcmluZ0NvbnRleHQ6OnJlYWRQaXhlbHMoRwogICAgIHVuc2lnbmVkIGludCB0b3RhbEJ5dGVz UmVxdWlyZWQ7CiAgICAgdW5zaWduZWQgaW50IHBhZGRpbmc7CiAgICAgR0MzRGVudW0gZXJyb3Ig PSBtX2NvbnRleHQtPmNvbXB1dGVJbWFnZVNpemVJbkJ5dGVzKGZvcm1hdCwgdHlwZSwgd2lkdGgs IGhlaWdodCwgbV9wYWNrQWxpZ25tZW50LCAmdG90YWxCeXRlc1JlcXVpcmVkLCAmcGFkZGluZyk7 Ci0gICAgaWYgKGVycm9yICE9IEdyYXBoaWNzQ29udGV4dDNEOjpOT19FUlJPUikgeworICAgIGlm IChlcnJvciAhPSBHcmFwaGljc0NvbnRleHQzRDo6R0MzRF9OT19FUlJPUikgewogICAgICAgICBt X2NvbnRleHQtPnN5bnRoZXNpemVHTEVycm9yKGVycm9yKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KQEAgLTQzNjgsNyArNDM2OCw3IEBAIGJvb2wgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp2YWxp ZGF0ZVRleEYKIAogICAgIHVuc2lnbmVkIGludCB0b3RhbEJ5dGVzUmVxdWlyZWQ7CiAgICAgR0Mz RGVudW0gZXJyb3IgPSBtX2NvbnRleHQtPmNvbXB1dGVJbWFnZVNpemVJbkJ5dGVzKGZvcm1hdCwg dHlwZSwgd2lkdGgsIGhlaWdodCwgbV91bnBhY2tBbGlnbm1lbnQsICZ0b3RhbEJ5dGVzUmVxdWly ZWQsIDApOwotICAgIGlmIChlcnJvciAhPSBHcmFwaGljc0NvbnRleHQzRDo6Tk9fRVJST1IpIHsK KyAgICBpZiAoZXJyb3IgIT0gR3JhcGhpY3NDb250ZXh0M0Q6OkdDM0RfTk9fRVJST1IpIHsKICAg ICAgICAgbV9jb250ZXh0LT5zeW50aGVzaXplR0xFcnJvcihlcnJvcik7CiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9CkBAIC00NzU1LDExICs0NzU1LDExIEBAIHZvaWQgV2ViR0xSZW5kZXJp bmdDb250ZXh0Ojpsb3NlQ29udGV4dCgKICAgICBkZXRhY2hBbmRSZW1vdmVBbGxPYmplY3RzKCk7 CiAKICAgICAvLyBUaGVyZSBpcyBubyBkaXJlY3Qgd2F5IHRvIGNsZWFyIGVycm9ycyBmcm9tIGEg R0wgaW1wbGVtZW50YXRpb24gYW5kCi0gICAgLy8gbG9vcGluZyB1bnRpbCBnZXRFcnJvcigpIGJl Y29tZXMgTk9fRVJST1IgbWlnaHQgY2F1c2UgYW4gaW5maW5pdGUgbG9vcCBpZgorICAgIC8vIGxv b3BpbmcgdW50aWwgZ2V0RXJyb3IoKSBiZWNvbWVzIEdDM0RfTk9fRVJST1IgbWlnaHQgY2F1c2Ug YW4gaW5maW5pdGUgbG9vcCBpZgogICAgIC8vIHRoZSBkcml2ZXIgb3IgY29udGV4dCBpbXBsZW1l bnRhdGlvbiBoYWQgYSBidWcuIFNvLCBsb29wIGEgcmVhc29uYWJseQogICAgIC8vIGxhcmdlIG51 bWJlciBvZiB0aW1lcyB0byBjbGVhciBhbnkgZXhpc3RpbmcgZXJyb3JzLgogICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgMTAwOyArK2kpIHsKLSAgICAgICAgaWYgKG1fY29udGV4dC0+Z2V0RXJyb3Io KSA9PSBHcmFwaGljc0NvbnRleHQzRDo6Tk9fRVJST1IpCisgICAgICAgIGlmIChtX2NvbnRleHQt PmdldEVycm9yKCkgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OkdDM0RfTk9fRVJST1IpCiAgICAgICAg ICAgICBicmVhazsKICAgICB9CiAgICAgbV9jb250ZXh0LT5zeW50aGVzaXplR0xFcnJvcihHcmFw aGljc0NvbnRleHQzRDo6Q09OVEVYVF9MT1NUX1dFQkdMKTsKQEAgLTQ3ODgsNyArNDc4OCw3IEBA IHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjptYXliZVJlc3RvcmUKICAgICBpbnQgY29udGV4 dExvc3RSZWFzb24gPSBtX2NvbnRleHQtPmdldEV4dGVuc2lvbnMoKS0+Z2V0R3JhcGhpY3NSZXNl dFN0YXR1c0FSQigpOwogCiAgICAgc3dpdGNoIChjb250ZXh0TG9zdFJlYXNvbikgewotICAgIGNh c2UgR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VSUk9SOgorICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0 M0Q6OkdDM0RfTk9fRVJST1I6CiAgICAgICAgIC8vIFRoZSBHcmFwaGljc0NvbnRleHQzRCBpbXBs ZW1lbnRhdGlvbiBtaWdodCBub3QgZnVsbHkKICAgICAgICAgLy8gc3VwcG9ydCBHTF9BUkJfcm9i dXN0bmVzcyBzZW1hbnRpY3MgeWV0LiBBbHRlcm5hdGl2ZWx5LCB0aGUKICAgICAgICAgLy8gV2Vi R0wgV0VCS0lUX2xvc2VfY29udGV4dCBleHRlbnNpb24gbWlnaHQgaGF2ZSBiZWVuIHVzZWQgdG8K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5p ZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJp bmdDb250ZXh0LmlkbAkocmV2aXNpb24gOTQwODYpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0xNDIsNyAr MTQyLDcgQEAgbW9kdWxlIGh0bWwgewogICAgICAgICBjb25zdCB1bnNpZ25lZCBpbnQgU0FNUExF X0NPVkVSQUdFICAgICAgICAgICAgICAgID0gMHg4MEEwOwogCiAgICAgICAgIC8qIEVycm9yQ29k ZSAqLwotICAgICAgICBjb25zdCB1bnNpZ25lZCBpbnQgTk9fRVJST1IgICAgICAgICAgICAgICAg ICAgICAgID0gMDsKKyAgICAgICAgY29uc3QgdW5zaWduZWQgaW50IE5PX0VSUk9SICAgICAgICAg ICAgICAgICAgICAgICA9IDA7IC8vIFRoaXMgaXMgbmFtZWQgR0MzRF9OT19FUlJPUiBpbiBHcmFw aGljc0NvbnRleHQzRCB0byBhdm9pZCBjbGFzaCB3aXRoIHN5c3RlbSBkZWZpbmVzIG9uIHNvbWUg cGxhdGZvcm1zCiAgICAgICAgIGNvbnN0IHVuc2lnbmVkIGludCBJTlZBTElEX0VOVU0gICAgICAg ICAgICAgICAgICAgPSAweDA1MDA7CiAgICAgICAgIGNvbnN0IHVuc2lnbmVkIGludCBJTlZBTElE X1ZBTFVFICAgICAgICAgICAgICAgICAgPSAweDA1MDE7CiAgICAgICAgIGNvbnN0IHVuc2lnbmVk IGludCBJTlZBTElEX09QRVJBVElPTiAgICAgICAgICAgICAgPSAweDA1MDI7CkBAIC0yODUsNyAr Mjg1LDcgQEAgbW9kdWxlIGh0bWwgewogICAgICAgICAvKiBTdHJpbmdOYW1lICovCiAgICAgICAg IGNvbnN0IHVuc2lnbmVkIGludCBWRU5ET1IgICAgICAgICAgICAgICAgICAgICAgICAgPSAweDFG MDA7CiAgICAgICAgIGNvbnN0IHVuc2lnbmVkIGludCBSRU5ERVJFUiAgICAgICAgICAgICAgICAg ICAgICAgPSAweDFGMDE7Ci0gICAgICAgIGNvbnN0IHVuc2lnbmVkIGludCBWRVJTSU9OICAgICAg ICAgICAgICAgICAgICAgICAgPSAweDFGMDI7CisgICAgICAgIGNvbnN0IHVuc2lnbmVkIGludCBW RVJTSU9OICAgICAgICAgICAgICAgICAgICAgICAgPSAweDFGMDI7ICAvLyBUaGlzIGlzIG5hbWVk IEdDM0RfVkVSU0lPTiBpbiBHcmFwaGljc0NvbnRleHQzRCB0byBhdm9pZCBjbGFzaCB3aXRoIHN5 c3RlbSBkZWZpbmVzIG9uIHNvbWUgcGxhdGZvcm1zCiAKICAgICAgICAgLyogVGV4dHVyZU1hZ0Zp bHRlciAqLwogICAgICAgICBjb25zdCB1bnNpZ25lZCBpbnQgTkVBUkVTVCAgICAgICAgICAgICAg ICAgICAgICAgID0gMHgyNjAwOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0M0QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmNwcAkocmV2aXNpb24gOTQwODYpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTY5LDcgKzY5LDcgQEAgYm9vbCBHcmFwaGljc0NvbnRleHQzRDo6 dGV4SW1hZ2UyRFJlc291cgogICAgIGlmICghaXNSZXNvdXJjZVNhZmUoKSAmJiB3aWR0aCA+IDAg JiYgaGVpZ2h0ID4gMCkgewogICAgICAgICB1bnNpZ25lZCBpbnQgc2l6ZTsKICAgICAgICAgR0Mz RGVudW0gZXJyb3IgPSBjb21wdXRlSW1hZ2VTaXplSW5CeXRlcyhmb3JtYXQsIHR5cGUsIHdpZHRo LCBoZWlnaHQsIHVucGFja0FsaWdubWVudCwgJnNpemUsIDApOwotICAgICAgICBpZiAoZXJyb3Ig IT0gR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VSUk9SKSB7CisgICAgICAgIGlmIChlcnJvciAhPSBH cmFwaGljc0NvbnRleHQzRDo6R0MzRF9OT19FUlJPUikgewogICAgICAgICAgICAgc3ludGhlc2l6 ZUdMRXJyb3IoZXJyb3IpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CkBA IC0xNDEsNyArMTQxLDcgQEAgR0MzRGVudW0gR3JhcGhpY3NDb250ZXh0M0Q6OmNvbXB1dGVJbWFn ZQogICAgICAgICAqaW1hZ2VTaXplSW5CeXRlcyA9IDA7CiAgICAgICAgIGlmIChwYWRkaW5nSW5C eXRlcykKICAgICAgICAgICAgICpwYWRkaW5nSW5CeXRlcyA9IDA7Ci0gICAgICAgIHJldHVybiBH cmFwaGljc0NvbnRleHQzRDo6Tk9fRVJST1I7CisgICAgICAgIHJldHVybiBHcmFwaGljc0NvbnRl eHQzRDo6R0MzRF9OT19FUlJPUjsKICAgICB9CiAgICAgQ2hlY2tlZEludDx1aW50MzJfdD4gY2hl Y2tlZFZhbHVlKGJ5dGVzUGVyQ29tcG9uZW50ICogY29tcG9uZW50c1BlclBpeGVsKTsKICAgICBj aGVja2VkVmFsdWUgKj0gIHdpZHRoOwpAQCAtMTYyLDcgKzE2Miw3IEBAIEdDM0RlbnVtIEdyYXBo aWNzQ29udGV4dDNEOjpjb21wdXRlSW1hZ2UKICAgICAqaW1hZ2VTaXplSW5CeXRlcyA9IGNoZWNr ZWRWYWx1ZS52YWx1ZSgpOwogICAgIGlmIChwYWRkaW5nSW5CeXRlcykKICAgICAgICAgKnBhZGRp bmdJbkJ5dGVzID0gcGFkZGluZzsKLSAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VS Uk9SOworICAgIHJldHVybiBHcmFwaGljc0NvbnRleHQzRDo6R0MzRF9OT19FUlJPUjsKIH0KIAog Ym9vbCBHcmFwaGljc0NvbnRleHQzRDo6ZXh0cmFjdEltYWdlRGF0YShJbWFnZSogaW1hZ2UsCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz Q29udGV4dDNELmgJKHJldmlzaW9uIDk0MDg2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTQgKzM1 LDYgQEAKICNpbmNsdWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29w eWFibGUuaD4KIAotLy8gRklYTUU6IEZpbmQgYSBiZXR0ZXIgd2F5IHRvIGF2b2lkIHRoZSBuYW1l IGNvbmZsaWN0aW9uIGZvciBOT19FUlJPUi4KLSNpZiAoKFBMQVRGT1JNKENIUk9NSVVNKSAmJiBP UyhXSU5ET1dTKSkgfHwgUExBVEZPUk0oV0lOKSB8fCAoUExBVEZPUk0oUVQpICYmIE9TKFdJTkRP V1MpKSkKLSN1bmRlZiBOT19FUlJPUgotI2VsaWYgUExBVEZPUk0oR1RLKQotLy8gVGhpcyBkZWZp bmUgaXMgZnJvbSB0aGUgWDExIGhlYWRlcnMsIGJ1dCBpdCdzIHVzZWQgYmVsb3csIHNvIHdlIG11 c3QgdW5kZWZpbmUgaXQuCi0jdW5kZWYgVkVSU0lPTgotI2VuZGlmCi0KICNpZiBQTEFURk9STShN QUMpIHx8IFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oUVQpCiAjaW5jbHVkZSAiQU5HTEVXZWJL aXRCcmlkZ2UuaCIKICNlbmRpZgpAQCAtMTEzLDYgKzEwNSw3IEBAIGNsYXNzIEdyYXBoaWNzQ29u dGV4dDNEUHJpdmF0ZTsKIGNsYXNzIEdyYXBoaWNzQ29udGV4dDNEIDogcHVibGljIFJlZkNvdW50 ZWQ8R3JhcGhpY3NDb250ZXh0M0Q+IHsKIHB1YmxpYzoKICAgICBlbnVtIHsKKyAgICAgICAgR0Mz RF9OT19FUlJPUiA9IDAsIC8vIFdlYkdMIGNhbGxzIHRoaXMgTk9fRVJST1IsIGJ1dCBwcmVmaXgg aGVyZSB0byBhdm9pZCBjb25mbGljdCB3aXRoIHN5c3RlbSBkZWZpbmVzIG9uIHNvbWUgcGxhdGZv cm1zCiAgICAgICAgIERFUFRIX0JVRkZFUl9CSVQgPSAweDAwMDAwMTAwLAogICAgICAgICBTVEVO Q0lMX0JVRkZFUl9CSVQgPSAweDAwMDAwNDAwLAogICAgICAgICBDT0xPUl9CVUZGRVJfQklUID0g MHgwMDAwNDAwMCwKQEAgLTE3Miw3ICsxNjUsNiBAQCBwdWJsaWM6CiAgICAgICAgIFBPTFlHT05f T0ZGU0VUX0ZJTEwgPSAweDgwMzcsCiAgICAgICAgIFNBTVBMRV9BTFBIQV9UT19DT1ZFUkFHRSA9 IDB4ODA5RSwKICAgICAgICAgU0FNUExFX0NPVkVSQUdFID0gMHg4MEEwLAotICAgICAgICBOT19F UlJPUiA9IDAsCiAgICAgICAgIElOVkFMSURfRU5VTSA9IDB4MDUwMCwKICAgICAgICAgSU5WQUxJ RF9WQUxVRSA9IDB4MDUwMSwKICAgICAgICAgSU5WQUxJRF9PUEVSQVRJT04gPSAweDA1MDIsCkBA IC0yODUsNyArMjc3LDcgQEAgcHVibGljOgogICAgICAgICBERUNSX1dSQVAgPSAweDg1MDgsCiAg ICAgICAgIFZFTkRPUiA9IDB4MUYwMCwKICAgICAgICAgUkVOREVSRVIgPSAweDFGMDEsCi0gICAg ICAgIFZFUlNJT04gPSAweDFGMDIsCisgICAgICAgIEdDM0RfVkVSU0lPTiA9IDB4MUYwMiwgLy8g V2ViR0wgY2FsbHMgdGhpcyBWRVJTSU9OLCBidXQgcHJlZml4IGhlcmUgdG8gYXZvaWQgY29uZmxp Y3Qgd2l0aCBzeXN0ZW0gZGVmaW5lcyBvbiBzb21lIHBsYXRmb3JtcwogICAgICAgICBFWFRFTlNJ T05TID0gMHgxRjAzLAogICAgICAgICBORUFSRVNUID0gMHgyNjAwLAogICAgICAgICBMSU5FQVIg PSAweDI2MDEsCkBAIC01MjcsNyArNTE5LDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCogYnl0ZXNQZXJDb21wb25lbnQpOwog CiAgICAgLy8gQ29tcHV0ZXMgdGhlIGltYWdlIHNpemUgaW4gYnl0ZXMuIElmIHBhZGRpbmdJbkJ5 dGVzIGlzIG5vdCBudWxsLCBwYWRkaW5nCi0gICAgLy8gaXMgYWxzbyBjYWxjdWxhdGVkIGluIHJl dHVybi4gUmV0dXJucyBOT19FUlJPUiBpZiBzdWNjZWVkLCBvdGhlcndpc2UKKyAgICAvLyBpcyBh bHNvIGNhbGN1bGF0ZWQgaW4gcmV0dXJuLiBSZXR1cm5zIEdDM0RfTk9fRVJST1IgaWYgc3VjY2Vl ZCwgb3RoZXJ3aXNlCiAgICAgLy8gcmV0dXJuIHRoZSBzdWdnZXN0ZWQgR0wgZXJyb3IgaW5kaWNh dGluZyB0aGUgY2F1c2Ugb2YgdGhlIGZhaWx1cmU6CiAgICAgLy8gICBJTlZBTElEX1ZBTFVFIGlm IHdpZHRoL2hlaWdodCBpcyBuZWdhdGl2ZSBvciBvdmVyZmxvdyBoYXBwZW5zLgogICAgIC8vICAg SU5WQUxJRF9FTlVNIGlmIGZvcm1hdC90eXBlIGlzIGlsbGVnYWwuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5z aW9uczNET3BlbkdMLmNwcAkocmV2aXNpb24gOTQwODYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTMzLDcgKzEzMyw3IEBAIGJvb2wgRXh0ZW5zaW9uczNET3BlbkdMOjppc0VuYWJsZWQo Y29uc3QKIAogaW50IEV4dGVuc2lvbnMzRE9wZW5HTDo6Z2V0R3JhcGhpY3NSZXNldFN0YXR1c0FS QigpCiB7Ci0gICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDNEOjpOT19FUlJPUjsKKyAgICByZXR1 cm4gR3JhcGhpY3NDb250ZXh0M0Q6OkdDM0RfTk9fRVJST1I7CiB9CiAKIHZvaWQgRXh0ZW5zaW9u czNET3BlbkdMOjpibGl0RnJhbWVidWZmZXIobG9uZyBzcmNYMCwgbG9uZyBzcmNZMCwgbG9uZyBz cmNYMSwgbG9uZyBzcmNZMSwgbG9uZyBkc3RYMCwgbG9uZyBkc3RZMCwgbG9uZyBkc3RYMSwgbG9u ZyBkc3RZMSwgdW5zaWduZWQgbG9uZyBtYXNrLCB1bnNpZ25lZCBsb25nIGZpbHRlcikK