44069 2010-08-16 13:07:53 -0700 [GTK] Clean up WebCore/platform/graphics/gtk/ImageGtk.cpp 2010-08-17 12:46:01 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned abarth eric gustavo webkit.review.bot xan.lopez oldest_to_newest 265208 0 mrobinson 2010-08-16 13:07:53 -0700 There are a good number of style violations in ImageGtk.cpp as well as some general badness. 265218 1 64516 mrobinson 2010-08-16 13:42:04 -0700 Created attachment 64516 Cleanup patch 265255 2 webkit.review.bot 2010-08-16 15:14:54 -0700 Attachment 64516 did not build on gtk: Build output: http://queues.webkit.org/results/3756311 265276 3 64530 mrobinson 2010-08-16 16:08:15 -0700 Created attachment 64530 Patch with build fixes 265293 4 64530 gustavo 2010-08-16 16:31:56 -0700 Comment on attachment 64530 Patch with build fixes WebCore/platform/graphics/gtk/ImageGtk.cpp:58 + if (!GetModuleFileName(hmodule, (CHAR *) dataDirectory, sizeof(retval) - 10)) Should this (CHAR *) be turned into a static_cast<CHAR*>(dataDirectory) for greater style guide followage? WebCore/platform/graphics/gtk/ImageGtk.cpp:141 + GOwnPtr<gchar> glibFileName(g_build_filename(getWebKitDataDirectory(), "webkit-1.0", "images", imageName.get(), NULL)); Data directories should follow the "soname" of the library. We have done it in InspectoClientGtk: http://trac.webkit.org/browser/trunk/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp#L90 Can you then also please change WebCore/GNUmakefile.am to add 'gtk' after 'webkit' here? You'll notice the inspector one is already correct, but we missed images =(: http://trac.webkit.org/browser/trunk/WebCore/GNUmakefile.am#L4575 As we discussed on IRC, it would be great to move the getWebKitDataDirectory function to, say, FileSystemGtk, and then use it in InspectorClient as well, so it starts actually working on Windows heh. Let's follow up on that later! 265682 5 mrobinson 2010-08-17 12:00:35 -0700 Committed r65529: <http://trac.webkit.org/changeset/65529> 265704 6 webkit.review.bot 2010-08-17 12:46:01 -0700 http://trac.webkit.org/changeset/65529 might have broken GTK Linux 64-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/65529 http://trac.webkit.org/changeset/65530 64516 2010-08-16 13:42:04 -0700 2010-08-16 16:08:12 -0700 Cleanup patch bug-44069-20100816134202.patch text/plain 5299 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTYzZjZjNWIxMzdmODI4N2NmY2MxNzFhOTgyMjFjYjA0NTc3YzhjNy4uNmM2MmM0MzA0OWUwODhk MDRiYmI3ZjRhOTNkYzAyYmRkMTBjNzZhZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wOC0xNiAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ2xlYW4gdXAgV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDA2OQorCisgICAgICAgIENsZWFuIHVwIHRoZSBXaW4z MiBzcGVjaWZpYyBjb2RlIGluIEltYWdlR3RrLmNwcCBhbmQgbW92ZSBhIHRlbXBsYXRlCisgICAg ICAgIHNwZWNpYWxpemF0aW9uIHRvIHRoZSBwcm9wZXIgZmlsZS4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHA6CisgICAgICAgIChnZXRXZWJLaXREYXRhRGly ZWN0b3J5KTogQWRkZWQgdGhpcyBoZWxwZXIuCisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6bG9h ZFBsYXRmb3JtUmVzb3VyY2UpOiBVc2UgR093blB0ciBmb3IgZ2NoYXIgcG9pbnRlcnMKKyAgICAg ICAgYW5kIHVzZSB0aGUgbmV3IGdldFdlYktpdERhdGFEaXJlY3RvcnkgaGVscGVyLgorICAgICAg ICAqIHBsYXRmb3JtL2d0ay9HT3duUHRyR3RrLmNwcDogTW92ZSB0aGUgR3RrSWNvbkluZm8gdGVt cGxhdGUgc3BlY2lhbGl6YXRpb24gdG8gdGhpcyBmaWxlLgorICAgICAgICAoV1RGOjpHdGtJY29u SW5mbyk6IEFkZGVkIHRoaXMgZm9yd2FyZCBkZWNsYXJhdGlvbi4KKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvR093blB0ckd0ay5oOiBEZWNsYXJhdGlvbiBmb3IgbmV3IHRlbXBsYXRlIHNwZWNpYWxp emF0aW9uLgorCiAyMDEwLTA4LTE2ICBQYXVsIFNhd2F5YSAgPHBzYXdheWFAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IENocmlzIE1hcnJpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3RrL0ltYWdlR3RrLmNwcAppbmRleCAzMGRiNmQ3MDcwOTRkMGVmZjg2YWFjY2FlNjMx MTBhNGYyMzMwMjQyLi42MGNkYmE1NTI1ODE2ZDg4YmYwZDE4ZDVmYWQ3ZTQ4NjA5ODRkMzlmIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwCkBAIC0yNyw1MyAr MjcsNDAgQEAKIAogI2luY2x1ZGUgIkJpdG1hcEltYWdlLmgiCiAjaW5jbHVkZSAiQ2Fpcm9VdGls aXRpZXMuaCIKLSNpbmNsdWRlICJHT3duUHRyLmgiCisjaW5jbHVkZSAiR093blB0ckd0ay5oIgog I2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K ICNpbmNsdWRlIDxjYWlyby5oPgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAotI2lmZGVmIF9XSU4z MgotIyAgaW5jbHVkZSA8bWJzdHJpbmcuaD4KLSMgIGluY2x1ZGUgPHNobG9iai5oPgotLyogc2Vh cmNoIGZvciBkYXRhIHJlbGF0aXZlIHRvIHdoZXJlIHdlIGFyZSBpbnN0YWxsZWQgKi8KKyNpZiBQ TEFURk9STShXSU4pCisjaW5jbHVkZSA8bWJzdHJpbmcuaD4KKyNpbmNsdWRlIDxzaGxvYmouaD4K IAogc3RhdGljIEhNT0RVTEUgaG1vZHVsZTsKIAotI2lmZGVmIF9fY3BsdXNwbHVzCiBleHRlcm4g IkMiIHsKLSNlbmRpZgotQk9PTCBXSU5BUEkKLURsbE1haW4oSElOU1RBTkNFIGhpbnN0RExMLAot ICAgIERXT1JEICAgICBmZHdSZWFzb24sCi0gICAgTFBWT0lEICAgIGxwdlJlc2VydmVkKQorQk9P TCBXSU5BUEkgRGxsTWFpbihISU5TVEFOQ0UgaGluc3RETEwsIERXT1JEIGZkd1JlYXNvbiwgTFBW T0lEIGxwdlJlc2VydmVkKQogewotICAgIHN3aXRjaCAoZmR3UmVhc29uKSB7Ci0gICAgY2FzZSBE TExfUFJPQ0VTU19BVFRBQ0g6CisgICAgaWYgKGZkd1JlYXNvbiA9PSBETExfUFJPQ0VTU19BVFRB Q0gpCiAgICAgICAgIGhtb2R1bGUgPSBoaW5zdERMTDsKLSAgICAgICAgYnJlYWs7Ci0gICAgfQot CiAgICAgcmV0dXJuIFRSVUU7CiB9Ci0jaWZkZWYgX19jcGx1c3BsdXMKIH0KLSNlbmRpZgogCi1z dGF0aWMgY2hhciAqCi1nZXRfd2Via2l0X2RhdGFkaXIodm9pZCkKK3N0YXRpYyBjaGFyKiBnZXRX ZWJLaXREYXRhRGlyZWN0b3J5KCkKIHsKLSAgICBzdGF0aWMgY2hhciByZXR2YWxbMTAwMF07Ci0g ICAgc3RhdGljIGludCBiZWVuaGVyZSA9IDA7Ci0KLSAgICB1bnNpZ25lZCBjaGFyICpwOwotCi0g ICAgaWYgKGJlZW5oZXJlKQotICAgICAgICByZXR1cm4gcmV0dmFsOworICAgIHN0YXRpYyBjaGFy KiBkYXRhRGlyZWN0b3J5ID0gMDsKKyAgICBpZiAoZGF0YURpcmVjdG9yeSkKKyAgICAgICAgcmV0 dXJuIGRhdGFEaXJlY3Rvcnk7CiAKLSAgICBpZiAoIUdldE1vZHVsZUZpbGVOYW1lIChobW9kdWxl LCAoQ0hBUiAqKSByZXR2YWwsIHNpemVvZihyZXR2YWwpIC0gMTApKQorICAgIGRhdGFEaXJlY3Rv cnkgPSBuZXcgY2hhcltQQVRIX01BWF07CisgICAgaWYgKCFHZXRNb2R1bGVGaWxlTmFtZShobW9k dWxlLCAoQ0hBUiAqKSBkYXRhRGlyZWN0b3J5LCBzaXplb2YocmV0dmFsKSAtIDEwKSkKICAgICAg ICAgcmV0dXJuIERBVEFfRElSOwogCisgICAgLy8gRklYTUU6IFRoaXMgaXMgcHJldHR5IHVnbHku IElkZWFsbHkgd2Ugc2hvdWxkIGJlIHVzaW5nIFdpbmRvd3MgQVBJCisgICAgLy8gZnVuY3Rpb25z IG9yIEdMaWIgbWV0aG9kcyB0byBjYWxjdWxhdGUgcGF0aHMuCisgICAgdW5zaWduZWQgY2hhciAq cDsKICAgICBwID0gX21ic3JjaHIoKGNvbnN0IHVuc2lnbmVkIGNoYXIgKikgcmV0dmFsLCAnXFwn KTsKICAgICAqcCA9ICdcMCc7CiAgICAgcCA9IF9tYnNyY2hyKChjb25zdCB1bnNpZ25lZCBjaGFy ICopIHJldHZhbCwgJ1xcJyk7CkBAIC04MywyNSArNzAsMTcgQEAgZ2V0X3dlYmtpdF9kYXRhZGly KHZvaWQpCiAgICAgfQogICAgIHN0cmNhdChyZXR2YWwsICJcXHNoYXJlIik7CiAKLSAgICBiZWVu aGVyZSA9IDE7Ci0KLSAgICByZXR1cm4gcmV0dmFsOworICAgIHJldHVybiBkYXRhRGlyZWN0b3J5 OwogfQogCi0jdW5kZWYgREFUQV9ESVIKLSNkZWZpbmUgREFUQV9ESVIgZ2V0X3dlYmtpdF9kYXRh ZGlyICgpCi0jZW5kaWYKLQorI2Vsc2UKIAotbmFtZXNwYWNlIFdURiB7Ci0KLXRlbXBsYXRlIDw+ IHZvaWQgZnJlZU93bmVkR1B0cjxHdGtJY29uSW5mbz4oR3RrSWNvbkluZm8qIGluZm8pCitzdGF0 aWMgY2hhciogZ2V0V2ViS2l0RGF0YURpcmVjdG9yeSgpCiB7Ci0gICAgaWYgKGluZm8pCi0gICAg ICAgIGd0a19pY29uX2luZm9fZnJlZShpbmZvKTsKKyAgICByZXR1cm4gREFUQV9ESVI7CiB9CiAK LX0KKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTE1OCwxMSArMTM3LDkgQEAg UGFzc1JlZlB0cjxJbWFnZT4gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGNvbnN0IGNoYXIq IG5hbWUpCiAgICAgaWYgKCFzdHJjbXAoIm1pc3NpbmdJbWFnZSIsIG5hbWUpKQogICAgICAgICBm aWxlTmFtZSA9IGdldFRoZW1lSWNvbkZpbGVOYW1lKEdUS19TVE9DS19NSVNTSU5HX0lNQUdFLCAx Nik7CiAgICAgaWYgKGZpbGVOYW1lLmlzTnVsbCgpKSB7Ci0gICAgICAgIGdjaGFyKiBpbWFnZW5h bWUgPSBnX3N0cmR1cF9wcmludGYoIiVzLnBuZyIsIG5hbWUpOwotICAgICAgICBnY2hhciogZ2xp YkZpbGVOYW1lID0gZ19idWlsZF9maWxlbmFtZShEQVRBX0RJUiwgIndlYmtpdC0xLjAiLCAiaW1h Z2VzIiwgaW1hZ2VuYW1lLCBOVUxMKTsKKyAgICAgICAgR093blB0cjxnY2hhcj4gaW1hZ2VuYW1l KGdfc3RyZHVwX3ByaW50ZigiJXMucG5nIiwgbmFtZSkpOworICAgICAgICBHT3duUHRyPGdjaGFy PiBnbGliRmlsZU5hbWUoZ19idWlsZF9maWxlbmFtZShnZXRXZWJLaXREYXRhRGlyZWN0b3J5KCks ICJ3ZWJraXQtMS4wIiwgImltYWdlcyIsIGltYWdlbmFtZSwgTlVMTCkpOwogICAgICAgICBmaWxl TmFtZSA9IGdsaWJGaWxlTmFtZTsKLSAgICAgICAgZ19mcmVlKGltYWdlbmFtZSk7Ci0gICAgICAg IGdfZnJlZShnbGliRmlsZU5hbWUpOwogICAgIH0KIAogICAgIHJldHVybiBsb2FkSW1hZ2VGcm9t RmlsZShmaWxlTmFtZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HT3duUHRy R3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJHdGsuY3BwCmluZGV4IDA1NThm MzMyYjUzOGM3OWJhNDE0Mzk5NzRkNDFhNmQ0MGQyODI0ZDAuLjZlZmFhMDhiZGUyZWJjNmNmMDQ0 M2NhYzc5NDVhZDk1MWQ1MTllMGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dP d25QdHJHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJHdGsuY3BwCkBA IC0zMCw0ICszMCwxMCBAQCB0ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8R2RrRXZlbnQ+ KEdka0V2ZW50KiBwdHIpCiAgICAgICAgIGdka19ldmVudF9mcmVlKHB0cik7CiB9CiAKK3RlbXBs YXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxHdGtJY29uSW5mbz4oR3RrSWNvbkluZm8qIGluZm8p Cit7CisgICAgaWYgKGluZm8pCisgICAgICAgIGd0a19pY29uX2luZm9fZnJlZShpbmZvKTsKK30K KwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR093blB0ckd0ay5oIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR093blB0ckd0ay5oCmluZGV4IDY3NGVhNTg3ZGFkOGE3ZjljZmZj YTI1Y2NhNGE1ZjkyYWM3M2I0OGMuLmJjZmQxYjZiYjI2YWJhMWRlMmI3MGMxY2YzYTM2MjY4NDVl ODJiMTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJHdGsuaAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HT3duUHRyR3RrLmgKQEAgLTI2LDcgKzI2LDggQEAgdHlw ZWRlZiB1bmlvbiBfR2RrRXZlbnQgR2RrRXZlbnQ7CiAKIG5hbWVzcGFjZSBXVEYgewogCi10ZW1w bGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHZGtFdmVudD4oR2RrRXZlbnQqKTsKK3RlbXBsYXRl IDw+IHZvaWQgZnJlZU93bmVkR1B0cjxHZGtFdmVudD4oR2RrRXZlbnQqKTsKK3RlbXBsYXRlIDw+ IHZvaWQgZnJlZU93bmVkR1B0cjxHdGtJY29uSW5mbz4oR3RrSWNvbkluZm8qKTsKIAogfQogCg== 64530 2010-08-16 16:08:15 -0700 2010-08-16 16:31:56 -0700 Patch with build fixes bug-44069-20100816160812.patch text/plain 5584 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODdjZGFkZDAxYTI3OTYyODFhNDYzNTI3MzFkMGEyODk3ZGMyODYxMy4uYzc2NTdlMDNlMDFmODk0 ZDg3YWQ1ZGI5NjY3OTRlNzNiYmFmZjI2YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wOC0xNiAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gQ2xlYW4gdXAgV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDA2OQorCisgICAgICAgIENsZWFuIHVwIHRoZSBXaW4z MiBzcGVjaWZpYyBjb2RlIGluIEltYWdlR3RrLmNwcCBhbmQgbW92ZSBhIHRlbXBsYXRlCisgICAg ICAgIHNwZWNpYWxpemF0aW9uIHRvIHRoZSBwcm9wZXIgZmlsZS4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHA6CisgICAgICAgIChnZXRXZWJLaXREYXRhRGly ZWN0b3J5KTogQWRkZWQgdGhpcyBoZWxwZXIuCisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6bG9h ZFBsYXRmb3JtUmVzb3VyY2UpOiBVc2UgR093blB0ciBmb3IgZ2NoYXIgcG9pbnRlcnMKKyAgICAg ICAgYW5kIHVzZSB0aGUgbmV3IGdldFdlYktpdERhdGFEaXJlY3RvcnkgaGVscGVyLgorICAgICAg ICAqIHBsYXRmb3JtL2d0ay9HT3duUHRyR3RrLmNwcDogTW92ZSB0aGUgR3RrSWNvbkluZm8gdGVt cGxhdGUgc3BlY2lhbGl6YXRpb24gdG8gdGhpcyBmaWxlLgorICAgICAgICAoV1RGOjpHdGtJY29u SW5mbyk6IEFkZGVkIHRoaXMgZm9yd2FyZCBkZWNsYXJhdGlvbi4KKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvR093blB0ckd0ay5oOiBEZWNsYXJhdGlvbiBmb3IgbmV3IHRlbXBsYXRlIHNwZWNpYWxp emF0aW9uLgorCiAyMDEwLTA4LTE2ICBWaW5jZW50IFNjaGVpYiAgPHNjaGVpYkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwCmluZGV4IDMwZGI2ZDcwNzA5NGQwZWZmODZh YWNjYWU2MzExMGE0ZjIzMzAyNDIuLjI4ZDA1MTU5MDQxMmI3ZTQwYWFkZmU4ODUwMjc1YTkzOWE3 ZWM0NGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3Rr LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHAKQEAg LTI3LDUzICsyNyw0MCBAQAogCiAjaW5jbHVkZSAiQml0bWFwSW1hZ2UuaCIKICNpbmNsdWRlICJD YWlyb1V0aWxpdGllcy5oIgotI2luY2x1ZGUgIkdPd25QdHIuaCIKKyNpbmNsdWRlICJHT3duUHRy R3RrLmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0 cmluZy5oPgogI2luY2x1ZGUgPGNhaXJvLmg+CiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogCi0jaWZk ZWYgX1dJTjMyCi0jICBpbmNsdWRlIDxtYnN0cmluZy5oPgotIyAgaW5jbHVkZSA8c2hsb2JqLmg+ Ci0vKiBzZWFyY2ggZm9yIGRhdGEgcmVsYXRpdmUgdG8gd2hlcmUgd2UgYXJlIGluc3RhbGxlZCAq LworI2lmIFBMQVRGT1JNKFdJTikKKyNpbmNsdWRlIDxtYnN0cmluZy5oPgorI2luY2x1ZGUgPHNo bG9iai5oPgogCiBzdGF0aWMgSE1PRFVMRSBobW9kdWxlOwogCi0jaWZkZWYgX19jcGx1c3BsdXMK IGV4dGVybiAiQyIgewotI2VuZGlmCi1CT09MIFdJTkFQSQotRGxsTWFpbihISU5TVEFOQ0UgaGlu c3RETEwsCi0gICAgRFdPUkQgICAgIGZkd1JlYXNvbiwKLSAgICBMUFZPSUQgICAgbHB2UmVzZXJ2 ZWQpCitCT09MIFdJTkFQSSBEbGxNYWluKEhJTlNUQU5DRSBoaW5zdERMTCwgRFdPUkQgZmR3UmVh c29uLCBMUFZPSUQgbHB2UmVzZXJ2ZWQpCiB7Ci0gICAgc3dpdGNoIChmZHdSZWFzb24pIHsKLSAg ICBjYXNlIERMTF9QUk9DRVNTX0FUVEFDSDoKKyAgICBpZiAoZmR3UmVhc29uID09IERMTF9QUk9D RVNTX0FUVEFDSCkKICAgICAgICAgaG1vZHVsZSA9IGhpbnN0RExMOwotICAgICAgICBicmVhazsK LSAgICB9Ci0KICAgICByZXR1cm4gVFJVRTsKIH0KLSNpZmRlZiBfX2NwbHVzcGx1cwogfQotI2Vu ZGlmCiAKLXN0YXRpYyBjaGFyICoKLWdldF93ZWJraXRfZGF0YWRpcih2b2lkKQorc3RhdGljIGNv bnN0IGNoYXIqIGdldFdlYktpdERhdGFEaXJlY3RvcnkoKQogewotICAgIHN0YXRpYyBjaGFyIHJl dHZhbFsxMDAwXTsKLSAgICBzdGF0aWMgaW50IGJlZW5oZXJlID0gMDsKLQotICAgIHVuc2lnbmVk IGNoYXIgKnA7Ci0KLSAgICBpZiAoYmVlbmhlcmUpCi0gICAgICAgIHJldHVybiByZXR2YWw7Cisg ICAgc3RhdGljIGNoYXIqIGRhdGFEaXJlY3RvcnkgPSAwOworICAgIGlmIChkYXRhRGlyZWN0b3J5 KQorICAgICAgICByZXR1cm4gZGF0YURpcmVjdG9yeTsKIAotICAgIGlmICghR2V0TW9kdWxlRmls ZU5hbWUgKGhtb2R1bGUsIChDSEFSICopIHJldHZhbCwgc2l6ZW9mKHJldHZhbCkgLSAxMCkpCisg ICAgZGF0YURpcmVjdG9yeSA9IG5ldyBjaGFyW1BBVEhfTUFYXTsKKyAgICBpZiAoIUdldE1vZHVs ZUZpbGVOYW1lKGhtb2R1bGUsIChDSEFSICopIGRhdGFEaXJlY3RvcnksIHNpemVvZihyZXR2YWwp IC0gMTApKQogICAgICAgICByZXR1cm4gREFUQV9ESVI7CiAKKyAgICAvLyBGSVhNRTogVGhpcyBp cyBwcmV0dHkgdWdseS4gSWRlYWxseSB3ZSBzaG91bGQgYmUgdXNpbmcgV2luZG93cyBBUEkKKyAg ICAvLyBmdW5jdGlvbnMgb3IgR0xpYiBtZXRob2RzIHRvIGNhbGN1bGF0ZSBwYXRocy4KKyAgICB1 bnNpZ25lZCBjaGFyICpwOwogICAgIHAgPSBfbWJzcmNocigoY29uc3QgdW5zaWduZWQgY2hhciAq KSByZXR2YWwsICdcXCcpOwogICAgICpwID0gJ1wwJzsKICAgICBwID0gX21ic3JjaHIoKGNvbnN0 IHVuc2lnbmVkIGNoYXIgKikgcmV0dmFsLCAnXFwnKTsKQEAgLTgzLDI1ICs3MCwxNyBAQCBnZXRf d2Via2l0X2RhdGFkaXIodm9pZCkKICAgICB9CiAgICAgc3RyY2F0KHJldHZhbCwgIlxcc2hhcmUi KTsKIAotICAgIGJlZW5oZXJlID0gMTsKLQotICAgIHJldHVybiByZXR2YWw7CisgICAgcmV0dXJu IGRhdGFEaXJlY3Rvcnk7CiB9CiAKLSN1bmRlZiBEQVRBX0RJUgotI2RlZmluZSBEQVRBX0RJUiBn ZXRfd2Via2l0X2RhdGFkaXIgKCkKLSNlbmRpZgotCisjZWxzZQogCi1uYW1lc3BhY2UgV1RGIHsK LQotdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRHUHRyPEd0a0ljb25JbmZvPihHdGtJY29uSW5m byogaW5mbykKK3N0YXRpYyBjb25zdCBjaGFyKiBnZXRXZWJLaXREYXRhRGlyZWN0b3J5KCkKIHsK LSAgICBpZiAoaW5mbykKLSAgICAgICAgZ3RrX2ljb25faW5mb19mcmVlKGluZm8pOworICAgIHJl dHVybiBEQVRBX0RJUjsKIH0KIAotfQorI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApA QCAtMTU4LDExICsxMzcsOSBAQCBQYXNzUmVmUHRyPEltYWdlPiBJbWFnZTo6bG9hZFBsYXRmb3Jt UmVzb3VyY2UoY29uc3QgY2hhciogbmFtZSkKICAgICBpZiAoIXN0cmNtcCgibWlzc2luZ0ltYWdl IiwgbmFtZSkpCiAgICAgICAgIGZpbGVOYW1lID0gZ2V0VGhlbWVJY29uRmlsZU5hbWUoR1RLX1NU T0NLX01JU1NJTkdfSU1BR0UsIDE2KTsKICAgICBpZiAoZmlsZU5hbWUuaXNOdWxsKCkpIHsKLSAg ICAgICAgZ2NoYXIqIGltYWdlbmFtZSA9IGdfc3RyZHVwX3ByaW50ZigiJXMucG5nIiwgbmFtZSk7 Ci0gICAgICAgIGdjaGFyKiBnbGliRmlsZU5hbWUgPSBnX2J1aWxkX2ZpbGVuYW1lKERBVEFfRElS LCAid2Via2l0LTEuMCIsICJpbWFnZXMiLCBpbWFnZW5hbWUsIE5VTEwpOwotICAgICAgICBmaWxl TmFtZSA9IGdsaWJGaWxlTmFtZTsKLSAgICAgICAgZ19mcmVlKGltYWdlbmFtZSk7Ci0gICAgICAg IGdfZnJlZShnbGliRmlsZU5hbWUpOworICAgICAgICBHT3duUHRyPGdjaGFyPiBpbWFnZU5hbWUo Z19zdHJkdXBfcHJpbnRmKCIlcy5wbmciLCBuYW1lKSk7CisgICAgICAgIEdPd25QdHI8Z2NoYXI+ IGdsaWJGaWxlTmFtZShnX2J1aWxkX2ZpbGVuYW1lKGdldFdlYktpdERhdGFEaXJlY3RvcnkoKSwg IndlYmtpdC0xLjAiLCAiaW1hZ2VzIiwgaW1hZ2VOYW1lLmdldCgpLCBOVUxMKSk7CisgICAgICAg IGZpbGVOYW1lID0gZ2xpYkZpbGVOYW1lLmdldCgpOwogICAgIH0KIAogICAgIHJldHVybiBsb2Fk SW1hZ2VGcm9tRmlsZShmaWxlTmFtZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9HT3duUHRyR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJHdGsuY3BwCmlu ZGV4IDA1NThmMzMyYjUzOGM3OWJhNDE0Mzk5NzRkNDFhNmQ0MGQyODI0ZDAuLjliNjkzZjQxNWU5 NzgyNDdmZDNjOTM4NGQ0ZWQyNTFlZTA0OWI4ZjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0dPd25QdHJHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJH dGsuY3BwCkBAIC0xOSw4ICsxOSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAi R093blB0ckd0ay5oIgogCi0jaW5jbHVkZSA8Z2RrL2dkay5oPgotI2luY2x1ZGUgPGdsaWIuaD4K KyNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKIG5hbWVzcGFjZSBXVEYgewogCkBAIC0zMCw0ICsyOSwx MCBAQCB0ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8R2RrRXZlbnQ+KEdka0V2ZW50KiBw dHIpCiAgICAgICAgIGdka19ldmVudF9mcmVlKHB0cik7CiB9CiAKK3RlbXBsYXRlIDw+IHZvaWQg ZnJlZU93bmVkR1B0cjxHdGtJY29uSW5mbz4oR3RrSWNvbkluZm8qIGluZm8pCit7CisgICAgaWYg KGluZm8pCisgICAgICAgIGd0a19pY29uX2luZm9fZnJlZShpbmZvKTsKK30KKwogfQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR093blB0ckd0ay5oIGIvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvR093blB0ckd0ay5oCmluZGV4IDY3NGVhNTg3ZGFkOGE3ZjljZmZjYTI1Y2NhNGE1Zjky YWM3M2I0OGMuLjgzNDE2NjFmOWZmN2QwMGFmNzhjYTIwZDQzMzAwYzgwNDBkMGU1YzMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJHdGsuaAorKysgYi9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HT3duUHRyR3RrLmgKQEAgLTIzLDEwICsyMywxMiBAQAogI2luY2x1ZGUgIkdP d25QdHIuaCIKIAogdHlwZWRlZiB1bmlvbiBfR2RrRXZlbnQgR2RrRXZlbnQ7Cit0eXBlZGVmIHN0 cnVjdCBfR3RrSWNvbkluZm8gR3RrSWNvbkluZm87CiAKIG5hbWVzcGFjZSBXVEYgewogCi10ZW1w bGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHZGtFdmVudD4oR2RrRXZlbnQqKTsKK3RlbXBsYXRl IDw+IHZvaWQgZnJlZU93bmVkR1B0cjxHZGtFdmVudD4oR2RrRXZlbnQqKTsKK3RlbXBsYXRlIDw+ IHZvaWQgZnJlZU93bmVkR1B0cjxHdGtJY29uSW5mbz4oR3RrSWNvbkluZm8qKTsKIAogfQogCg==