[PATCH] dbghelp: search for debugfiles in modulepath too.
Andreas Maier <[email protected]> Sat, 3 Nov 2018 21:19:50 +0100
| Newsgroups | gmane.comp.emulators.wine.patches |
|---|---|
| Message-ID | <[email protected]> |
RGVidWcgc3ltYm9scyAobGlrZSBQREIsIC4uLikgY291bGQgbm90IGJlIGZvdW5kIGlmIHRoZSBk aXJlY29yeSBvZgp0aGUgbW9kdWxlIGFuZCBhcHBsaWNhdGlvbiBkaWZmZXJzLiBBcHBseWluZyB0 aGlzIHBhdGNoIHRoZXkgd2lsbApiZSBmb3VuZC4gCkRiZ2hlbHAgc2VhcmNoZXMgdGhlIG1vZHVs ZSBwYXRoIHRvby4gKFNlZSBNUyBkb2NzKS4KClNpZ25lZC1vZmYtYnk6IEFuZHJlYXMgTWFpZXIg PGFuZHkxLm1AZ214LmRlPgotLS0KIGRsbHMvZGJnaGVscC9kYmdoZWxwX3ByaXZhdGUuaCB8ICA2 ICsrKy0tLQogZGxscy9kYmdoZWxwL21zYy5jICAgICAgICAgICAgIHwgIDQgKystLQogZGxscy9k YmdoZWxwL3BhdGguYyAgICAgICAgICAgIHwgMzQgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLQogZGxscy9kYmdoZWxwL3BlX21vZHVsZS5jICAgICAgIHwgIDIgKy0KIDQgZmlsZXMg Y2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k bGxzL2RiZ2hlbHAvZGJnaGVscF9wcml2YXRlLmggYi9kbGxzL2RiZ2hlbHAvZGJnaGVscF9wcml2 YXRlLmgKaW5kZXggNzZmNWQwMDgzMC4uOThmNDE4ZGY3OSAxMDA2NDQKLS0tIGEvZGxscy9kYmdo ZWxwL2RiZ2hlbHBfcHJpdmF0ZS5oCisrKyBiL2RsbHMvZGJnaGVscC9kYmdoZWxwX3ByaXZhdGUu aApAQCAtNjQ5LDkgKzY0OSw5IEBAIGV4dGVybiBCT09MICAgICAgICAgcGRiX3ZpcnR1YWxfdW53 aW5kKHN0cnVjdCBjcHVfc3RhY2tfd2FsayogY3N3LCBEV09SRF9QVFIgaXAsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDT05URVhUKiBjb250ZXh0LCBzdHJ1Y3QgcGRi X2NtZF9wYWlyKiBjcGFpcikgREVDTFNQRUNfSElEREVOOwogCiAvKiBwYXRoLmMgKi8KLWV4dGVy biBCT09MICAgICAgICAgcGF0aF9maW5kX3N5bWJvbF9maWxlKGNvbnN0IHN0cnVjdCBwcm9jZXNz KiBwY3MsIFBDU1RSIGZ1bGxfcGF0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IEdVSUQqIGd1aWQsIERXT1JEIGR3MSwgRFdPUkQgZHcyLCBQU1RSIGJ1 ZmZlciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEJPT0wqIGlz X3VubWF0Y2hlZCkgREVDTFNQRUNfSElEREVOOworZXh0ZXJuIEJPT0wgICAgICAgICBwYXRoX2Zp bmRfc3ltYm9sX2ZpbGUoY29uc3Qgc3RydWN0IHByb2Nlc3MqIHBjcywgY29uc3Qgc3RydWN0IG1v ZHVsZSogbW9kdWxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UENTVFIgZnVsbF9wYXRoLCBjb25zdCBHVUlEKiBndWlkLCBEV09SRCBkdzEsIERXT1JEIGR3MiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTVFIgYnVmZmVyLCBC T09MKiBpc191bm1hdGNoZWQpIERFQ0xTUEVDX0hJRERFTjsKIAogLyogcGVfbW9kdWxlLmMgKi8K IGV4dGVybiBCT09MICAgICAgICAgcGVfbG9hZF9udF9oZWFkZXIoSEFORExFIGhQcm9jLCBEV09S RDY0IGJhc2UsIElNQUdFX05UX0hFQURFUlMqIG50aCkgREVDTFNQRUNfSElEREVOOwpkaWZmIC0t Z2l0IGEvZGxscy9kYmdoZWxwL21zYy5jIGIvZGxscy9kYmdoZWxwL21zYy5jCmluZGV4IGNjMTI1 OWRmMTguLjBlNGUwMGYzMzQgMTAwNjQ0Ci0tLSBhL2RsbHMvZGJnaGVscC9tc2MuYworKysgYi9k bGxzL2RiZ2hlbHAvbXNjLmMKQEAgLTI0NTAsMTEgKzI0NTAsMTEgQEAgc3RhdGljIEhBTkRMRSBt YXBfcGRiX2ZpbGUoY29uc3Qgc3RydWN0IHByb2Nlc3MqIHBjcywKICAgICBzd2l0Y2ggKGxvb2t1 cC0+a2luZCkKICAgICB7CiAgICAgY2FzZSBQREJfSkc6Ci0gICAgICAgIHJldCA9IHBhdGhfZmlu ZF9zeW1ib2xfZmlsZShwY3MsIGxvb2t1cC0+ZmlsZW5hbWUsIE5VTEwsIGxvb2t1cC0+dGltZXN0 YW1wLAorICAgICAgICByZXQgPSBwYXRoX2ZpbmRfc3ltYm9sX2ZpbGUocGNzLCBtb2R1bGUsIGxv b2t1cC0+ZmlsZW5hbWUsIE5VTEwsIGxvb2t1cC0+dGltZXN0YW1wLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbG9va3VwLT5hZ2UsIGRiZ19maWxlX3BhdGgsICZtb2R1bGUt Pm1vZHVsZS5QZGJVbm1hdGNoZWQpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFBEQl9EUzoK LSAgICAgICAgcmV0ID0gcGF0aF9maW5kX3N5bWJvbF9maWxlKHBjcywgbG9va3VwLT5maWxlbmFt ZSwgJmxvb2t1cC0+Z3VpZCwgMCwKKyAgICAgICAgcmV0ID0gcGF0aF9maW5kX3N5bWJvbF9maWxl KHBjcywgbW9kdWxlLCBsb29rdXAtPmZpbGVuYW1lLCAmbG9va3VwLT5ndWlkLCAwLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9va3VwLT5hZ2UsIGRiZ19maWxlX3BhdGgs ICZtb2R1bGUtPm1vZHVsZS5QZGJVbm1hdGNoZWQpOwogICAgICAgICBicmVhazsKICAgICB9CmRp ZmYgLS1naXQgYS9kbGxzL2RiZ2hlbHAvcGF0aC5jIGIvZGxscy9kYmdoZWxwL3BhdGguYwppbmRl eCA4Yzc0NDI2ZWVjLi4yZTRkOTgyMzNmIDEwMDY0NAotLS0gYS9kbGxzL2RiZ2hlbHAvcGF0aC5j CisrKyBiL2RsbHMvZGJnaGVscC9wYXRoLmMKQEAgLTQ5LDYgKzQ5LDE3IEBAIHN0YXRpYyBpbmxp bmUgY29uc3QgV0NIQVIqIGZpbGVfbmFtZVcoY29uc3QgV0NIQVIqIHN0cikKICAgICByZXR1cm4g cCArIDE7CiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCBmaWxlX3BhdGhXKGNvbnN0IFdDSEFSKiBz cmNGaWxlTmFtZVcsCisgICAgV0NIQVIqIGRzdEZpbGVQYXRoVykKK3sKKyAgICBpbnQgbGVuOwor CisgICAgZm9yIChsZW4gPSBzdHJsZW5XKHNyY0ZpbGVOYW1lVykgLSAxOyAobGVuID4gMCkgJiYg KCFpc19zZXBXKHNyY0ZpbGVOYW1lV1tsZW5dKSk7IGxlbi0tKTsKKworICAgIGxzdHJjcHluVyhk c3RGaWxlUGF0aFcsIHNyY0ZpbGVOYW1lVywgbGVuKTsKKyAgICBkc3RGaWxlUGF0aFdbbGVuXSA9 IEwnXDAnOworfQorCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqCiAgKgkJRmluZERlYnVnSW5mb0ZpbGUgKERCR0hFTFAu QCkKICAqCkBAIC02MTIsOSArNjIzLDkgQEAgc3RhdGljIEJPT0wgQ0FMTEJBQ0sgbW9kdWxlX2Zp bmRfY2IoUENXU1RSIGJ1ZmZlciwgUFZPSUQgdXNlcikKICAgICByZXR1cm4gbWYtPm1hdGNoZWQg PT0gMjsKIH0KIAotQk9PTCBwYXRoX2ZpbmRfc3ltYm9sX2ZpbGUoY29uc3Qgc3RydWN0IHByb2Nl c3MqIHBjcywgUENTVFIgZnVsbF9wYXRoLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgR1VJRCogZ3VpZCwgRFdPUkQgZHcxLCBEV09SRCBkdzIsIFBTVFIgYnVmZmVyLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgQk9PTCogaXNfdW5tYXRjaGVkKQorQk9PTCBwYXRoX2ZpbmRf c3ltYm9sX2ZpbGUoY29uc3Qgc3RydWN0IHByb2Nlc3MqIHBjcywgY29uc3Qgc3RydWN0IG1vZHVs ZSogbW9kdWxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgUENTVFIgZnVsbF9wYXRoLCBj b25zdCBHVUlEKiBndWlkLCBEV09SRCBkdzEsIERXT1JEIGR3MiwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIFBTVFIgYnVmZmVyLCBCT09MKiBpc191bm1hdGNoZWQpCiB7CiAgICAgc3RydWN0 IG1vZHVsZV9maW5kICBtZjsKICAgICBXQ0hBUiAgICAgICAgICAgICAgIGZ1bGxfcGF0aFdbTUFY X1BBVEhdOwpAQCAtNjQzLDYgKzY1NCwyMyBAQCBCT09MIHBhdGhfZmluZF9zeW1ib2xfZmlsZShj b25zdCBzdHJ1Y3QgcHJvY2VzcyogcGNzLCBQQ1NUUiBmdWxsX3BhdGgsCiAgICAgICAgIHJldHVy biBUUlVFOwogICAgIH0KIAorICAgIC8qIEZJWE1FOiBVc2UgRW52aXJvbm1lbnQtVmFyaWFibGVz IChzZWUgTVMgZG9jcykKKyAgICAgICAgICAgICAgICAgX05UX1NZTUJPTF9QQVRIIGFuZCBfTlRf QUxUX1NZTUJPTF9QQVRICisgICAgICAgRklYTUU6IEltcGxlbWVudCAiU3RhbmRhcmQgUGF0aCBF bGVtZW50cyIgKFBhdGgpIC4uLiAoc2VlIE1TIGRvY3MpCisgICAgICAgICAgICAgIGRvIGEgc2Vh cmNoIGZvciAoZXZlcnk/KSBwYXRoLWVsZW1lbnQgbGlrZSB0aGlzIC4uLgorICAgICAgICAgICAg ICA8cGF0aD4KKyAgICAgICAgICAgICAgPHBhdGg+XGRsbAorICAgICAgICAgICAgICA8cGF0aD5c c3ltYm9sc1xkbGwKKyAgICAgICAgICAgICAgKGRsbCBtYXkgYmUgZXhlLCBvciBzeXMgZGVwZW5k aW5nIG9uIHRoZSBmaWxlIGV4dGVuc2lvbikgICAqLworCisgICAgLyogMi4gY2hlY2sgbW9kdWxl LXBhdGggKi8KKyAgICBmaWxlX3BhdGhXKG1vZHVsZS0+bW9kdWxlLkxvYWRlZEltYWdlTmFtZSwg dG1wKTsKKyAgICBpZiAoZG9fc2VhcmNoVyhmaWxlbmFtZSwgdG1wLCBGQUxTRSwgbW9kdWxlX2Zp bmRfY2IsICZtZikpCisgICAgeworICAgICAgICBXaWRlQ2hhclRvTXVsdGlCeXRlKENQX0FDUCwg MCwgdG1wLCAtMSwgYnVmZmVyLCBNQVhfUEFUSCwgTlVMTCwgTlVMTCk7CisgICAgICAgIHJldHVy biBUUlVFOworICAgIH0KKwogICAgIHdoaWxlIChzZWFyY2hQYXRoKQogICAgIHsKICAgICAgICAg cHRyID0gc3RyY2hyVyhzZWFyY2hQYXRoLCAnOycpOwpkaWZmIC0tZ2l0IGEvZGxscy9kYmdoZWxw L3BlX21vZHVsZS5jIGIvZGxscy9kYmdoZWxwL3BlX21vZHVsZS5jCmluZGV4IGU3MjU1Zjg5YmEu LmVhMmE4MjYyZDIgMTAwNjQ0Ci0tLSBhL2RsbHMvZGJnaGVscC9wZV9tb2R1bGUuYworKysgYi9k bGxzL2RiZ2hlbHAvcGVfbW9kdWxlLmMKQEAgLTUzMSw3ICs1MzEsNyBAQCBzdGF0aWMgQk9PTCBw ZV9sb2FkX2RiZ19maWxlKGNvbnN0IHN0cnVjdCBwcm9jZXNzKiBwY3MsIHN0cnVjdCBtb2R1bGUq IG1vZHVsZSwKIAogICAgIFRSQUNFKCJQcm9jZXNzaW5nIERCRyBmaWxlICVzXG4iLCBkZWJ1Z3N0 cl9hKGRiZ19uYW1lKSk7CiAKLSAgICBpZiAocGF0aF9maW5kX3N5bWJvbF9maWxlKHBjcywgZGJn X25hbWUsIE5VTEwsIHRpbWVzdGFtcCwgMCwgdG1wLCAmbW9kdWxlLT5tb2R1bGUuRGJnVW5tYXRj aGVkKSAmJgorICAgIGlmIChwYXRoX2ZpbmRfc3ltYm9sX2ZpbGUocGNzLCBtb2R1bGUsIGRiZ19u YW1lLCBOVUxMLCB0aW1lc3RhbXAsIDAsIHRtcCwgJm1vZHVsZS0+bW9kdWxlLkRiZ1VubWF0Y2hl ZCkgJiYKICAgICAgICAgKGhGaWxlID0gQ3JlYXRlRmlsZUEodG1wLCBHRU5FUklDX1JFQUQsIEZJ TEVfU0hBUkVfUkVBRCwgTlVMTCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgT1BFTl9F WElTVElORywgRklMRV9BVFRSSUJVVEVfTk9STUFMLCBOVUxMKSkgIT0gSU5WQUxJRF9IQU5ETEVf VkFMVUUgJiYKICAgICAgICAgKChoTWFwID0gQ3JlYXRlRmlsZU1hcHBpbmdXKGhGaWxlLCBOVUxM LCBQQUdFX1JFQURPTkxZLCAwLCAwLCBOVUxMKSkgIT0gMCkgJiYKLS0gCjIuMTEuMAoKCgo=