143768 2015-04-15 06:30:55 -0700 [W32][GTK] Conflict between NO_ERROR from W32API and GraphicsContext3D 2015-05-18 23:15:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 133028 1 lrn1986 webkit-unassigned cgarcia cmarcelo commit-queue dino esprehn+autocc gyuyoung.kim kondapallykalyan lrn1986 luiz noam roger_fong oldest_to_newest 1085463 0 lrn1986 2015-04-15 06:30:55 -0700 In file included from /mingw/include/_mingw.h:12:0, from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93, from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32, from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30, from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27: ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()': ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant return GraphicsContext3D::NO_ERROR; because NO_ERROR is also a macro defined in Windows headers. Ouch. 1085551 1 250814 lrn1986 2015-04-15 10:08:52 -0700 Created attachment 250814 Work around name conflicts (NO_ERROR) In file included from /mingw/include/_mingw.h:12:0, from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93, from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32, from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30, from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27: ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()': ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant return GraphicsContext3D::NO_ERROR; because NO_ERROR is also a macro defined in Windows headers. Ouch. Also expand this to the (PLATFORM(GTK) && OS(WINDOWS)) combination, in addition to the workaround for VERSION already present there. 1085555 2 commit-queue 2015-04-15 10:10:48 -0700 Attachment 250814 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:23: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1085646 3 250842 lrn1986 2015-04-15 13:15:15 -0700 Created attachment 250842 Work around name conflicts (NO_ERROR) In file included from /mingw/include/_mingw.h:12:0, from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93, from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32, from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30, from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27: ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()': ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant return GraphicsContext3D::NO_ERROR; because NO_ERROR is also a macro defined in Windows headers. Ouch. Also expand this to the (PLATFORM(GTK) && OS(WINDOWS)) combination, in addition to the workaround for VERSION already present there. 1095838 4 250842 cgarcia 2015-05-18 23:14:39 -0700 Comment on attachment 250842 Work around name conflicts (NO_ERROR) View in context: https://bugs.webkit.org/attachment.cgi?id=250842&action=review I don't understand why the workaround needs to be duplicated, but LRN confirmed it doesn't build otherwise. > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:88 > +#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS)) I'll remove the QT thing before landing 1095840 5 cgarcia 2015-05-18 23:15:37 -0700 Committed to 2.4 http://trac.webkit.org/changeset/184545 250814 2015-04-15 10:08:52 -0700 2015-04-15 13:15:15 -0700 Work around name conflicts (NO_ERROR) Work-around-name-conflicts-NOERROR.patch text/plain 6174 lrn1986 RnJvbSBhM2FjNjhhMmFlMTVmZGYzNjBiNDdjNjhjMTVhNDg3NGRkOWIzMWYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/PUQwPUEwPUQxPTgzPUQxPTgxPUQwPUJCPUQw PUIwPUQwPUJEPTIwPUQwPTk4PUQwPUI2PUQwPUIxPz0KID0/VVRGLTg/cT89RDE9ODM9RDA9QkI9 RDA9QjA9RDE9ODI9RDA9QkU9RDA9QjI/PSA8bHJuMTk4NkBnbWFpbC5jb20+CkRhdGU6IFR1ZSwg MTQgQXByIDIwMTUgMTA6NTc6NDEgKzAwMDAKU3ViamVjdDogW1BBVENIXSBXb3JrIGFyb3VuZCBu YW1lIGNvbmZsaWN0cyAoTk9fRVJST1IpCgpJbiBmaWxlIGluY2x1ZGVkIGZyb20gL21pbmd3L2lu Y2x1ZGUvX21pbmd3Lmg6MTI6MCwKICAgICAgICAgICAgICAgICBmcm9tIC4uL3dlYmtpdGd0ay0y LjQuOC9Tb3VyY2UvV1RGL3d0Zi9Db21waWxlci5oOjkzLAogICAgICAgICAgICAgICAgIGZyb20g Li4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmg6MzIsCiAgICAgICAg ICAgICAgICAgZnJvbSAuLi93ZWJraXRndGstMi40LjgvU291cmNlL0phdmFTY3JpcHRDb3JlL2Nv bmZpZy5oOjMwLAogICAgICAgICAgICAgICAgIGZyb20gLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21t b24uY3BwOjI3OgouLi93ZWJraXRndGstMi40LjgvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHA6IEluIG1lbWJlciBmdW5j dGlvbiAndmlydHVhbCBpbnQgV2ViQ29yZTo6RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uOjpnZXRH cmFwaGljc1Jlc2V0U3RhdHVzQVJCKCknOgouLi93ZWJraXRndGstMi40LjgvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHA6 MTQ0OjMxOiBlcnJvcjogZXhwZWN0ZWQgdW5xdWFsaWZpZWQtaWQgYmVmb3JlIG51bWVyaWMgY29u c3RhbnQKICAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VSUk9SOwoKYmVjYXVzZSBO T19FUlJPUiBpcyBhbHNvIGEgbWFjcm8gZGVmaW5lZCBpbiBXaW5kb3dzIGhlYWRlcnMuIE91Y2gu CkFsc28gZXhwYW5kIHRoaXMgdG8gdGhlIChQTEFURk9STShHVEspICYmIE9TKFdJTkRPV1MpKSBj b21iaW5hdGlvbiwKaW4gYWRkaXRpb24gdG8gdGhlIHdvcmthcm91bmQgZm9yIFZFUlNJT04gYWxy ZWFkeSBwcmVzZW50IHRoZXJlLgoKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0Mzc2OAotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgMjkgKysrKysrKysrKysrKysrKysrKysrKwogLi4uL1dlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCAgfCAgOCArKysrKysKIC4uLi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmggIHwgIDYgKysrLS0KIC4uLi9n cmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmNwcCAgIHwgIDQgKysrCiAu Li4vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmNwcCB8ICA0ICsr KwogNSBmaWxlcyBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAwMDJiZWI3Li4xZmM4N2QzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzQgQEAK IDIwMTUtMDQtMTUgINCg0YPRgdC70LDQvSDQmNC20LHRg9C70LDRgtC+0LIgIDxscm4xOTg2QGdt YWlsLmNvbT4KIAorICAgICAgICBXb3JrIGFyb3VuZCBuYW1lIGNvbmZsaWN0cyAoTk9fRVJST1Ip CisKKyAgICAgICAgSW4gZmlsZSBpbmNsdWRlZCBmcm9tIC9taW5ndy9pbmNsdWRlL19taW5ndy5o OjEyOjAsCisgICAgICAgICAgICAgICAgICAgICAgICAgZnJvbSAuLi93ZWJraXRndGstMi40Ljgv U291cmNlL1dURi93dGYvQ29tcGlsZXIuaDo5MywKKyAgICAgICAgICAgICAgICAgICAgICAgICBm cm9tIC4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oOjMyLAorICAg ICAgICAgICAgICAgICAgICAgICAgIGZyb20gLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9jb25maWcuaDozMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICBmcm9tIC4u L3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wv RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmNwcDoyNzoKKyAgICAgICAgLi4vd2Via2l0Z3RrLTIu NC44L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RP cGVuR0xDb21tb24uY3BwOiBJbiBtZW1iZXIgZnVuY3Rpb24gJ3ZpcnR1YWwgaW50IFdlYkNvcmU6 OkV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbjo6Z2V0R3JhcGhpY3NSZXNldFN0YXR1c0FSQigpJzoK KyAgICAgICAgLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uY3BwOjE0NDozMTogZXJyb3I6IGV4 cGVjdGVkIHVucXVhbGlmaWVkLWlkIGJlZm9yZSBudW1lcmljIGNvbnN0YW50CisgICAgICAgICAg ICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDNEOjpOT19FUlJPUjsKKworICAgICAgICBiZWNhdXNl IE5PX0VSUk9SIGlzIGFsc28gYSBtYWNybyBkZWZpbmVkIGluIFdpbmRvd3MgaGVhZGVycy4gT3Vj aC4KKyAgICAgICAgQWxzbyBleHBhbmQgdGhpcyB0byB0aGUgKFBMQVRGT1JNKEdUSykgJiYgT1Mo V0lORE9XUykpIGNvbWJpbmF0aW9uLAorICAgICAgICBpbiBhZGRpdGlvbiB0byB0aGUgd29ya2Fy b3VuZCBmb3IgVkVSU0lPTiBhbHJlYWR5IHByZXNlbnQgdGhlcmUuCisKKyAgICAgICAgW1czMl1b R1RLXSBDb25mbGljdCBiZXR3ZWVuIE5PX0VSUk9SIGZyb20gVzMyQVBJIGFuZCBHcmFwaGljc0Nv bnRleHQzRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQzNzY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRl cmluZ0NvbnRleHQuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dDNELmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMz RE9wZW5HTENvbW1vbi5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmNwcDoKKworMjAxNS0wNC0xNSAg0KDRg9GB0LvQsNC9 INCY0LbQsdGD0LvQsNGC0L7QsiAgPGxybjE5ODZAZ21haWwuY29tPgorCiAgICAgICAgIEVuc3Vy ZSB0aGF0IGdlbmVyYXRvci1zY3JpcHRzIGdldCBDQyBmcm9tIGNvbmZpZ3VyZQogCiAgICAgICAg IFZhcmlvdXMgc2NyaXB0cyBjaGVjayB0aGUgQ0MgZW52aXJvbm1lbnQgdmFyaWFibGUgdG8gZ2V0 IHRoZSBjb21waWxlciB0bwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXggZmE1NTM3Yi4uNzU4YWJlYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3Bw CkBAIC04NSw2ICs4NSwxNCBAQAogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNs dWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKKyNpZiBQTEFURk9STShXSU4pIHx8IChQ TEFURk9STShRVCkgJiYgT1MoV0lORE9XUykpIHx8IChQTEFURk9STShHVEspICYmIE9TKFdJTkRP V1MpKQorI3VuZGVmIE5PX0VSUk9SCisjZW5kaWYKKworI2lmIFBMQVRGT1JNKEdUSykKKyN1bmRl ZiBWRVJTSU9OCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjb25zdCBkb3VibGUg c2Vjb25kc0JldHdlZW5SZXN0b3JlQXR0ZW1wdHMgPSAxLjA7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAppbmRleCA3MDVjMzI3 Li5kZTUzYjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dDNELmgKQEAgLTQzLDkgKzQzLDExIEBACiAjZW5kaWYKIAogLy8gRklY TUU6IEZpbmQgYSBiZXR0ZXIgd2F5IHRvIGF2b2lkIHRoZSBuYW1lIGNvbmZsaWN0aW9uIGZvciBO T19FUlJPUi4KLSNpZiBQTEFURk9STShXSU4pCisjaWYgUExBVEZPUk0oV0lOKSB8fCAoUExBVEZP Uk0oUVQpICYmIE9TKFdJTkRPV1MpKSB8fCAoUExBVEZPUk0oR1RLKSAmJiBPUyhXSU5ET1dTKSkK ICN1bmRlZiBOT19FUlJPUgotI2VsaWYgUExBVEZPUk0oR1RLKQorI2VuZGlmCisKKyNpZiBQTEFU Rk9STShHVEspCiAvLyBUaGlzIGRlZmluZSBpcyBmcm9tIHRoZSBYMTEgaGVhZGVycywgYnV0IGl0 J3MgdXNlZCBiZWxvdywgc28gd2UgbXVzdCB1bmRlZmluZSBpdC4KICN1bmRlZiBWRVJTSU9OCiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5n bC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKaW5kZXggZjE3MTNk OC4uM2JkMmI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKQEAg LTQ5LDYgKzQ5LDEwIEBACiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4KICNpbmNsdWRlIDx3 dGYvVmVjdG9yLmg+CiAKKyNpZiBQTEFURk9STShXSU4pIHx8IChQTEFURk9STShRVCkgJiYgT1Mo V0lORE9XUykpIHx8IChQTEFURk9STShHVEspICYmIE9TKFdJTkRPV1MpKQorI3VuZGVmIE5PX0VS Uk9SCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBFeHRlbnNpb25zM0RPcGVuR0xD b21tb246OkV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbihHcmFwaGljc0NvbnRleHQzRCogY29udGV4 dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwCmluZGV4IGY0Yjlh N2UuLmQ4Y2FlYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmNw cApAQCAtMjksNiArMjksMTAgQEAKIAogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIu aD4KIAorI2lmIFBMQVRGT1JNKFdJTikgfHwgKFBMQVRGT1JNKFFUKSAmJiBPUyhXSU5ET1dTKSkg fHwgKFBMQVRGT1JNKEdUSykgJiYgT1MoV0lORE9XUykpCisjdW5kZWYgTk9fRVJST1IKKyNlbmRp ZgorCiAjZGVmaW5lIFNUUklOR0lGWSguLi4pICNfX1ZBX0FSR1NfXwogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7Ci0tIAoxLjguNS4z 250842 2015-04-15 13:15:15 -0700 2015-05-18 23:14:39 -0700 Work around name conflicts (NO_ERROR) Work-around-name-conflicts-NOERROR.patch text/plain 6144 lrn1986 RnJvbSBjYmNmYTEyZTE1YTExMDAxMWQxMTYzZjI0NDZiZDcxOWY1NjYwZWJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/PUQwPUEwPUQxPTgzPUQxPTgxPUQwPUJCPUQw PUIwPUQwPUJEPTIwPUQwPTk4PUQwPUI2PUQwPUIxPz0KID0/VVRGLTg/cT89RDE9ODM9RDA9QkI9 RDA9QjA9RDE9ODI9RDA9QkU9RDA9QjI/PSA8bHJuMTk4NkBnbWFpbC5jb20+CkRhdGU6IFR1ZSwg MTQgQXByIDIwMTUgMTA6NTc6NDEgKzAwMDAKU3ViamVjdDogW1BBVENIXSBXb3JrIGFyb3VuZCBu YW1lIGNvbmZsaWN0cyAoTk9fRVJST1IpCgpJbiBmaWxlIGluY2x1ZGVkIGZyb20gL21pbmd3L2lu Y2x1ZGUvX21pbmd3Lmg6MTI6MCwKICAgICAgICAgICAgICAgICBmcm9tIC4uL3dlYmtpdGd0ay0y LjQuOC9Tb3VyY2UvV1RGL3d0Zi9Db21waWxlci5oOjkzLAogICAgICAgICAgICAgICAgIGZyb20g Li4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmg6MzIsCiAgICAgICAg ICAgICAgICAgZnJvbSAuLi93ZWJraXRndGstMi40LjgvU291cmNlL0phdmFTY3JpcHRDb3JlL2Nv bmZpZy5oOjMwLAogICAgICAgICAgICAgICAgIGZyb20gLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21t b24uY3BwOjI3OgouLi93ZWJraXRndGstMi40LjgvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHA6IEluIG1lbWJlciBmdW5j dGlvbiAndmlydHVhbCBpbnQgV2ViQ29yZTo6RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uOjpnZXRH cmFwaGljc1Jlc2V0U3RhdHVzQVJCKCknOgouLi93ZWJraXRndGstMi40LjgvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHA6 MTQ0OjMxOiBlcnJvcjogZXhwZWN0ZWQgdW5xdWFsaWZpZWQtaWQgYmVmb3JlIG51bWVyaWMgY29u c3RhbnQKICAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0M0Q6Ok5PX0VSUk9SOwoKYmVjYXVzZSBO T19FUlJPUiBpcyBhbHNvIGEgbWFjcm8gZGVmaW5lZCBpbiBXaW5kb3dzIGhlYWRlcnMuIE91Y2gu CkFsc28gZXhwYW5kIHRoaXMgdG8gdGhlIChQTEFURk9STShHVEspICYmIE9TKFdJTkRPV1MpKSBj b21iaW5hdGlvbiwKaW4gYWRkaXRpb24gdG8gdGhlIHdvcmthcm91bmQgZm9yIFZFUlNJT04gYWxy ZWFkeSBwcmVzZW50IHRoZXJlLgoKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0Mzc2OAotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgMjcgKysrKysrKysrKysrKysrKysrKysrKwogLi4uL1dlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCAgfCAgOCArKysrKysrCiAuLi4vV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oICB8ICA2ICsrKy0tCiAuLi4v Z3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAgICB8ICA0ICsrKysK IC4uLi9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwIHwgIDQg KysrKwogNSBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NjZhYzU0Li40NDcxZmZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIg QEAKIDIwMTUtMDQtMTUgINCg0YPRgdC70LDQvSDQmNC20LHRg9C70LDRgtC+0LIgIDxscm4xOTg2 QGdtYWlsLmNvbT4KIAorICAgICAgICBXb3JrIGFyb3VuZCBuYW1lIGNvbmZsaWN0cyAoTk9fRVJS T1IpCisKKyAgICAgICAgSW4gZmlsZSBpbmNsdWRlZCBmcm9tIC9taW5ndy9pbmNsdWRlL19taW5n dy5oOjEyOjAsCisgICAgICAgICAgICAgICAgICAgICAgICAgZnJvbSAuLi93ZWJraXRndGstMi40 LjgvU291cmNlL1dURi93dGYvQ29tcGlsZXIuaDo5MywKKyAgICAgICAgICAgICAgICAgICAgICAg ICBmcm9tIC4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oOjMyLAor ICAgICAgICAgICAgICAgICAgICAgICAgIGZyb20gLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9jb25maWcuaDozMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICBmcm9t IC4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmNwcDoyNzoKKyAgICAgICAgLi4vd2Via2l0Z3Rr LTIuNC44L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25z M0RPcGVuR0xDb21tb24uY3BwOiBJbiBtZW1iZXIgZnVuY3Rpb24gJ3ZpcnR1YWwgaW50IFdlYkNv cmU6OkV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbjo6Z2V0R3JhcGhpY3NSZXNldFN0YXR1c0FSQigp JzoKKyAgICAgICAgLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uY3BwOjE0NDozMTogZXJyb3I6 IGV4cGVjdGVkIHVucXVhbGlmaWVkLWlkIGJlZm9yZSBudW1lcmljIGNvbnN0YW50CisgICAgICAg ICAgICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDNEOjpOT19FUlJPUjsKKworICAgICAgICBiZWNh dXNlIE5PX0VSUk9SIGlzIGFsc28gYSBtYWNybyBkZWZpbmVkIGluIFdpbmRvd3MgaGVhZGVycy4g T3VjaC4KKyAgICAgICAgQWxzbyBleHBhbmQgdGhpcyB0byB0aGUgKFBMQVRGT1JNKEdUSykgJiYg T1MoV0lORE9XUykpIGNvbWJpbmF0aW9uLAorICAgICAgICBpbiBhZGRpdGlvbiB0byB0aGUgd29y a2Fyb3VuZCBmb3IgVkVSU0lPTiBhbHJlYWR5IHByZXNlbnQgdGhlcmUuCisKKyAgICAgICAgW1cz Ml1bR1RLXSBDb25mbGljdCBiZXR3ZWVuIE5PX0VSUk9SIGZyb20gVzMyQVBJIGFuZCBHcmFwaGlj c0NvbnRleHQzRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQzNzY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHA6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmNwcDoK KworMjAxNS0wNC0xNSAg0KDRg9GB0LvQsNC9INCY0LbQsdGD0LvQsNGC0L7QsiAgPGxybjE5ODZA Z21haWwuY29tPgorCiAgICAgICAgIEVuc3VyZSB0aGF0IGdlbmVyYXRvci1zY3JpcHRzIGdldCBD QyBmcm9tIGNvbmZpZ3VyZQogCiAgICAgICAgIFZhcmlvdXMgc2NyaXB0cyBjaGVjayB0aGUgQ0Mg ZW52aXJvbm1lbnQgdmFyaWFibGUgdG8gZ2V0IHRoZSBjb21waWxlciB0bwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXgg ZmE1NTM3Yi4uNzU4YWJlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC04NSw2ICs4NSwxNCBAQAogI2luY2x1ZGUg PHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+ CiAKKyNpZiBQTEFURk9STShXSU4pIHx8IChQTEFURk9STShRVCkgJiYgT1MoV0lORE9XUykpIHx8 IChQTEFURk9STShHVEspICYmIE9TKFdJTkRPV1MpKQorI3VuZGVmIE5PX0VSUk9SCisjZW5kaWYK KworI2lmIFBMQVRGT1JNKEdUSykKKyN1bmRlZiBWRVJTSU9OCisjZW5kaWYKKwogbmFtZXNwYWNl IFdlYkNvcmUgewogCiBjb25zdCBkb3VibGUgc2Vjb25kc0JldHdlZW5SZXN0b3JlQXR0ZW1wdHMg PSAxLjA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQzRC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhp Y3NDb250ZXh0M0QuaAppbmRleCA3MDVjMzI3Li5kZTUzYjA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKQEAgLTQzLDkg KzQzLDExIEBACiAjZW5kaWYKIAogLy8gRklYTUU6IEZpbmQgYSBiZXR0ZXIgd2F5IHRvIGF2b2lk IHRoZSBuYW1lIGNvbmZsaWN0aW9uIGZvciBOT19FUlJPUi4KLSNpZiBQTEFURk9STShXSU4pCisj aWYgUExBVEZPUk0oV0lOKSB8fCAoUExBVEZPUk0oUVQpICYmIE9TKFdJTkRPV1MpKSB8fCAoUExB VEZPUk0oR1RLKSAmJiBPUyhXSU5ET1dTKSkKICN1bmRlZiBOT19FUlJPUgotI2VsaWYgUExBVEZP Uk0oR1RLKQorI2VuZGlmCisKKyNpZiBQTEFURk9STShHVEspCiAvLyBUaGlzIGRlZmluZSBpcyBm cm9tIHRoZSBYMTEgaGVhZGVycywgYnV0IGl0J3MgdXNlZCBiZWxvdywgc28gd2UgbXVzdCB1bmRl ZmluZSBpdC4KICN1bmRlZiBWRVJTSU9OCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9w ZW5HTENvbW1vbi5jcHAKaW5kZXggZjE3MTNkOC4uM2JkMmI3MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1v bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVu c2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKQEAgLTQ5LDYgKzQ5LDEwIEBACiAjaW5jbHVkZSA8d3Rm L01haW5UaHJlYWQuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKKyNpZiBQTEFURk9STShX SU4pIHx8IChQTEFURk9STShRVCkgJiYgT1MoV0lORE9XUykpIHx8IChQTEFURk9STShHVEspICYm IE9TKFdJTkRPV1MpKQorI3VuZGVmIE5PX0VSUk9SCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNv cmUgewogCiBFeHRlbnNpb25zM0RPcGVuR0xDb21tb246OkV4dGVuc2lvbnMzRE9wZW5HTENvbW1v bihHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNo YWRlclByb2dyYW0uY3BwCmluZGV4IGY0YjlhN2UuLmQ4Y2FlYWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyUHJv Z3JhbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmNwcApAQCAtMjksNiArMjksMTAgQEAKIAogI2luY2x1 ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KIAorI2lmIFBMQVRGT1JNKFdJTikgfHwgKFBM QVRGT1JNKFFUKSAmJiBPUyhXSU5ET1dTKSkgfHwgKFBMQVRGT1JNKEdUSykgJiYgT1MoV0lORE9X UykpCisjdW5kZWYgTk9fRVJST1IKKyNlbmRpZgorCiAjZGVmaW5lIFNUUklOR0lGWSguLi4pICNf X1ZBX0FSR1NfXwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7Ci0tIAoxLjguNS4z