51616 2010-12-26 00:57:54 -0800 [GTK] Can't find webinspector and error page redirection on Windows 2012-02-19 21:24:35 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Major --- 0 mr.tiar webkit-unassigned mrobinson webkit.review.bot oldest_to_newest 326868 0 mr.tiar 2010-12-26 00:57:54 -0800 DATA_DIR that use DllMain to find toplevel path only defined in ImageGTK.cpp, other two files affected still return invalid path ($PREFIX): FrameLoaderClientGtk.cpp and InspectorClientGtk.cpp while there should only one DllMain exists. 331928 1 mr.tiar 2011-01-10 13:59:25 -0800 I found this trick http://stackoverflow.com/questions/2396328/get-hmodule-from-inside-a-dll and I use it like this (in FrameLoaderClientGtk.cpp): .... #ifdef _WIN32 # include <shlobj.h> # include <assert.h> static HMODULE GetThisDllHandle() { MEMORY_BASIC_INFORMATION info; size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info)); assert(len == sizeof(info)); return len ? (HMODULE)info.AllocationBase : NULL; } const gchar * get_webkit_datadir(void) { gchar *retval; retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL); return retval; } #undef DATA_DIR #define DATA_DIR get_webkit_datadir () #endif .... So far in Win32 it return the correct path, and it doesn't have "initialize once" limitation as DllMain() 337315 2 79594 mr.tiar 2011-01-20 06:39:44 -0800 Created attachment 79594 fix DATADIR path Umm is this patch legal then? 559908 3 127735 tuxator 2012-02-19 10:09:02 -0800 Created attachment 127735 Patch 559955 4 127744 tuxator 2012-02-19 15:12:02 -0800 Created attachment 127744 Patch updated with Changelog entry 559984 5 127744 mrobinson 2012-02-19 19:04:58 -0800 Comment on attachment 127744 Patch updated with Changelog entry Great work. 559992 6 mr.tiar 2012-02-19 20:03:18 -0800 Thanks pawel 560014 7 127744 webkit.review.bot 2012-02-19 21:24:30 -0800 Comment on attachment 127744 Patch updated with Changelog entry Clearing flags on attachment: 127744 Committed r108206: <http://trac.webkit.org/changeset/108206> 560015 8 webkit.review.bot 2012-02-19 21:24:35 -0800 All reviewed patches have been landed. Closing bug. 79594 2011-01-20 06:39:44 -0800 2011-01-20 06:39:44 -0800 fix DATADIR path datadir.patch text/plain 4831 mr.tiar LS0tIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCUZy aSBTZXAgMTAgMjA6MjA6MzMgMjAxMA0KKysrIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuY3BwCVR1ZSBKYW4gMTEgMTI6NDc6MTQgMjAxMQ0KQEAgLTcxLDYg KzcxLDMwIEBADQogI2luY2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+DQogI2luY2x1ZGUgPHN0ZGlv Lmg+DQogDQorI2lmZGVmIF9XSU4zMg0KKy8qIHNlYXJjaCBmb3IgZGF0YSByZWxhdGl2ZSB0byB3 aGVyZSB3ZSBhcmUgaW5zdGFsbGVkICovDQorI2luY2x1ZGUgPHNobG9iai5oPg0KKyNpbmNsdWRl IDxhc3NlcnQuaD4NCisNCitzdGF0aWMgSE1PRFVMRSBHZXRUaGlzRGxsSGFuZGxlKCkNCit7DQor ICBNRU1PUllfQkFTSUNfSU5GT1JNQVRJT04gaW5mbzsNCisgIHNpemVfdCBsZW4gPSBWaXJ0dWFs UXVlcnlFeChHZXRDdXJyZW50UHJvY2VzcygpLCAodm9pZCopR2V0VGhpc0RsbEhhbmRsZSwgJmlu Zm8sIHNpemVvZihpbmZvKSk7DQorICBhc3NlcnQobGVuID09IHNpemVvZihpbmZvKSk7DQorICBy ZXR1cm4gbGVuID8gKEhNT0RVTEUpaW5mby5BbGxvY2F0aW9uQmFzZSA6IE5VTEw7DQorfQ0KKw0K K2NvbnN0IGdjaGFyICoNCitnZXRfd2Via2l0X2RhdGFkaXIodm9pZCkNCit7DQorICAgIGdjaGFy ICpyZXR2YWw7DQorICAgIHJldHZhbCA9IGdfYnVpbGRfZmlsZW5hbWUgKGdfd2luMzJfZ2V0X3Bh Y2thZ2VfaW5zdGFsbGF0aW9uX2RpcmVjdG9yeV9vZl9tb2R1bGUgKEdldFRoaXNEbGxIYW5kbGUo KSksICIvc2hhcmUiLCBOVUxMKTsNCisgICAgcmV0dXJuIHJldHZhbDsNCit9DQorI3VuZGVmIERB VEFfRElSDQorI2RlZmluZSBEQVRBX0RJUiBnZXRfd2Via2l0X2RhdGFkaXIgKCkNCisjZW5kaWYN CisNCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsNCiANCiBuYW1lc3BhY2UgV2ViS2l0IHsNCkBA IC05ODksNyArMTAxMywxMyBAQA0KIA0KICAgICBTdHJpbmcgY29udGVudDsNCiAgICAgZ2NoYXIq IGZpbGVDb250ZW50ID0gMDsNCisjaWZkZWYgX1dJTjMyDQorICAgIGdjaGFyKiBlcnJvclBhdGgg PSBnX2J1aWxkX2ZpbGVuYW1lIChEQVRBX0RJUiwgIi93ZWJraXQtMS4wL3Jlc291cmNlcy9lcnJv ci5odG1sIiwgTlVMTCk7DQorICAgIGdjaGFyKiBlcnJvclVSSSA9IGdfZmlsZW5hbWVfdG9fdXJp KGVycm9yUGF0aCwgTlVMTCwgTlVMTCk7DQorICAgIGdfZnJlZShlcnJvclBhdGgpOw0KKyNlbHNl DQogICAgIGdjaGFyKiBlcnJvclVSSSA9IGdfZmlsZW5hbWVfdG9fdXJpKERBVEFfRElSIi93ZWJr aXQtMS4wL3Jlc291cmNlcy9lcnJvci5odG1sIiwgTlVMTCwgTlVMTCk7DQorI2VuZGlmDQogICAg IEdGaWxlKiBlcnJvckZpbGUgPSBnX2ZpbGVfbmV3X2Zvcl91cmkoZXJyb3JVUkkpOw0KICAgICBn X2ZyZWUoZXJyb3JVUkkpOw0KICAgICANCi0tLSBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0lu c3BlY3RvckNsaWVudEd0ay5jcHAJRnJpIFNlcCAxMCAyMDoyMDozMyAyMDEwDQorKysgV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwCU1vbiBKYW4gMTcgMDc6 NDI6MzUgMjAxMQ0KQEAgLTI3LDYgKzI3LDMxIEBADQogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVk LmgiDQogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiDQogDQorI2lmZGVmIF9XSU4zMg0KKy8q IHNlYXJjaCBmb3IgZGF0YSByZWxhdGl2ZSB0byB3aGVyZSB3ZSBhcmUgaW5zdGFsbGVkICovDQor IyAgaW5jbHVkZSA8c2hsb2JqLmg+DQorIyAgaW5jbHVkZSA8YXNzZXJ0Lmg+DQorDQorc3RhdGlj IEhNT0RVTEUgR2V0VGhpc0RsbEhhbmRsZSgpDQorew0KKyAgTUVNT1JZX0JBU0lDX0lORk9STUFU SU9OIGluZm87DQorICBzaXplX3QgbGVuID0gVmlydHVhbFF1ZXJ5RXgoR2V0Q3VycmVudFByb2Nl c3MoKSwgKHZvaWQqKUdldFRoaXNEbGxIYW5kbGUsICZpbmZvLCBzaXplb2YoaW5mbykpOw0KKyAg YXNzZXJ0KGxlbiA9PSBzaXplb2YoaW5mbykpOw0KKyAgcmV0dXJuIGxlbiA/IChITU9EVUxFKWlu Zm8uQWxsb2NhdGlvbkJhc2UgOiBOVUxMOw0KK30NCisNCitjb25zdCBnY2hhciAqDQorZ2V0X3dl YmtpdF9wYXRoKHZvaWQpDQorew0KKyAgICBnY2hhciAqcmV0dmFsOw0KKyAgICByZXR2YWwgPSBn X2J1aWxkX2ZpbGVuYW1lIChnX3dpbjMyX2dldF9wYWNrYWdlX2luc3RhbGxhdGlvbl9kaXJlY3Rv cnlfb2ZfbW9kdWxlIChHZXRUaGlzRGxsSGFuZGxlKCkpLCAiL3NoYXJlIiwgTlVMTCk7DQorICAg IHJldHVybiByZXR2YWw7DQorfQ0KKyN1bmRlZiBEQVRBX0RJUg0KKyNkZWZpbmUgREFUQV9ESVIg Z2V0X3dlYmtpdF9wYXRoICgpDQorI2VuZGlmDQorDQorDQogdXNpbmcgbmFtZXNwYWNlIFdlYkNv cmU7DQogDQogbmFtZXNwYWNlIFdlYktpdCB7DQpAQCAtNjcsMjEgKzkyLDMwIEBADQogICAgIHdl YmtpdF93ZWJfaW5zcGVjdG9yX3NldF93ZWJfdmlldyh3ZWJJbnNwZWN0b3IsIGluc3BlY3Rvcldl YlZpZXcpOw0KIA0KICAgICBHT3duUHRyPGdjaGFyPiBpbnNwZWN0b3JVUkk7DQotDQorI2lmZGVm IF9XSU4zMg0KKyAgICBnY2hhciogaW5zcGVjdG9yUGF0aCA9IGdfYnVpbGRfZmlsZW5hbWUgKERB VEFfRElSLCAiL3dlYmtpdC0xLjAvd2ViaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sIiwgTlVMTCk7 DQorI2VuZGlmDQogICAgIC8vIE1ha2UgdGhlIFdlYiBJbnNwZWN0b3Igd29yayB3aGVuIHJ1bm5p bmcgdGVzdHMNCiAgICAgaWYgKGdfZmlsZV90ZXN0KCJXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmh0bWwiLCBHX0ZJTEVfVEVTVF9FWElTVFMpKSB7DQogICAgICAgICBHT3du UHRyPGdjaGFyPiBjdXJyZW50RGlyZWN0b3J5KGdfZ2V0X2N1cnJlbnRfZGlyKCkpOw0KICAgICAg ICAgR093blB0cjxnY2hhcj4gZnVsbFBhdGgoZ19zdHJkdXBfcHJpbnRmKCIlcy9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwiLCBjdXJyZW50RGlyZWN0b3J5LmdldCgp KSk7DQogICAgICAgICBpbnNwZWN0b3JVUkkuc2V0KGdfZmlsZW5hbWVfdG9fdXJpKGZ1bGxQYXRo LmdldCgpLCBOVUxMLCBOVUxMKSk7DQogICAgIH0gZWxzZQ0KKyNpZmRlZiBfV0lOMzINCisgICAg ICAgIGluc3BlY3RvclVSSS5zZXQoZ19maWxlbmFtZV90b191cmkoaW5zcGVjdG9yUGF0aCwgTlVM TCwgTlVMTCkpOw0KKyNlbHNlDQogICAgICAgICBpbnNwZWN0b3JVUkkuc2V0KGdfZmlsZW5hbWVf dG9fdXJpKERBVEFfRElSIi93ZWJraXQtMS4wL3dlYmluc3BlY3Rvci9pbnNwZWN0b3IuaHRtbCIs IE5VTEwsIE5VTEwpKTsNCi0NCisjZW5kaWYNCiAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJp KGluc3BlY3RvcldlYlZpZXcsIGluc3BlY3RvclVSSS5nZXQoKSk7DQogDQogICAgIGd0a193aWRn ZXRfc2hvdyhHVEtfV0lER0VUKGluc3BlY3RvcldlYlZpZXcpKTsNCiANCiAgICAgUGFnZSogaW5z cGVjdG9yUGFnZSA9IGNvcmUoaW5zcGVjdG9yV2ViVmlldyk7DQogICAgIGluc3BlY3RvclBhZ2Ut Pmluc3BlY3RvckNvbnRyb2xsZXIoKS0+c2V0SW5zcGVjdG9yRnJvbnRlbmRDbGllbnQobmV3IElu c3BlY3RvckZyb250ZW5kQ2xpZW50KG1faW5zcGVjdGVkV2ViVmlldywgaW5zcGVjdG9yV2ViVmll dywgd2ViSW5zcGVjdG9yLCBpbnNwZWN0b3JQYWdlKSk7DQorDQorI2lmZGVmIF9XSU4zMg0KKyAg ICBnX2ZyZWUoaW5zcGVjdG9yUGF0aCk7DQorI2VuZGlmDQogfQ0KIA0KIHZvaWQgSW5zcGVjdG9y Q2xpZW50OjpoaWdobGlnaHQoTm9kZSogbm9kZSkNCkBAIC0xNDUsNiArMTc5LDEwIEBADQogU3Ry aW5nIEluc3BlY3RvckZyb250ZW5kQ2xpZW50Ojpsb2NhbGl6ZWRTdHJpbmdzVVJMKCkNCiB7DQog ICAgIEdPd25QdHI8Z2NoYXI+IFVSTDsNCisgICAgDQorI2lmZGVmIF9XSU4zMg0KKyAgICBnY2hh ciogbG9jYWxpemVkUGF0aCA9IGdfYnVpbGRfZmlsZW5hbWUgKERBVEFfRElSLCAiL3dlYmtpdC0x LjAvd2ViaW5zcGVjdG9yL2xvY2FsaXplZFN0cmluZ3MuanMiLCBOVUxMKTsNCisjZW5kaWYNCiAN CiAgICAgLy8gTWFrZSB0aGUgV2ViIEluc3BlY3RvciB3b3JrIHdoZW4gcnVubmluZyB0ZXN0cw0K ICAgICBpZiAoZ19maWxlX3Rlc3QoIldlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzIiwgR19GSUxFX1RFU1RfRVhJU1RTKSkgew0KQEAgLTE1MiwxMCArMTkwLDE2IEBADQog ICAgICAgICBHT3duUHRyPGdjaGFyPiBmdWxsUGF0aChnX3N0cmR1cF9wcmludGYoIiVzL1dlYkNv cmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIiwgY3VycmVudERpcmVjdG9yeS5n ZXQoKSkpOw0KICAgICAgICAgVVJMLnNldChnX2ZpbGVuYW1lX3RvX3VyaShmdWxsUGF0aC5nZXQo KSwgTlVMTCwgTlVMTCkpOw0KICAgICB9IGVsc2UNCisjaWZkZWYgX1dJTjMyDQorICAgICAgICBV Ukwuc2V0KGdfZmlsZW5hbWVfdG9fdXJpKGxvY2FsaXplZFBhdGgsIE5VTEwsIE5VTEwpKTsNCisj ZWxzZQ0KICAgICAgICAgVVJMLnNldChnX2ZpbGVuYW1lX3RvX3VyaShEQVRBX0RJUiIvd2Via2l0 LTEuMC93ZWJpbnNwZWN0b3IvbG9jYWxpemVkU3RyaW5ncy5qcyIsIE5VTEwsIE5VTEwpKTsNCi0N CisjZW5kaWYNCiAgICAgLy8gRklYTUU6IHN1cHBvcnQgbDEwbiBvZiBsb2NhbGl6ZWRTdHJpbmdz LmpzDQogICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4KFVSTC5nZXQoKSk7DQorI2lmZGVmIF9X SU4zMg0KKyAgICBnX2ZyZWUobG9jYWxpemVkUGF0aCk7DQorI2VuZGlmDQogfQ0KIA0KIFN0cmlu ZyBJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6aGlkZGVuUGFuZWxzKCkNCg== 127735 2012-02-19 10:09:02 -0800 2012-02-19 15:12:02 -0800 Patch DATADIR.patch text/plain 7031 tuxator ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVTeXN0ZW0uaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVTeXN0ZW0uaAppbmRleCAzM2M2NDNlLi5lZThkOWYwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GaWxlU3lzdGVtLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5oCkBAIC0xOTgsNiArMTk4LDcgQEAgUmV0 YWluUHRyPENGVVJMUmVmPiBwYXRoQXNVUkwoY29uc3QgU3RyaW5nJik7CiBTdHJpbmcgZmlsZW5h bWVUb1N0cmluZyhjb25zdCBjaGFyKik7CiBTdHJpbmcgZmlsZW5hbWVGb3JEaXNwbGF5KGNvbnN0 IFN0cmluZyYpOwogQ1N0cmluZyBhcHBsaWNhdGlvbkRpcmVjdG9yeVBhdGgoKTsKK0NTdHJpbmcg c2hhcmVkUmVzb3VyY2VzUGF0aCgpOwogdWludDY0X3QgZ2V0Vm9sdW1lRnJlZVNpemVGb3JQYXRo KGNvbnN0IGNoYXIqKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9hdWRpby9ndGsvQXVkaW9CdXNHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vZ3RrL0F1ZGlvQnVzR3RrLmNwcAppbmRleCBhZGU3NzhmLi5jMzRiOWFkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9ndGsvQXVkaW9CdXNHdGsuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2d0ay9BdWRpb0J1c0d0ay5jcHAKQEAg LTIzLDYgKzIzLDcgQEAKICNpbmNsdWRlICJBdWRpb0J1cy5oIgogCiAjaW5jbHVkZSAiQXVkaW9G aWxlUmVhZGVyLmgiCisjaW5jbHVkZSAiRmlsZVN5c3RlbS5oIgogI2luY2x1ZGUgIkdPd25QdHIu aCIKIAogI2luY2x1ZGUgPGdpby9naW8uaD4KQEAgLTMzLDcgKzM0LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogUGFzc093blB0cjxBdWRpb0J1cz4gQXVkaW9CdXM6OmxvYWRQbGF0Zm9ybVJlc291 cmNlKGNvbnN0IGNoYXIqIG5hbWUsIGZsb2F0IHNhbXBsZVJhdGUpCiB7CiAgICAgR093blB0cjxn Y2hhcj4gZmlsZW5hbWUoZ19zdHJkdXBfcHJpbnRmKCIlcy53YXYiLCBuYW1lKSk7Ci0gICAgR093 blB0cjxnY2hhcj4gYWJzb2x1dGVGaWxlbmFtZShnX2J1aWxkX2ZpbGVuYW1lKERBVEFfRElSLCAi d2Via2l0Z3RrLSJXRUJLSVRHVEtfQVBJX1ZFUlNJT05fU1RSSU5HLCAicmVzb3VyY2VzIiwgImF1 ZGlvIiwgZmlsZW5hbWUuZ2V0KCksIE5VTEwpKTsKKyAgICBHT3duUHRyPGdjaGFyPiBhYnNvbHV0 ZUZpbGVuYW1lKGdfYnVpbGRfZmlsZW5hbWUoc2hhcmVkUmVzb3VyY2VzUGF0aCgpLmRhdGEoKSwg InJlc291cmNlcyIsICJhdWRpbyIsIGZpbGVuYW1lLmdldCgpLCBOVUxMKSk7CiAKICAgICBHRmls ZSogZmlsZSA9IGdfZmlsZV9uZXdfZm9yX3BhdGgoZmlsZW5hbWUuZ2V0KCkpOwogICAgIGlmICgh Z19maWxlX3F1ZXJ5X2V4aXN0cyhmaWxlLCAwKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHAKaW5kZXggNmU4MWUzMy4uYzVhNTE5NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3Rr LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsu Y3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKICNpbmNsdWRlICJC aXRtYXBJbWFnZS5oIgorI2luY2x1ZGUgIkZpbGVTeXN0ZW0uaCIKICNpbmNsdWRlICJHZGtDYWly b1V0aWxpdGllcy5oIgogI2luY2x1ZGUgIkdPd25QdHJHdGsuaCIKICNpbmNsdWRlICJTaGFyZWRC dWZmZXIuaCIKQEAgLTMzLDYzICszNCwxNiBAQAogI2luY2x1ZGUgPGNhaXJvLmg+CiAjaW5jbHVk ZSA8Z3RrL2d0ay5oPgogCi0jaWYgUExBVEZPUk0oV0lOKQotI2luY2x1ZGUgPG1ic3RyaW5nLmg+ Ci0jaW5jbHVkZSA8c2hsb2JqLmg+Ci0KLXN0YXRpYyBITU9EVUxFIGhtb2R1bGU7Ci0KLWV4dGVy biAiQyIgewotQk9PTCBXSU5BUEkgRGxsTWFpbihISU5TVEFOQ0UgaGluc3RETEwsIERXT1JEIGZk d1JlYXNvbiwgTFBWT0lEIGxwdlJlc2VydmVkKQotewotICAgIGlmIChmZHdSZWFzb24gPT0gRExM X1BST0NFU1NfQVRUQUNIKQotICAgICAgICBobW9kdWxlID0gaGluc3RETEw7Ci0gICAgcmV0dXJu IFRSVUU7Ci19Ci19Ci0KLXN0YXRpYyBjaGFyKiBnZXRQYXRoVG9JbWFnZVJlc291cmNlKGNoYXIq IHJlc291cmNlKQotewotICAgIHN0YXRpYyBjaGFyKiBkYXRhRGlyZWN0b3J5ID0gMDsKLSAgICBp ZiAoIWRhdGFEaXJlY3RvcnkpIHsKLSAgICAgICAgZGF0YURpcmVjdG9yeSA9IG5ldyBjaGFyW1BB VEhfTUFYXTsKLSAgICAgICAgaWYgKCFHZXRNb2R1bGVGaWxlTmFtZShobW9kdWxlLCBzdGF0aWNf Y2FzdDxDSEFSKj4oZGF0YURpcmVjdG9yeSksIHNpemVvZihkYXRhRGlyZWN0b3J5KSAtIDEwKSkK LSAgICAgICAgICAgIGRhdGFEaXJlY3RvcnkgPSBEQVRBX0RJUjsKLQotICAgICAgICAvLyBGSVhN RTogVGhpcyBpcyBwcmV0dHkgdWdseS4gSWRlYWxseSB3ZSBzaG91bGQgYmUgdXNpbmcgV2luZG93 cyBBUEkKLSAgICAgICAgLy8gZnVuY3Rpb25zIG9yIEdMaWIgbWV0aG9kcyB0byBjYWxjdWxhdGUg cGF0aHMuCi0gICAgICAgIHVuc2lnbmVkIGNoYXIgKnA7Ci0gICAgICAgIHAgPSBfbWJzcmNocihz dGF0aWNfY2FzdDxjb25zdCB1bnNpZ25lZCBjaGFyICo+KGRhdGFEaXJlY3RvcnkpLCAnXFwnKTsK LSAgICAgICAgKnAgPSAnXDAnOwotICAgICAgICBwID0gX21ic3JjaHIoc3RhdGljX2Nhc3Q8Y29u c3QgdW5zaWduZWQgY2hhciAqPihkYXRhRGlyZWN0b3J5KSwgJ1xcJyk7Ci0gICAgICAgIGlmIChw KSB7Ci0gICAgICAgICAgICBpZiAoIXN0cmljbXAoKGNvbnN0IGNoYXIgKikgKHArMSksICJiaW4i KSkKLSAgICAgICAgICAgICAgICAqcCA9ICdcMCc7Ci0gICAgICAgIH0KLSAgICAgICAgc3RyY2F0 KGRhdGFEaXJlY3RvcnksICJcXHNoYXJlXFx3ZWJraXRndGstIldFQktJVEdUS19BUElfVkVSU0lP Tl9TVFJJTkciXFxpbWFnZXNcXCIpOwotICAgIH0KLQotICAgIGNoYXIqIGltYWdlUmVzb3VyY2VQ YXRoID0gbmV3IGNoYXJbUEFUSF9NQVhdOwotICAgIHN0cmNhdChpbWFnZVJlc291cmNlUGF0aCwg ZGF0YURpcmVjdG9yeSk7Ci0gICAgc3RyY2F0KGltYWdlUmVzb3VyY2VQYXRoLCByZXNvdXJjZSk7 Ci0KLSAgICByZXR1cm4gaW1hZ2VSZXNvdXJjZVBhdGg7Ci19Ci0KLSNlbHNlCituYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIHN0YXRpYyBjaGFyKiBnZXRQYXRoVG9JbWFnZVJlc291cmNlKGNoYXIqIHJl c291cmNlKQogewogICAgIGlmIChnX2dldGVudigiV0VCS0lUX1RPUF9MRVZFTCIpKQogICAgICAg ICByZXR1cm4gZ19idWlsZF9maWxlbmFtZShnX2dldGVudigiV0VCS0lUX1RPUF9MRVZFTCIpLCAi U291cmNlIiwgIldlYkNvcmUiLCAiUmVzb3VyY2VzIiwgcmVzb3VyY2UsIE5VTEwpOwogCi0gICAg cmV0dXJuIGdfYnVpbGRfZmlsZW5hbWUoREFUQV9ESVIsICJ3ZWJraXRndGstIldFQktJVEdUS19B UElfVkVSU0lPTl9TVFJJTkcsICJpbWFnZXMiLCByZXNvdXJjZSwgTlVMTCk7CisgICAgcmV0dXJu IGdfYnVpbGRfZmlsZW5hbWUoc2hhcmVkUmVzb3VyY2VzUGF0aCgpLmRhdGEoKSwgImltYWdlcyIs IHJlc291cmNlLCBOVUxMKTsKIH0KIAotI2VuZGlmCi0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQog c3RhdGljIENTdHJpbmcgZ2V0VGhlbWVJY29uRmlsZU5hbWUoY29uc3QgY2hhciogbmFtZSwgaW50 IHNpemUpCiB7CiAgICAgR3RrSWNvbkluZm8qIGljb25JbmZvID0gZ3RrX2ljb25fdGhlbWVfbG9v a3VwX2ljb24oZ3RrX2ljb25fdGhlbWVfZ2V0X2RlZmF1bHQoKSwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcAppbmRleCBmYzlkNGJmLi45NTBkNjE4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRmlsZVN5c3RlbUd0ay5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0ZpbGVTeXN0ZW1HdGsuY3BwCkBAIC0x OTAsNiArMTkwLDI2IEBAIENTdHJpbmcgYXBwbGljYXRpb25EaXJlY3RvcnlQYXRoKCkKICAgICBy ZXR1cm4gZGlybmFtZS5nZXQoKTsKIH0KIAorQ1N0cmluZyBzaGFyZWRSZXNvdXJjZXNQYXRoKCkK K3sKKyAgICBzdGF0aWMgQ1N0cmluZyBjYWNoZWRQYXRoOworICAgIGlmICghY2FjaGVkUGF0aC5p c051bGwoKSkKKyAgICAgICAgcmV0dXJuIGNhY2hlZFBhdGg7CisKKyNpZiBPUyhXSU5ET1dTKQor ICAgIEhNT0RVTEUgaG1vZHVsZSA9IDA7CisgICAgR2V0TW9kdWxlSGFuZGxlRXhBKEdFVF9NT0RV TEVfSEFORExFX0VYX0ZMQUdfRlJPTV9BRERSRVNTLCByZWludGVycHJldF9jYXN0PGNoYXIqPihz aGFyZWRSZXNvdXJjZXNQYXRoKSwgJmhtb2R1bGUpOworCisgICAgR093blB0cjxnY2hhcj4gcnVu dGltZURpcihnX3dpbjMyX2dldF9wYWNrYWdlX2luc3RhbGxhdGlvbl9kaXJlY3Rvcnlfb2ZfbW9k dWxlKGhtb2R1bGUpKTsKKyAgICBHT3duUHRyPGdjaGFyPiBkYXRhUGF0aChnX2J1aWxkX2ZpbGVu YW1lKHJ1bnRpbWVEaXIuZ2V0KCksICJzaGFyZSIsICJ3ZWJraXRndGstIldFQktJVEdUS19BUElf VkVSU0lPTl9TVFJJTkcsIE5VTEwpKTsKKyNlbHNlCisgICAgR093blB0cjxnY2hhcj4gZGF0YVBh dGgoZ19idWlsZF9maWxlbmFtZShEQVRBX0RJUiwgIndlYmtpdGd0ay0iV0VCS0lUR1RLX0FQSV9W RVJTSU9OX1NUUklORywgTlVMTCkpOworI2VuZGlmCisKKyAgICBjYWNoZWRQYXRoID0gZGF0YVBh dGguZ2V0KCk7CisgICAgcmV0dXJuIGNhY2hlZFBhdGg7Cit9CisKIHVpbnQ2NF90IGdldFZvbHVt ZUZyZWVTaXplRm9yUGF0aChjb25zdCBjaGFyKiBwYXRoKQogewogICAgIEdSZWZQdHI8R0ZpbGU+ IGZpbGUgPSBhZG9wdEdSZWYoZ19maWxlX25ld19mb3JfcGF0aChwYXRoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5j cHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0 ay5jcHAKaW5kZXggNjBiMDBlOC4uNmI4NDhjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9n dGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcApAQCAtMzMs NiArMzMsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRG9jdW1l bnRMb2FkZXJHdGsuaCIKICNpbmNsdWRlICJFcnJvcnNHdGsuaCIKKyNpbmNsdWRlICJGaWxlU3lz dGVtLmgiCiAjaW5jbHVkZSAiRm9ybVN0YXRlLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIK ICNpbmNsdWRlICJGcmFtZU5ldHdvcmtpbmdDb250ZXh0R3RrLmgiCkBAIC0xMTAzLDcgKzExMDQs OSBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZEZhaWxMb2FkKGNvbnN0IFJl c291cmNlRXJyb3ImIGVycm9yKQogCiAgICAgU3RyaW5nIGNvbnRlbnQ7CiAgICAgZ2NoYXIqIGZp bGVDb250ZW50ID0gMDsKLSAgICBnY2hhciogZXJyb3JVUkkgPSBnX2ZpbGVuYW1lX3RvX3VyaShE QVRBX0RJUiIvd2Via2l0LTEuMC9yZXNvdXJjZXMvZXJyb3IuaHRtbCIsIE5VTEwsIE5VTEwpOwor ICAgIEdPd25QdHI8Z2NoYXI+IGVycm9yUGF0aChnX2J1aWxkX2ZpbGVuYW1lKHNoYXJlZFJlc291 cmNlc1BhdGgoKS5kYXRhKCksICJyZXNvdXJjZXMiLCAiZXJyb3IuaHRtbCIsIE5VTEwpKTsKKyAg ICBnY2hhciogZXJyb3JVUkkgPSBnX2ZpbGVuYW1lX3RvX3VyaShlcnJvclBhdGguZ2V0KCksIDAs IDApOworCiAgICAgR0ZpbGUqIGVycm9yRmlsZSA9IGdfZmlsZV9uZXdfZm9yX3VyaShlcnJvclVS SSk7CiAgICAgZ19mcmVlKGVycm9yVVJJKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9n dGsvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQv Z3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEd0ay5jcHAKaW5kZXggZDRkMzIxZC4u ZjliOTJmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvSW5z cGVjdG9yQ2xpZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwCkBAIC0yMCw2ICsyMCw3IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yQ2xpZW50R3RrLmgiCiAKKyNpbmNsdWRlICJGaWxl U3lzdGVtLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JDb250cm9s bGVyLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKQEAgLTIwMiw3ICsyMDMsNyBAQCBj b25zdCBjaGFyKiBJbnNwZWN0b3JDbGllbnQ6Omluc3BlY3RvckZpbGVzUGF0aCgpCiAgICAgaWYg KGVudmlyb25tZW50UGF0aCAmJiBnX2ZpbGVfdGVzdChlbnZpcm9ubWVudFBhdGgsIEdfRklMRV9U RVNUX0lTX0RJUikpCiAgICAgICAgIG1faW5zcGVjdG9yRmlsZXNQYXRoLnNldChnX3N0cmR1cChl bnZpcm9ubWVudFBhdGgpKTsKICAgICBlbHNlCi0gICAgICAgIG1faW5zcGVjdG9yRmlsZXNQYXRo LnNldChnX2J1aWxkX2ZpbGVuYW1lKERBVEFfRElSLCAid2Via2l0Z3RrLSJXRUJLSVRHVEtfQVBJ X1ZFUlNJT05fU1RSSU5HLCAid2ViaW5zcGVjdG9yIiwgTlVMTCkpOworICAgICAgICBtX2luc3Bl Y3RvckZpbGVzUGF0aC5zZXQoZ19idWlsZF9maWxlbmFtZShzaGFyZWRSZXNvdXJjZXNQYXRoKCku ZGF0YSgpLCAid2ViaW5zcGVjdG9yIiwgTlVMTCkpOwogCiAgICAgcmV0dXJuIG1faW5zcGVjdG9y RmlsZXNQYXRoLmdldCgpOwogfQo= 127744 2012-02-19 15:12:02 -0800 2012-02-19 21:24:30 -0800 Patch updated with Changelog entry DATADIR.patch text/plain 8787 tuxator ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNTNkNWY5Li43YTU5YThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTItMDItMTkgIFBhd2XFgiBGb3J5c2l1ayAgPHR1eGF0b3JAbzIucGw+CisKKyAgICAg ICAgW0dUS10gQ2FuJ3QgZmluZCB3ZWJpbnNwZWN0b3IgYW5kIGVycm9yIHBhZ2UgcmVkaXJlY3Rp b24gb24gV2luZG93cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTE2MTYKKworICAgICAgICBDcmVhdGUgYW5kIHVzZSBhbiBhYnN0cmFjdGlvbiBmb3Ig ZmluZGluZyBzaGFyZWQgcmVzb3VyY2VzIG9uIFdpbmRvd3MuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9GaWxlU3lzdGVtLmg6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9ndGsvQXVkaW9CdXNH dGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9CdXM6OmxvYWRQbGF0Zm9ybVJlc291cmNl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Z2V0UGF0aFRvSW1hZ2VSZXNvdXJjZSk6CisgICAgICAgICogcGxhdGZvcm0v Z3RrL0ZpbGVTeXN0ZW1HdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hhcmVkUmVzb3VyY2Vz UGF0aCk6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0wMi0xOSAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IG1h a2UgZGlzdGNoZWNrIGlzc3Vlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0ZpbGVTeXN0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVTeXN0ZW0uaAppbmRl eCAzM2M2NDNlLi5lZThkOWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9G aWxlU3lzdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5oCkBA IC0xOTgsNiArMTk4LDcgQEAgUmV0YWluUHRyPENGVVJMUmVmPiBwYXRoQXNVUkwoY29uc3QgU3Ry aW5nJik7CiBTdHJpbmcgZmlsZW5hbWVUb1N0cmluZyhjb25zdCBjaGFyKik7CiBTdHJpbmcgZmls ZW5hbWVGb3JEaXNwbGF5KGNvbnN0IFN0cmluZyYpOwogQ1N0cmluZyBhcHBsaWNhdGlvbkRpcmVj dG9yeVBhdGgoKTsKK0NTdHJpbmcgc2hhcmVkUmVzb3VyY2VzUGF0aCgpOwogdWludDY0X3QgZ2V0 Vm9sdW1lRnJlZVNpemVGb3JQYXRoKGNvbnN0IGNoYXIqKTsKICNlbmRpZgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9ndGsvQXVkaW9CdXNHdGsuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3RrL0F1ZGlvQnVzR3RrLmNwcAppbmRleCBhZGU3 NzhmLi5jMzRiOWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9n dGsvQXVkaW9CdXNHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2d0 ay9BdWRpb0J1c0d0ay5jcHAKQEAgLTIzLDYgKzIzLDcgQEAKICNpbmNsdWRlICJBdWRpb0J1cy5o IgogCiAjaW5jbHVkZSAiQXVkaW9GaWxlUmVhZGVyLmgiCisjaW5jbHVkZSAiRmlsZVN5c3RlbS5o IgogI2luY2x1ZGUgIkdPd25QdHIuaCIKIAogI2luY2x1ZGUgPGdpby9naW8uaD4KQEAgLTMzLDcg KzM0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogUGFzc093blB0cjxBdWRpb0J1cz4gQXVkaW9C dXM6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGNvbnN0IGNoYXIqIG5hbWUsIGZsb2F0IHNhbXBsZVJh dGUpCiB7CiAgICAgR093blB0cjxnY2hhcj4gZmlsZW5hbWUoZ19zdHJkdXBfcHJpbnRmKCIlcy53 YXYiLCBuYW1lKSk7Ci0gICAgR093blB0cjxnY2hhcj4gYWJzb2x1dGVGaWxlbmFtZShnX2J1aWxk X2ZpbGVuYW1lKERBVEFfRElSLCAid2Via2l0Z3RrLSJXRUJLSVRHVEtfQVBJX1ZFUlNJT05fU1RS SU5HLCAicmVzb3VyY2VzIiwgImF1ZGlvIiwgZmlsZW5hbWUuZ2V0KCksIE5VTEwpKTsKKyAgICBH T3duUHRyPGdjaGFyPiBhYnNvbHV0ZUZpbGVuYW1lKGdfYnVpbGRfZmlsZW5hbWUoc2hhcmVkUmVz b3VyY2VzUGF0aCgpLmRhdGEoKSwgInJlc291cmNlcyIsICJhdWRpbyIsIGZpbGVuYW1lLmdldCgp LCBOVUxMKSk7CiAKICAgICBHRmlsZSogZmlsZSA9IGdfZmlsZV9uZXdfZm9yX3BhdGgoZmlsZW5h bWUuZ2V0KCkpOwogICAgIGlmICghZ19maWxlX3F1ZXJ5X2V4aXN0cyhmaWxlLCAwKSkgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHAKaW5k ZXggNmU4MWUzMy4uYzVhNTE5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAKICNpbmNsdWRlICJCaXRtYXBJbWFnZS5oIgorI2luY2x1ZGUgIkZpbGVTeXN0ZW0u aCIKICNpbmNsdWRlICJHZGtDYWlyb1V0aWxpdGllcy5oIgogI2luY2x1ZGUgIkdPd25QdHJHdGsu aCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKQEAgLTMzLDYzICszNCwxNiBAQAogI2luY2x1 ZGUgPGNhaXJvLmg+CiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogCi0jaWYgUExBVEZPUk0oV0lOKQot I2luY2x1ZGUgPG1ic3RyaW5nLmg+Ci0jaW5jbHVkZSA8c2hsb2JqLmg+Ci0KLXN0YXRpYyBITU9E VUxFIGhtb2R1bGU7Ci0KLWV4dGVybiAiQyIgewotQk9PTCBXSU5BUEkgRGxsTWFpbihISU5TVEFO Q0UgaGluc3RETEwsIERXT1JEIGZkd1JlYXNvbiwgTFBWT0lEIGxwdlJlc2VydmVkKQotewotICAg IGlmIChmZHdSZWFzb24gPT0gRExMX1BST0NFU1NfQVRUQUNIKQotICAgICAgICBobW9kdWxlID0g aGluc3RETEw7Ci0gICAgcmV0dXJuIFRSVUU7Ci19Ci19Ci0KLXN0YXRpYyBjaGFyKiBnZXRQYXRo VG9JbWFnZVJlc291cmNlKGNoYXIqIHJlc291cmNlKQotewotICAgIHN0YXRpYyBjaGFyKiBkYXRh RGlyZWN0b3J5ID0gMDsKLSAgICBpZiAoIWRhdGFEaXJlY3RvcnkpIHsKLSAgICAgICAgZGF0YURp cmVjdG9yeSA9IG5ldyBjaGFyW1BBVEhfTUFYXTsKLSAgICAgICAgaWYgKCFHZXRNb2R1bGVGaWxl TmFtZShobW9kdWxlLCBzdGF0aWNfY2FzdDxDSEFSKj4oZGF0YURpcmVjdG9yeSksIHNpemVvZihk YXRhRGlyZWN0b3J5KSAtIDEwKSkKLSAgICAgICAgICAgIGRhdGFEaXJlY3RvcnkgPSBEQVRBX0RJ UjsKLQotICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBwcmV0dHkgdWdseS4gSWRlYWxseSB3ZSBz aG91bGQgYmUgdXNpbmcgV2luZG93cyBBUEkKLSAgICAgICAgLy8gZnVuY3Rpb25zIG9yIEdMaWIg bWV0aG9kcyB0byBjYWxjdWxhdGUgcGF0aHMuCi0gICAgICAgIHVuc2lnbmVkIGNoYXIgKnA7Ci0g ICAgICAgIHAgPSBfbWJzcmNocihzdGF0aWNfY2FzdDxjb25zdCB1bnNpZ25lZCBjaGFyICo+KGRh dGFEaXJlY3RvcnkpLCAnXFwnKTsKLSAgICAgICAgKnAgPSAnXDAnOwotICAgICAgICBwID0gX21i c3JjaHIoc3RhdGljX2Nhc3Q8Y29uc3QgdW5zaWduZWQgY2hhciAqPihkYXRhRGlyZWN0b3J5KSwg J1xcJyk7Ci0gICAgICAgIGlmIChwKSB7Ci0gICAgICAgICAgICBpZiAoIXN0cmljbXAoKGNvbnN0 IGNoYXIgKikgKHArMSksICJiaW4iKSkKLSAgICAgICAgICAgICAgICAqcCA9ICdcMCc7Ci0gICAg ICAgIH0KLSAgICAgICAgc3RyY2F0KGRhdGFEaXJlY3RvcnksICJcXHNoYXJlXFx3ZWJraXRndGst IldFQktJVEdUS19BUElfVkVSU0lPTl9TVFJJTkciXFxpbWFnZXNcXCIpOwotICAgIH0KLQotICAg IGNoYXIqIGltYWdlUmVzb3VyY2VQYXRoID0gbmV3IGNoYXJbUEFUSF9NQVhdOwotICAgIHN0cmNh dChpbWFnZVJlc291cmNlUGF0aCwgZGF0YURpcmVjdG9yeSk7Ci0gICAgc3RyY2F0KGltYWdlUmVz b3VyY2VQYXRoLCByZXNvdXJjZSk7Ci0KLSAgICByZXR1cm4gaW1hZ2VSZXNvdXJjZVBhdGg7Ci19 Ci0KLSNlbHNlCituYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBjaGFyKiBnZXRQYXRoVG9J bWFnZVJlc291cmNlKGNoYXIqIHJlc291cmNlKQogewogICAgIGlmIChnX2dldGVudigiV0VCS0lU X1RPUF9MRVZFTCIpKQogICAgICAgICByZXR1cm4gZ19idWlsZF9maWxlbmFtZShnX2dldGVudigi V0VCS0lUX1RPUF9MRVZFTCIpLCAiU291cmNlIiwgIldlYkNvcmUiLCAiUmVzb3VyY2VzIiwgcmVz b3VyY2UsIE5VTEwpOwogCi0gICAgcmV0dXJuIGdfYnVpbGRfZmlsZW5hbWUoREFUQV9ESVIsICJ3 ZWJraXRndGstIldFQktJVEdUS19BUElfVkVSU0lPTl9TVFJJTkcsICJpbWFnZXMiLCByZXNvdXJj ZSwgTlVMTCk7CisgICAgcmV0dXJuIGdfYnVpbGRfZmlsZW5hbWUoc2hhcmVkUmVzb3VyY2VzUGF0 aCgpLmRhdGEoKSwgImltYWdlcyIsIHJlc291cmNlLCBOVUxMKTsKIH0KIAotI2VuZGlmCi0KLW5h bWVzcGFjZSBXZWJDb3JlIHsKLQogc3RhdGljIENTdHJpbmcgZ2V0VGhlbWVJY29uRmlsZU5hbWUo Y29uc3QgY2hhciogbmFtZSwgaW50IHNpemUpCiB7CiAgICAgR3RrSWNvbkluZm8qIGljb25JbmZv ID0gZ3RrX2ljb25fdGhlbWVfbG9va3VwX2ljb24oZ3RrX2ljb25fdGhlbWVfZ2V0X2RlZmF1bHQo KSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3Rr LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9GaWxlU3lzdGVtR3RrLmNwcAppbmRl eCBmYzlkNGJmLi45NTBkNjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvRmlsZVN5c3RlbUd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0Zp bGVTeXN0ZW1HdGsuY3BwCkBAIC0xOTAsNiArMTkwLDI2IEBAIENTdHJpbmcgYXBwbGljYXRpb25E aXJlY3RvcnlQYXRoKCkKICAgICByZXR1cm4gZGlybmFtZS5nZXQoKTsKIH0KIAorQ1N0cmluZyBz aGFyZWRSZXNvdXJjZXNQYXRoKCkKK3sKKyAgICBzdGF0aWMgQ1N0cmluZyBjYWNoZWRQYXRoOwor ICAgIGlmICghY2FjaGVkUGF0aC5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuIGNhY2hlZFBhdGg7 CisKKyNpZiBPUyhXSU5ET1dTKQorICAgIEhNT0RVTEUgaG1vZHVsZSA9IDA7CisgICAgR2V0TW9k dWxlSGFuZGxlRXhBKEdFVF9NT0RVTEVfSEFORExFX0VYX0ZMQUdfRlJPTV9BRERSRVNTLCByZWlu dGVycHJldF9jYXN0PGNoYXIqPihzaGFyZWRSZXNvdXJjZXNQYXRoKSwgJmhtb2R1bGUpOworCisg ICAgR093blB0cjxnY2hhcj4gcnVudGltZURpcihnX3dpbjMyX2dldF9wYWNrYWdlX2luc3RhbGxh dGlvbl9kaXJlY3Rvcnlfb2ZfbW9kdWxlKGhtb2R1bGUpKTsKKyAgICBHT3duUHRyPGdjaGFyPiBk YXRhUGF0aChnX2J1aWxkX2ZpbGVuYW1lKHJ1bnRpbWVEaXIuZ2V0KCksICJzaGFyZSIsICJ3ZWJr aXRndGstIldFQktJVEdUS19BUElfVkVSU0lPTl9TVFJJTkcsIE5VTEwpKTsKKyNlbHNlCisgICAg R093blB0cjxnY2hhcj4gZGF0YVBhdGgoZ19idWlsZF9maWxlbmFtZShEQVRBX0RJUiwgIndlYmtp dGd0ay0iV0VCS0lUR1RLX0FQSV9WRVJTSU9OX1NUUklORywgTlVMTCkpOworI2VuZGlmCisKKyAg ICBjYWNoZWRQYXRoID0gZGF0YVBhdGguZ2V0KCk7CisgICAgcmV0dXJuIGNhY2hlZFBhdGg7Cit9 CisKIHVpbnQ2NF90IGdldFZvbHVtZUZyZWVTaXplRm9yUGF0aChjb25zdCBjaGFyKiBwYXRoKQog ewogICAgIEdSZWZQdHI8R0ZpbGU+IGZpbGUgPSBhZG9wdEdSZWYoZ19maWxlX25ld19mb3JfcGF0 aChwYXRoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNDY1ZTU0MC4uNTk2MjZiOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0No YW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAyLTE5ICBQYXdlxYIgRm9yeXNpdWsgIDx0 dXhhdG9yQG8yLnBsPgorICAgICAgICBbR1RLXSBDYW4ndCBmaW5kIHdlYmluc3BlY3RvciBhbmQg ZXJyb3IgcGFnZSByZWRpcmVjdGlvbiBvbiBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTYxNgorCisgICAgICAgIFVzZSBhbiBhYnN0cmFj dGlvbiBmb3IgZmluZGluZyBzaGFyZWQgcmVzb3VyY2VzIG9uIFdpbmRvd3MuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xp ZW50OjpkaXNwYXRjaERpZEZhaWxMb2FkKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNw ZWN0b3JDbGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbnNwZWN0b3JDbGllbnQ6Omlu c3BlY3RvckZpbGVzUGF0aCk6CisKIDIwMTItMDItMTcgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5n LmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbR1RLXSBjaGFuZ2UgdGhlIHdheSBvZiByZWdp c3RlcmluZyBEZXZpY2VPcmllbnRhdGlvbiBjbGllbnRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIGIvU291cmNl L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4 IGQ0ODM1YjcuLjQyYTQ5NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKQEAgLTMzLDYgKzMzLDcgQEAK ICNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyR3Rr LmgiCiAjaW5jbHVkZSAiRXJyb3JzR3RrLmgiCisjaW5jbHVkZSAiRmlsZVN5c3RlbS5oIgogI2lu Y2x1ZGUgIkZvcm1TdGF0ZS5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyLmgiCiAjaW5jbHVkZSAi RnJhbWVOZXR3b3JraW5nQ29udGV4dEd0ay5oIgpAQCAtMTEwNSw3ICsxMTA2LDkgQEAgdm9pZCBG cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRGYWlsTG9hZChjb25zdCBSZXNvdXJjZUVycm9y JiBlcnJvcikKIAogICAgIFN0cmluZyBjb250ZW50OwogICAgIGdjaGFyKiBmaWxlQ29udGVudCA9 IDA7Ci0gICAgZ2NoYXIqIGVycm9yVVJJID0gZ19maWxlbmFtZV90b191cmkoREFUQV9ESVIiL3dl YmtpdC0xLjAvcmVzb3VyY2VzL2Vycm9yLmh0bWwiLCBOVUxMLCBOVUxMKTsKKyAgICBHT3duUHRy PGdjaGFyPiBlcnJvclBhdGgoZ19idWlsZF9maWxlbmFtZShzaGFyZWRSZXNvdXJjZXNQYXRoKCku ZGF0YSgpLCAicmVzb3VyY2VzIiwgImVycm9yLmh0bWwiLCBOVUxMKSk7CisgICAgZ2NoYXIqIGVy cm9yVVJJID0gZ19maWxlbmFtZV90b191cmkoZXJyb3JQYXRoLmdldCgpLCAwLCAwKTsKKwogICAg IEdGaWxlKiBlcnJvckZpbGUgPSBnX2ZpbGVfbmV3X2Zvcl91cmkoZXJyb3JVUkkpOwogICAgIGdf ZnJlZShlcnJvclVSSSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0luc3BlY3RvckNsaWVudEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3Jl U3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwCmluZGV4IGQ0ZDMyMWQuLmY5YjkyZjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVu dEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9y Q2xpZW50R3RrLmNwcApAQCAtMjAsNiArMjAsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2lu Y2x1ZGUgIkluc3BlY3RvckNsaWVudEd0ay5oIgogCisjaW5jbHVkZSAiRmlsZVN5c3RlbS5oIgog I2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yQ29udHJvbGxlci5oIgogI2lu Y2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCkBAIC0yMDIsNyArMjAzLDcgQEAgY29uc3QgY2hhciog SW5zcGVjdG9yQ2xpZW50OjppbnNwZWN0b3JGaWxlc1BhdGgoKQogICAgIGlmIChlbnZpcm9ubWVu dFBhdGggJiYgZ19maWxlX3Rlc3QoZW52aXJvbm1lbnRQYXRoLCBHX0ZJTEVfVEVTVF9JU19ESVIp KQogICAgICAgICBtX2luc3BlY3RvckZpbGVzUGF0aC5zZXQoZ19zdHJkdXAoZW52aXJvbm1lbnRQ YXRoKSk7CiAgICAgZWxzZQotICAgICAgICBtX2luc3BlY3RvckZpbGVzUGF0aC5zZXQoZ19idWls ZF9maWxlbmFtZShEQVRBX0RJUiwgIndlYmtpdGd0ay0iV0VCS0lUR1RLX0FQSV9WRVJTSU9OX1NU UklORywgIndlYmluc3BlY3RvciIsIE5VTEwpKTsKKyAgICAgICAgbV9pbnNwZWN0b3JGaWxlc1Bh dGguc2V0KGdfYnVpbGRfZmlsZW5hbWUoc2hhcmVkUmVzb3VyY2VzUGF0aCgpLmRhdGEoKSwgIndl Ymluc3BlY3RvciIsIE5VTEwpKTsKIAogICAgIHJldHVybiBtX2luc3BlY3RvckZpbGVzUGF0aC5n ZXQoKTsKIH0K